Преглед изворни кода

fix VARIANT not getting set

Chris Mullins пре 8 година
родитељ
комит
04a8c2bbbc
2 измењених фајлова са 6 додато и 6 уклоњено
  1. 2 2
      .get_version.py
  2. 4 4
      platformio.ini

+ 2 - 2
.get_version.py

@@ -1,5 +1,5 @@
 from subprocess import check_output
-import os
+import sys
 import os
 import platform
 import subprocess
@@ -29,4 +29,4 @@ if is_tool("git"):
         pass
 
 
-print("-DMILIGHT_HUB_VERSION=%s" % version)
+sys.stdout.write("-DMILIGHT_HUB_VERSION=%s" % version)

+ 4 - 4
platformio.ini

@@ -26,7 +26,7 @@ board = nodemcuv2
 lib_deps =
   ${common.lib_deps_builtin}
   ${common.lib_deps_external}
-build_flags = ${common.build_flags} -D FIRMWARE_VARIANT=nodemcuv2
+build_flags = -D FIRMWARE_VARIANT=nodemcuv2 ${common.build_flags}
 
 [env:d1_mini]
 platform = espressif8266
@@ -35,13 +35,13 @@ board = d1_mini
 lib_deps =
   ${common.lib_deps_builtin}
   ${common.lib_deps_external}
-build_flags = ${common.build_flags} -D FIRMWARE_VARIANT=d1_mini
+build_flags = -D FIRMWARE_VARIANT=d1_mini ${common.build_flags}
 
 [env:esp12]
 platform = espressif8266
 board = esp12e
 framework = arduino
-build_flags = ${common.build_flags} -Wl,-Tesp8266.flash.4m1m.ld -D FIRMWARE_VARIANT=esp12
+build_flags = -Wl,-Tesp8266.flash.4m1m.ld -D FIRMWARE_VARIANT=esp12 ${common.build_flags}
 lib_deps =
   ${common.lib_deps_builtin}
   ${common.lib_deps_external}
@@ -50,7 +50,7 @@ lib_deps =
 platform = espressif8266
 board = esp07
 framework = arduino
-build_flags = ${common.build_flags} -Wl,-Tesp8266.flash.1m64.ld -D FIRMWARE_VARIANT=esp07
+build_flags = -Wl,-Tesp8266.flash.1m64.ld -D FIRMWARE_VARIANT=esp07 ${common.build_flags}
 lib_deps =
   ${common.lib_deps_builtin}
   ${common.lib_deps_external}