localhorst/ttn-esp32
1
0
Fork 0
mirror of https://github.com/manuelbl/ttn-esp32.git synced 2025-06-15 12:24:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

No LMIC clear if it cannot be restored from NVS

Browse Source
This commit is contained in:
Manuel Bl 2023-06-14 22:07:08 +02:00
parent c32c6b4cd6
commit 89ad39d463
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ttn.c
View File

@ -291,8 +291,8 @@ bool join_core(void)
xQueueReset(lmic_event_queue); xQueueReset(lmic_event_queue);
waiting_reason = TTN_WAITING_FOR_JOIN; waiting_reason = TTN_WAITING_FOR_JOIN;
LMIC_startJoining();
config_rf_params(); config_rf_params();
LMIC_startJoining();
hal_esp32_wake_up(); hal_esp32_wake_up();
hal_esp32_leave_critical_section(); hal_esp32_leave_critical_section();

18
src/ttn_nvs.c
View File

@ -28,6 +28,8 @@
#define NVS_FLASH_KEY_CHUNK_3 "chunk3" #define NVS_FLASH_KEY_CHUNK_3 "chunk3"
#define NVS_FLASH_KEY_TIME "time" #define NVS_FLASH_KEY_TIME "time"
static struct lmic_t tmp_LMIC;
void ttn_nvs_save() void ttn_nvs_save()
{ {
nvs_handle handle = 0; nvs_handle handle = 0;
@ -82,21 +84,21 @@ bool ttn_nvs_restore(int off_duration)
goto done; goto done;
size_t len1 = LMIC_DIST(radio, pendTxData); size_t len1 = LMIC_DIST(radio, pendTxData);
res = nvs_get_blob(handle, NVS_FLASH_KEY_CHUNK_1, &LMIC.radio, &len1); res = nvs_get_blob(handle, NVS_FLASH_KEY_CHUNK_1, &tmp_LMIC.radio, &len1);
if (res != ESP_OK) if (res != ESP_OK)
goto done; goto done;
memset(LMIC.pendTxData, 0, MAX_LEN_PAYLOAD); memset(LMIC.pendTxData, 0, MAX_LEN_PAYLOAD);
size_t len2 = LMIC_DIST(pendTxData, frame) - MAX_LEN_PAYLOAD; size_t len2 = LMIC_DIST(pendTxData, frame) - MAX_LEN_PAYLOAD;
res = nvs_get_blob(handle, NVS_FLASH_KEY_CHUNK_2, (u1_t *)&LMIC.pendTxData + MAX_LEN_PAYLOAD, &len2); res = nvs_get_blob(handle, NVS_FLASH_KEY_CHUNK_2, (u1_t *)&tmp_LMIC.pendTxData + MAX_LEN_PAYLOAD, &len2);
if (res != ESP_OK) if (res != ESP_OK)
goto done; goto done;
memset(LMIC.frame, 0, MAX_LEN_FRAME); memset(LMIC.frame, 0, MAX_LEN_FRAME);
size_t len3 = sizeof(struct lmic_t) - LMIC_OFFSET(frame) - MAX_LEN_FRAME; size_t len3 = sizeof(struct lmic_t) - LMIC_OFFSET(frame) - MAX_LEN_FRAME;
res = nvs_get_blob(handle, NVS_FLASH_KEY_CHUNK_3, (u1_t *)&LMIC.frame + MAX_LEN_FRAME, &len3); res = nvs_get_blob(handle, NVS_FLASH_KEY_CHUNK_3, (u1_t *)&tmp_LMIC.frame + MAX_LEN_FRAME, &len3);
if (res != ESP_OK) if (res != ESP_OK)
goto done; goto done;
@ -115,8 +117,14 @@ bool ttn_nvs_restore(int off_duration)
done: done:
nvs_close(handle); nvs_close(handle);
if (res != ESP_OK) if (res == ESP_OK) {
memset(&LMIC.radio, 0, sizeof(LMIC) - LMIC_OFFSET(radio)); // copy temporary data to actual
memcpy(&LMIC.radio, &tmp_LMIC.radio, LMIC_DIST(radio, pendTxData));
memcpy((u1_t *)&LMIC.pendTxData + MAX_LEN_PAYLOAD, (u1_t *)&tmp_LMIC.pendTxData + MAX_LEN_PAYLOAD,
LMIC_DIST(pendTxData, frame) - MAX_LEN_PAYLOAD);
memcpy((u1_t *)&LMIC.frame + MAX_LEN_FRAME, (u1_t *)&tmp_LMIC.frame + MAX_LEN_FRAME,
sizeof(struct lmic_t) - LMIC_OFFSET(frame) - MAX_LEN_FRAME);
}
return res == ESP_OK; return res == ESP_OK;
} }