Merge remote-tracking branch 'origin/v3.4' into dev

This commit is contained in:
proddy
2022-01-23 17:56:52 +01:00
parent 02e2b51814
commit 77e1898512
538 changed files with 32282 additions and 38655 deletions

View File

@@ -12,7 +12,7 @@
#endif
#ifndef FACTORY_OTA_PASSWORD
#define FACTORY_OTA_PASSWORD "esp-react"
#define FACTORY_OTA_PASSWORD "ems-esp-neo"
#endif
#ifndef FACTORY_OTA_ENABLED
@@ -58,4 +58,4 @@ class OTASettingsService : public StatefulService<OTASettings> {
void WiFiEvent(WiFiEvent_t event, WiFiEventInfo_t info);
};
#endif // end OTASettingsService_h
#endif