rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2024-11-29 10:24:12 +01:00
Code Issues Releases Activity
1,604 Commits 7 Branches 93 Tags 2.9 GiB
76e551592a
Commit Graph

40 Commits

Author SHA1 Message Date
Zach Eveland
d169114205 Merge branch 'master' of github.com:arduino/Arduino into LUFA_bootloader 2012-03-14 15:40:29 -04:00
David Mellis
1559066379 Adding .inf file for USB-serial convertor. 2012-03-11 14:01:13 -04:00
Zach Eveland
25a4fe8607 changed Leonardo bootloader and sketch PID values again (now 0x0701 for bootloader, 0x0801 for sketch) 2012-02-13 00:10:16 -05:00
Zach Eveland
c39793001c adjusting descriptors - trying to prevent sketch and bootloader from grabbing different COM numbers on Windows 2012-02-08 01:16:56 -05:00
Zach Eveland
d8e906f81b added LUFA CDC Bootloader.inf for testing - temporary only 2012-02-03 23:16:35 -05:00
Zach Eveland
0fc76a6b87 made Leonardo and Micro bootloader PIDs same as sketch PIDs 2012-01-10 21:23:01 -05:00
Zach Eveland
b78c50bc70 updated Arduino Leonardo.inf with PID for Leonardo bootloader 2012-01-10 17:25:29 -05:00
Zach Eveland
102aabf4ff removed old, invalid device reference in Leonardo .inf file. 
PID 0x0032 was a leftover from bootloader testing - should never have been committed in the first place.
 2011-12-31 12:24:38 -05:00
Cristian Maglie
1e9baf7a46 Fixed windows drivers (usb-serial) 2011-11-11 11:38:13 -05:00
Cristian Maglie
ec0ccf2fc3 Windows .inf drivers for R3 boards 2011-11-11 11:36:45 -05:00
Zach Eveland
c8f495ba7f changed Leonardo PID to 0x0032 for Diskloader testing. updated .inf to match. 2011-10-31 23:44:32 -04:00
Zach Eveland
a6a59f1783 Revert "Merge branch 'master' of github.com:arduino/Arduino into diskloader_reboot" 
This reverts commit df9835efaf, reversing
changes made to ec45af8bfa.

Conflicts:

	hardware/arduino/variants/mega/pins_arduino.h
	libraries/Ethernet/examples/PachubeClientString/PachubeClientString.ino
 2011-10-27 11:45:13 -04:00
Zach Eveland
df9835efaf Merge branch 'master' of github.com:arduino/Arduino into diskloader_reboot 
Conflicts:
	app/src/processing/app/Editor.java
	app/src/processing/app/Sketch.java
	build/shared/examples/4.Communication/SerialCallResponse/SerialCallResponse.pde
	build/shared/lib/theme/theme.txt
	hardware/arduino/cores/arduino/HardwareSerial.h
	hardware/arduino/cores/arduino/Print.cpp
	hardware/arduino/cores/arduino/WString.h
	hardware/arduino/variants/mega/pins_arduino.h
	libraries/Ethernet/examples/PachubeClient/PachubeClient.ino
	libraries/Ethernet/examples/PachubeClientString/PachubeClientString.ino
	libraries/Firmata/examples/EchoString/EchoString.ino
	libraries/SD/File.cpp
	libraries/SoftwareSerial/SoftwareSerial.cpp
	libraries/SoftwareSerial/SoftwareSerial.h
	libraries/SoftwareSerial/examples/SoftwareSerialExample/SoftwareSerialExample.ino
	libraries/SoftwareSerial/keywords.txt
 2011-10-27 09:32:27 -04:00
David A. Mellis
72ac63c892 Fixing same eeprom.h problem on Windows. 2011-09-28 17:23:44 -04:00
Zach Eveland
16ff49ac62 fixed typo in INF's device description 2011-09-13 20:46:53 -04:00
Zach Eveland
6f65578b99 updated Leonardo INF with correct PID and created new Micro INF. 2011-09-08 20:45:10 -04:00
Zach Eveland
e24e9499cf Merge branch 'new-extension' of https://github.com/arduino/Arduino into new-extension 
Conflicts:
	build/macosx/dist/tools-universal.zip
	build/windows/avr_tools.zip
	hardware/arduino/cores/arduino/HardwareSerial.cpp
 2011-09-05 12:53:45 -04:00
David Mellis
85bf4252f0 Updating to avrdude 5.11 (Windows). stk500 -> arduino in boards.txt. 
http://code.google.com/p/arduino/issues/detail?id=606
 2011-09-02 19:57:29 -04:00
Zach Eveland
81948ea4bf added Peter's .inf (uses VID/PID 0x2341/0x0020) 2011-08-14 16:16:40 -04:00
Zach Eveland
87898da8f6 updated avrdude.conf to support 32u4 on Windows, OS X and LInux 2011-08-11 11:20:00 -04:00
David Mellis
a98816a611 Updating FTDI drivers on Windows (to version 2.08.14 from 2011-04-12). 2011-05-14 10:03:27 -04:00
David A. Mellis
896b1a48a1 Revert "Merge branch 'new-extension' of git@github.com:arduino/Arduino" 
This reverts commit 42fa932ceb, reversing
changes made to a7352b894f.

See: http://www.kernel.org/pub/software/scm/git/docs/howto/revert-a-faulty-merge.txt for information on how to merge the branch in later.
 2011-02-25 18:23:34 -05:00
David A. Mellis
12d4552c66 Merge branch 'master' into new-extension 
Conflicts:
	app/src/processing/app/Editor.java
 2010-12-25 18:59:59 -06:00
David Mellis
544cfafb36 Updating eeprom.h on Windows, too. 2010-12-23 19:14:59 -05:00
David Mellis
9e92bed4a7 New about image bitmap for Windows launcher. 2010-11-10 11:53:21 -05:00
David A. Mellis
fa4d058297 Reapplying Christian's regex patch. 
Revert "Revert "Removed dependencies from regex library oro.jar""

This reverts commit ed7795ef8d.
 2010-10-03 19:44:28 -04:00
David A. Mellis
ed7795ef8d Revert "Removed dependencies from regex library oro.jar" 
This reverts commit 2b4391052c.
 2010-10-02 17:19:53 +02:00
Cristian Maglie
2b4391052c Removed dependencies from regex library oro.jar 2010-10-01 19:41:36 +02:00
David Mellis
04be32ce9e Adding Mega 2560 .inf file (Windows). 2010-09-24 09:59:08 -04:00
David Mellis
ff226e1c0c Adding Arduino Uno .inf files (Windows). 2010-09-24 09:48:42 -04:00
David A. Mellis
66f671b6a8 Updating application icon for Mac OS X and Windows. (Windows one is untested.) 2010-09-22 09:08:09 -04:00
David A. Mellis
e5b24cc48b Removing old shell scripts. 2010-05-22 20:25:43 +00:00
David A. Mellis
66a96f53d9 updating windows build scripts for libraries. 2010-01-29 20:06:56 +00:00
David A. Mellis
1cbe35efca Updating to Java 6u16 (from Processing rev. 5883). 2009-12-27 01:04:16 +00:00
David A. Mellis
3dc7fc0781 Syncing with Processing 1.0.7 (5692); needs testing. 
Also, the Sketchbook and Examples menus are currently disabled on the Mac to work-around a bug in Apple's implementation of Java.  I think this bug may have been solved, so I should try re-enabling the menus and see what happens (on 10.4 and 10.5 and 10.6).  Also, I may still need to update the jre / jdk on Linux.
 2009-09-24 03:16:00 +00:00
David A. Mellis
e272a8bcc0 Adding guihead.o and head.o from launch4j (these apparently have some custom modifications from Processing). 2009-09-07 16:42:14 +00:00
David A. Mellis
47fd6c3066 New about.bmp. Apparently the ones you make in Mac OS X don't work with launch4j. 2009-07-31 23:14:55 +00:00
David A. Mellis
d50988f991 New icons and about image by Thomas Glaser (envis precisely). 2009-07-31 21:59:53 +00:00
David A. Mellis
c3c44d8ee1 Updating Windows build scripts and launch4j config and copying over relevant files (avr tools, drivers, dll's) 2009-06-07 16:00:05 +00:00
David A. Mellis
22ed6cdb73 Importing Processing rev. 5503 (1.0.3). 2009-05-31 15:53:33 +00:00