1
0
mirror of https://github.com/arduino/Arduino.git synced 2024-12-10 21:24:12 +01:00
Commit Graph

3640 Commits

Author SHA1 Message Date
Matthijs Kooijman
d2505a08f6 Process platform-specific suffixes immediately
In preferences files, platform-specific versions can be indicated by a
.linux, .windows or .macos suffix on the key name. Previously, these
keys were loaded as normal and then afterwards, all keys were scanned
after loading them and any platform-specific versions replaced the
regular ones.

However, this means that these platform-specific versions get an
unexpected form of priority. Normally, when a single key is set twice,
the latter overrides the first. However, the platform-specific values
could override the regular versions, even when the regular version
occurs later in the file.

This problem was particularly confusing when using the new
platform.local.txt: a regular preference in platform.local.txt did not
override a platform-specific preference in platform.txt.

This commit changes behaviour to process these suffixes directly as they
are read from the preference files. If a suffix for the current platform
is found, the line is processed as if the suffix was not present. If a
suffix for another platform is found, the line is ignored altogether.

This can slightly change the way preferences files are parsed, but as
long as platform-specific preferences are defined after the
corresponding regular preferences, the behaviour should be the same.
2014-04-14 15:35:33 +02:00
Cristian Maglie
f0738fdf9f Merge branch 'ide-1.5.x_serial_config' of github.com:bluesign2k/Arduino into ide-1.5.x 2014-04-10 21:55:29 +02:00
Cristian Maglie
b0e29179a5 Added extra flags support through platform.local.txt on sam
See #1985
2014-04-10 21:47:09 +02:00
Cristian Maglie
082f12b9f9 Merge remote-tracking branch 'matthijs/ide-1.5.x-platform.local.txt' into ide-1.5.x 2014-04-10 21:26:26 +02:00
Matthijs Kooijman
a89f5e68cf Explicitly define compiler.path in avr/platform.txt
Previously, this relied on an (ugly, avr-specific) magic default for the
compiler.path variable, set by the IDE. This allowed the IDE to fall
back to a system-wide toolchain when no bundled toolchain was found (by
making compiler.path empty).

However,
 - this only worked for avr, not sam,
 - this worked only for gcc, a system-wide avrdude would break on the
   avrdude.conf path in platform.txt, and

This would mean that automatic system-wide fallback didn't work in all
situations, so you'd still have to modify platform.txt (or create
platform.local.txt). Since doing that explictly is the most reliable
way, this commit removes the partial-working ability to do this
automatically.

Note that the code to automatically set compiler.path is still kept
around, in case third-party hardware still relies on this. At some
point, this code should be removed, but for now it just shows a warning
message.
2014-04-10 12:19:43 +02:00
Chris
d02fde6e37 Add config options to due Serial1, 2, and 3
Adds ability to set length, parity and stop bit configuration to
hardware serial ports using USART module (Serial1, Serial2, and Serial
3) on Due to allow compatibility with avr devices.
2014-04-07 21:55:23 +01:00
Cristian Maglie
06d75a4fa6 Merge branch 'master' into ide-1.5.x 2014-04-07 19:14:13 +02:00
Cristian Maglie
9c7e3ab4c3 Fixed example StringStartsWithEndsWith.ino 2014-04-07 19:07:49 +02:00
Cristian Maglie
a74597dceb Merge branch 'master' of github.com:majenkotech/Arduino 2014-04-07 18:54:27 +02:00
Cristian Maglie
ae1ef4750a Merge branch 'master' into ide-1.5.x 2014-04-07 18:53:15 +02:00
Matthijs Kooijman
d2ec05611c Add (empty) compiler.*.extra_flags variables in platform.txt
These make it easier for a user to add extra compiler flags in a
platform.local.txt file.
2014-04-04 11:31:50 +02:00
Matthijs Kooijman
a46e503a30 Allow overriding platform.txt using platform.local.txt
This helps advanced users that want to change options (e.g. to use a
different toolchain or enable warnings), without having to change
platform.txt (which could make git report changed files all the time).
2014-04-04 10:35:32 +02:00
Federico Fissore
b2500b3b85 Temboo: library and examples update 2014-04-03 19:56:46 +02:00
Federico Vanzati
4a10c1c5a8 Merge pull request #1907 from egueli/master
Esplora: added reading from Tinkerkit inputs
2014-04-02 11:50:37 +02:00
Cristian Maglie
710e4fb7b8 Merge commit '1ad74' into ide-1.5.x 2014-04-01 17:19:54 +02:00
Cristian Maglie
1ad74ce09b Use correct type for index calculation in HardwareSerial 2014-04-01 17:18:02 +02:00
jantje
77187ad4e4 I forgot a file 2014-04-01 16:14:16 +02:00
Matt Jenkins
8a1fffdb8e Import WString from 1.5.6 2014-04-01 14:46:13 +01:00
Matt Jenkins
5bc28a178f Fixed string constructor overloading bug 2014-04-01 14:02:17 +01:00
Federico Fissore
88ed5d53a6 Spacebrew update 2014-04-01 09:35:56 +02:00
Cristian Maglie
2f7e712fb9 Merge pull request #1968 from matthijskooijman/ide-1.5.x-hwserial-typo
Fix typo in SerialEvent3 handling
2014-03-27 19:47:59 +01:00
Matthijs Kooijman
c734246c46 Fix typo in SerialEvent3 handling
In commit 0e97bcb (Put each HardwareSerial instance in its own .cpp
file), the serial event handling was changed. This was probably a
copy-paste typo.

The effect of this bug was that SerialEvent3 would not run, unless
SerialEvent2 was defined, but also that if SerialEvent2 is defined but
SerialEvent3 is not, this could cause a reset (call to NULL pointer).

This closes #1967, thanks to Peter Olson for finding the bug and fix.
2014-03-27 19:20:54 +01:00
Cristian Maglie
ff85589b62 Merge remote-tracking branch 'arduino/master' into ide-1.5.x 2014-03-25 22:45:20 +01:00
Cristian Maglie
8be693e7ac Merge branch 'master' into ide-1.5.x
Conflicts:
	app/src/processing/app/Sketch.java
	app/src/processing/app/debug/Compiler.java
2014-03-25 22:44:30 +01:00
Cristian Maglie
962d6d1e3a Merge pull request #1958 from Ramoonus/patch-1
Update README.md
2014-03-25 18:01:37 +01:00
jantje
a51e1c4025 Added support for different size of TX and RX buffer sizes.
Added support for buffer sizes bigger than 256 bytes.
Added possibility to overrule the default size.

Added support for different size of TX and RX buffer sizes.
The default values remain the same. You can however specify a different
value for TX and RX buffer

Added possibility to overrule the default size.
If you want to have different values
define SERIAL_TX_BUFFER_SIZE and SERIAL_RX_BUFFER_SIZE on the command
line


Added support for buffer sizes bigger than 256 bytes.
Because of the possibility to change the size of the buffer sizes longer
than 256 must be supported.
The type of the indexes is decided upon the size of the buffers. So
there is no increase in program/data size when the buffers are smaller
than 257
2014-03-24 21:40:12 +01:00
Ramon van Belzen
860da6fe0d Update README.md
also make ToDo a link
2014-03-24 19:56:25 +01:00
jantje
fd5f4791c4 This commit contains 2 changes:
Added support for different size of TX and RX buffer sizes.
Added support for buffer sizes bigger than 256 bytes.

Added support for different size of TX and RX buffer sizes.
The default values remain the same. If you want to have different values
define SERIAL_TX_BUFFER_SIZE and SERIAL_RX_BUFFER_SIZE on the command
line

Added support for buffer sizes bigger than 256 bytes.
The type of the indexes is decided upon the size of the buffers. So
there is no increase in program/data size when the buffers are smaller
than 257
2014-03-23 23:12:00 +01:00
Cristian Maglie
567240236a Added compatibity for 1.5 libraries layout on IDE 1.0.x
See #1765
2014-03-20 14:56:46 +01:00
Cristian Maglie
70df7ffc0c Fixed build.xml leftovers after last merge 2014-03-17 10:31:20 +01:00
Cristian Maglie
c192d689bc Better checks for library metadata
See #1765
2014-03-16 12:54:04 +01:00
Cristian Maglie
f50ec335fe Removing the magic baudrate is no longer needed with JSSC
Fixes #1203.

The original patch was introduced to workaround a problem with ArduinoISP reported
in #995. After some debugging it seems caused by a glitch in RXTX library,
more discussion here: https://github.com/arduino/Arduino/issues/1203
2014-03-16 12:17:25 +01:00
Cristian Maglie
738b9d8e29 Merge remote-tracking branch 'arduino/master' into ide-1.5.x
Conflicts:
	.gitignore
	app/lib/commons-logging-1.0.4.jar
	build/build.xml
	build/windows/launcher/config_debug.xml
	libraries/Esplora/examples/Beginners/EsploraJoystickMouse/EsploraJoystickMouse.ino
2014-03-16 12:11:19 +01:00
Cristian Maglie
4672eee6e6 Merge pull request #1931 from Fede85/ide-1.5.x
[YunSerialTerminal example]: corrected the CRC in the Bridge shutdown co...
2014-03-14 10:46:46 +01:00
Fede85
475ee9fde5 [YunSerialTerminal example]: corrected the CRC in the Bridge shutdown command 2014-03-13 11:44:44 +01:00
Scott Fitzgerald
9810e896d1 Update to Esplora example
Added Mouse.press to Esplora Joystick Mouse example
2014-03-08 12:43:18 +04:00
Cristian Maglie
16915f12a3 Merge pull request #1899 from arduino/arduino_debug_master_backport
Windows: arduino_debug.exe
2014-03-04 14:17:33 +01:00
Federico Fissore
5a60f6b008 Windows: launch4j gets downloaded at build time 2014-03-04 13:13:48 +01:00
Cristian Maglie
4c8199e412 Merge pull request #1773 from oni303/minus_support
added support for '-' in filenames
2014-03-04 10:55:00 +01:00
Enrico Gueli
8642df71e6 Esplora: added reading form Tinkerkit inputs 2014-03-03 19:57:02 +01:00
Georg von Zengen
efedfa7049 cut the filename at the last '.' not at the first in tab-names of the editor 2014-02-27 14:30:19 +01:00
Cristian Maglie
d2ef583c2c Merge pull request #1902 from arduino/ide-1.5.x-hidden-files-removed
Removed useless hidden files
2014-02-27 14:24:33 +01:00
Federico Fissore
f3ca136cd9 Removed useless hidden files
Updated .gitignore
Closes #996
2014-02-27 14:21:48 +01:00
Georg von Zengen
3be6eb84b9 added support for '-' and '.' but both not as the first as first character 2014-02-27 14:14:36 +01:00
Cristian Maglie
c84e9ed21a Merge branch 'master' into ide-1.5.x 2014-02-27 13:32:35 +01:00
Federico Fissore
994f0d7bfd Windows: arduino_debug.exe. Backport of ad2ff737bb 2014-02-27 13:24:49 +01:00
Cristian Maglie
2380a8f3d7 Added copyright license for WiFi shield library
See #1117
2014-02-27 12:46:05 +01:00
Cristian Maglie
34009f075d Merge pull request #1886 from arduino/ide-1.5.6-r2
Fixes for 1.5.6-r2 release
2014-02-21 18:02:03 +01:00
Federico Fissore
f3619c3123 Closes #277. Cores files intentionally left out of the commit as they require a different approach and have a different history 2014-02-21 16:21:32 +01:00
Federico Fissore
79eb32f816 Fixed NPE when RXCHAR event with no bytes. Closes #1885 2014-02-21 11:14:30 +01:00