led menu for generic boards

Author: d-a-v

platform.txt

@@ -21,6 +21,8 @@ build.lwip_lib=-llwip_gcc
 build.lwip_include=lwip/include
 build.lwip_flags=-DLWIP_OPEN_SRC
 
+build.led=
+
 compiler.path={runtime.tools.xtensa-lx106-elf-gcc.path}/bin/
 compiler.sdk.path={runtime.platform.path}/tools/sdk
 compiler.libc.path={runtime.platform.path}/tools/sdk/libc/xtensa-lx106-elf
@@ -72,13 +74,13 @@ recipe.hooks.core.prebuild.1.pattern=bash -c "mkdir -p {build.path}/core && echo
 recipe.hooks.core.prebuild.1.pattern.windows=
 
 ## Compile c files
-recipe.c.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.cpreprocessor.flags} {compiler.c.flags} -DF_CPU={build.f_cpu} {build.lwip_flags} {build.debug_port} {build.debug_level} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD="{build.board}" {compiler.c.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
+recipe.c.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.cpreprocessor.flags} {compiler.c.flags} -DF_CPU={build.f_cpu} {build.lwip_flags} {build.debug_port} {build.debug_level} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD="{build.board}" {build.led} {compiler.c.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
 
 ## Compile c++ files
-recipe.cpp.o.pattern="{compiler.path}{compiler.cpp.cmd}" {compiler.cpreprocessor.flags} {compiler.cpp.flags} -DF_CPU={build.f_cpu} {build.lwip_flags} {build.debug_port} {build.debug_level} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD="{build.board}" {compiler.cpp.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
+recipe.cpp.o.pattern="{compiler.path}{compiler.cpp.cmd}" {compiler.cpreprocessor.flags} {compiler.cpp.flags} -DF_CPU={build.f_cpu} {build.lwip_flags} {build.debug_port} {build.debug_level} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD="{build.board}" {build.led} {compiler.cpp.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
 
 ## Compile S files
-recipe.S.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.cpreprocessor.flags} {compiler.S.flags} -DF_CPU={build.f_cpu} {build.lwip_flags} {build.debug_port} {build.debug_level} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD="{build.board}" {compiler.c.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
+recipe.S.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.cpreprocessor.flags} {compiler.S.flags} -DF_CPU={build.f_cpu} {build.lwip_flags} {build.debug_port} {build.debug_level} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD="{build.board}" {build.led} {compiler.c.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
 
 ## Create archives
 recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} {compiler.ar.extra_flags} "{build.path}/arduino.ar" "{object_file}"

tools/boards.txt.py

@@ -61,6 +61,7 @@
             'flashfreq_menu',
             'flashmode_menu',
             '512K', '1M', '2M', '4M', '8M', '16M',
+            'led',
             ],
     }),
     ( 'esp8285', {
@@ -74,6 +75,7 @@
             'flashmode_dout',
             'flashfreq_40',
             '1M',
+            'led',
             ],
     }),
     ( 'espduino', {
@@ -399,7 +401,6 @@
 macros = {
     'defaults': collections.OrderedDict([
         ( '.upload.tool', 'esptool' ),
-        ( '.upload.speed', '115200' ),
         ( '.upload.maximum_data_size', '81920' ),
         ( '.upload.wait_for_upload_port', 'true' ),
         ( '.serial.disableDTR', 'true' ),
@@ -552,10 +553,12 @@
 
     }
 
-################################################################
 ################################################################
 # defs
 
+################################################################
+# debug options
+
 # https://rosettacode.org/wiki/Combinations#Python
 def comb (m, lst):
     if m == 0: return [[]]
@@ -613,6 +616,9 @@ def all_debug ():
             ]))
     return { 'debug_menu': debugmenu }
 
+################################################################
+# flash size
+
 def flash_size (display, optname, ld, desc, max_upload_size, spiffs_start = 0, spiffs_size = 0, spiffs_blocksize = 0):
     menu = '.menu.FlashSize.' + optname
     menub = menu + '.build.'
@@ -658,6 +664,24 @@ def all_flash_size ():
         }
 
 ################################################################
+# builtin led
+
+def led (default,max):
+    led = collections.OrderedDict([
+                ('.menu.led.' + str(default), str(default)),
+                ('.menu.led.' + str(default) + '.build.led', '-DUSERLED=' + str(default)),
+          ]);
+    for i in range(0,max):
+        if not i == default:
+            led.update(
+                collections.OrderedDict([
+                    ('.menu.led.' + str(i), str(i)),
+                    ('.menu.led.' + str(i) + '.build.led', '-DUSERLED=' + str(i)),
+                ]))
+    return { 'led': led }
+
+################################################################
+# help / usage
 
 def usage (name,ret):
     print ""
@@ -667,6 +691,7 @@ def usage (name,ret):
     print ""
     print "	-h, --help"
     print "	--lwip			- preferred default lwIP version (default %d)" % lwip
+    print "	--led			- preferred default builtin led for generic boards (default %d)" % led_default
     print "	--board b		- board to modify:"
     print "		--speed	s	- change default serial speed"
     print ""
@@ -694,9 +719,11 @@ def usage (name,ret):
 
 lwip = 2
 default_speed = '115'
+led_default = 2
+led_max = 16
 
 try:
-    opts, args = getopt.getopt(sys.argv[1:], "h", ["help", "lwip=", "speed=", "board="])
+    opts, args = getopt.getopt(sys.argv[1:], "h", ["help", "lwip=", "led=", "speed=", "board="])
 except getopt.GetoptError as err:
     print str(err)  # will print something like "option -a not recognized"
     usage(sys.argv[0], 1)
@@ -711,6 +738,9 @@ def usage (name,ret):
 
     elif o in ("--lwip"):
         lwip = a
+    
+    elif o in ("--led"):
+        led_default = int(a)
 
     elif o in ("--board"):
         if not a in boards:
@@ -732,6 +762,7 @@ def usage (name,ret):
 
 macros.update(all_flash_size())
 macros.update(all_debug())
+macros.update(led(led_default, led_max))
 
 print '#'
 print '# this file is script-generated and is likely to be overwritten by ' + sys.argv[0]
@@ -749,6 +780,7 @@ def usage (name,ret):
 print 'menu.Debug=Debug port'
 print 'menu.DebugLevel=Debug Level'
 print 'menu.LwIPVariant=lwIP Variant'
+print 'menu.led=Builtin Led'
 print ''
 
 for id in boards:

variants/generic/pins_arduino.h

@@ -34,7 +34,10 @@
 static const uint8_t SDA = PIN_WIRE_SDA;
 static const uint8_t SCL = PIN_WIRE_SCL;
 
-static const uint8_t BUILTIN_LED = 1;
-static const uint8_t LED_BUILTIN = 1;
+#ifndef USERLED
+#define USERLED 1
+#endif
+static const uint8_t BUILTIN_LED = USERLED;
+static const uint8_t LED_BUILTIN = USERLED;
 
 #endif /* Pins_Arduino_h */