Skip to content

Commit 4532c4b

Browse files
committed
Merge remote-tracking branch 'origin/wifi_leven_dev' into HEAD
2 parents cf1aeea + 68a66f2 commit 4532c4b

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

libraries/WiFiS3/src/Modem.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ void ModemClass::begin(int badurate){
3131
_serial->begin(badurate);
3232
beginned = true;
3333
string res = "";
34+
_serial->flush();
3435
modem.write(string(PROMPT(_SOFTRESETWIFI)),res, "%s" , CMD(_SOFTRESETWIFI));
3536
}
3637
}
@@ -198,6 +199,7 @@ bool ModemClass::buf_read(const string &prompt, string &data_res) {
198199
found = true;
199200
read_by_size = false;
200201
res = true;
202+
data_res = data_res.substr(0, data_res.length() - sizeof(RESULT_OK));
201203
}
202204
}
203205
else {

libraries/WiFiS3/src/WiFi.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ static bool macStr2macArray(uint8_t *mac_out, const char *mac_in) {
224224
return false;
225225
}
226226

227-
for(int i = 0; i < 6; i++) {
227+
for(int i = 5; i >= 0; i--) {
228228
std::string str_num(mac_in+(i*3),2);
229229
*(mac_out+i) = std::stoul(str_num,nullptr,16);
230230
}

0 commit comments

Comments
 (0)