Skip to content

Commit 467d137

Browse files
committed
Clean up warnings in compliance sketch, more AVR-isms
1 parent ea09b2d commit 467d137

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

examples/compliance-otaa-halconfig/compliance-otaa-halconfig.ino

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ void printFcnts(cEventQueue::eventnode_t &e) {
314314
}
315315

316316
#if LMIC_ENABLE_event_logging
317-
// dump all the registers. Must have printf setup.
317+
// dump all the registers.
318318
void printAllRegisters(void) {
319319
uint8_t regbuf[0x80];
320320
regbuf[0] = 0;
@@ -400,21 +400,21 @@ void eventPrint(cEventQueue::eventnode_t &e) {
400400
u1_t nwkKey[16];
401401
u1_t artKey[16];
402402
LMIC_getSessionKeys(&netid, &devaddr, nwkKey, artKey);
403-
Serial.print("netid: ");
403+
Serial.print(F("netid: "));
404404
Serial.println(netid, DEC);
405-
Serial.print("devaddr: ");
405+
Serial.print(F("devaddr: "));
406406
Serial.println(devaddr, HEX);
407-
Serial.print("artKey: ");
408-
for (int i=0; i<sizeof(artKey); ++i) {
407+
Serial.print(F("artKey: "));
408+
for (size_t i=0; i<sizeof(artKey); ++i) {
409409
if (i != 0)
410-
Serial.print("-");
410+
Serial.print('-');
411411
printHex2(artKey[i]);
412412
}
413-
Serial.println("");
414-
Serial.print("nwkKey: ");
415-
for (int i=0; i<sizeof(nwkKey); ++i) {
413+
printNl();
414+
Serial.print(F("nwkKey: "));
415+
for (size_t i=0; i<sizeof(nwkKey); ++i) {
416416
if (i != 0)
417-
Serial.print("-");
417+
Serial.print('-');
418418
printHex2(nwkKey[i]);
419419
}
420420
} while (0);
@@ -432,7 +432,6 @@ void eventPrint(cEventQueue::eventnode_t &e) {
432432
printFreq(e.freq);
433433
printRps(e.rps);
434434
printOpmode(e.opmode);
435-
printf(" irqLevel %u", hal_getIrqLevel());
436435
#if LMIC_ENABLE_event_logging
437436
printAllRegisters();
438437
#endif

0 commit comments

Comments
 (0)