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

260 Commits

Author SHA1 Message Date
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
b35e76ab42 Cleaning up Mac OS X ant build script (template.app copying). 2011-10-10 11:49:08 -04:00
David A. Mellis
72ac63c892 Fixing same eeprom.h problem on Windows. 2011-09-28 17:23:44 -04:00
David A. Mellis
68fdc3f012 Fixing a bug in Mac eeprom.h (that appears on ATtiny's). 2011-09-28 17:21:59 -04:00
David A. Mellis
479fe85d27 Merge remote-tracking branch 'upstream/new-extension' into new-extension 2011-09-16 20:55:42 -04:00
David A. Mellis
98777c6b87 Updating Mac OS X version to 1.0-rc1. 2011-09-16 20:55:12 -04:00
Zach Eveland
ab8fc5aab7 Merge branch 'new-extension' of https://github.com/arduino/Arduino into new-extension 2011-09-16 10:27:11 -04:00
Zach Eveland
16ff49ac62 fixed typo in INF's device description 2011-09-13 20:46:53 -04:00
David A. Mellis
1627fd39dc Updating Mac OS X Info.plist (.app) version to 1.0-beta4. 2011-09-09 17:16:28 -04:00
David A. Mellis
3414012dc8 Updating to avrdude 5.11 on Linux 64-bit. 
http://code.google.com/p/arduino/issues/detail?id=606
 2011-09-09 16:07:21 -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
94879d3ac6 Merge branch 'new-extension' of https://github.com/arduino/Arduino into new-extension 
Conflicts:
	build/linux/dist/tools/avrdude.conf
 2011-09-08 20:26:47 -04:00
David A. Mellis
3cbbb17e9f Changing editor line status bar text color to white. 
http://code.google.com/p/arduino/issues/detail?id=599
 2011-09-07 17:53:33 -04:00
David A. Mellis
a6a1aca8a2 Updating to avrdude 5.11 on Linux. 
http://code.google.com/p/arduino/issues/detail?id=606
 2011-09-07 19:58:10 +02: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 A. Mellis
9dcf769123 Updating Mac OS X Info.plist version to 1.0-beta3. 2011-09-04 20:18:05 -04:00
David A. Mellis
1a600d67e2 Updating to avrdude 5.11 on Mac OS X. 
http://code.google.com/p/arduino/issues/detail?id=606
 2011-09-02 20:41:07 -04:00
David Mellis
83da177280 Merge branch 'new-extension' of github.com:arduino/Arduino into new-extension 2011-09-02 19:58:39 -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
David A. Mellis
be786b70de Revert "Don't include ArduinoTestSuite in Mac OS X distribution." 
This reverts commit a18eb93d817b11c5b8659d55376856c9c06ca743.
 2011-09-02 10:02:55 -04:00
David A. Mellis
1278144d50 Moving serialEvent() calls from RX interrupts to main for() loop (after loop()). 
http://code.google.com/p/arduino/issues/detail?id=584
 2011-08-31 15:52:56 -04:00
Tom Igoe
b21b43c591 deleted .pde examples 2011-08-30 17:02:55 -04:00
Tom Igoe
35777612c0 Changed all .pde examples to .ino 
All examples in /build/shared/examples/ and /libraries/ have had their
extensions changed to .ino
 2011-08-30 15:33:32 -04:00
Zach Eveland
91f89da73a Merge branch 'mainline' into new-extension 2011-08-30 08:38:06 -04:00
Zach Eveland
6345e2942a auto-upload-and-reset works now at 300 bps. patched avrdude for Mac to support 300 bps connection, changed core and boards.txt to match 2011-08-27 20:32:34 -04:00
David A. Mellis
3f0b7f21c2 Updating Mac OS X .app version to 1.0-beta2. 2011-08-26 13:34:25 -04:00
Cristian Maglie
f233861a4c URL right-clickable and underlined. 2011-08-23 19:21:42 +02:00
Cristian Maglie
d60c42e5ed Clickable url are now searched with a good regexp and highlighted. 2011-08-19 22:32:34 +02:00
David A. Mellis
ac3f093b76 Revert "Added Schematic view (from wiring)." 
This reverts commit ccb318c2abd193269236141324d04e421a50e44e.
 2011-08-18 14:54:42 -04:00
David A. Mellis
cb39ad9739 A few API changes to new Stream parsing functions. 
Renamed readChars() -> readBytes(), readCharsUntil() -> readBytesUntil().
Changed timeouts to milliseconds from seconds; default from 5 to 1 seconds.
Removed readCharsBetween().
 2011-08-17 14:16:47 -04:00
Cristian Maglie
ccb318c2ab Added Schematic view (from wiring). 2011-08-16 20:38:23 +02: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
tigoe
4c73aaf186 Edited build/shared/examples/4.Communication/SerialEvent/SerialEvent.ino via GitHub 2011-06-09 04:08:38 -07:00
Tom Igoe
665ae33e88 removing new-extension branch examples from master branch 2011-05-24 13:35:36 -04:00
Tom Igoe
4805fea3b2 Moving recent commits to new-extension branch 2011-05-21 13:22:43 -04:00
Tom Igoe
ceddbf960f Added SerialEvent() example 2011-05-21 09:58:52 -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
0efc1311ab Updating FTDI drivers on Mac OS X (to 2.2.16 from 28 February 2011). 2011-05-13 11:08:59 -04:00
Tom Igoe
7ecf9ec237 Updated Serial Communication examples with compressed versions of Max/MSP patches that accompany them. 2011-05-03 13:21:41 -04:00
David A. Mellis
43cfc87f17 Updating version number to 0100 to allow checking for Arduino 1.0. 
http://code.google.com/p/arduino/issues/detail?id=453
 2011-03-26 16:41:30 -04:00
David A. Mellis
6739f20bbf Modifying examples to use Serial.write() instead of Serial.print(BYTE). 2011-02-26 14:04:41 -05:00
David A. Mellis
97abbd7a31 Removing BYTE keyword (use Serial.write() instead). 2011-02-26 13:58:03 -05:00
David A. Mellis
3eae87adc9 Modifying examples to use Serial.write() instead of Serial.print(BYTE). 2011-02-26 13:57:41 -05:00
David A. Mellis
896b1a48a1 Revert "Merge branch 'new-extension' of git@github.com:arduino/Arduino" 
This reverts commit 42fa932cebb23b62bece52392548f6526fc4d563, reversing
changes made to a7352b894f258c7b2e8087d735f1a4aa8e765ea0.

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
Tom Igoe
fa3728ea03 Merge branch 'master' of git@github.com:arduino/Arduino 2011-02-24 09:31:13 -05:00
David A. Mellis
d15e9aa98a Merge branch 'master' into new-extension 2011-02-22 22:02:22 -05:00
David A. Mellis
956a4f2024 Revert "Adding noAnalogWrite() function to disable PWM." 
This reverts commit 38d4a34fec6925b29a732d13e200f54ee4b42025.
 2011-02-18 10:40:56 -05:00
David A. Mellis
24e62aa4e7 Switching to RXTX-2.1-7r2 on 64-bit Linux (working version). 
This also means we don't need a separate RXTXcomm.jar file for 64-bit Linux.
 2011-02-16 23:26:40 -05:00
David A. Mellis
6e227dda6e Updating 64-bit linux version of avrdude (to one with usbtiny support). 
This also means we don't need a separate avrdude.conf for the 64-bit Linux version of avrdude.
 2011-02-16 20:56:33 -05:00