Skip to content

Commit 30d8a0f

Browse files
committed
Replace scanf %2hhx with %2x for gcc 8.3 compatibility
1 parent 3587e1d commit 30d8a0f

File tree

1 file changed

+29
-9
lines changed

1 file changed

+29
-9
lines changed

src/lorawan.c

Lines changed: 29 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ static void OnNetworkParametersChange( CommissioningParams_t* params )
405405
params->DevAddr = 0;
406406

407407
for (int i = 0; i < 4; i++) {
408-
uint8_t b;
408+
int b;
409409

410410
sscanf(device_address + i * 2, "%2hhx", &b);
411411

@@ -427,7 +427,11 @@ static void OnNetworkParametersChange( CommissioningParams_t* params )
427427
uint8_t deviceEui[8];
428428

429429
for (int i = 0; i < 8; i++) {
430-
sscanf(device_eui + i * 2, "%2hhx", &deviceEui[i]);
430+
int b;
431+
432+
sscanf(device_eui + i * 2, "%2x", &b);
433+
434+
deviceEui[i] = b;
431435
}
432436

433437
mibReq.Type = MIB_DEV_EUI;
@@ -440,7 +444,11 @@ static void OnNetworkParametersChange( CommissioningParams_t* params )
440444
uint8_t joinEui[8];
441445

442446
for (int i = 0; i < 8; i++) {
443-
sscanf(app_eui + i * 2, "%2hhx", &joinEui[i]);
447+
int b;
448+
449+
sscanf(app_eui + i * 2, "%2x", &b);
450+
451+
joinEui[i] = b;
444452
}
445453

446454
mibReq.Type = MIB_JOIN_EUI;
@@ -453,7 +461,11 @@ static void OnNetworkParametersChange( CommissioningParams_t* params )
453461
uint8_t appKey[16];
454462

455463
for (int i = 0; i < 16; i++) {
456-
sscanf(app_key + i * 2, "%2hhx", &appKey[i]);
464+
int b;
465+
466+
sscanf(app_key + i * 2, "%2x", &b);
467+
468+
appKey[i] = b;
457469
}
458470

459471
mibReq.Type = MIB_APP_KEY;
@@ -469,7 +481,11 @@ static void OnNetworkParametersChange( CommissioningParams_t* params )
469481
uint8_t appSessionKey[16];
470482

471483
for (int i = 0; i < 16; i++) {
472-
sscanf(app_session_key + i * 2, "%2hhx", &appSessionKey[i]);
484+
int b;
485+
486+
sscanf(app_session_key + i * 2, "%2x", &b);
487+
488+
appSessionKey[i] = b;
473489
}
474490

475491
mibReq.Type = MIB_APP_S_KEY;
@@ -481,7 +497,11 @@ static void OnNetworkParametersChange( CommissioningParams_t* params )
481497
uint8_t networkSessionKey[16];
482498

483499
for (int i = 0; i < 16; i++) {
484-
sscanf(network_session_key + i * 2, "%2hhx", &networkSessionKey[i]);
500+
int b;
501+
502+
sscanf(network_session_key + i * 2, "%2x", &b);
503+
504+
networkSessionKey[i] = b;
485505
}
486506

487507
mibReq.Type = MIB_F_NWK_S_INT_KEY;
@@ -501,10 +521,10 @@ static void OnNetworkParametersChange( CommissioningParams_t* params )
501521
uint16_t channelMask[6];
502522

503523
for (int i = 0; i < 6; i++) {
504-
uint8_t b[2];
524+
int b[2];
505525

506-
sscanf(channel_mask + i * 4 + 0, "%2hhx", &b[0]);
507-
sscanf(channel_mask + i * 4 + 2, "%2hhx", &b[1]);
526+
sscanf(channel_mask + i * 4 + 0, "%2x", &b[0]);
527+
sscanf(channel_mask + i * 4 + 2, "%2x", &b[1]);
508528

509529
channelMask[i] = (b[0] << 8) | b[1];
510530
}

0 commit comments

Comments
 (0)