github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-01-27 20:48:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Atle Johansen
2020-05-01 14:21:55 +02:00
parent 41784511e9 1ea9da22c7
commit 958ff37d7d
14 changed files with 817 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/AmsConfiguration.h
View File

@@ -48,8 +48,11 @@ public:
void setMqttPassword(String mqttPassword);
int getMqttPayloadFormat();
void setMqttPayloadFormat(int mqttPayloadFormat);
bool isMqttSsl();
void setMqttSsl(bool mqttSsl);
void clearMqtt();
void setMqttChanged();
bool isMqttChanged();
void ackMqttChange();
@@ -121,6 +124,7 @@ private:
String mqttUser;
String mqttPassword;
int mqttPayloadFormat = 0;
bool mqttSsl;
bool mqttChanged = false;
byte authSecurity;
@@ -144,15 +148,14 @@ private:
bool domoChanged;
const int EEPROM_SIZE = 512;
const int EEPROM_CHECK_SUM = 91; // Used to check if config is stored. Change if structure changes
const int EEPROM_CHECK_SUM = 82; // Used to check if config is stored. Change if structure changes
const int EEPROM_CONFIG_ADDRESS = 0;
bool loadConfig72(int address);
bool loadConfig75(int address);
bool loadConfig80(int address);
bool loadConfig81(int address);
bool loadConfig91(int address); // domoticz
bool loadConfig82(int address);
int saveString(int pAddress, const char* pString);
int readString(int pAddress, char* pString[]);