Merge remote-tracking branch 'upstream/dev-v1.3.0' into add_domoticz

This commit is contained in:
Atle Johansen
2020-05-01 14:21:55 +02:00
14 changed files with 817 additions and 223 deletions

View File

@@ -44,7 +44,7 @@ private:
AmsConfiguration* config;
AmsData data;
MQTTClient* mqtt;
File firmwareFile;
File file;
bool performRestart = false;
#if defined(ESP8266)
@@ -56,6 +56,7 @@ private:
bool checkSecurity(byte level);
void indexHtml();
void indexJs();
void configMeterHtml();
void configWifiHtml();
void configMqttHtml();
@@ -68,11 +69,25 @@ private:
void handleSave();
void configSystemHtml();
void configSystemPost();
void configSystemUpload();
void restartWaitHtml();
void isAliveCheck();
void uploadHtml(const char* label, const char* action, const char* menu);
void deleteHtml(const char* label, const char* action, const char* menu);
void uploadFile(const char* path);
void deleteFile(const char* path);
void uploadPost();
void mqttCa();
void mqttCaUpload();
void mqttCaDelete();
void mqttCert();
void mqttCertUpload();
void mqttCertDelete();
void mqttKey();
void mqttKeyUpload();
void mqttKeyDelete();
void printD(String fmt, ...);
void printI(String fmt, ...);
void printW(String fmt, ...);