rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-01-11 00:52:21 +01:00
Code Issues Releases Activity
4,070 Commits 7 Branches 93 Tags
Commit Graph

193 Commits

Author SHA1 Message Date
Cristian Maglie
6c4f7dc293 Merge branch 'master' into ide-1.5.x 
Conflicts:
	hardware/arduino/cores/arduino/wiring.c
	libraries/Ethernet/src/utility/util.h
	libraries/Ethernet/src/utility/w5100.cpp
	libraries/Ethernet/src/utility/w5100.h
	libraries/Ethernet/util.h
	libraries/Ethernet/utility/util.h
	libraries/SPI/SPI.cpp
	libraries/SPI/SPI.h
 2014-12-02 22:35:17 +01:00
Cristian Maglie
ae402c2907 Update revision log 2014-12-02 22:20:40 +01:00
Cristian Maglie
7b45b18ae8 Merge branch 'ide-1.5.x-libastyle-2.05' of github.com:ffissore/Arduino into ide-1.5.x 2014-11-21 11:45:46 +01:00
Cristian Maglie
6aff4f4077 Merge branch 'ide-1.5.x-gui-refactor' into ide-1.5.x 2014-11-18 12:22:43 +01:00
Cristian Maglie
285a03a655 Merge branch 'autosave' into HEAD 2014-11-13 11:54:54 +01:00
Cristian Maglie
6ec9f5b23e Merge branch 'ide-1.5.x' of github.com:dpslwk/Arduino into dpslwk-ide-1.5.x 2014-11-07 18:07:38 +01:00
Cristian Maglie
52b685a7a5 Merge remote-tracking branch 'ide-1.5.x-avrdude' into ide-1.5.x 2014-11-05 19:49:53 +01:00
Cristian Maglie
b0d6f42755 Merge branch 'ide-1.5.x-lcd' of github.com:matthijskooijman/Arduino 2014-11-05 17:28:30 +01:00
Cristian Maglie
ca5e30a255 Fixed Robot_Control example R06_Wheel_Calibration 
Fixes #2217
 2014-11-05 15:18:50 +01:00
dpslwk
b8623a4338 (Mac OSX) Improve Quick look and syntax highlighting under OSX 
An exported UTI declaration means that the type is available for use by all other parties.
By adding an this declaration for ino files, it allows Quick Look to display file content and
external editors (like Xcode) to automatically syntax highlight .ino files as C++
 2014-11-04 14:24:18 +00:00
Cristian Maglie
b4f2af4f9d Merge remote-tracking branch 'ide-1.5.x-core.a-rebuild' into ide-1.5.x 2014-11-02 11:52:57 +01:00
Cristian Maglie
d1714a9fb8 [sam] Added -MMD flag to tell compiler to produce dependencies files 
Now a full rebuild of the sketch is triggered only if needed.
 2014-10-22 13:36:14 +02:00
Cristian Maglie
0824abfee5 Merge branch 'master' into ide-1.5.x 
Conflicts:
	hardware/arduino/cores/arduino/HardwareSerial.cpp
	hardware/arduino/cores/robot/Arduino.h
 2014-10-21 17:47:59 +02:00
Cristian Maglie
54a6d644b6 Updated revision log 2014-10-21 17:40:48 +02:00
Cristian Maglie
58b6fd4789 Fixed missing NOT_AN_INTERRUPT constant in digitalPinToInterrupt() 
Fixes #2379
 2014-10-21 16:55:37 +02:00
Cristian Maglie
2a912bab62 Merge branch 'master' into ide-1.5.x 
Conflicts:
	app/src/processing/app/Base.java
 2014-10-10 00:14:22 +02:00
Cristian Maglie
ed5ad426dd Upped version to 1.0.7. Update revision log. 2014-10-10 00:08:41 +02:00
Cristian Maglie
afc368b01f GSM: Backported library from IDE 1.5.x 
Fixes #2343
 2014-10-10 00:02:18 +02:00
Cristian Maglie
3a1b7ea362 Merge branch 'master' into ide-1.5.x. Updated revision log. 
Conflicts:
	build/shared/examples/09.USB/Keyboard/KeyboardLogout/KeyboardLogout.ino
	hardware/arduino/boards.txt
 2014-10-01 13:59:32 +02:00
Cristian Maglie
0d86acc274 Update revision log 2014-09-20 19:47:29 +02:00
Cristian Maglie
7531a3571d update revision log 2014-09-16 12:53:46 +02:00
Cristian Maglie
84518e442c Fixed attribution rights for SAM delayMicroseconds function 2014-09-16 12:31:16 +02:00
Cristian Maglie
44bcd2040b Merge branch 'master' into ide-1.5.x 
Conflicts:
	app/src/processing/app/Base.java
	build/build.xml
	todo.txt
 2014-09-16 12:19:39 +02:00
Cristian Maglie
90bd172f30 Updated revision log. Version upped to 1.0.6. 2014-09-16 12:16:06 +02:00
Cristian Maglie
7f2350f714 Merge branch 'master' into ide-1.5.x 2014-08-08 15:44:41 +02:00
Christopher Andrews
1bbcb2f9d4 Added replacement stub for cstdlib atexit() funciton. 
This is an empty stub to simply allow use of complex types with a
non global static lifetime. For more complex handling the function
'atexit' can be redefined in user code.

For more information see:

https://github.com/arduino/Arduino/pull/2229
https://github.com/arduino/Arduino/issues/1919
 2014-08-08 15:38:57 +02:00
Cristian Maglie
60f8a897ed Updated revision log 2014-08-08 14:35:39 +02:00
Cristian Maglie
8ae1d36a00 Update revision log 2014-08-06 10:21:30 +02:00
Cristian Maglie
66c6d49325 Merge branch 'find-replace-fixes' into ide-1.5.x 2014-07-25 12:36:46 +02:00
Cristian Maglie
8131af93dd Fixed wrong return value in FileIO::size() 
Fixes #2203
 2014-07-24 12:19:13 +02:00
Cristian Maglie
5de6192dae Updated revision log 2014-07-06 01:41:54 +02:00
Cristian Maglie
807f509a6e Updated revision log 2014-07-04 18:25:17 +02:00
Cristian Maglie
f9cdc5ea00 Update revision log 2014-07-02 16:10:07 +02:00
Cristian Maglie
5f1173e7e3 Update revision log 2014-07-02 15:04:33 +02:00
Fede85
8e48cef584 added support for the ArduinoISP 2014-07-02 15:03:12 +02:00
Cristian Maglie
81a5352811 Merge branch 'master' into ide-1.5.x 2014-07-01 19:07:55 +02:00
Cristian Maglie
494d3de97d Fixed permission on wifishield upgrade script. 2014-07-01 19:05:03 +02:00
Cristian Maglie
c2c122b079 Merge branch 'master' into matthijskooijman-ide-1.5.x-timer-variant 
Conflicts:
	app/src/processing/app/debug/Compiler.java
	hardware/arduino/sam/cores/arduino/main.cpp
 2014-07-01 18:34:46 +02:00
Cristian Maglie
668559fc6f Updated revision log 2014-07-01 18:27:03 +02:00
Cristian Maglie
3332d28e54 Merge branch 'master' into ide-1.5.x 2014-06-30 18:26:56 +02:00
Cristian Maglie
f73209728d Updated revision log 2014-06-30 18:24:42 +02:00
Cristian Maglie
d52e75ff38 Merge branch 'osx-app-bundler' into ide-1.5.x 
Conflicts:
	build/build.xml
 2014-06-27 16:08:20 +02:00
Cristian Maglie
403c96f1cc Merge remote-tracking branch 'arduino/master' into ide-1.5.x 2014-06-27 13:53:26 +02:00
Cristian Maglie
370648a532 Merge branch 'ide-1.5.7' into ide-1.5.x 2014-06-27 13:44:18 +02:00
Cristian Maglie
a798c79dab Updates to revision log 2014-06-25 16:02:00 +02:00
Cristian Maglie
c2e5f67ea6 Updated arm gcc to version 4.8.3-2014q1 2014-06-25 11:59:47 +02:00
Cristian Maglie
4df2c8982a Updated arm gcc to 4.8.3 2014-06-25 11:57:49 +02:00
Cristian Maglie
3a4381955e Updated arm gcc to 4.7.4 2014-06-25 11:56:50 +02:00
Cristian Maglie
6b5a99b7b5 Version bumped to 1.5.7. Updated revision log. 2014-06-25 11:21:15 +02:00
Federico Fissore
c387f87329 Corrected typos: Yun -> Yún 2014-05-30 12:17:09 +02:00