DigitalInfinity/ESP32-PaxCounter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix issue#649

Browse Source
This commit is contained in:
Klaus K Wilting 2020-10-01 15:39:54 +02:00
parent 25ef6a5eca
commit c8f8b7c1a4
2 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
src/configmanager.cpp
View File

@ -80,8 +80,8 @@ void saveConfig() {
ESP_LOGI(TAG, "Storing settings in NVS"); ESP_LOGI(TAG, "Storing settings in NVS");
open_storage(); open_storage();
if (err == ESP_OK) { if (err == ESP_OK) {
int8_t flash8 = 0; uint8_t flash8 = 0;
int16_t flash16 = 0; uint16_t flash16 = 0;
size_t required_size; size_t required_size;
uint8_t bsecstate_buffer[BSEC_MAX_STATE_BLOB_SIZE + 1]; uint8_t bsecstate_buffer[BSEC_MAX_STATE_BLOB_SIZE + 1];
char storedversion[10]; char storedversion[10];
@ -98,73 +98,73 @@ void saveConfig() {
strcmp(storedversion, cfg.version) != 0) strcmp(storedversion, cfg.version) != 0)
nvs_set_str(my_handle, "version", cfg.version); nvs_set_str(my_handle, "version", cfg.version);
if (nvs_get_i8(my_handle, "loradr", &flash8) != ESP_OK || if (nvs_get_u8(my_handle, "loradr", &flash8) != ESP_OK ||
flash8 != cfg.loradr) flash8 != cfg.loradr)
nvs_set_i8(my_handle, "loradr", cfg.loradr); nvs_set_u8(my_handle, "loradr", cfg.loradr);
if (nvs_get_i8(my_handle, "txpower", &flash8) != ESP_OK || if (nvs_get_u8(my_handle, "txpower", &flash8) != ESP_OK ||
flash8 != cfg.txpower) flash8 != cfg.txpower)
nvs_set_i8(my_handle, "txpower", cfg.txpower); nvs_set_u8(my_handle, "txpower", cfg.txpower);
if (nvs_get_i8(my_handle, "adrmode", &flash8) != ESP_OK || if (nvs_get_u8(my_handle, "adrmode", &flash8) != ESP_OK ||
flash8 != cfg.adrmode) flash8 != cfg.adrmode)
nvs_set_i8(my_handle, "adrmode", cfg.adrmode); nvs_set_u8(my_handle, "adrmode", cfg.adrmode);
if (nvs_get_i8(my_handle, "screensaver", &flash8) != ESP_OK || if (nvs_get_u8(my_handle, "screensaver", &flash8) != ESP_OK ||
flash8 != cfg.screensaver) flash8 != cfg.screensaver)
nvs_set_i8(my_handle, "screensaver", cfg.screensaver); nvs_set_u8(my_handle, "screensaver", cfg.screensaver);
if (nvs_get_i8(my_handle, "screenon", &flash8) != ESP_OK || if (nvs_get_u8(my_handle, "screenon", &flash8) != ESP_OK ||
flash8 != cfg.screenon) flash8 != cfg.screenon)
nvs_set_i8(my_handle, "screenon", cfg.screenon); nvs_set_u8(my_handle, "screenon", cfg.screenon);
if (nvs_get_i8(my_handle, "countermode", &flash8) != ESP_OK || if (nvs_get_u8(my_handle, "countermode", &flash8) != ESP_OK ||
flash8 != cfg.countermode) flash8 != cfg.countermode)
nvs_set_i8(my_handle, "countermode", cfg.countermode); nvs_set_u8(my_handle, "countermode", cfg.countermode);
if (nvs_get_i8(my_handle, "sendcycle", &flash8) != ESP_OK || if (nvs_get_u8(my_handle, "sendcycle", &flash8) != ESP_OK ||
flash8 != cfg.sendcycle) flash8 != cfg.sendcycle)
nvs_set_i8(my_handle, "sendcycle", cfg.sendcycle); nvs_set_u8(my_handle, "sendcycle", cfg.sendcycle);
if (nvs_get_i8(my_handle, "wifichancycle", &flash8) != ESP_OK || if (nvs_get_u8(my_handle, "wifichancycle", &flash8) != ESP_OK ||
flash8 != cfg.wifichancycle) flash8 != cfg.wifichancycle)
nvs_set_i8(my_handle, "wifichancycle", cfg.wifichancycle); nvs_set_u8(my_handle, "wifichancycle", cfg.wifichancycle);
if (nvs_get_i8(my_handle, "blescantime", &flash8) != ESP_OK || if (nvs_get_u8(my_handle, "blescantime", &flash8) != ESP_OK ||
flash8 != cfg.blescantime) flash8 != cfg.blescantime)
nvs_set_i8(my_handle, "blescantime", cfg.blescantime); nvs_set_u8(my_handle, "blescantime", cfg.blescantime);
if (nvs_get_i8(my_handle, "blescanmode", &flash8) != ESP_OK || if (nvs_get_u8(my_handle, "blescanmode", &flash8) != ESP_OK ||
flash8 != cfg.blescan) flash8 != cfg.blescan)
nvs_set_i8(my_handle, "blescanmode", cfg.blescan); nvs_set_u8(my_handle, "blescanmode", cfg.blescan);
if (nvs_get_i8(my_handle, "wifiscanmode", &flash8) != ESP_OK || if (nvs_get_u8(my_handle, "wifiscanmode", &flash8) != ESP_OK ||
flash8 != cfg.wifiscan) flash8 != cfg.wifiscan)
nvs_set_i8(my_handle, "wifiscanmode", cfg.wifiscan); nvs_set_u8(my_handle, "wifiscanmode", cfg.wifiscan);
if (nvs_get_i8(my_handle, "wifiant", &flash8) != ESP_OK || if (nvs_get_u8(my_handle, "wifiant", &flash8) != ESP_OK ||
flash8 != cfg.wifiant) flash8 != cfg.wifiant)
nvs_set_i8(my_handle, "wifiant", cfg.wifiant); nvs_set_u8(my_handle, "wifiant", cfg.wifiant);
if (nvs_get_i8(my_handle, "vendorfilter", &flash8) != ESP_OK || if (nvs_get_u8(my_handle, "vendorfilter", &flash8) != ESP_OK ||
flash8 != cfg.vendorfilter) flash8 != cfg.vendorfilter)
nvs_set_i8(my_handle, "vendorfilter", cfg.vendorfilter); nvs_set_u8(my_handle, "vendorfilter", cfg.vendorfilter);
if (nvs_get_i8(my_handle, "rgblum", &flash8) != ESP_OK || if (nvs_get_u8(my_handle, "rgblum", &flash8) != ESP_OK ||
flash8 != cfg.rgblum) flash8 != cfg.rgblum)
nvs_set_i8(my_handle, "rgblum", cfg.rgblum); nvs_set_u8(my_handle, "rgblum", cfg.rgblum);
if (nvs_get_i8(my_handle, "payloadmask", &flash8) != ESP_OK || if (nvs_get_u8(my_handle, "payloadmask", &flash8) != ESP_OK ||
flash8 != cfg.payloadmask) flash8 != cfg.payloadmask)
nvs_set_i8(my_handle, "payloadmask", cfg.payloadmask); nvs_set_u8(my_handle, "payloadmask", cfg.payloadmask);
if (nvs_get_i8(my_handle, "monitormode", &flash8) != ESP_OK || if (nvs_get_u8(my_handle, "monitormode", &flash8) != ESP_OK ||
flash8 != cfg.monitormode) flash8 != cfg.monitormode)
nvs_set_i8(my_handle, "monitormode", cfg.monitormode); nvs_set_u8(my_handle, "monitormode", cfg.monitormode);
if (nvs_get_i16(my_handle, "rssilimit", &flash16) != ESP_OK || if (nvs_get_u16(my_handle, "rssilimit", &flash16) != ESP_OK ||
flash16 != cfg.rssilimit) flash16 != cfg.rssilimit)
nvs_set_i16(my_handle, "rssilimit", cfg.rssilimit); nvs_set_u16(my_handle, "rssilimit", cfg.rssilimit);
err = nvs_commit(my_handle); err = nvs_commit(my_handle);
nvs_close(my_handle); nvs_close(my_handle);
@ -195,8 +195,8 @@ void loadConfig() {
saveConfig(); saveConfig();
} // saves factory settings to NVRAM } // saves factory settings to NVRAM
else { else {
int8_t flash8 = 0; uint8_t flash8 = 0;
int16_t flash16 = 0; uint16_t flash16 = 0;
size_t required_size; size_t required_size;
// check if configuration stored in NVRAM matches PROGVERSION // check if configuration stored in NVRAM matches PROGVERSION
@ -223,7 +223,7 @@ void loadConfig() {
ESP_LOGI(TAG, "bsecstate = %d", cfg.bsecstate[BSEC_MAX_STATE_BLOB_SIZE]); ESP_LOGI(TAG, "bsecstate = %d", cfg.bsecstate[BSEC_MAX_STATE_BLOB_SIZE]);
}; };
if (nvs_get_i8(my_handle, "loradr", &flash8) == ESP_OK) { if (nvs_get_u8(my_handle, "loradr", &flash8) == ESP_OK) {
cfg.loradr = flash8; cfg.loradr = flash8;
ESP_LOGI(TAG, "loradr = %d", flash8); ESP_LOGI(TAG, "loradr = %d", flash8);
} else { } else {
@ -231,7 +231,7 @@ void loadConfig() {
saveConfig(); saveConfig();
} }
if (nvs_get_i8(my_handle, "txpower", &flash8) == ESP_OK) { if (nvs_get_u8(my_handle, "txpower", &flash8) == ESP_OK) {
cfg.txpower = flash8; cfg.txpower = flash8;
ESP_LOGI(TAG, "txpower = %d", flash8); ESP_LOGI(TAG, "txpower = %d", flash8);
} else { } else {
@ -239,7 +239,7 @@ void loadConfig() {
saveConfig(); saveConfig();
} }
if (nvs_get_i8(my_handle, "adrmode", &flash8) == ESP_OK) { if (nvs_get_u8(my_handle, "adrmode", &flash8) == ESP_OK) {
cfg.adrmode = flash8; cfg.adrmode = flash8;
ESP_LOGI(TAG, "adrmode = %d", flash8); ESP_LOGI(TAG, "adrmode = %d", flash8);
} else { } else {
@ -247,7 +247,7 @@ void loadConfig() {
saveConfig(); saveConfig();
} }
if (nvs_get_i8(my_handle, "screensaver", &flash8) == ESP_OK) { if (nvs_get_u8(my_handle, "screensaver", &flash8) == ESP_OK) {
cfg.screensaver = flash8; cfg.screensaver = flash8;
ESP_LOGI(TAG, "screensaver = %d", flash8); ESP_LOGI(TAG, "screensaver = %d", flash8);
} else { } else {
@ -255,7 +255,7 @@ void loadConfig() {
saveConfig(); saveConfig();
} }
if (nvs_get_i8(my_handle, "screenon", &flash8) == ESP_OK) { if (nvs_get_u8(my_handle, "screenon", &flash8) == ESP_OK) {
cfg.screenon = flash8; cfg.screenon = flash8;
ESP_LOGI(TAG, "screenon = %d", flash8); ESP_LOGI(TAG, "screenon = %d", flash8);
} else { } else {
@ -263,7 +263,7 @@ void loadConfig() {
saveConfig(); saveConfig();
} }
if (nvs_get_i8(my_handle, "countermode", &flash8) == ESP_OK) { if (nvs_get_u8(my_handle, "countermode", &flash8) == ESP_OK) {
cfg.countermode = flash8; cfg.countermode = flash8;
ESP_LOGI(TAG, "countermode = %d", flash8); ESP_LOGI(TAG, "countermode = %d", flash8);
} else { } else {
@ -271,7 +271,7 @@ void loadConfig() {
saveConfig(); saveConfig();
} }
if (nvs_get_i8(my_handle, "sendcycle", &flash8) == ESP_OK) { if (nvs_get_u8(my_handle, "sendcycle", &flash8) == ESP_OK) {
cfg.sendcycle = flash8; cfg.sendcycle = flash8;
ESP_LOGI(TAG, "sendcycle = %d", flash8); ESP_LOGI(TAG, "sendcycle = %d", flash8);
} else { } else {
@ -279,7 +279,7 @@ void loadConfig() {
saveConfig(); saveConfig();
} }
if (nvs_get_i8(my_handle, "wifichancycle", &flash8) == ESP_OK) { if (nvs_get_u8(my_handle, "wifichancycle", &flash8) == ESP_OK) {
cfg.wifichancycle = flash8; cfg.wifichancycle = flash8;
ESP_LOGI(TAG, "wifichancycle = %d", flash8); ESP_LOGI(TAG, "wifichancycle = %d", flash8);
} else { } else {
@ -287,7 +287,7 @@ void loadConfig() {
saveConfig(); saveConfig();
} }
if (nvs_get_i8(my_handle, "wifiant", &flash8) == ESP_OK) { if (nvs_get_u8(my_handle, "wifiant", &flash8) == ESP_OK) {
cfg.wifiant = flash8; cfg.wifiant = flash8;
ESP_LOGI(TAG, "wifiantenna = %d", flash8); ESP_LOGI(TAG, "wifiantenna = %d", flash8);
} else { } else {
@ -295,7 +295,7 @@ void loadConfig() {
saveConfig(); saveConfig();
} }
if (nvs_get_i8(my_handle, "vendorfilter", &flash8) == ESP_OK) { if (nvs_get_u8(my_handle, "vendorfilter", &flash8) == ESP_OK) {
cfg.vendorfilter = flash8; cfg.vendorfilter = flash8;
ESP_LOGI(TAG, "vendorfilter = %d", flash8); ESP_LOGI(TAG, "vendorfilter = %d", flash8);
} else { } else {
@ -303,7 +303,7 @@ void loadConfig() {
saveConfig(); saveConfig();
} }
if (nvs_get_i8(my_handle, "rgblum", &flash8) == ESP_OK) { if (nvs_get_u8(my_handle, "rgblum", &flash8) == ESP_OK) {
cfg.rgblum = flash8; cfg.rgblum = flash8;
ESP_LOGI(TAG, "rgbluminosity = %d", flash8); ESP_LOGI(TAG, "rgbluminosity = %d", flash8);
} else { } else {
@ -311,7 +311,7 @@ void loadConfig() {
saveConfig(); saveConfig();
} }
if (nvs_get_i8(my_handle, "blescantime", &flash8) == ESP_OK) { if (nvs_get_u8(my_handle, "blescantime", &flash8) == ESP_OK) {
cfg.blescantime = flash8; cfg.blescantime = flash8;
ESP_LOGI(TAG, "blescantime = %d", flash8); ESP_LOGI(TAG, "blescantime = %d", flash8);
} else { } else {
@ -319,7 +319,7 @@ void loadConfig() {
saveConfig(); saveConfig();
} }
if (nvs_get_i8(my_handle, "blescanmode", &flash8) == ESP_OK) { if (nvs_get_u8(my_handle, "blescanmode", &flash8) == ESP_OK) {
cfg.blescan = flash8; cfg.blescan = flash8;
ESP_LOGI(TAG, "BLEscanmode = %d", flash8); ESP_LOGI(TAG, "BLEscanmode = %d", flash8);
} else { } else {
@ -327,7 +327,7 @@ void loadConfig() {
saveConfig(); saveConfig();
} }
if (nvs_get_i8(my_handle, "wifiscanmode", &flash8) == ESP_OK) { if (nvs_get_u8(my_handle, "wifiscanmode", &flash8) == ESP_OK) {
cfg.wifiscan = flash8; cfg.wifiscan = flash8;
ESP_LOGI(TAG, "WIFIscanmode = %d", flash8); ESP_LOGI(TAG, "WIFIscanmode = %d", flash8);
} else { } else {
@ -335,7 +335,7 @@ void loadConfig() {
saveConfig(); saveConfig();
} }
if (nvs_get_i16(my_handle, "rssilimit", &flash16) == ESP_OK) { if (nvs_get_u16(my_handle, "rssilimit", &flash16) == ESP_OK) {
cfg.rssilimit = flash16; cfg.rssilimit = flash16;
ESP_LOGI(TAG, "rssilimit = %d", flash16); ESP_LOGI(TAG, "rssilimit = %d", flash16);
} else { } else {
@ -343,7 +343,7 @@ void loadConfig() {
saveConfig(); saveConfig();
} }
if (nvs_get_i8(my_handle, "payloadmask", &flash8) == ESP_OK) { if (nvs_get_u8(my_handle, "payloadmask", &flash8) == ESP_OK) {
cfg.payloadmask = flash8; cfg.payloadmask = flash8;
ESP_LOGI(TAG, "payloadmask = %hhu", flash8); ESP_LOGI(TAG, "payloadmask = %hhu", flash8);
} else { } else {
@ -351,7 +351,7 @@ void loadConfig() {
saveConfig(); saveConfig();
} }
if (nvs_get_i8(my_handle, "monitormode", &flash8) == ESP_OK) { if (nvs_get_u8(my_handle, "monitormode", &flash8) == ESP_OK) {
cfg.monitormode = flash8; cfg.monitormode = flash8;
ESP_LOGI(TAG, "Monitor mode = %d", flash8); ESP_LOGI(TAG, "Monitor mode = %d", flash8);
} else { } else {

2
src/rcommand.cpp
View File

@ -48,7 +48,7 @@ void set_rssi(uint8_t val[]) {
void set_sendcycle(uint8_t val[]) { void set_sendcycle(uint8_t val[]) {
cfg.sendcycle = val[0]; cfg.sendcycle = val[0];
// update send cycle interrupt [seconds // update send cycle interrupt [seconds / 2]
sendcycler.attach(cfg.sendcycle * 2, sendcycle); sendcycler.attach(cfg.sendcycle * 2, sendcycle);
ESP_LOGI(TAG, "Remote command: set send cycle to %d seconds", ESP_LOGI(TAG, "Remote command: set send cycle to %d seconds",
cfg.sendcycle * 2); cfg.sendcycle * 2);