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

Updated cloud connector

Browse Source
This commit is contained in:
Gunnar Skjold
2024-01-06 09:52:35 +01:00
parent 460238e99d
commit 6012c19fc4
10 changed files with 185 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/AmsConfiguration/include/AmsConfiguration.h
View File

@@ -244,8 +244,7 @@ struct CloudConfig {
uint8_t interval;
char hostname[64];
uint16_t port;
char clientId[17];
char clientSecret[17];
uint8_t clientId[16];
};
class AmsConfiguration {

8
lib/AmsConfiguration/src/AmsConfiguration.cpp
View File

@@ -784,15 +784,12 @@ bool AmsConfiguration::setCloudConfig(CloudConfig& config) {
cloudChanged |= config.interval!= existing.interval;
cloudChanged |= config.port!= existing.port;
cloudChanged |= strcmp(config.hostname, existing.hostname) != 0;
cloudChanged |= strcmp(config.clientId, existing.clientId) != 0;
cloudChanged |= strcmp(config.clientSecret, existing.clientSecret) != 0;
cloudChanged |= memcmp(config.clientId, existing.clientId, 16) != 0;
} else {
cloudChanged = true;
}
stripNonAscii((uint8_t*) config.hostname, 64);
stripNonAscii((uint8_t*) config.clientId, 17);
stripNonAscii((uint8_t*) config.clientSecret, 17);
EEPROM.begin(EEPROM_SIZE);
EEPROM.put(CONFIG_CLOUD_START, config);
@@ -806,8 +803,7 @@ void AmsConfiguration::clearCloudConfig(CloudConfig& config) {
strcpy(config.hostname, "cloud.amsleser.no");
config.port = 7443;
config.interval = 10;
strcpy(config.clientId, "");
strcpy(config.clientSecret, "");
memset(config.clientId, 0, 16);
}
bool AmsConfiguration::isCloudChanged() {