Skip to content
Closed
Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
1524 commits
Select commit Hold shift + click to select a range
dace68f
Updating revisions.txt
Oct 22, 2013
bdf7eba
Fixed pre processor bug. Closes #1245
Oct 22, 2013
c11a119
Forgot to include .ino files as test resource
Oct 22, 2013
8aab91c
Removed unused parameteri
Oct 24, 2013
26ff527
It's now possible to specify additional custom board parameters when …
Oct 24, 2013
d133365
IDE command line: sketches can now be specified with relative paths. …
Oct 28, 2013
5284c3a
IDE Command line: using "isAbsolute" instead of "exists" to avoid con…
Oct 28, 2013
35d4772
Added pinToInterrupt() variant macro (Paul Stoffregen)
cmaglie Sep 28, 2013
fca3a87
Added digitalPinToInterrupt also to robot variants
cmaglie Sep 28, 2013
8f1e3fd
Using NOT_AN_INTERRUPT defined constant
cmaglie Oct 1, 2013
cdf9db8
Merge branch 'master' into ide-1.5.x
cmaglie Nov 3, 2013
3607c0b
Merge branch 'master' into ide-1.5.x
cmaglie Nov 3, 2013
8e3da56
Added LED_BUILTIN definition to Arduino Due
cmaglie Nov 3, 2013
be30113
Reference libraries in hardware addons when they reference another core.
cmaglie Nov 3, 2013
c4823cc
Merge branch 'master' into ide-1.5.x
cmaglie Nov 4, 2013
12446a2
Test preproc
Nov 6, 2013
0d8e12d
OSX workaround for board autodetection #223
Nov 8, 2013
aeb510e
Merge remote-tracking branch 'upstream/ide-1.5.x' into task-arduino-1…
karlbackstrom Nov 9, 2013
42a0096
Added VID and PID for older Arduino Unos
Lauszus Nov 11, 2013
7706fcf
Can now detect devices with serial number in the port number on OSX -…
Lauszus Nov 11, 2013
12bd098
Merge pull request #1668 from Lauszus/ide-1.5.x-upstream2
ffissore Nov 11, 2013
77635aa
Merge pull request #1667 from Lauszus/ide-1.5.x-upstream
ffissore Nov 11, 2013
22dfa98
Merge branch 'ide-1.5.x' into ide-1.5.x-preproc
Nov 11, 2013
07f8c69
PdePreprocessor.scubComments result used before looking for libraries…
Nov 11, 2013
05bf2b0
PrePreprocess.scrubComments doesn't properly work: using RegExp from …
Nov 11, 2013
e1579af
PdePreprocessor: different patterns order leads to a slightly differe…
Nov 11, 2013
853be57
Merge remote-tracking branch 'arduino/master' into ide-1.5.x
cmaglie Nov 11, 2013
95eced6
Merge remote-tracking branch 'arduino/ide-1.5.x' into ide-1.5.x
cmaglie Nov 11, 2013
78abc56
Merge branch 'master' into serial-variant
cmaglie Nov 11, 2013
56572fa
Added SERIAL metadata into variant files.
cmaglie Nov 11, 2013
edfa75f
Merge branch 'master' into serial-variant
cmaglie Nov 11, 2013
a0727ac
Merge branch 'master' into ide-1.5.x
cmaglie Nov 12, 2013
3ba9480
Merge pull request #1634 from cmaglie/adc-fix
cmaglie Nov 12, 2013
9b1c9d4
Updated language file.
cmaglie Nov 12, 2013
41697f0
Removed redundant LED_BUILTIN define in Yun variant.
cmaglie Nov 12, 2013
9dcbfd4
Merge branch 'master' into ide-1.5.x
cmaglie Nov 14, 2013
fdb98f1
Using [code] instead of [quote] for Copy for forum. Fixes #1675
Nov 14, 2013
258c7af
Bridge library is now platform independent.
cmaglie Nov 14, 2013
9a9652d
Revert "Wire library to the 1.5 format"
cmaglie Nov 14, 2013
7f17170
Revert "SoftwareSerial library to the new format"
cmaglie Nov 14, 2013
71bb7f7
Fixed vid/pid definition for arduino_due_x_dbg in boards.txt. (Luca B…
cmaglie Nov 15, 2013
139dd6b
PdePreprocessor restored to version 316b871
Nov 16, 2013
e6698e4
Enforcing string start/end check. See #1687
Nov 16, 2013
84e9d70
Preprocessor regexp: "." now matches even line terminators. Closes #1653
Nov 17, 2013
7902fc2
Fixed non working example: StringStartsWithEndsWith.ino
cmaglie Nov 18, 2013
d0758af
PreProcessor now replace every single char with a space, without coll…
Nov 18, 2013
3283206
Fixed compile error on StandardFirmata example.
cmaglie Nov 18, 2013
a4a6601
Don't forbid unknown files in a library
matthijskooijman Nov 19, 2013
3bec912
Reintroduced warning on development leftovers in 1.5 libraries.
cmaglie Nov 20, 2013
fabbe45
Updated msys-1.0.dll to the latest version for Windows 8.1 compatibil…
cmaglie Nov 20, 2013
ff24874
Revert "EEPROM library to the new format"
cmaglie Nov 21, 2013
d5c8287
Revert "SPI library to new format"
cmaglie Nov 21, 2013
bc58474
Detect version of bridge.py running on the Yun.
cmaglie Nov 22, 2013
061d71e
Update version to 1.5.5 (Base.java)
cmaglie Nov 22, 2013
fcb20ea
Added missing File::size() method to Bridge.
cmaglie Nov 22, 2013
e5e9d53
Fixed typo
cmaglie Nov 22, 2013
fe6295e
Implemented multi-byte read in File::read of Bridge library.
cmaglie Nov 22, 2013
583dafb
Fixed return value of Bridge::get(..) (returning 0 also with valid da…
cmaglie Nov 25, 2013
0861595
Update Serial functions
karlbackstrom Nov 26, 2013
efb525c
Variant fix for Serial
karlbackstrom Nov 26, 2013
9728af3
Sync up xmega core with avr core
karlbackstrom Nov 26, 2013
e44365d
Compile fix for XPlain board
karlbackstrom Nov 26, 2013
cb5b0e0
Updated revisions.txt
cmaglie Nov 27, 2013
a0f1d16
Updated revisions.txt
Nov 28, 2013
43f9f15
Upped version to 1.5.5
cmaglie Nov 28, 2013
2186790
Updated translations
cmaglie Nov 28, 2013
ff970f1
Another language update
cmaglie Nov 28, 2013
d5cc92d
FileUtils.readFileToString opens files with UTF-8 encoding
Nov 28, 2013
f334e67
removing RXTX, switching to JSSC
Oct 4, 2013
4b3717b
jssc: updated config files (eclipse, ant build.xml, windows launcher,…
Oct 21, 2013
4a7cee4
Fixed upload on Arduino Leonardo (and derivatives) with JSSC on Mac.
cmaglie Oct 23, 2013
89fa1c4
Don't re-set board preference when changing custom suboptions
matthijskooijman Oct 25, 2013
46c930c
Pass TargetBoard objects around instead of strings
matthijskooijman Oct 25, 2013
0ea5509
Handle errors in the --board parameter
matthijskooijman Oct 25, 2013
e32eafe
Handle sketch with only invalid code filenames
matthijskooijman Oct 25, 2013
4ba80e3
Show an error on unknown options
matthijskooijman Oct 25, 2013
400ae7f
Slightly delay opening of files specified on the commandline
matthijskooijman Oct 25, 2013
0a3b82a
Improve error handling for files on the commandline
matthijskooijman Oct 25, 2013
f502c9b
Error out when a required commandline argument is left out
matthijskooijman Oct 27, 2013
57551b9
Add --pref option
matthijskooijman Oct 27, 2013
beac88e
Pass arguments to the Compiler constructor
matthijskooijman Oct 29, 2013
7b7f447
Move the definition of primaryClassName in Sketch
matthijskooijman Oct 29, 2013
4592acc
Change the logic deciding when to do a full rebuild
matthijskooijman Oct 29, 2013
c6795dd
In EditorConsole::write(), use all arguments
matthijskooijman Oct 29, 2013
9196a8d
Don't show the GUI on --verify or --upload
matthijskooijman Oct 29, 2013
0029e97
Return different exit codes with --verify or --upload
matthijskooijman Nov 28, 2013
1d8901d
Fixed indentation.
cmaglie Dec 3, 2013
cc347e4
Removed unused variable
cmaglie Dec 3, 2013
9b05911
Merge branch 'ide-1.5.x-jssc2' into ide-1.5.x
Dec 3, 2013
9a50f9f
TFT library: warning messages in PImage class and strings inside exam…
Fede85 Dec 6, 2013
c41cc36
Add icons
matthijskooijman Dec 7, 2013
eb986fe
Add .ino mime type info for Linux
matthijskooijman Dec 7, 2013
f73bb08
Add arduino.desktop file for Linux
matthijskooijman Dec 7, 2013
76645b9
In boards.txt, rename atmega328diecimila to diecimila
matthijskooijman Dec 8, 2013
fe2bec5
Add manual page
matthijskooijman Dec 9, 2013
0516ec1
Merge pull request #1727 from matthijskooijman/ide-1.5.x-linuxstuff
cmaglie Dec 9, 2013
d20c028
Merge remote-tracking branch 'arduino/master' into ide-1.5.x
cmaglie Dec 9, 2013
5a6b213
Add appdata.xml file
matthijskooijman Dec 11, 2013
e0825e5
Added script to run astyle every once in a while against all .ino files
Dec 11, 2013
b984463
Merge pull request #1730 from matthijskooijman/ide-1.5.x-appdata
cmaglie Dec 13, 2013
f9bbcab
Removed redefinitions of SERIAL_* in Yun variant
cmaglie Dec 13, 2013
c5880c2
Merge branch 'pins-define' into ide-1.5.x
cmaglie Dec 13, 2013
e2b15c8
Changed pins definition in variants from constants to #defines.
cmaglie Dec 13, 2013
2e7b645
[sam] Fixed wrap-around bug in delay() (Mark Tillotson)
cmaglie Dec 13, 2013
a1c4809
[sam] Fixed regression in analogRead() (fails to read multiple channels)
cmaglie Dec 16, 2013
b530742
[sam] Fixed regression in analogRead() (fails to read multiple channe…
cmaglie Dec 17, 2013
4e262a5
Introducing "defaultTarget" board is the one selected in preferences …
Dec 19, 2013
88a2ca1
Print.print optimization. Closes #1760
Dec 23, 2013
660c7d8
Optimized Print::print(String&) (part 2)
cmaglie Dec 23, 2013
2503868
Add Print::write(const char *, size_t)
matthijskooijman Dec 24, 2013
f304abe
Add uint8_t* versions of methods in Stream
matthijskooijman Dec 24, 2013
2ea12d0
Remove unneeded casts in Print::write(const String&)
matthijskooijman Dec 24, 2013
e93760a
Implemented support for 1.5 libraries specification rev.2
cmaglie Dec 24, 2013
e045cd2
Added a warning for library using the no longer supported "arch" folder
cmaglie Dec 24, 2013
5e76635
Use Files instead of String to handle paths in Compiler class.
cmaglie Dec 24, 2013
4932831
IDE do not hide libraries with incompatible architectures
cmaglie Dec 25, 2013
ce5ff8c
Added "category" field in libraries.
cmaglie Dec 25, 2013
164da52
Added "license" field in libraries.
cmaglie Dec 25, 2013
512925a
IDE warns if a library is compiled with an unsupported architecture
cmaglie Dec 25, 2013
2b53d69
Added the possibility to override library compatibility check
cmaglie Dec 26, 2013
6923cc9
Removed unused import
cmaglie Dec 26, 2013
d930e22
GSM library to format 1.5 rev.2
cmaglie Dec 27, 2013
a80b2b1
Audio library to format 1.5 rev.2
cmaglie Dec 27, 2013
5d361f5
Use reinterpret_cast to cast __FlashStringHelper to const char*
Lauszus Dec 27, 2013
825d8c8
sam: Optimized delayMicroseconds() (Rob Tillaart)
cmaglie Dec 30, 2013
d920b7b
Removed unused stuff from WiFi library.
cmaglie Dec 10, 2013
9d48b52
Removed unused "socket.h" interface from WiFi library.
cmaglie Dec 10, 2013
a248273
Moved vanilla parts of WiFi library into common source folder.
cmaglie Dec 10, 2013
1ddf613
WiFi librari: SPI delay is computed based on F_CPU constant
cmaglie Dec 10, 2013
dd7e0ee
WiFi library is now vanilla
cmaglie Dec 10, 2013
0b72c88
Merge pull request #1762 from matthijskooijman/ide-1.5.x-write-char
cmaglie Dec 30, 2013
98777e8
Use PGM_P instead of prog_char
matthijskooijman Nov 20, 2013
ffddfc8
Merge branch 'cast' of github.com:Lauszus/Arduino into Lauszus-cast
cmaglie Dec 31, 2013
c50821b
Fixed value of NUM_DIGITAL_PINS for Arduino Due
cmaglie Dec 31, 2013
90ab663
sam: moved "variant" methods into proper place
cmaglie Dec 31, 2013
e2d373e
sam: Added digitalPinHasPWM(..) method
cmaglie Dec 31, 2013
673847c
Improved portability of String class (maniacbug)
cmaglie Dec 31, 2013
03a7cf3
Robot Control library to format 1.5 rev.2
cmaglie Jan 1, 2014
4b73026
Servo library to format 1.5 rev.2
cmaglie Jan 1, 2014
d8c30c3
Add error handling and optimize FileIO::doBuffer() in the Bridge library
bobh66 Dec 26, 2013
618f537
Ethernet library refactoring
cmaglie Jan 4, 2014
4dc21ce
Fixed "runtime.hardware.path" and "runtime.platform.path" values
cmaglie Jan 5, 2014
9fce7f1
Added new EULER constant. Fixes #1792
Jan 6, 2014
dfe77f3
Removed = char from #define. See https://github.com/arduino/Arduino/i…
Jan 6, 2014
e50b0ec
Merge branch 'master' into ide-1.5.x
cmaglie Jan 7, 2014
4916654
Removed old Arduino Due drivers for Windows (leftovers)
cmaglie Jan 7, 2014
5925485
Updated drivers signature for Windows
cmaglie Jan 7, 2014
572592a
Merge pull request #1794 from arduino/ide-1.5.x-euler
cmaglie Jan 7, 2014
8595d14
Merge pull request #1790 from cmaglie/platform-paths
cmaglie Jan 9, 2014
2491c16
Merge branch 'lib-1.5-rev2' into HEAD
cmaglie Jan 9, 2014
3d46d58
Signed drivers for Windows 8.1
cmaglie Jan 10, 2014
63e33be
Merge tag '1.5.5-r2' into ide-1.5.x
cmaglie Jan 10, 2014
5eb21f3
New common AVR toolchain
Jan 11, 2014
a23fd5f
Added missing DLLs
Jan 12, 2014
24d05d7
Fixed MacOSX AVR toolchain .zip checksum
Jan 12, 2014
a1371ae
Merge remote-tracking branch 'upstream/ide-1.5.x' into xmegaduino
karlbackstrom Jan 13, 2014
db88e17
Updated avr toolchain for macosx: should be compatible with macosx 10…
Jan 14, 2014
dde1a75
Make some operators in IPAddress const
matthijskooijman Jan 9, 2014
c2e9860
Merge remote-tracking branch 'matthijs/ide-1.5.x-ipaddress-const' int…
cmaglie Jan 16, 2014
f35ec75
Remove duplicate code from HardwareSerial::begin() methods.
matthijskooijman Apr 19, 2013
1fab8c8
Slightly reduce code utilization by inlining HardwareSerail begin(bau…
cmaglie Jan 16, 2014
db5da36
Remove unused variable
matthijskooijman Apr 19, 2013
6cce478
Simplify HardwareSerial::begin()
matthijskooijman Apr 19, 2013
6ac8185
Define a _NOP() macro
matthijskooijman Dec 1, 2013
e40cf5b
Use constants for register bit positions in HardwareSerial
matthijskooijman Apr 18, 2013
03fac84
Move interrupt handlers into HardwareSerial class
matthijskooijman Apr 18, 2013
fbdb480
Merge branch 'ide-1.5.x' into ide-1.5.x-avr-toolchain
Jan 17, 2014
8364134
Wire library, move hard references IRQn to defines in variant.h
dpslwk Jan 17, 2014
e63b942
Toolchains updated, sha1sum updates follow
Jan 19, 2014
90fb863
better Client.stop() handling in WebClientRepeating and WifiWebClient…
Fede85 Jan 21, 2014
fb32435
Compile with -x assembler-with-cpp instead of -assembler-with-cpp.
Jan 21, 2014
bd5a493
Merge pull request #1816 from HeMan/ide-1.5.x
cmaglie Jan 22, 2014
722675b
Use bit_is_clear in HardwareSerial::flush()
matthijskooijman Apr 18, 2013
3d34651
Improve HardwareSerial::flush()
matthijskooijman Apr 18, 2013
4fb15f2
Fix HardwareSerial::flush() when interrupts are kept disabled for a w…
matthijskooijman Apr 19, 2013
ccd8880
Fix lockup when writing to HardwareSerial with interrupts disabled
matthijskooijman Apr 18, 2013
0be4e8c
Disable the UDRE interrupt sooner in HardwareSerial
matthijskooijman Apr 18, 2013
8e43c1a
Centrally decide which hardware UARTS are available
matthijskooijman Dec 1, 2013
0e97bcb
Put each HardwareSerial instance in its own .cpp file
matthijskooijman Dec 3, 2013
275c0a0
Inlined HardwareSerial calls to RX ISR.
cmaglie Jan 22, 2014
9ad14b2
In HardwareSerial::write, bypass the queue when it's empty
matthijskooijman Dec 18, 2013
dd02dcf
Merge branch 'master' into ide-1.5.x
Jan 23, 2014
201e8c7
Toolchains updated, sha1sum updates follow
Jan 23, 2014
a111f82
Merge remote-tracking branch 'arduino/ide-1.5.x' into ide-1.5.x-avr-t…
Jan 23, 2014
895d394
Added command line option "--preferences-file" to manually set the pa…
Jan 23, 2014
a013ab2
Added some string to translate
Jan 23, 2014
f876733
Updated manpage
cmaglie Jan 25, 2014
48c1223
Update to jssc 2.8.0
Jan 23, 2014
5b48b1e
Merge branch 'serial-patch-2' into ide-1.5.x
cmaglie Jan 27, 2014
bcfa1a7
Updated revision log
cmaglie Jan 28, 2014
9ebfe23
Merge branch 'patch-1' of github.com:bobh66/Arduino into bobh66-patch-1
cmaglie Jan 28, 2014
cd9657f
Clean up unused var from HardwareSerial_private.h
ribbons Jan 28, 2014
fbea640
Fixed macosx app template to reflect jssc update
cmaglie Jan 29, 2014
6315177
Reorder HardwareSerial init to fix compiler warn
ribbons Jan 29, 2014
5cf8671
Merge pull request #1835 from ribbons/hardwareserial-warning
cmaglie Jan 29, 2014
cb732b1
Merge branch 'ide-1.5.x' into ide-1.5.x-avr-toolchain
Jan 30, 2014
b6fa3c7
Update .classpath
cmaglie Jan 30, 2014
a4fb116
Merge branch 'ide-1.5.x' into ide-1.5.x-avr-toolchain
Jan 30, 2014
40ef449
New toolchain: gcc 4.8.1, avr-libc 1.8.0, binutils 2.23.2
Feb 4, 2014
2f1f5a0
New toolchain: macosx fix
Feb 4, 2014
793b139
Merge remote-tracking branch 'arduino/master' into ide-1.5.x
cmaglie Feb 5, 2014
0c62798
Fixed typo in test
Feb 6, 2014
1fe82d8
Merge remote-tracking branch 'arduino/ide-1.5.x' into ide-1.5.x
Feb 6, 2014
b05e7ac
Merge remote-tracking branch 'upstream/ide-1.5.x-avr-toolchain-gcc-4.…
karlbackstrom Feb 7, 2014
765d762
Removed old xmega specific tool chain.
karlbackstrom Feb 7, 2014
ea4bb17
Make xmega core build with new toolchain
karlbackstrom Feb 7, 2014
d60f1df
Added command line option --verbose-build and --verbose-upload
cmaglie Feb 6, 2014
9d46f1f
Added license for avr/HardwareSerial.
cmaglie Feb 7, 2014
9eb0c14
Added license for Client, IPAddressm and Server
cmaglie Feb 7, 2014
397046a
Added license for Arduino.h, binary.h and main.cpp
cmaglie Feb 10, 2014
bb91f33
Fixed avrdude path for xmega.
karlbackstrom Feb 11, 2014
a44f4be
Merge remote-tracking branch 'arduino/master' into ide-1.5.x
cmaglie Feb 11, 2014
a96c8ca
Merge branch 'master' into ide-1.5.x
cmaglie Feb 12, 2014
79f5a34
Revert "Changed pins definition in variants from constants to #defines."
cmaglie Feb 13, 2014
6104b28
Merge remote-tracking branch 'arduino/master' into ide-1.5.x
cmaglie Feb 13, 2014
6372eb8
In HardwareSerial, don't use int for buffer indices
matthijskooijman Feb 12, 2014
8504bca
Merge branch 'ide-1.5.x' of github.com:dpslwk/Arduino into dpslwk-ide…
cmaglie Feb 14, 2014
92958ef
Merge pull request #1863 from matthijskooijman/ide-1.5.x-serial-int
cmaglie Feb 14, 2014
277a64d
Merge branch 'ide-1.5.x' into ide-1.5.x-avr-toolchain
Feb 17, 2014
ea0acb2
Merge branch 'ide-1.5.x-avr-toolchain' into ide-1.5.x-avr-toolchain-g…
Feb 17, 2014
2115d63
Merge remote-tracking branch 'arduino/master' into ide-1.5.x
Feb 17, 2014
cb10999
Merge branch 'ide-1.5.x' into ide-1.5.x-avr-toolchain
Feb 17, 2014
2b5e73f
Merge branch 'ide-1.5.x-avr-toolchain' into ide-1.5.x-avr-toolchain-g…
Feb 17, 2014
4e334b2
Merge branch 'master' into ide-1.5.x
cmaglie Feb 17, 2014
39c5b34
In HardwareSerial::_rx_complete_irq, don't use int for buffer index
matthijskooijman Feb 12, 2014
dfa490f
Be more consistent about not trying to redownload the JRE and astyle …
obra Feb 18, 2014
170b742
Merge pull request #1871 from obra/dont-redownload-existing-files
ffissore Feb 18, 2014
76ded60
Updated all library.properties to 1.5 rev2 lib format
cmaglie Feb 18, 2014
bab0062
Temboo library is now vanilla
cmaglie Feb 18, 2014
0a126d7
[sam] itoa() and related function are now available for the sketch
cmaglie Feb 18, 2014
ce65ece
SpacebrewYun library is now vanilla (after 42d19b55c900cc33334d7938c9…
cmaglie Feb 18, 2014
8120558
Fix loops in the SAM banzai() reset function
matthijskooijman Feb 18, 2014
9fcf005
[sam] Removed workaround in banzai() subroutine after 8120558af569cc6…
cmaglie Feb 18, 2014
c039653
Merge pull request #1870 from matthijskooijman/ide-1.5.x-serial-int
cmaglie Feb 18, 2014
ab362fc
Merge remote-tracking branch 'arduino/master' into ide-1.5.x
cmaglie Feb 19, 2014
50abaaa
Updated translations
cmaglie Feb 19, 2014
2659b47
Update revision log. Upped version to 1.5.6
cmaglie Feb 19, 2014
781271e
Robot_Control fixes. See #1709 #1599.
cmaglie Feb 19, 2014
ad2ff73
Windows: arduino_debug.exe: no splash screen, outputs messages to stdout
Feb 20, 2014
36b4248
Fixed jar inclusion in launch4j config files
cmaglie Feb 20, 2014
a3632d5
Windows: launch4j gets downloaded at build time
Feb 20, 2014
f91670e
Fixed JSSC upload problem with Arduino Due on MacOSX
cmaglie Feb 20, 2014
c39a6a2
Update revision log
cmaglie Feb 20, 2014
79eb32f
Fixed NPE when RXCHAR event with no bytes. Closes #1885
Feb 21, 2014
f3619c3
Closes #277. Cores files intentionally left out of the commit as they…
Feb 21, 2014
34009f0
Merge pull request #1886 from arduino/ide-1.5.6-r2
cmaglie Feb 21, 2014
f67919c
Manual merge ide.1.5.x
Feb 26, 2014
c3ee7ed
Manual merge ide.1.5.x-avr-toolchain
Feb 26, 2014
a966acd
Toolchains updated: avrdude 6.0.1 replaces 5.11
Feb 27, 2014
0faf605
Merge remote-tracking branch 'upstream/ide-1.5.x-avr-toolchain-gcc-4.…
karlbackstrom Feb 27, 2014
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ build/windows/jre.zip
build/windows/libastylej*
build/windows/arduino-*.zip
build/windows/dist/gcc-*.tar.gz
build/windows/launch4j-*
build/windows/launcher/launch4j
build/windows/WinAVR-*.zip
build/macosx/arduino-*.zip
build/macosx/dist/gcc-*.tar.gz
build/macosx/libastylej*
Expand All @@ -31,3 +34,4 @@ test-bin
.DS_Store
hardware/arduino/avr/libraries/Bridge/examples/XivelyClient/passwords.h
avr-toolchain-*.zip

2 changes: 0 additions & 2 deletions app/src/cc/arduino/packages/Uploader.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

$Id$
*/

package cc.arduino.packages;
Expand Down
14 changes: 7 additions & 7 deletions app/src/cc/arduino/packages/discoverers/SerialDiscovery.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@

package cc.arduino.packages.discoverers;

import cc.arduino.packages.BoardPort;
import cc.arduino.packages.Discovery;
import jssc.SerialPortList;
import java.util.ArrayList;
import java.util.List;

import processing.app.Base;
import processing.app.Platform;
import processing.app.Serial;
import processing.app.helpers.PreferencesMap;

import java.util.ArrayList;
import java.util.List;
import cc.arduino.packages.BoardPort;
import cc.arduino.packages.Discovery;

public class SerialDiscovery implements Discovery {

Expand All @@ -48,7 +48,7 @@ public List<BoardPort> discovery() {

List<BoardPort> res = new ArrayList<BoardPort>();

String[] ports = SerialPortList.getPortNames();
List<String> ports = Serial.list();

for (String port : ports) {
String boardName = os.resolveDeviceAttachedTo(port, Base.packages, devicesListOutput);
Expand Down
2 changes: 0 additions & 2 deletions app/src/cc/arduino/packages/uploaders/SerialUploader.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

$Id$
*/

package cc.arduino.packages.uploaders;
Expand Down
4 changes: 2 additions & 2 deletions app/src/processing/app/Base.java
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@
* files and images, etc) that comes from that.
*/
public class Base {
public static final int REVISION = 155;
public static final int REVISION = 156;
/** This might be replaced by main() if there's a lib/version.txt file. */
static String VERSION_NAME = "0155";
static String VERSION_NAME = "0156";
/** Set true if this a proper release rather than a numbered revision. */
static public boolean RELEASE = false;

Expand Down
4 changes: 4 additions & 0 deletions app/src/processing/app/Preferences.java
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ public String toString() {

Language languages[] = {
new Language(_("System Default"), "", ""),
new Language(_("Albanian"), "shqip", "sq"),
new Language(_("Arabic"), "العربية", "ar"),
new Language(_("Aragonese"), "Aragonés", "an"),
new Language(_("Belarusian"), "Беларуская мова", "be"),
Expand Down Expand Up @@ -145,6 +146,7 @@ public String toString() {
Language missingLanguages[] = {
new Language(_("Armenian"), "Հայերեն", "hy"),
new Language(_("Asturian"), "Asturianu", "ast"),
new Language(_("Basque"), "Euskara", "eu"),
new Language(_("Bosnian"), "Bosanski", "bs"),
new Language(_("Burmese (Myanmar)"), "ဗမာစကား", "my_MM"),
new Language(_("Chinese (China)"), "", "zh_CN"),
Expand All @@ -153,8 +155,10 @@ public String toString() {
new Language(_("Chinese (Taiwan) (Big5)"), "", "zh_TW.Big5"),
new Language(_("Dutch (Netherlands)"), "Nederlands", "nl_NL"),
new Language(_("Nepali"), "नेपाली", "ne"),
new Language(_("N'Ko"), "ߒߞߏ", "nqo"),
new Language(_("Marathi"), "मराठी", "mr"),
new Language(_("Portugese"), "Português", "pt"),
new Language(_("Persian (Iran)"), "فارسی (Iran)", "fa_IR"),
};

/**
Expand Down
11 changes: 7 additions & 4 deletions app/src/processing/app/Serial.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,17 @@

package processing.app;

import jssc.*;
import processing.app.debug.MessageConsumer;
import static processing.app.I18n._;

import java.io.IOException;
import java.util.Arrays;
import java.util.List;

import static processing.app.I18n._;
import jssc.SerialPort;
import jssc.SerialPortEvent;
import jssc.SerialPortEventListener;
import jssc.SerialPortException;
import processing.app.debug.MessageConsumer;


public class Serial implements SerialPortEventListener {
Expand Down Expand Up @@ -172,7 +175,7 @@ public void addListener(MessageConsumer consumer) {
public synchronized void serialEvent(SerialPortEvent serialEvent) {
if (serialEvent.isRXCHAR()) {
try {
byte[] buf = port.readBytes();
byte[] buf = port.readBytes(serialEvent.getEventValue());
if (buf.length > 0) {
if (bufferLast == buffer.length) {
byte temp[] = new byte[bufferLast << 1];
Expand Down
Loading