Make ota optional for some configs

2020-08-09 04:55:43 +02:00
parent 9fb12587be
commit eb85dfc349
1 changed files with 79 additions and 50 deletions
--- a/platformio.ini
+++ b/platformio.ini
@ -12,7 +12,6 @@
 platform = espressif32
 board = esp32dev
 framework = arduino
-board_build.partitions = bobbycar.csv

 lib_deps =
    TFT_eSPI
@ -57,7 +56,6 @@ build_flags =
  -DPINS_TX1=5
  -DPINS_RX2=25
  -DPINS_TX2=26
-  -DFEATURE_OTA
  -DFEATURE_MOSFETS
  -DPINS_MOSFET0=18
  -DPINS_MOSFET1=19
@ -75,11 +73,28 @@ build_flags =
    -DPINS_GAS=33
    -DPINS_BREMS=35

+[ota_common]
+board_build.partitions = bobbycar.csv
+build_flags =
+    -DFEATURE_OTA
+
+[no_ota_common]
+board_build.partitions = bobbycar_noota.csv
+build_flags =
+

 [feedc0de]
+platform = ${common_env_data.platform}
+board = ${common_env_data.board}
+framework = ${common_env_data.framework}
+board_build.partitions = ${no_ota_common.board_build.partitions}
+lib_deps = ${common_env_data.lib_deps}
+lib_compat_mode = ${common_env_data.lib_compat_mode}
+build_unflags = ${common_env_data.build_unflags}
 build_flags =
  ${common_env_data.build_flags}
  ${peters_platine.build_flags}
+  ${no_ota_common.build_flags}
  ${default_limits.build_flags}
  -DDEVICE_PREFIX=bobbyquad
  -DAP_PASSWORD=Passwort_123
@ -88,10 +103,6 @@ build_flags =
  -DPINS_DPAD_3WIRESW_OUT=0
  -DPINS_DPAD_3WIRESW_IN1=16
  -DPINS_DPAD_3WIRESW_IN2=27
-;  -DFEATURE_ROTARY
-;  -DPINS_ROTARY_CLK=16
-;  -DPINS_ROTARY_DT=27
-;  -DPINS_ROTARY_SW=0
  -DDEFAULT_GASMIN=800
  -DDEFAULT_GASMAX=3700
  -DDEFAULT_BREMSMIN=1300
@ -109,26 +120,26 @@ build_flags =
  -DDEFAULT_GAMETRAKDISTMAX=4095

 [env:feedc0de_usb]
-platform = ${common_env_data.platform}
-board = ${common_env_data.board}
-framework = ${common_env_data.framework}
-board_build.partitions = ${common_env_data.board_build.partitions}
-lib_deps = ${common_env_data.lib_deps}
-lib_compat_mode = ${common_env_data.lib_compat_mode}
-build_unflags = ${common_env_data.build_unflags}
+platform = ${feedc0de.platform}
+board = ${feedc0de.board}
+framework = ${feedc0de.framework}
+board_build.partitions = ${feedc0de.board_build.partitions}
+lib_deps = ${feedc0de.lib_deps}
+lib_compat_mode = ${feedc0de.lib_compat_mode}
+build_unflags = ${feedc0de.build_unflags}
 build_flags = ${feedc0de.build_flags}

 upload_speed = 921600
 upload_port = /dev/ttyUSB*

 [env:feedc0de_ota]
-platform = ${common_env_data.platform}
-board = ${common_env_data.board}
-framework = ${common_env_data.framework}
-board_build.partitions = ${common_env_data.board_build.partitions}
-lib_deps = ${common_env_data.lib_deps}
-lib_compat_mode = ${common_env_data.lib_compat_mode}
-build_unflags = ${common_env_data.build_unflags}
+platform = ${feedc0de.platform}
+board = ${feedc0de.board}
+framework = ${feedc0de.framework}
+board_build.partitions = ${feedc0de.board_build.partitions}
+lib_deps = ${feedc0de.lib_deps}
+lib_compat_mode = ${feedc0de.lib_compat_mode}
+build_unflags = ${feedc0de.build_unflags}
 build_flags = ${feedc0de.build_flags}

 upload_protocol = espota
@ -137,9 +148,17 @@ upload_port = 192.168.127.171


 [greyhash]
+platform = ${common_env_data.platform}
+board = ${common_env_data.board}
+framework = ${common_env_data.framework}
+board_build.partitions = ${ota_common.board_build.partitions}
+lib_deps = ${common_env_data.lib_deps}
+lib_compat_mode = ${common_env_data.lib_compat_mode}
+build_unflags = ${common_env_data.build_unflags}
 build_flags =
  ${common_env_data.build_flags}
  ${peters_platine.build_flags}
+  ${ota_common.build_flags}
  ${default_limits.build_flags}
  -DDEVICE_PREFIX=bobbycar
  -DAP_PASSWORD=Passwort_123
@ -155,26 +174,26 @@ build_flags =
  -DFEATURE_DPAD

 [env:greyhash_usb]
-platform = ${common_env_data.platform}
-board = ${common_env_data.board}
-framework = ${common_env_data.framework}
-board_build.partitions = ${common_env_data.board_build.partitions}
-lib_deps = ${common_env_data.lib_deps}
-lib_compat_mode = ${common_env_data.lib_compat_mode}
-build_unflags = ${common_env_data.build_unflags}
+platform = ${greyhash.platform}
+board = ${greyhash.board}
+framework = ${greyhash.framework}
+board_build.partitions = ${greyhash.board_build.partitions}
+lib_deps = ${greyhash.lib_deps}
+lib_compat_mode = ${greyhash.lib_compat_mode}
+build_unflags = ${greyhash.build_unflags}
 build_flags = ${greyhash.build_flags}

 upload_speed = 921600
 upload_port = /dev/ttyUSB*

 [env:greyhash_ota]
-platform = ${common_env_data.platform}
-board = ${common_env_data.board}
-framework = ${common_env_data.framework}
-board_build.partitions = ${common_env_data.board_build.partitions}
-lib_deps = ${common_env_data.lib_deps}
-lib_compat_mode = ${common_env_data.lib_compat_mode}
-build_unflags = ${common_env_data.build_unflags}
+platform = ${greyhash.platform}
+board = ${greyhash.board}
+framework = ${greyhash.framework}
+board_build.partitions = ${greyhash.board_build.partitions}
+lib_deps = ${greyhash.lib_deps}
+lib_compat_mode = ${greyhash.lib_compat_mode}
+build_unflags = ${greyhash.build_unflags}
 build_flags = ${greyhash.build_flags}

 upload_protocol = espota
@ -186,7 +205,7 @@ upload_port = 192.168.127.198
 platform = ${common_env_data.platform}
 board = ${common_env_data.board}
 framework = ${common_env_data.framework}
-board_build.partitions = ${common_env_data.board_build.partitions}
+board_build.partitions = ${ota_common.board_build.partitions}
 lib_deps = ${common_env_data.lib_deps}
 lib_compat_mode = ${common_env_data.lib_compat_mode}
 build_unflags = ${common_env_data.build_unflags}
@ -197,6 +216,7 @@ upload_port = /dev/ttyUSB*
 build_flags =
  ${common_env_data.build_flags}
  ${peters_platine.build_flags}
+  ${ota_common.build_flags}
  ${default_limits.build_flags}
  -DDEVICE_PREFIX=bobbyquad
  -DAP_PASSWORD=Passwort_123
@ -217,7 +237,7 @@ build_flags =
 platform = ${common_env_data.platform}
 board = ${common_env_data.board}
 framework = ${common_env_data.framework}
-board_build.partitions = bobbycar_noota.csv
+board_build.partitions = ${no_ota_common.board_build.partitions}
 lib_deps = ${common_env_data.lib_deps}
 lib_compat_mode = ${common_env_data.lib_compat_mode}
 build_unflags = ${common_env_data.build_unflags}
@ -227,6 +247,7 @@ upload_speed = 921600

 build_flags =
  ${common_env_data.build_flags}
+  ${no_ota_common.build_flags}
  ${default_limits.build_flags}
  -DDEVICE_PREFIX=bobbyquad
  -DAP_PASSWORD=Passwort_123
@ -260,9 +281,17 @@ build_flags =


 [peter]
+platform = ${common_env_data.platform}
+board = ${common_env_data.board}
+framework = ${common_env_data.framework}
+board_build.partitions = ${ota_common.board_build.partitions}
+lib_deps = ${common_env_data.lib_deps}
+lib_compat_mode = ${common_env_data.lib_compat_mode}
+build_unflags = ${common_env_data.build_unflags}
 build_flags =
  ${common_env_data.build_flags}
  ${peters_platine_reversed.build_flags}
+  ${ota_common.build_flags}
  ${default_limits.build_flags}
  -DDEVICE_PREFIX=bobbycar
  -DAP_PASSWORD=Passwort_123
@ -273,25 +302,25 @@ build_flags =
  -DDEFAULT_BREMSMAX=2700

 [env:peter_usb]
-platform = ${common_env_data.platform}
-board = ${common_env_data.board}
-framework = ${common_env_data.framework}
-board_build.partitions = ${common_env_data.board_build.partitions}
-lib_deps = ${common_env_data.lib_deps}
-lib_compat_mode = ${common_env_data.lib_compat_mode}
-build_unflags = ${common_env_data.build_unflags}
+platform = ${peter.platform}
+board = ${peter.board}
+framework = ${peter.framework}
+board_build.partitions = ${peter.board_build.partitions}
+lib_deps = ${peter.lib_deps}
+lib_compat_mode = ${peter.lib_compat_mode}
+build_unflags = ${peter.build_unflags}
 build_flags = ${peter.build_flags}

 upload_speed = 921600

 [env:peter_ota]
-platform = ${common_env_data.platform}
-board = ${common_env_data.board}
-framework = ${common_env_data.framework}
-board_build.partitions = ${common_env_data.board_build.partitions}
-lib_deps = ${common_env_data.lib_deps}
-lib_compat_mode = ${common_env_data.lib_compat_mode}
-build_unflags = ${common_env_data.build_unflags}
+platform = ${peter.platform}
+board = ${peter.board}
+framework = ${peter.framework}
+board_build.partitions = ${peter.board_build.partitions}
+lib_deps = ${peter.lib_deps}
+lib_compat_mode = ${peter.lib_compat_mode}
+build_unflags = ${peter.build_unflags}
 build_flags = ${peter.build_flags}

 upload_protocol = espota