Changed bin file names to be more descriptive. (letscontrolit#597)

* Changed bin file names to be more descriptive. * Fixed TRAVIS check
s0170071 · Nov 21, 2017 · 3131a07 · 3131a07
1 parent 3418f2b
commit 3131a07
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 23 deletions.
diff --git a/before_deploy b/before_deploy
@@ -3,19 +3,22 @@
 VERSION=$(git describe)
 echo "Creating release archives for $VERSION ..."
 #binaries
-# cp .pioenvs/mini_512/firmware.bin dist/"ESPEasy_$VERSION""_mini_512.bin"
 
-cp .pioenvs/normal_1024/firmware.bin dist/"ESPEasy_$VERSION""_normal_1024.bin"
-cp .pioenvs/normal_4096/firmware.bin dist/"ESPEasy_$VERSION""_normal_4096.bin"
-cp .pioenvs/normal_8285/firmware.bin dist/"ESPEasy_$VERSION""_normal_8285.bin"
+#ESP_Easy_v[version]-[build type]-dev[dev number]-ESP[chip type]-[size].bin
 
-cp .pioenvs/test_1024/firmware.bin dist/"ESPEasy_$VERSION""_test_1024.bin"
-cp .pioenvs/test_4096/firmware.bin dist/"ESPEasy_$VERSION""_test_4096.bin"
-cp .pioenvs/test_8285/firmware.bin dist/"ESPEasy_$VERSION""_test_8285.bin"
+#cp .pioenvs/mini_512/firmware.bin dist/"ESPEasy_$VERSION""_mini_512.bin"
 
-cp .pioenvs/dev_1024/firmware.bin dist/"ESPEasy_$VERSION""_dev_1024.bin"
-cp .pioenvs/dev_4096/firmware.bin dist/"ESPEasy_$VERSION""_dev_4096.bin"
-cp .pioenvs/dev_8285/firmware.bin dist/"ESPEasy_$VERSION""_dev_8285.bin"
+cp .pioenvs/normal_ESP8266_1024/firmware.bin dist/"ESP_Easy_$VERSION""_normal_ESP8266_1024.bin"
+cp .pioenvs/normal_ESP8266_4096/firmware.bin dist/"ESP_Easy_$VERSION""_normal_ESP8266_4096.bin"
+cp .pioenvs/normal_ESP8285_1024/firmware.bin dist/"ESP_Easy_$VERSION""_normal_ESP8285_1024.bin"
+
+cp .pioenvs/test_ESP8266_1024/firmware.bin dist/"ESP_Easy_$VERSION""_test_ESP8266_1024.bin"
+cp .pioenvs/test_ESP8266_4096/firmware.bin dist/"ESP_Easy_$VERSION""_test_ESP8266_4096.bin"
+cp .pioenvs/test_ESP8285_1024/firmware.bin dist/"ESP_Easy_$VERSION""_test_ESP8285_1024.bin"
+
+cp .pioenvs/dev_ESP8266_1024/firmware.bin dist/"ESP_Easy_$VERSION""_dev_ESP8266_1024.bin"
+cp .pioenvs/dev_ESP8266_4096/firmware.bin dist/"ESP_Easy_$VERSION""_dev_ESP8266_4096.bin"
+cp .pioenvs/dev_ESP8285_1024/firmware.bin dist/"ESP_Easy_$VERSION""_dev_ESP8285_1024.bin"
 
 #create a source structure that is the same as the original ESPEasy project (and works with the howto on the wiki)
 rm -rf dist/Source 2>/dev/null

diff --git a/memanalyzer.py b/memanalyzer.py
@@ -23,7 +23,7 @@
 TOTAL_IRAM = 32786;
 TOTAL_DRAM = 81920;
 
-env="dev_4096"
+env="dev_ESP8266_4096"
 
 sections = OrderedDict([
     ("data", "Initialized Data (RAM)"),
@@ -185,8 +185,8 @@ def enable_lib(lib):
     # results={}
     # for lib in libs:
     #     enable_lib(lib)
-    #     subprocess.check_call("platformio run --silent --environment dev_4096", shell=True)
-    #     results[lib]=analyse_memory(".pioenvs/dev_4096/firmware.elf")
+    #     subprocess.check_call("platformio run --silent --environment dev_ESP8266_4096", shell=True)
+    #     results[lib]=analyse_memory(".pioenvs/dev_ESP8266_4096/firmware.elf")
     #     disable_lib(lib)
     #
     #     print(output_format.format(

diff --git a/platformio.ini b/platformio.ini
@@ -21,11 +21,11 @@
 # thanks @chouffe103
 
 [common]
-build_flags = -D BUILD_GIT='"${env.TRAVIS_TAG}"' 
+build_flags = -D BUILD_GIT='"${env.TRAVIS_TAG}"'
 
 
 #normal version with stable plugins, 1024k version
-[env:normal_1024]
+[env:normal_ESP8266_1024]
 platform = espressif8266
 framework = arduino
 board = esp12e
@@ -34,7 +34,7 @@ build_flags = ${common.build_flags} -Wl,-Tesp8266.flash.1m128.ld
 # upload_port = /dev/ttyUSB0
 
 #normal version with stable plugins, 4096k version
-[env:normal_4096]
+[env:normal_ESP8266_4096]
 platform = espressif8266
 framework = arduino
 board = esp12e
@@ -43,7 +43,7 @@ build_flags = ${common.build_flags} -Wl,-Tesp8266.flash.4m1m.ld
 # upload_port = /dev/ttyUSB0
 
 #normal version with stable plugins, 4096k version for esp8285
-[env:normal_8285]
+[env:normal_ESP8285_1024]
 platform = espressif8266
 framework = arduino
 board = esp8285
@@ -53,23 +53,23 @@ build_flags = ${common.build_flags} -Wl,-Tesp8266.flash.1m128.ld -DESP8285
 
 
 #version with additional plugins (and dependend code) that are in test-stadium 1024k
-[env:test_1024]
+[env:test_ESP8266_1024]
 platform = espressif8266
 framework = arduino
 board = esp12e
 upload_speed=460800
 build_flags = ${common.build_flags} -Wl,-Tesp8266.flash.1m128.ld -D PLUGIN_BUILD_TESTING
 
 #version with additional plugins (and dependend code) that are in test-stadium 4096k
-[env:test_4096]
+[env:test_ESP8266_4096]
 platform = espressif8266
 framework = arduino
 board = esp12e
 upload_speed=460800
 build_flags = ${common.build_flags} -Wl,-Tesp8266.flash.4m1m.ld -D PLUGIN_BUILD_TESTING
 
 #version with additional plugins (and dependend code) that are in test-stadium 4096k for esp8285
-[env:test_8285]
+[env:test_ESP8285_1024]
 platform = espressif8266
 framework = arduino
 board = esp8285
@@ -78,23 +78,23 @@ build_flags = ${common.build_flags} -Wl,-Tesp8266.flash.1m128.ld -D PLUGIN_BUILD
 
 
 #version with additional plugins (and dependend code) that is in development (probably broken or incomplete) 1024k
-[env:dev_1024]
+[env:dev_ESP8266_1024]
 platform = espressif8266
 framework = arduino
 board = esp12e
 upload_speed=460800
 build_flags = ${common.build_flags} -Wl,-Tesp8266.flash.1m128.ld -D PLUGIN_BUILD_TESTING -D PLUGIN_BUILD_DEV
 
 #version with additional plugins (and dependend code) that is in development (probably broken or incomplete) 4096k
-[env:dev_4096]
+[env:dev_ESP8266_4096]
 platform = espressif8266
 framework = arduino
 board = esp12e
 upload_speed=460800
 build_flags = ${common.build_flags} -Wl,-Tesp8266.flash.4m1m.ld -D PLUGIN_BUILD_TESTING -D PLUGIN_BUILD_DEV
 
 #version with additional plugins (and dependend code) that is in development (probably broken or incomplete) 4096k for esp8285
-[env:dev_8285]
+[env:dev_ESP8285_1024]
 platform = espressif8266
 framework = arduino
 board = esp8285