made enviroment buildable again

This commit is contained in:
Marcel Peterkau 2024-01-25 11:27:58 +01:00
parent bbd76e77fa
commit 75ed8e6308
2 changed files with 7 additions and 16 deletions

View File

@ -31,6 +31,7 @@
#define GPIO_LED D8 #define GPIO_LED D8
#define GPIO_TRIGGER D6 #define GPIO_TRIGGER D6
#define GPIO_PUMP D5 #define GPIO_PUMP D5
#define GPIO_CS_CAN -1
#elif PCB_REV == 3 #elif PCB_REV == 3
#define GPIO_BUTTON D4 #define GPIO_BUTTON D4
#define GPIO_LED D3 #define GPIO_LED D3

View File

@ -26,7 +26,6 @@ upload_flags =
--port=8266 --port=8266
--auth=${wifi_cred.admin_password} --auth=${wifi_cred.admin_password}
build_flags = build_flags =
!python codegen/git_rev_macro.py !python codegen/git_rev_macro.py
-DWIFI_SSID_CLIENT=${wifi_cred.wifi_ssid_client} -DWIFI_SSID_CLIENT=${wifi_cred.wifi_ssid_client}
@ -35,6 +34,10 @@ build_flags =
-DWIFI_AP_PASSWORD=${wifi_cred.wifi_ap_password} -DWIFI_AP_PASSWORD=${wifi_cred.wifi_ap_password}
-DWIFI_AP_IP_GW=10,0,0,1 -DWIFI_AP_IP_GW=10,0,0,1
-DATOMIC_FS_UPDATE -DATOMIC_FS_UPDATE
-DCAN_DEBUG_MESSAGE
;-DFEATURE_ENABLE_WIFI_CLIENT
;-DFEATURE_ENABLE_TIMER
-DFEATURE_ENABLE_OLED
board_build.filesystem = littlefs board_build.filesystem = littlefs
extra_scripts = extra_scripts =
@ -52,37 +55,24 @@ lib_deps =
robtillaart/I2C_EEPROM @ ^1.8.2 robtillaart/I2C_EEPROM @ ^1.8.2
esphome/ESPAsyncWebServer-esphome @ 3.1.0 esphome/ESPAsyncWebServer-esphome @ 3.1.0
bblanchon/ArduinoJson @ ^7.0.1 bblanchon/ArduinoJson @ ^7.0.1
coryjfowler/mcp_can @ ^1.5.0
mikalhart/TinyGPSPlus @ ^1.0.3
[env:pcb_rev_1-3] [env:pcb_rev_1-3]
;build_type = debug ;build_type = debug
custom_pcb_revision = 3 custom_pcb_revision = 3
build_flags = build_flags =
${env.build_flags} ${env.build_flags}
;-DFEATURE_ENABLE_WIFI_CLIENT
;-DFEATURE_ENABLE_TIMER
-DFEATURE_ENABLE_OLED
-DCAN_DEBUG_MESSAGE
-DPCB_REV=${this.custom_pcb_revision} -DPCB_REV=${this.custom_pcb_revision}
board_build.ldscript = eagle.flash.4m1m.ld board_build.ldscript = eagle.flash.4m1m.ld
lib_deps =
${env.lib_deps}
coryjfowler/mcp_can @ ^1.5.0
mikalhart/TinyGPSPlus @ ^1.0.3
[env:pcb_rev_1-2] [env:pcb_rev_1-2]
;build_type = debug ;build_type = debug
custom_pcb_revision = 2 custom_pcb_revision = 2
build_flags = build_flags =
${env.build_flags} ${env.build_flags}
;-DFEATURE_ENABLE_WIFI_CLIENT
;-DFEATURE_ENABLE_TIMER
-DFEATURE_ENABLE_OLED
-DFEATURE_ENABLE_WEBSOCKETS
-DPCB_REV=${this.custom_pcb_revision} -DPCB_REV=${this.custom_pcb_revision}
board_build.ldscript = eagle.flash.4m1m.ld board_build.ldscript = eagle.flash.4m1m.ld
lib_deps =
${env.lib_deps}