switch to firmware 2.2.x-190703 by default (#6826)

d-a-v · web-flow · commit 8b3b60056ac3 · 2019-11-24T01:00:18.000+01:00
diff --git a/boards.txt b/boards.txt
@@ -372,12 +372,12 @@ generic.menu.led.15=15
 generic.menu.led.15.build.led=-DLED_BUILTIN=15
 generic.menu.led.16=16
 generic.menu.led.16.build.led=-DLED_BUILTIN=16
-generic.menu.sdk.nonosdk_191024=nonos-sdk 2.2.1+111 (191024)
-generic.menu.sdk.nonosdk_191024.build.sdk=NONOSDK22x_191024
-generic.menu.sdk.nonosdk_191105=nonos-sdk 2.2.1+113 (191105)
-generic.menu.sdk.nonosdk_191105.build.sdk=NONOSDK22x_191105
 generic.menu.sdk.nonosdk_190703=nonos-sdk 2.2.1+100 (190703)
 generic.menu.sdk.nonosdk_190703.build.sdk=NONOSDK22x_190703
+generic.menu.sdk.nonosdk_191105=nonos-sdk 2.2.1+113 (191105)
+generic.menu.sdk.nonosdk_191105.build.sdk=NONOSDK22x_191105
+generic.menu.sdk.nonosdk_191024=nonos-sdk 2.2.1+111 (191024)
+generic.menu.sdk.nonosdk_191024.build.sdk=NONOSDK22x_191024
 generic.menu.sdk.nonosdk221=nonos-sdk 2.2.1 (legacy)
 generic.menu.sdk.nonosdk221.build.sdk=NONOSDK221
 generic.menu.sdk.nonosdk3v0=nonos-sdk pre-3 (180626 known issues)
diff --git a/platform.txt b/platform.txt
@@ -42,8 +42,8 @@ build.led=
 
 # default SDK for all boards
 # (generic board overrides this variable)
-#build.sdk=NONOSDK22x_190703
-build.sdk=NONOSDK22x_191024
+build.sdk=NONOSDK22x_190703
+#build.sdk=NONOSDK22x_191024
 #build.sdk=NONOSDK22x_191105
 
 compiler.path={runtime.tools.xtensa-lx106-elf-gcc.path}/bin/
diff --git a/tools/boards.txt.py b/tools/boards.txt.py
@@ -1457,12 +1457,12 @@ def led (name, default, ledList):
 
 def sdk ():
     return { 'sdk': collections.OrderedDict([
-                        ('.menu.sdk.nonosdk_191024', 'nonos-sdk 2.2.1+111 (191024)'),
-                        ('.menu.sdk.nonosdk_191024.build.sdk', 'NONOSDK22x_191024'),
-                        ('.menu.sdk.nonosdk_191105', 'nonos-sdk 2.2.1+113 (191105)'),
-                        ('.menu.sdk.nonosdk_191105.build.sdk', 'NONOSDK22x_191105'),
                         ('.menu.sdk.nonosdk_190703', 'nonos-sdk 2.2.1+100 (190703)'),
                         ('.menu.sdk.nonosdk_190703.build.sdk', 'NONOSDK22x_190703'),
+                        ('.menu.sdk.nonosdk_191105', 'nonos-sdk 2.2.1+113 (191105)'),
+                        ('.menu.sdk.nonosdk_191105.build.sdk', 'NONOSDK22x_191105'),
+                        ('.menu.sdk.nonosdk_191024', 'nonos-sdk 2.2.1+111 (191024)'),
+                        ('.menu.sdk.nonosdk_191024.build.sdk', 'NONOSDK22x_191024'),
                      #  ('.menu.sdk.nonosdk_190313', 'nonos-sdk 2.2.1+61 (190313 testing)'),
                      #  ('.menu.sdk.nonosdk_190313.build.sdk', 'NONOSDK22x_190313'),
                         ('.menu.sdk.nonosdk221', 'nonos-sdk 2.2.1 (legacy)'),
diff --git a/tools/platformio-build.py b/tools/platformio-build.py
@@ -175,20 +175,20 @@ def scons_patched_match_splitext(path, suffixes=None):
         CPPDEFINES=[("NONOSDK22x_190313", 1)],
         LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22x_190313")]
     )
-elif "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703" in flatten_cppdefines:
+elif "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191024" in flatten_cppdefines:
     env.Append(
-        CPPDEFINES=[("NONOSDK22x_190703", 1)],
-        LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22x_190703")]
+        CPPDEFINES=[("NONOSDK22x_191024", 1)],
+        LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22x_191024")]
     )
 elif "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191105" in flatten_cppdefines:
     env.Append(
         CPPDEFINES=[("NONOSDK22x_191105", 1)],
         LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22x_191105")]
     )
-else: #(default) if "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191024" in flatten_cppdefines:
+else: #(default) if "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703" in flatten_cppdefines:
     env.Append(
-        CPPDEFINES=[("NONOSDK22x_191024", 1)],
-        LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22x_191024")]
+        CPPDEFINES=[("NONOSDK22x_190703", 1)],
+        LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22x_190703")]
     )
 
 #

Original file line number	Diff line number	Diff line change
`@@ -175,20 +175,20 @@ def scons_patched_match_splitext(path, suffixes=None):`
`175`	`175`	`CPPDEFINES=[("NONOSDK22x_190313", 1)],`
`176`	`176`	`LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22x_190313")]`
`177`	`177`	`)`
`178`		`-elif "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703" in flatten_cppdefines:`
	`178`	`+elif "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191024" in flatten_cppdefines:`
`179`	`179`	`env.Append(`
`180`		`- CPPDEFINES=[("NONOSDK22x_190703", 1)],`
`181`		`- LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22x_190703")]`
	`180`	`+ CPPDEFINES=[("NONOSDK22x_191024", 1)],`
	`181`	`+ LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22x_191024")]`
`182`	`182`	`)`
`183`	`183`	`elif "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191105" in flatten_cppdefines:`
`184`	`184`	`env.Append(`
`185`	`185`	`CPPDEFINES=[("NONOSDK22x_191105", 1)],`
`186`	`186`	`LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22x_191105")]`
`187`	`187`	`)`
`188`		`-else: #(default) if "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191024" in flatten_cppdefines:`
	`188`	`+else: #(default) if "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703" in flatten_cppdefines:`
`189`	`189`	`env.Append(`
`190`		`- CPPDEFINES=[("NONOSDK22x_191024", 1)],`
`191`		`- LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22x_191024")]`
	`190`	`+ CPPDEFINES=[("NONOSDK22x_190703", 1)],`
	`191`	`+ LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22x_190703")]`
`192`	`192`	`)`
`193`	`193`
`194`	`194`	`#`