Skip to content

Commit 915b84b

Browse files
authored
Merge branch 'master' into feature/ppp_modem_support
2 parents a57bbdb + 394ebb6 commit 915b84b

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

Diff for: libraries/Update/src/Updater.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ bool UpdateClass::setCryptMode(const int cryptMode){
228228
if(cryptMode >= U_AES_DECRYPT_NONE && cryptMode <= U_AES_DECRYPT_ON){
229229
_cryptMode = cryptMode;
230230
}else{
231-
log_e("bad crypt mode arguement %i", cryptMode);
231+
log_e("bad crypt mode argument %i", cryptMode);
232232
return false;
233233
}
234234
return true;

Diff for: libraries/WiFi/src/WiFiGeneric.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -686,6 +686,7 @@ bool WiFiGenericClass::initiateFTM(uint8_t frm_count, uint16_t burst_period, uin
686686
.channel = channel,
687687
.frm_count = frm_count,
688688
.burst_period = burst_period,
689+
.use_get_report_api = true
689690
};
690691
if(mac != NULL){
691692
memcpy(ftmi_cfg.resp_mac, mac, 6);

0 commit comments

Comments
 (0)