arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-17 22:23:10 +03:00
Code Activity

Merge branch 'ide-1.5.x' into dev-ide-1.5.x-discovery

Browse Source 
Conflicts:
	app/src/cc/arduino/packages/uploaders/SerialUploader.java
	app/src/processing/app/Editor.java
	app/src/processing/app/Sketch.java
	app/src/processing/app/debug/Uploader.java
This commit is contained in:
Cristian Maglie
2013-07-14 12:01:03 +02:00
parent de095c0c43 65c36f2eb6
commit 008818868c
11 changed files with 80 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hardware/arduino/avr/libraries/SoftwareSerial/keywords.txt
View File

@ -1,6 +1,6 @@
#######################################
# Syntax Coloring Map for SoftwareSerial
# (formely NewSoftSerial)
# (formerly NewSoftSerial)
#######################################
#######################################

3
hardware/arduino/avr/platform.txt
View File

@ -40,6 +40,9 @@ recipe.c.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.c.flags} -mmcu={b
## Compile c++ files
recipe.cpp.o.pattern="{compiler.path}{compiler.cpp.cmd}" {compiler.cpp.flags} -mmcu={build.mcu} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
## Compile S files
recipe.S.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.S.flags} -mmcu={build.mcu} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
## Create archives
recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} "{build.path}/{archive_file}" "{object_file}"