Made webserver optional

This commit is contained in:
2020-06-01 20:36:14 +02:00
parent 30b4b5a61b
commit 13211aa63c
3 changed files with 10 additions and 0 deletions

View File

@@ -88,6 +88,7 @@ build_flags =
${common_env_data.build_flags} ${common_env_data.build_flags}
${peters_platine.build_flags} ${peters_platine.build_flags}
-DDEVICE_PREFIX=bobbyquad -DDEVICE_PREFIX=bobbyquad
-DFEATURE_WEBSERVER
-DFEATURE_3WIRESW -DFEATURE_3WIRESW
-DPINS_3WIRESW_OUT=0 -DPINS_3WIRESW_OUT=0
-DPINS_3WIRESW_IN1=16 -DPINS_3WIRESW_IN1=16
@@ -152,6 +153,7 @@ build_flags =
${peters_platine.build_flags} ${peters_platine.build_flags}
${default_limits.build_flags} ${default_limits.build_flags}
-DDEVICE_PREFIX=bobbycar -DDEVICE_PREFIX=bobbycar
-DFEATURE_WEBSERVER
-DDEFAULT_GASMIN=400 -DDEFAULT_GASMIN=400
-DDEFAULT_GASMAX=2000 -DDEFAULT_GASMAX=2000
-DDEFAULT_BREMSMIN=600 -DDEFAULT_BREMSMIN=600
@@ -201,6 +203,7 @@ build_flags =
${common_env_data.build_flags} ${common_env_data.build_flags}
${peters_platine.build_flags} ${peters_platine.build_flags}
-DDEVICE_PREFIX=bobbyquad -DDEVICE_PREFIX=bobbyquad
-DFEATURE_WEBSERVER
; -DFEATURE_3WIRESW ; -DFEATURE_3WIRESW
; -DPINS_3WIRESW_OUT=0 ; -DPINS_3WIRESW_OUT=0
; -DPINS_3WIRESW_IN1=16 ; -DPINS_3WIRESW_IN1=16
@@ -237,6 +240,7 @@ upload_speed = 921600
build_flags = build_flags =
${common_env_data.build_flags} ${common_env_data.build_flags}
-DDEVICE_PREFIX=testbench -DDEVICE_PREFIX=testbench
-DFEATURE_WEBSERVER
-DILI9341_DRIVER=1 -DILI9341_DRIVER=1
-DTFT_MOSI=22 -DTFT_MOSI=22
-DTFT_SCLK=21 -DTFT_SCLK=21
@@ -284,6 +288,7 @@ upload_speed = 921600
build_flags = build_flags =
${common_env_data.build_flags} ${common_env_data.build_flags}
-DDEVICE_PREFIX=bobbyquad -DDEVICE_PREFIX=bobbyquad
-DFEATURE_WEBSERVER
-DUSER_SETUP_LOADED=1 -DUSER_SETUP_LOADED=1
-DRPI_DISPLAY_TYPE -DRPI_DISPLAY_TYPE
-DILI9486_DRIVER -DILI9486_DRIVER
@@ -328,6 +333,7 @@ build_flags =
${peters_platine_reversed.build_flags} ${peters_platine_reversed.build_flags}
${default_limits.build_flags} ${default_limits.build_flags}
-DDEVICE_PREFIX=bobbycar -DDEVICE_PREFIX=bobbycar
-DFEATURE_WEBSERVER
-DDEFAULT_GASMIN=1000 -DDEFAULT_GASMIN=1000
-DDEFAULT_GASMAX=4000 -DDEFAULT_GASMAX=4000
-DDEFAULT_BREMSMIN=200 -DDEFAULT_BREMSMIN=200

View File

@@ -5,6 +5,7 @@
#include "screens.h" #include "screens.h"
namespace { namespace {
#ifdef FEATURE_WEBSERVER
WebServer webServer{80}; WebServer webServer{80};
class HtmlTag { class HtmlTag {
@@ -228,4 +229,5 @@ void handleWebserver()
{ {
webServer.handleClient(); webServer.handleClient();
} }
#endif
} }

View File

@@ -193,7 +193,9 @@ void loop()
handleOta(); handleOta();
#endif #endif
#ifdef FEATURE_WEBSERVER
handleWebserver(); handleWebserver();
#endif
#ifdef FEATURE_BMS #ifdef FEATURE_BMS
bms::update(); bms::update();