Browse Source

Runs on ESP32 now

pull/167/head
tastendruecker123 3 years ago
parent
commit
af59b24ff9
  1. 12
      tools/esp8266/app.cpp

12
tools/esp8266/app.cpp

@ -17,15 +17,9 @@ app::app() {
Serial.begin(115200); Serial.begin(115200);
DPRINTLN(DBG_VERBOSE, F("app::app")); DPRINTLN(DBG_VERBOSE, F("app::app"));
mEep = new eep(); mEep = new eep();
DPRINTLN(DBG_VERBOSE, F("app::wifi"));
mWifi = new ahoywifi(this, &mSysConfig, &mConfig); mWifi = new ahoywifi(this, &mSysConfig, &mConfig);
DPRINTLN(DBG_VERBOSE, F("app::web"));
mWebInst = new web(this, &mSysConfig, &mConfig, mVersion);
DPRINTLN(DBG_VERBOSE, F("app::setup"));
mWebInst->setup();
DPRINTLN(DBG_VERBOSE, F("app::reset"));
resetSystem(); resetSystem();
DPRINTLN(DBG_VERBOSE, F("app::config"));
loadDefaultConfig(); loadDefaultConfig();
mSys = new HmSystemType(); mSys = new HmSystemType();
@ -34,7 +28,6 @@ DPRINTLN(DBG_VERBOSE, F("app::reset"));
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void app::setup(uint32_t timeout) { void app::setup(uint32_t timeout) {
DPRINTLN(DBG_VERBOSE, F("app::setup"));
mWifiSettingsValid = checkEEpCrc(ADDR_START, ADDR_WIFI_CRC, ADDR_WIFI_CRC); mWifiSettingsValid = checkEEpCrc(ADDR_START, ADDR_WIFI_CRC, ADDR_WIFI_CRC);
mSettingsValid = checkEEpCrc(ADDR_START_SETTINGS, ((ADDR_NEXT)-(ADDR_START_SETTINGS)), ADDR_SETTINGS_CRC); mSettingsValid = checkEEpCrc(ADDR_START_SETTINGS, ((ADDR_NEXT)-(ADDR_START_SETTINGS)), ADDR_SETTINGS_CRC);
@ -46,6 +39,9 @@ void app::setup(uint32_t timeout) {
setupMqtt(); setupMqtt();
#endif #endif
mSys->setup(&mConfig); mSys->setup(&mConfig);
mWebInst = new web(this, &mSysConfig, &mConfig, mVersion);
mWebInst->setup();
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

Loading…
Cancel
Save