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

configmanager bitmask display

Browse Source
This commit is contained in:
Verkehrsrot 2019-03-17 22:00:02 +01:00
parent 9e4da009ca
commit 2d93f323b4
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/configmanager.h
View File

@ -3,7 +3,6 @@
#include <nvs.h> #include <nvs.h>
#include <nvs_flash.h> #include <nvs_flash.h>
#include <bitset>
void eraseConfig(void); void eraseConfig(void);
void saveConfig(void); void saveConfig(void);

10
src/configmanager.cpp
View File

@ -82,7 +82,8 @@ void saveConfig() {
if (nvs_get_blob(my_handle, "bsecstate", bsecstate_buffer, if (nvs_get_blob(my_handle, "bsecstate", bsecstate_buffer,
&required_size) != ESP_OK || &required_size) != ESP_OK ||
memcmp(bsecstate_buffer, cfg.bsecstate, BSEC_MAX_STATE_BLOB_SIZE + 1) != 0) memcmp(bsecstate_buffer, cfg.bsecstate, BSEC_MAX_STATE_BLOB_SIZE + 1) !=
0)
nvs_set_blob(my_handle, "bsecstate", cfg.bsecstate, nvs_set_blob(my_handle, "bsecstate", cfg.bsecstate,
BSEC_MAX_STATE_BLOB_SIZE + 1); BSEC_MAX_STATE_BLOB_SIZE + 1);
@ -213,8 +214,7 @@ void loadConfig() {
if (nvs_get_blob(my_handle, "bsecstate", NULL, &required_size) == ESP_OK) { if (nvs_get_blob(my_handle, "bsecstate", NULL, &required_size) == ESP_OK) {
nvs_get_blob(my_handle, "bsecstate", cfg.bsecstate, &required_size); nvs_get_blob(my_handle, "bsecstate", cfg.bsecstate, &required_size);
ESP_LOGI(TAG, "bsecstate = %d", ESP_LOGI(TAG, "bsecstate = %d", cfg.bsecstate[BSEC_MAX_STATE_BLOB_SIZE]);
cfg.bsecstate[BSEC_MAX_STATE_BLOB_SIZE]);
}; };
if (nvs_get_i8(my_handle, "lorasf", &flash8) == ESP_OK) { if (nvs_get_i8(my_handle, "lorasf", &flash8) == ESP_OK) {
@ -331,9 +331,9 @@ void loadConfig() {
if (nvs_get_i8(my_handle, "payloadmask", &flash8) == ESP_OK) { if (nvs_get_i8(my_handle, "payloadmask", &flash8) == ESP_OK) {
cfg.payloadmask = flash8; cfg.payloadmask = flash8;
ESP_LOGI(TAG, "payloadmask = %d", flash8); ESP_LOGI(TAG, "payloadmask = %hhu", flash8);
} else { } else {
ESP_LOGI(TAG, "payloadmask set to default %d", std::bitset<8>(cfg.payloadmask)); ESP_LOGI(TAG, "payloadmask set to default %hhu", cfg.payloadmask);
saveConfig(); saveConfig();
} }