arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-07-30 16:24:09 +03:00
Code Activity

Pre-merge upstream Arduino

Browse Source
This commit is contained in:
Cristian Maglie
2012-05-21 01:56:06 +02:00
parent 38973dc916 2313f6e427
commit b276a75d13
103 changed files with 60311 additions and 2041 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/shared/lib/keywords.txt
View File

@ -3,6 +3,7 @@
HIGH LITERAL1 Constants
LOW LITERAL1 Constants
INPUT LITERAL1 Constants
INPUT_PULLUP LITERAL1 Constants
OUTPUT LITERAL1 Constants
DEC LITERAL1 Serial_Print
BIN LITERAL1 Serial_Print
@ -30,6 +31,7 @@ byte KEYWORD1 Byte
case KEYWORD1 SwitchCase
char KEYWORD1 Char
class KEYWORD1
const KEYWORD1 Const
continue KEYWORD1 Continue
default KEYWORD1 SwitchCase
do KEYWORD1 DoWhile

17
build/shared/lib/preferences.txt
View File

@ -76,11 +76,16 @@ editor.window.width.default = 500
editor.window.height.default = 600
editor.window.width.min = 400
editor.window.height.min = 500
editor.window.height.min = 290
# the following commented out to better support netbooks
# http://code.google.com/p/arduino/issues/detail?id=52
#editor.window.height.min = 500
# tested as approx 440 on OS X
editor.window.height.min.macosx = 450
#editor.window.height.min.macosx = 450
# tested to be 515 on Windows XP, this leaves some room
editor.window.height.min.windows = 530
#editor.window.height.min.windows = 530
# font size for editor
editor.font=Monospaced,plain,12
@ -245,9 +250,15 @@ software=ARDUINO
programmer = arduino:avrispmkii
upload.using = bootloader
upload.verify = true
serial.port=COM1
serial.databits=8
serial.stopbits=1
serial.parity=N
serial.debug_rate=9600
# I18 Preferences
# default chosen language (none for none)
editor.languages.current =