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

[ESP8266] Added Module overrides for all Arduino core functions

Browse source
This commit is contained in:
jgromes 2020-08-01 16:34:06 +02:00
parent 259b82a006
commit 67239551b0
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/modules/ESP8266/ESP8266.cpp
View file

@ -30,13 +30,13 @@ int16_t ESP8266::reset() {
} }
// wait for the module to start // wait for the module to start
delay(2000); Module::delay(2000);
// test AT setup // test AT setup
uint32_t start = millis(); uint32_t start = Module::millis();
while (millis() - start < 3000) { while (Module::millis() - start < 3000) {
if(!_mod->ATsendCommand("AT")) { if(!_mod->ATsendCommand("AT")) {
delay(100); Module::delay(100);
} else { } else {
return(ERR_NONE); return(ERR_NONE);
} }
@ -192,11 +192,11 @@ int16_t ESP8266::send(uint8_t* data, size_t len) {
size_t ESP8266::receive(uint8_t* data, size_t len, uint32_t timeout) { size_t ESP8266::receive(uint8_t* data, size_t len, uint32_t timeout) {
size_t i = 0; size_t i = 0;
uint32_t start = millis(); uint32_t start = Module::millis();
// wait until the required number of bytes is received or until timeout // wait until the required number of bytes is received or until timeout
while((millis() - start < timeout) && (i < len)) { while((Module::millis() - start < timeout) && (i < len)) {
yield(); Module::yield();
while(_mod->ModuleSerial->available() > 0) { while(_mod->ModuleSerial->available() > 0) {
uint8_t b = _mod->ModuleSerial->read(); uint8_t b = _mod->ModuleSerial->read();
RADIOLIB_DEBUG_PRINT(b); RADIOLIB_DEBUG_PRINT(b);
@ -209,10 +209,10 @@ size_t ESP8266::receive(uint8_t* data, size_t len, uint32_t timeout) {
size_t ESP8266::getNumBytes(uint32_t timeout, size_t minBytes) { size_t ESP8266::getNumBytes(uint32_t timeout, size_t minBytes) {
// wait for available data // wait for available data
uint32_t start = millis(); uint32_t start = Module::millis();
while(_mod->ModuleSerial->available() < (int16_t)minBytes) { while(_mod->ModuleSerial->available() < (int16_t)minBytes) {
yield(); Module::yield();
if(millis() - start >= timeout) { if(Module::millis() - start >= timeout) {
return(0); return(0);
} }
} }
@ -220,16 +220,16 @@ size_t ESP8266::getNumBytes(uint32_t timeout, size_t minBytes) {
// read response // read response
char rawStr[20]; char rawStr[20];
uint8_t i = 0; uint8_t i = 0;
start = millis(); start = Module::millis();
while(_mod->ModuleSerial->available() > 0) { while(_mod->ModuleSerial->available() > 0) {
yield(); Module::yield();
char c = _mod->ModuleSerial->read(); char c = _mod->ModuleSerial->read();
rawStr[i++] = c; rawStr[i++] = c;
if(c == ':') { if(c == ':') {
rawStr[i++] = 0; rawStr[i++] = 0;
break; break;
} }
if(millis() - start >= timeout) { if(Module::millis() - start >= timeout) {
rawStr[i++] = 0; rawStr[i++] = 0;
break; break;
} }