1
0
mirror of https://github.com/arduino/Arduino.git synced 2024-12-12 23:08:52 +01:00
Commit Graph

111 Commits

Author SHA1 Message Date
Cristian Maglie
23c7536dc7 Merged 1.0.2
Merge remote-tracking branch 'arduino/master' into ide-1.5.x

Conflicts:
	app/src/processing/app/debug/AvrdudeUploader.java
	build/shared/examples/09.USB/Keyboard/KeyboardLogout/KeyboardLogout.ino
	build/shared/examples/09.USB/Keyboard/KeyboardReprogram/KeyboardReprogram.ino
	build/shared/examples/09.USB/Keyboard/KeyboardSerial/KeyboardSerial.ino
	build/shared/examples/09.USB/Mouse/ButtonMouseControl/ButtonMouseControl.ino
	build/shared/examples/09.USB/Mouse/JoystickMouseControl/JoystickMouseControl.ino
	hardware/arduino/boards.txt
2012-11-04 22:49:14 +01:00
Cristian Maglie
7b946264d5 Added general yield()-hook for cooperative scheduling development (part 2) 2012-11-02 18:12:21 +01:00
Cristian Maglie
107c1929bd Added general yield()-hook for cooperative scheduling development 2012-10-31 01:37:37 +01:00
Cristian Maglie
289b836046 Merged latest changes in AVR arduino core 2012-10-18 18:47:50 +02:00
Cristian Maglie
aba27c43aa Merged upstream arduino branch 2012-10-18 15:50:09 +02:00
Cristian Maglie
46aeeb4b29 Merged upstream Arduino master branch 2012-06-26 00:51:35 +02:00
Cristian Maglie
33083d84b3 Merge of arduino-1.0.1. Work in progress... 2012-05-23 09:22:52 +02:00
Cristian Maglie
b276a75d13 Pre-merge upstream Arduino 2012-05-22 11:23:47 +02:00
Thibaut VIARD
f83cd2f3e7 [sam] prelimanary work on USB Device stack 2012-03-29 21:11:05 +02:00
Cristian Maglie
5ad4422fc7 Merge remote-tracking branch 'arduino/master' into platforms-b 2011-12-31 17:29:36 +01:00
Cristian Maglie
1b3ae5fa63 Created second level in hardware folder: hardware/PACKAGE/PLATFORM/...
Made some helper class for files filtering.
platforms.txt now contains only one platform at a time.
Some cleanup in Compiler and AvrDudeUploader classes.
2011-12-30 15:46:04 +01:00