ota (experimental)

.gitignore

@@ -10,4 +10,3 @@
 .clang_complete
 .gcc-flags.json
 src/loraconf.h
-platformio.ini

platformio.ini

@@ -1,15 +1,9 @@
 ; PlatformIO Project Configuration File
 ;
-;   Build options: build flags, source filter
-;   Upload options: custom upload port, speed and extra flags
-;   Library options: dependencies, extra library storages
-;   Advanced options: extra scripting
-;
 ; Please visit documentation for the other options and examples
 ; http://docs.platformio.org/page/projectconf.html
 
 
-
 ; ---> SELECT TARGET PLATFORM HERE! <---
 [platformio]
 ;env_default = generic
@@ -17,8 +11,8 @@
 ;env_default = heltec
 ;env_default = ttgov1
 ;env_default = ttgov2
-env_default = ttgov21
-;env_default = ttgobeam
+;env_default = ttgov21
+env_default = ttgobeam
 ;env_default = lopy
 ;env_default = lopy4
 ;env_default = fipy
@@ -34,42 +28,20 @@ repository = paxcounter-firmware
 package = ttgov21_old
 api_token = 2e10f923df5d47b9c7e25752510322a1d65ee997
 
-[wifi]
-ssid = testnet
-password = test0815
-
 [common]
-platform = https://github.com/platformio/platform-espressif32.git
-
-; firmware version, please modify it between releases
-; positive integer value
-;release_version = 1.4.30
-release_version = 3
+release_version = 5
 
+[ota]
 ; build configuration based on Bintray and Wi-Fi settings
+wifi_ssid = testnet
+wifi_password = test0815
 build_flags =
-    '-DWIFI_SSID="${wifi.ssid}"'
-    '-DWIFI_PASS="${wifi.password}"'
+    '-DWIFI_SSID="${ota.wifi_ssid}"'
+    '-DWIFI_PASS="${ota.wifi_password}"'
     '-DBINTRAY_USER="${bintray.user}"'
     '-DBINTRAY_REPO="${bintray.repository}"'
     '-DBINTRAY_PACKAGE="${bintray.package}"'
     -DVERSION=${common.release_version}
-;
-; ---> NOTE: For production run set DEBUG_LEVEL level to NONE! <---
-; otherwise device may leak RAM
-;
-; None
-; -DCORE_DEBUG_LEVEL=0
-; Error
-; -DCORE_DEBUG_LEVEL=1
-; Warn
-; -DCORE_DEBUG_LEVEL=2
-; Info
- -DCORE_DEBUG_LEVEL=3
-; Debug
-; -DCORE_DEBUG_LEVEL=4
-; Verbose
-; -DCORE_DEBUG_LEVEL=5
 
 [common_env_data]
 platform_espressif32 = espressif32@1.3.0
@@ -91,6 +63,21 @@ build_flags =
     -include "src/paxcounter.conf"
     -include "src/hal/${PIOENV}.h"
     -w
+; ---> NOTE: For production run set DEBUG_LEVEL level to NONE! <---
+; otherwise device may leak RAM
+;
+; None
+; -DCORE_DEBUG_LEVEL=0
+; Error
+; -DCORE_DEBUG_LEVEL=1
+; Warn
+; -DCORE_DEBUG_LEVEL=2
+; Info
+ -DCORE_DEBUG_LEVEL=3
+; Debug
+; -DCORE_DEBUG_LEVEL=4
+; Verbose
+; -DCORE_DEBUG_LEVEL=5
 
 [env:ebox]
 platform = ${common_env_data.platform_espressif32}
@@ -102,6 +89,7 @@ monitor_speed = 115200
 lib_deps = 
     ${common_env_data.lib_deps_all}
 build_flags = 
+    ${ota.build_flags}
     ${common_env_data.build_flags}
 
 [env:heltec]
@@ -154,10 +142,7 @@ lib_deps =
     ${common_env_data.lib_deps_all}
     ${common_env_data.lib_deps_display}
 build_flags = 
-    ${common.build_flags}
     ${common_env_data.build_flags}
-;upload_protocol = custom
-;extra_scripts = pre:publish_firmware.py
 
 [env:ttgobeam]
 platform = ${common_env_data.platform_espressif32}
@@ -170,8 +155,11 @@ lib_deps =
     ${common_env_data.lib_deps_all}
     ${common_env_data.lib_deps_gps}
 build_flags = 
+    ${ota.build_flags}
     ${common_env_data.build_flags}
     -mfix-esp32-psram-cache-issue
+upload_protocol = custom
+extra_scripts = pre:publish_firmware.py
 
 [env:fipy]
 platform = ${common_env_data.platform_espressif32}
@@ -212,6 +200,7 @@ lib_deps =
     ${common_env_data.lib_deps_rgbled}
     ${common_env_data.lib_deps_gps}
 build_flags =
+    ${ota.build_flags}
     ${common_env_data.build_flags}
     -mfix-esp32-psram-cache-issue
 
@@ -267,4 +256,5 @@ lib_deps =
     ${common_env_data.lib_deps_gps}
     ${common_env_data.lib_deps_display}
 build_flags =
+    ${ota.build_flags}
     ${common_env_data.build_flags}