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

62 Commits

Author SHA1 Message Date
ddcb89e1fa Removed wrong executable flag on many files 2013-09-27 18:18:51 +02:00
00fa0f2002 Added pow keyword (closes #1509) 2013-09-27 18:05:55 +02:00
8f39da6664 added some String methods syntax highlighting 2013-07-03 09:03:17 +02:00
2d6af8264b Merge remote-tracking branch 'arduino/ide-1.5.x' into ide-1.5.x-discovery 2013-05-13 16:58:10 +02:00
a46259a0cf Merged 1.0.5
Still missing:
- updates to WiFi lib for sam.
- updates to examples of Ehternet and WiFi for sam.

Merge remote-tracking branch 'arduino/master' into ide-1.5.x

Conflicts:
	app/src/processing/app/Base.java
	app/src/processing/app/Editor.java
	app/src/processing/app/helpers/FileUtils.java
	app/src/processing/app/i18n/Resources_fr.po
	app/src/processing/app/i18n/Resources_fr.properties
	build/shared/revisions.txt
	hardware/arduino/avr/libraries/Ethernet/examples/DnsWebClient/DnsWebClient.ino
	hardware/arduino/avr/libraries/WiFi/examples/WifiChatServer/WifiChatServer.ino
	hardware/arduino/avr/libraries/WiFi/examples/WifiPachubeClient/WifiPachubeClient.ino
	hardware/arduino/avr/libraries/WiFi/examples/WifiPachubeClientString/WifiPachubeClientString.ino
	hardware/arduino/avr/libraries/WiFi/examples/WifiTwitterClient/WifiTwitterClient.ino
	hardware/arduino/avr/libraries/WiFi/examples/WifiUdpSendReceiveString/WifiUdpSendReceiveString.ino
	hardware/arduino/avr/libraries/WiFi/examples/WifiWebClient/WifiWebClient.ino
	hardware/arduino/avr/libraries/WiFi/examples/WifiWebClientRepeating/WifiWebClientRepeating.ino
	hardware/arduino/avr/libraries/WiFi/examples/WifiWebServer/WifiWebServer.ino
	libraries/WiFi/examples/WiFiChatServer/WiFiChatServer.ino
	libraries/WiFi/examples/WiFiPachubeClient/WiFiPachubeClient.ino
	libraries/WiFi/examples/WiFiPachubeClientString/WiFiPachubeClientString.ino
	libraries/WiFi/examples/WiFiTwitterClient/WiFiTwitterClient.ino
	libraries/WiFi/examples/WiFiUdpSendReceiveString/WiFiUdpSendReceiveString.ino
	libraries/WiFi/examples/WiFiWebClient/WiFiWebClient.ino
	libraries/WiFi/examples/WiFiWebClientRepeating/WiFiWebClientRepeating.ino
	libraries/WiFi/examples/WiFiWebServer/WiFiWebServer.ino
	libraries/WiFi/examples/WifiChatServer/WifiChatServer.ino
	libraries/WiFi/examples/WifiPachubeClient/WifiPachubeClient.ino
	libraries/WiFi/examples/WifiPachubeClientString/WifiPachubeClientString.ino
	libraries/WiFi/examples/WifiTwitterClient/WifiTwitterClient.ino
	libraries/WiFi/examples/WifiUdpSendReceiveString/WifiUdpSendReceiveString.ino
	libraries/WiFi/examples/WifiWebClient/WifiWebClient.ino
	libraries/WiFi/examples/WifiWebClientRepeating/WifiWebClientRepeating.ino
	libraries/WiFi/examples/WifiWebServer/WifiWebServer.ino
2013-05-11 14:37:25 +02:00
595d7fe1a3 added colored keywords readString and readStringUntil 2013-05-09 18:39:03 +02:00
dc71ab77bf nicer password popup 2013-05-06 12:31:03 +02:00
79952e9691 linux, macosx, windows build scripts and confs
temporary lock image
2013-05-06 12:31:03 +02:00
090f721606 Clarified error messages and added a configurable warning level
Changed memory usage check to only fail build on 100%+ usage and added a
configurable warning level for memory usage defaulting to 75%.

Clarified error and warning messages related to memory usage to specify
that this is the minimum memory usage.
2013-05-02 13:10:02 -07:00
c46e178c2e added driver install utility (dpinst 32- and 64-bit) and Arduino icon needed for Windows installer 2013-04-12 15:15:21 -04:00
66ee23b885 Merged 1.0.3 2012-12-10 15:55:05 +01:00
6dbc2bfc57 "register" is now highlighted as a keyword.
Fixes #1154
2012-12-10 12:27:42 +01:00
d458ef7806 fixed permissions on a lot of text files. see #1116 2012-12-10 10:42:49 +01:00
107c1929bd Added general yield()-hook for cooperative scheduling development 2012-10-31 01:37:37 +01:00
562324d5f6 Adjusted off-by-one naming for Serial object: Serial2/3/4 => Serial1/2/3 2012-10-15 14:27:03 +02:00
2071c00ba0 Assigned Serial to UART and SerialUSB to USB-CDC-ACM 2012-09-28 16:18:22 +02:00
33083d84b3 Merge of arduino-1.0.1. Work in progress... 2012-05-23 09:22:52 +02:00
b276a75d13 Pre-merge upstream Arduino 2012-05-22 11:23:47 +02:00
afaeee22ac [sam] Fixed pinout for Serial4. Fixed keywords. Recompiled shipped libsam binary 2012-04-27 14:25:57 +02:00
75fbe7673f added new CDC-, Mouse-, and Keyboard-related keywords 2012-04-09 09:00:48 -04:00
a9284d7a11 Defaulting to system language instead of English. 2012-04-08 15:25:05 -04:00
c3535a0d8e hacked the IDE to support multiple translations and include a dropdown list to choose the most convenient 2012-04-08 03:51:37 +02:00
04c9bb2f4d Adding const to keywords.txt.
http://code.google.com/p/arduino/issues/detail?id=137
2012-03-11 14:25:35 -04:00
a292677108 Adding preference for disabling verification on upload (Nathan Seidle)
Adds a checkbox to the preferences dialog that controls whether or not
to verify code on upload via serial (verification still always occurs
when uploading using a programmer).  It is checked by default to match
current behavior.
2012-03-03 13:54:10 -05:00
6ab18ea1cc Lowering minimum editor heights for netbooks
http://code.google.com/p/arduino/issues/detail?id=52
2012-02-14 16:13:39 -08:00
76c964d32b Adding INPUT_PULLUP option pinMode(). (Paul Stoffregen).
This also changes pinMode(pin, INPUT); to explicitly disable the pull-up resistor, even if it was previously set.

http://code.google.com/p/arduino/issues/detail?id=246
2012-01-02 14:20:28 -05:00
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
65c15d93eb Merge commit 'fcbbf8f4b4960bae1091c0cd9dc58b4a1885baf6' into platforms-b
Conflicts:
	app/src/processing/app/Base.java
	app/src/processing/app/debug/Compiler.java
	build/build.xml
	hardware/arduino/boards.txt
2011-12-22 00:35:33 +01:00
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
dacfa86223 Addtional debuggin. Trying to find the pins compile issue. 2011-06-22 21:20:45 -06:00
f977f5f3c8 Updated preferences.txt to have a default platform=avr 2011-06-15 19:18:07 -04: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