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

Support for long MQTT username and password

Browse Source
This commit is contained in:
Gunnar Skjold
2021-09-23 19:28:55 +02:00
parent 7627d6c369
commit dce7b7e64b
3 changed files with 56 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/AmsConfiguration.h
View File

@@ -4,13 +4,12 @@
#include "Arduino.h"
#define EEPROM_SIZE 1024 * 3
#define EEPROM_CHECK_SUM 86 // Used to check if config is stored. Change if structure changes
#define EEPROM_CHECK_SUM 87 // Used to check if config is stored. Change if structure changes
#define EEPROM_CONFIG_ADDRESS 0
#define EEPROM_TEMP_CONFIG_ADDRESS 2048
#define CONFIG_SYSTEM_START 8
#define CONFIG_WIFI_START 16
#define CONFIG_MQTT_START 224
#define CONFIG_WEB_START 648
#define CONFIG_METER_START 784
#define CONFIG_DEBUG_START 824
@@ -18,6 +17,10 @@
#define CONFIG_DOMOTICZ_START 856
#define CONFIG_NTP_START 872
#define CONFIG_ENTSOE_START 944
#define CONFIG_MQTT_START 1004
#define CONFIG_MQTT_START_86 224
struct SystemConfig {
uint8_t boardType;
@@ -35,7 +38,7 @@ struct WiFiConfig {
bool mdns;
}; // 204
struct MqttConfig {
struct MqttConfig86 {
char host[128];
uint16_t port;
char clientId[32];
@@ -47,6 +50,18 @@ struct MqttConfig {
bool ssl;
}; // 420
struct MqttConfig {
char host[128];
uint16_t port;
char clientId[32];
char publishTopic[64];
char subscribeTopic[64];
char username[128];
char password[256];
uint8_t payloadFormat;
bool ssl;
}; // 676
struct WebConfig {
uint8_t security;
char username[64];
@@ -320,6 +335,7 @@ private:
bool loadConfig82(int address);
bool loadConfig83(int address);
bool relocateConfig86();
int readString(int pAddress, char* pString[]);
int readInt(int pAddress, int *pValue);