From 13211aa63c5b9885cac2ff7560418fe65322bc15 Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE64 Date: Mon, 1 Jun 2020 20:36:14 +0200 Subject: [PATCH] Made webserver optional --- platformio.ini | 6 ++++++ src/bobby_webserver.h | 2 ++ src/main.cpp | 2 ++ 3 files changed, 10 insertions(+) diff --git a/platformio.ini b/platformio.ini index 00b2582..3b88f09 100644 --- a/platformio.ini +++ b/platformio.ini @@ -88,6 +88,7 @@ build_flags = ${common_env_data.build_flags} ${peters_platine.build_flags} -DDEVICE_PREFIX=bobbyquad + -DFEATURE_WEBSERVER -DFEATURE_3WIRESW -DPINS_3WIRESW_OUT=0 -DPINS_3WIRESW_IN1=16 @@ -152,6 +153,7 @@ build_flags = ${peters_platine.build_flags} ${default_limits.build_flags} -DDEVICE_PREFIX=bobbycar + -DFEATURE_WEBSERVER -DDEFAULT_GASMIN=400 -DDEFAULT_GASMAX=2000 -DDEFAULT_BREMSMIN=600 @@ -201,6 +203,7 @@ build_flags = ${common_env_data.build_flags} ${peters_platine.build_flags} -DDEVICE_PREFIX=bobbyquad + -DFEATURE_WEBSERVER ; -DFEATURE_3WIRESW ; -DPINS_3WIRESW_OUT=0 ; -DPINS_3WIRESW_IN1=16 @@ -237,6 +240,7 @@ upload_speed = 921600 build_flags = ${common_env_data.build_flags} -DDEVICE_PREFIX=testbench + -DFEATURE_WEBSERVER -DILI9341_DRIVER=1 -DTFT_MOSI=22 -DTFT_SCLK=21 @@ -284,6 +288,7 @@ upload_speed = 921600 build_flags = ${common_env_data.build_flags} -DDEVICE_PREFIX=bobbyquad + -DFEATURE_WEBSERVER -DUSER_SETUP_LOADED=1 -DRPI_DISPLAY_TYPE -DILI9486_DRIVER @@ -328,6 +333,7 @@ build_flags = ${peters_platine_reversed.build_flags} ${default_limits.build_flags} -DDEVICE_PREFIX=bobbycar + -DFEATURE_WEBSERVER -DDEFAULT_GASMIN=1000 -DDEFAULT_GASMAX=4000 -DDEFAULT_BREMSMIN=200 diff --git a/src/bobby_webserver.h b/src/bobby_webserver.h index 75f4db2..9112bf8 100644 --- a/src/bobby_webserver.h +++ b/src/bobby_webserver.h @@ -5,6 +5,7 @@ #include "screens.h" namespace { +#ifdef FEATURE_WEBSERVER WebServer webServer{80}; class HtmlTag { @@ -228,4 +229,5 @@ void handleWebserver() { webServer.handleClient(); } +#endif } diff --git a/src/main.cpp b/src/main.cpp index ad18344..2fae159 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -193,7 +193,9 @@ void loop() handleOta(); #endif +#ifdef FEATURE_WEBSERVER handleWebserver(); +#endif #ifdef FEATURE_BMS bms::update();