Skip to content

Commit

Permalink
Fix non-TFT build
Browse files Browse the repository at this point in the history
  • Loading branch information
kimble4 committed Sep 28, 2024
1 parent 06f6ce7 commit 93e599e
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions src/net_manager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,9 @@ void NetManagerTask::wifiStartAccessPoint()
_lcd.display(String(F("Pass: ")) + _softAP_password, 0, 1, 15 * 1000, LCD_CLEAR_LINE);

_led.setWifiMode(false, false);
#ifdef ENABLE_SCREEN_LCD_TFT
_lcd.setWifiMode(false, false);

#endif //ENABLE_SCREEN_LCD_TFT
_apClients = 0;
_state = NetState::AccessPointConnecting;
}
Expand All @@ -156,7 +157,9 @@ void NetManagerTask::wifiStartClient()
wifiClientConnect();

_led.setWifiMode(true, false);
#ifdef ENABLE_SCREEN_LCD_TFT
_lcd.setWifiMode(true, false);
#endif //ENABLE_SCREEN_LCD_TFT
_state = NetState::StationClientConnecting;
}

Expand Down Expand Up @@ -208,7 +211,9 @@ void NetManagerTask::haveNetworkConnection(IPAddress myAddress)
Mongoose.ipConfigChanged();

_led.setWifiMode(true, true);
#ifdef ENABLE_SCREEN_LCD_TFT
_lcd.setWifiMode(true, true);
#endif ENABLE_SCREEN_LCD_TFT

Check warning on line 216 in src/net_manager.cpp

View workflow job for this annotation

GitHub Actions / Build nodemcu-32s

extra tokens at end of #endif directive [-Wendif-labels]

Check warning on line 216 in src/net_manager.cpp

View workflow job for this annotation

GitHub Actions / Build espressif_esp-wrover-kit

extra tokens at end of #endif directive [-Wendif-labels]

Check warning on line 216 in src/net_manager.cpp

View workflow job for this annotation

GitHub Actions / Build espressif_esp-wrover-kit_latest

extra tokens at end of #endif directive [-Wendif-labels]

Check warning on line 216 in src/net_manager.cpp

View workflow job for this annotation

GitHub Actions / Build adafruit_huzzah32_dev

extra tokens at end of #endif directive [-Wendif-labels]

Check warning on line 216 in src/net_manager.cpp

View workflow job for this annotation

GitHub Actions / Build adafruit_huzzah32

extra tokens at end of #endif directive [-Wendif-labels]

Check warning on line 216 in src/net_manager.cpp

View workflow job for this annotation

GitHub Actions / Build adafruit_featheresp32

extra tokens at end of #endif directive [-Wendif-labels]

Check warning on line 216 in src/net_manager.cpp

View workflow job for this annotation

GitHub Actions / Build openevse_wifi_v1

extra tokens at end of #endif directive [-Wendif-labels]

Check warning on line 216 in src/net_manager.cpp

View workflow job for this annotation

GitHub Actions / Build olimex_esp32-gateway-old

extra tokens at end of #endif directive [-Wendif-labels]

Check warning on line 216 in src/net_manager.cpp

View workflow job for this annotation

GitHub Actions / Build olimex_esp32-gateway-e

extra tokens at end of #endif directive [-Wendif-labels]

Check warning on line 216 in src/net_manager.cpp

View workflow job for this annotation

GitHub Actions / Build olimex_esp32-gateway-f

extra tokens at end of #endif directive [-Wendif-labels]

Check warning on line 216 in src/net_manager.cpp

View workflow job for this annotation

GitHub Actions / Build olimex_esp32-gateway-e_dev

extra tokens at end of #endif directive [-Wendif-labels]

Check warning on line 216 in src/net_manager.cpp

View workflow job for this annotation

GitHub Actions / Build olimex_esp32-gateway-f_dev

extra tokens at end of #endif directive [-Wendif-labels]

Check warning on line 216 in src/net_manager.cpp

View workflow job for this annotation

GitHub Actions / Build olimex_esp32-poe-iso

extra tokens at end of #endif directive [-Wendif-labels]

Check warning on line 216 in src/net_manager.cpp

View workflow job for this annotation

GitHub Actions / Build heltec_esp32-wifi-lora-v2

extra tokens at end of #endif directive [-Wendif-labels]

Check warning on line 216 in src/net_manager.cpp

View workflow job for this annotation

GitHub Actions / Build wt32-eth01

extra tokens at end of #endif directive [-Wendif-labels]

Check warning on line 216 in src/net_manager.cpp

View workflow job for this annotation

GitHub Actions / Build esp32-c3-devkitc-02

extra tokens at end of #endif directive [-Wendif-labels]

Check warning on line 216 in src/net_manager.cpp

View workflow job for this annotation

GitHub Actions / Build elecrow_esp32_hmi

extra tokens at end of #endif directive [-Wendif-labels]

Check warning on line 216 in src/net_manager.cpp

View workflow job for this annotation

GitHub Actions / Build openevse_wifi_tft_v1

extra tokens at end of #endif directive [-Wendif-labels]

Check warning on line 216 in src/net_manager.cpp

View workflow job for this annotation

GitHub Actions / Build openevse_wifi_tft_v1_dev

extra tokens at end of #endif directive [-Wendif-labels]
_time.setHost(sntp_hostname.c_str());

_apAutoApStopTime = millis() + ACCESS_POINT_AUTO_STOP_TIMEOUT;
Expand Down Expand Up @@ -285,8 +290,9 @@ void NetManagerTask::wifiOnAPModeStationConnected(const WiFiEventSoftAPModeStati
_lcd.display(_ipaddress, 0, 1, (0 == _apClients ? 15 : 5) * 1000, LCD_CLEAR_LINE);

_led.setWifiMode(false, true);
#ifdef ENABLE_SCREEN_LCD_TFT
_lcd.setWifiMode(false, true);

#endif //ENABLE_SCREEN_LCD_TFT
_apClients++;
}

Expand All @@ -296,7 +302,9 @@ void NetManagerTask::wifiOnAPModeStationDisconnected(const WiFiEventSoftAPModeSt

if(0 == _apClients && NetState::AccessPointConnecting == _state) {
_led.setWifiMode(false, false);
#ifdef ENABLE_SCREEN_LCD_TFT
_lcd.setWifiMode(false, false);
#endif ENABLE_SCREEN_LCD_TFT

Check warning on line 307 in src/net_manager.cpp

View workflow job for this annotation

GitHub Actions / Build nodemcu-32s

extra tokens at end of #endif directive [-Wendif-labels]

Check warning on line 307 in src/net_manager.cpp

View workflow job for this annotation

GitHub Actions / Build espressif_esp-wrover-kit

extra tokens at end of #endif directive [-Wendif-labels]

Check warning on line 307 in src/net_manager.cpp

View workflow job for this annotation

GitHub Actions / Build espressif_esp-wrover-kit_latest

extra tokens at end of #endif directive [-Wendif-labels]

Check warning on line 307 in src/net_manager.cpp

View workflow job for this annotation

GitHub Actions / Build adafruit_huzzah32_dev

extra tokens at end of #endif directive [-Wendif-labels]

Check warning on line 307 in src/net_manager.cpp

View workflow job for this annotation

GitHub Actions / Build adafruit_huzzah32

extra tokens at end of #endif directive [-Wendif-labels]

Check warning on line 307 in src/net_manager.cpp

View workflow job for this annotation

GitHub Actions / Build adafruit_featheresp32

extra tokens at end of #endif directive [-Wendif-labels]

Check warning on line 307 in src/net_manager.cpp

View workflow job for this annotation

GitHub Actions / Build openevse_wifi_v1

extra tokens at end of #endif directive [-Wendif-labels]

Check warning on line 307 in src/net_manager.cpp

View workflow job for this annotation

GitHub Actions / Build olimex_esp32-gateway-old

extra tokens at end of #endif directive [-Wendif-labels]

Check warning on line 307 in src/net_manager.cpp

View workflow job for this annotation

GitHub Actions / Build olimex_esp32-gateway-e

extra tokens at end of #endif directive [-Wendif-labels]

Check warning on line 307 in src/net_manager.cpp

View workflow job for this annotation

GitHub Actions / Build olimex_esp32-gateway-f

extra tokens at end of #endif directive [-Wendif-labels]

Check warning on line 307 in src/net_manager.cpp

View workflow job for this annotation

GitHub Actions / Build olimex_esp32-gateway-e_dev

extra tokens at end of #endif directive [-Wendif-labels]

Check warning on line 307 in src/net_manager.cpp

View workflow job for this annotation

GitHub Actions / Build olimex_esp32-gateway-f_dev

extra tokens at end of #endif directive [-Wendif-labels]

Check warning on line 307 in src/net_manager.cpp

View workflow job for this annotation

GitHub Actions / Build olimex_esp32-poe-iso

extra tokens at end of #endif directive [-Wendif-labels]

Check warning on line 307 in src/net_manager.cpp

View workflow job for this annotation

GitHub Actions / Build heltec_esp32-wifi-lora-v2

extra tokens at end of #endif directive [-Wendif-labels]

Check warning on line 307 in src/net_manager.cpp

View workflow job for this annotation

GitHub Actions / Build wt32-eth01

extra tokens at end of #endif directive [-Wendif-labels]

Check warning on line 307 in src/net_manager.cpp

View workflow job for this annotation

GitHub Actions / Build esp32-c3-devkitc-02

extra tokens at end of #endif directive [-Wendif-labels]

Check warning on line 307 in src/net_manager.cpp

View workflow job for this annotation

GitHub Actions / Build elecrow_esp32_hmi

extra tokens at end of #endif directive [-Wendif-labels]

Check warning on line 307 in src/net_manager.cpp

View workflow job for this annotation

GitHub Actions / Build openevse_wifi_tft_v1

extra tokens at end of #endif directive [-Wendif-labels]

Check warning on line 307 in src/net_manager.cpp

View workflow job for this annotation

GitHub Actions / Build openevse_wifi_tft_v1_dev

extra tokens at end of #endif directive [-Wendif-labels]
}
}

Expand Down

0 comments on commit 93e599e

Please sign in to comment.