Skip to content

Commit bec1cfd

Browse files
committed
Fix #383: clean up compile warnings found by CI testing
1 parent 3206214 commit bec1cfd

File tree

7 files changed

+16
-20
lines changed

7 files changed

+16
-20
lines changed

examples/ttn-otaa-feather-us915-dht22/ttn-otaa-feather-us915-dht22.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,14 +112,14 @@ void onEvent (ev_t ev) {
112112
Serial.print("devaddr: ");
113113
Serial.println(devaddr, HEX);
114114
Serial.print("artKey: ");
115-
for (int i=0; i<sizeof(artKey); ++i) {
115+
for (size_t i=0; i<sizeof(artKey); ++i) {
116116
if (i != 0)
117117
Serial.print("-");
118118
Serial.print(artKey[i], HEX);
119119
}
120120
Serial.println("");
121121
Serial.print("nwkKey: ");
122-
for (int i=0; i<sizeof(nwkKey); ++i) {
122+
for (size_t i=0; i<sizeof(nwkKey); ++i) {
123123
if (i != 0)
124124
Serial.print("-");
125125
Serial.print(nwkKey[i], HEX);

examples/ttn-otaa-feather-us915/ttn-otaa-feather-us915.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,14 +154,14 @@ void onEvent (ev_t ev) {
154154
Serial.print("devaddr: ");
155155
Serial.println(devaddr, HEX);
156156
Serial.print("artKey: ");
157-
for (int i=0; i<sizeof(artKey); ++i) {
157+
for (size_t i=0; i<sizeof(artKey); ++i) {
158158
if (i != 0)
159159
Serial.print("-");
160160
Serial.print(artKey[i], HEX);
161161
}
162162
Serial.println("");
163163
Serial.print("nwkKey: ");
164-
for (int i=0; i<sizeof(nwkKey); ++i) {
164+
for (size_t i=0; i<sizeof(nwkKey); ++i) {
165165
if (i != 0)
166166
Serial.print("-");
167167
Serial.print(nwkKey[i], HEX);

examples/ttn-otaa-halconfig-us915/ttn-otaa-halconfig-us915.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,14 +108,14 @@ void onEvent (ev_t ev) {
108108
Serial.print("devaddr: ");
109109
Serial.println(devaddr, HEX);
110110
Serial.print("artKey: ");
111-
for (int i=0; i<sizeof(artKey); ++i) {
111+
for (size_t i=0; i<sizeof(artKey); ++i) {
112112
if (i != 0)
113113
Serial.print("-");
114114
Serial.print(artKey[i], HEX);
115115
}
116116
Serial.println("");
117117
Serial.print("nwkKey: ");
118-
for (int i=0; i<sizeof(nwkKey); ++i) {
118+
for (size_t i=0; i<sizeof(nwkKey); ++i) {
119119
if (i != 0)
120120
Serial.print("-");
121121
Serial.print(nwkKey[i], HEX);

examples/ttn-otaa-network-time/ttn-otaa-network-time.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,12 @@ void onEvent (ev_t ev) {
114114
Serial.print("devaddr: ");
115115
Serial.println(devaddr, HEX);
116116
Serial.print("artKey: ");
117-
for (int i=0; i<sizeof(artKey); ++i) {
117+
for (size_t i=0; i<sizeof(artKey); ++i) {
118118
Serial.print(artKey[i], HEX);
119119
}
120120
Serial.println("");
121121
Serial.print("nwkKey: ");
122-
for (int i=0; i<sizeof(nwkKey); ++i) {
122+
for (size_t i=0; i<sizeof(nwkKey); ++i) {
123123
Serial.print(nwkKey[i], HEX);
124124
}
125125
Serial.println("");

examples/ttn-otaa/ttn-otaa.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,12 @@ void onEvent (ev_t ev) {
113113
Serial.print("devaddr: ");
114114
Serial.println(devaddr, HEX);
115115
Serial.print("artKey: ");
116-
for (int i=0; i<sizeof(artKey); ++i) {
116+
for (size_t i=0; i<sizeof(artKey); ++i) {
117117
Serial.print(artKey[i], HEX);
118118
}
119119
Serial.println("");
120120
Serial.print("nwkKey: ");
121-
for (int i=0; i<sizeof(nwkKey); ++i) {
121+
for (size_t i=0; i<sizeof(nwkKey); ++i) {
122122
Serial.print(nwkKey[i], HEX);
123123
}
124124
Serial.println("");

src/lmic/lmic.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -803,7 +803,7 @@ applyAdrRequests(
803803

804804
static int
805805
scan_mac_cmds_link_adr(
806-
const char *opts,
806+
const uint8_t *opts,
807807
int olen,
808808
bit_t *presponse_fit
809809
)
@@ -868,7 +868,6 @@ scan_mac_cmds(
868868
int port
869869
) {
870870
int oidx = 0;
871-
bit_t fSawAdrReq = 0;
872871
uint8_t cmd;
873872

874873
LMIC.pendMacLen = 0;

src/lmic/lmic_compliance.c

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,7 @@ Copyright notice and license info:
3535
|
3636
\****************************************************************************/
3737

38-
static void acDoJoin(void);
3938
static void acEnterActiveMode(void);
40-
static void acEnterTestMode(void);
4139
static void acExitActiveMode(void);
4240
static void acSendUplink(void);
4341
static void acSetTimer(ostime_t);
@@ -55,7 +53,9 @@ static void evEchoCommand(const uint8_t *pMessage, size_t nMessage);
5553
static lmic_event_cb_t lmicEventCb;
5654
static lmic_txmessage_cb_t sendUplinkCompleteCb;
5755
static osjobcbfn_t timerExpiredCb;
58-
static const char *txSuccessToString(int fSuccess);
56+
57+
/* this is declared global so the optimizer can chuck it without warnings */
58+
const char *LMICcompliance_txSuccessToString(int fSuccess);
5959

6060
/****************************************************************************\
6161
|
@@ -655,9 +655,6 @@ static void acEnterActiveMode(void) {
655655
LMIC_Compliance.state = LMIC_COMPLIANCE_STATE_ACTIVE;
656656
}
657657

658-
static void acEnterTestMode(void) {
659-
}
660-
661658
void acSetTimer(ostime_t delay) {
662659
os_setTimedCallback(&LMIC_Compliance.timerJob, os_getTime() + delay, timerExpiredCb);
663660
}
@@ -739,7 +736,7 @@ static void acSendUplink(void) {
739736

740737
static void sendUplinkCompleteCb(void *pUserData, int fSuccess) {
741738
LMIC_Compliance.eventflags |= LMIC_COMPLIANCE_EVENT_UPLINK_COMPLETE;
742-
LMIC_COMPLIANCE_PRINTF("%s(%s)\n", __func__, txSuccessToString(fSuccess));
739+
LMIC_COMPLIANCE_PRINTF("%s(%s)\n", __func__, LMICcompliance_txSuccessToString(fSuccess));
743740
fsmEvalDeferred();
744741
}
745742

@@ -762,6 +759,6 @@ static void acSendUplinkBuffer(void) {
762759
}
763760
}
764761

765-
static const char *txSuccessToString(int fSuccess) {
762+
const char *LMICcompliance_txSuccessToString(int fSuccess) {
766763
return fSuccess ? "ok" : "failed";
767764
}

0 commit comments

Comments
 (0)