forks/RadioLibSmol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[XBee] Fixed autodetection

Browse source
This commit is contained in:
jgromes 2019-01-05 12:12:24 +01:00
parent 2fbb6afcf4
commit 59564a17e2
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/modules/XBee.cpp
View file

@ -32,9 +32,8 @@ int16_t XBee::begin(long speed) {
uint8_t i = 0; uint8_t i = 0;
while((i < 10) && !flagFound) { while((i < 10) && !flagFound) {
// send test frame (get baudrate setting) // send test frame (get baudrate setting)
uint8_t frameID = _frameID++; sendApiFrame(XBEE_API_FRAME_AT_COMMAND_QUEUE, 0x00, "BD");
sendApiFrame(XBEE_API_FRAME_AT_COMMAND_QUEUE, frameID, "BD"); int16_t state = readApiFrame(0x00, 4, 2000);
int16_t state = readApiFrame(frameID, 4, 2000);
if(state == ERR_NONE) { if(state == ERR_NONE) {
flagFound = true; flagFound = true;
@ -45,6 +44,7 @@ int16_t XBee::begin(long speed) {
DEBUG_PRINTLN(state); DEBUG_PRINTLN(state);
DEBUG_PRINTLN_STR("Resetting ..."); DEBUG_PRINTLN_STR("Resetting ...");
reset(); reset();
i++;
} }
} }
@ -386,7 +386,6 @@ int16_t XBee::readApiFrame(uint8_t frameID, uint8_t codePos, uint16_t timeout) {
uint32_t start = millis(); uint32_t start = millis();
while(_mod->ModuleSerial->available() < (int16_t)numBytes) { while(_mod->ModuleSerial->available() < (int16_t)numBytes) {
if(millis() - start >= timeout/2) { if(millis() - start >= timeout/2) {
Serial.println(_mod->ModuleSerial->available());
return(ERR_FRAME_MALFORMED); return(ERR_FRAME_MALFORMED);
} }
} }