1
0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-16 11:21:18 +03:00
Commit Graph

32 Commits

Author SHA1 Message Date
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
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
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
f233861a4c URL right-clickable and underlined. 2011-08-23 19:21:42 +02:00
d60c42e5ed Clickable url are now searched with a good regexp and highlighted. 2011-08-19 22:32:34 +02:00
ac3f093b76 Revert "Added Schematic view (from wiring)."
This reverts commit ccb318c2ab.
2011-08-18 14:54:42 -04:00
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
ccb318c2ab Added Schematic view (from wiring). 2011-08-16 20:38:23 +02:00
97abbd7a31 Removing BYTE keyword (use Serial.write() instead). 2011-02-26 13:58:03 -05:00
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
956a4f2024 Revert "Adding noAnalogWrite() function to disable PWM."
This reverts commit 38d4a34fec.
2011-02-18 10:40:56 -05:00
38d4a34fec Adding noAnalogWrite() function to disable PWM.
Also, removing the inline version of digitalPinToTimer() (since we're not optimizing the functions that use it anyway).  The noAnalogWrite() function is in wiring_analog.c, deriving from the previous turnOffPWM() which has moved from wiring_digital.c.

http://code.google.com/p/arduino/issues/detail?id=476
2011-02-12 14:47:08 -05:00
15d07fa036 Splitting up programmer selection menu and burn bootloader menu item. 2010-12-17 19:58:40 -05:00
299b779ca2 Updating colors, toolbar icon, and about image. 2010-11-10 10:43:46 -05:00
57e2c152f1 Adding shiftIn() from Wiring (no count or delaytime though). 2010-08-11 22:59:00 +00:00
4df6fde6b5 Added String keyword 2010-07-27 21:29:58 +00:00
52e0e1a999 INTERNAL -> INTERNAL1V1 AND INTERNAL2V56 on the Mega (issue #194). 2010-07-10 21:07:51 +00:00
31601ffe77 Adding a peek() function to Stream and HardwareSerial (Serial). 2010-07-04 23:31:55 +00:00
34579ae440 Initial sync with Processing 6406. Compiles and runs (on Mac OS X) but probably very buggy. 2010-04-21 01:58:57 +00:00
0f357096b4 Updated reference and added tone() and noTone() to keywords.txt. 2010-01-09 17:43:16 +00:00
9c8f9c852c Adding end() to the keywords file. 2009-12-23 00:01:36 +00:00
76f7c447b9 Adding Serial1, Serial2, Serial3 to keywords.txt. Removing SERIAL and DISPLAY. 2009-12-18 16:25:28 +00:00
5f9cbf5bb1 Adding default target to the preferences. 2009-12-18 16:00:36 +00:00
de28fadf49 Adding break and continue to the keywords file. 2009-10-23 22:40:47 +00:00
2e26a2d994 Syncing with Processing 1.0.9 (revision 5766). 2009-10-22 00:56:16 +00:00
d50988f991 New icons and about image by Thomas Glaser (envis precisely). 2009-07-31 21:59:53 +00:00
46f5a9f540 Defaulting to the standard Apple (Mac) menu bar at the top of the screen instead of the in-window menus that Processing uses. 2009-07-31 21:48:14 +00:00
20ebdc9d30 Spaces -> tabs in keywords.txt (should fix highlighting of bit related functions). 2009-07-14 22:07:37 +00:00
950d0d4c00 Switching theme colors and images to the old Arduino blue ones. On the plus side, the new theme setup should make it easier to have different colors in different releases (i.e. improve the color scheme). 2009-06-13 13:43:48 +00:00
60a3f29abf Removing files for Processing's export to applet feature. 2009-06-02 16:13:08 +00:00
df4f1629c4 Making things more Arduino-like (cont...) 2009-06-01 17:10:56 +00:00
22ed6cdb73 Importing Processing rev. 5503 (1.0.3). 2009-05-31 15:53:33 +00:00