unixweb/ttgo-t-beam-gps-ttn-tracker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

if prefs file open fails, don't try other operations

Browse Source
This commit is contained in:
geeksville 2020-01-20 10:51:58 -08:00
parent 5a11a7a880
commit e84a840190
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
main/ttn.ino
View File

@ -176,12 +176,13 @@ void onEvent(ev_t event) {
Serial.println();
Preferences p;
p.begin("lora", false);
p.putUInt("netId", netid);
p.putUInt("devAddr", devaddr);
p.putBytes("nwkKey", nwkKey, sizeof(nwkKey));
p.putBytes("artKey", artKey, sizeof(artKey));
p.end();
if(p.begin("lora", false)) {
p.putUInt("netId", netid);
p.putUInt("devAddr", devaddr);
p.putBytes("nwkKey", nwkKey, sizeof(nwkKey));
p.putBytes("artKey", artKey, sizeof(artKey));
p.end();
}
break; }
case EV_TXCOMPLETE:
Serial.println(F("EV_TXCOMPLETE (inc. RX win. wait)"));
@ -226,9 +227,10 @@ void ttn_response(uint8_t * buffer, size_t len) {
static void initCount() {
if(count == 0) {
Preferences p;
p.begin("lora", true);
count = p.getUInt("count", 0);
p.end();
if(p.begin("lora", true)) {
count = p.getUInt("count", 0);
p.end();
}
}
}
@ -326,7 +328,7 @@ void ttn_join() {
#endif
Preferences p;
p.begin("lora", true);
p.begin("lora", true); // we intentionally ignore failure here
uint32_t netId = p.getUInt("netId", UINT32_MAX);
uint32_t devAddr = p.getUInt("devAddr", UINT32_MAX);
uint8_t nwkKey[16], artKey[16];
@ -377,9 +379,10 @@ static void ttn_set_cnt() {
lastWriteMsec = now;
Preferences p;
p.begin("lora", false);
p.putUInt("count", count);
p.end();
if(p.begin("lora", false)) {
p.putUInt("count", count);
p.end();
}
}
}