Mirrors/knx
1
0
Fork 0
mirror of https://github.com/thelsing/knx.git synced 2025-08-13 13:46:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update tpuart_data_link_layer.cpp

Browse Source 
use platform specific millis function
This commit is contained in:
Bernator 2019-07-15 19:48:14 +02:00 committed by GitHub
parent d11bd33cbf
commit 8cad0738bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/knx/tpuart_data_link_layer.cpp
View File

@ -100,7 +100,7 @@ void TpUartDataLinkLayer::loop(){
if(!_waitConfirm && !isTxQueueEmpty()){ if(!_waitConfirm && !isTxQueueEmpty()){
loadNextTxFrame(); loadNextTxFrame();
_waitConfirm = true; _waitConfirm = true;
_waitConfirmStartTime = micros(); _waitConfirmStartTime = _platform.millis();
_loopState = TX_FRAME; _loopState = TX_FRAME;
} }
} }
@ -112,7 +112,7 @@ void TpUartDataLinkLayer::loop(){
break; break;
case RX_FIRST_BYTE: case RX_FIRST_BYTE:
rxByte =_platform.readUart(); rxByte =_platform.readUart();
_lastByteRxTime = micros(); _lastByteRxTime = _platform.millis();
_RxByteCnt = 0; _RxByteCnt = 0;
_xorSum = 0; _xorSum = 0;
if ((rxByte & L_DATA_MASK) == L_DATA_STANDARD_IND){ if ((rxByte & L_DATA_MASK) == L_DATA_STANDARD_IND){
@ -186,14 +186,14 @@ void TpUartDataLinkLayer::loop(){
_loopState = IDLE; _loopState = IDLE;
break; break;
case RX_L_DATA: case RX_L_DATA:
if (micros() - _lastByteRxTime > BYTE_TIMEOUT){ if (_platform.millis() - _lastByteRxTime > BYTE_TIMEOUT){
_RxByteCnt = 0; _RxByteCnt = 0;
_loopState = IDLE; _loopState = IDLE;
println("Timeout during RX_L_DATA"); println("Timeout during RX_L_DATA");
break; break;
} }
if(!_platform.uartAvailable()) break; if(!_platform.uartAvailable()) break;
_lastByteRxTime = micros(); _lastByteRxTime = _platform.millis();
rxByte =_platform.readUart(); rxByte =_platform.readUart();
if(_RxByteCnt == MAX_KNX_TELEGRAM_SIZE){ if(_RxByteCnt == MAX_KNX_TELEGRAM_SIZE){
@ -265,7 +265,7 @@ void TpUartDataLinkLayer::loop(){
case RX_WAIT_DATA_CON: case RX_WAIT_DATA_CON:
if(!_platform.uartAvailable()) break; if(!_platform.uartAvailable()) break;
rxByte =_platform.readUart(); rxByte =_platform.readUart();
_lastByteRxTime = micros(); _lastByteRxTime = _platform.millis();
if ((rxByte & L_DATA_CON_MASK) == L_DATA_CON){ if ((rxByte & L_DATA_CON_MASK) == L_DATA_CON){
//println("L_DATA_CON received"); //println("L_DATA_CON received");
dataConBytesReceived(_receiveBuffer, _RxByteCnt+2, ((rxByte & SUCCESS) > 0)); dataConBytesReceived(_receiveBuffer, _RxByteCnt+2, ((rxByte & SUCCESS) > 0));
@ -291,7 +291,7 @@ void TpUartDataLinkLayer::loop(){
} }
if(_waitConfirm){ if(_waitConfirm){
if (micros() - _waitConfirmStartTime > CONFIRM_TIMEOUT){ if (_platform.millis() - _waitConfirmStartTime > CONFIRM_TIMEOUT){
println("L_DATA_CON not received within expected time"); println("L_DATA_CON not received within expected time");
uint8_t cemiBuffer[MAX_KNX_TELEGRAM_SIZE]; uint8_t cemiBuffer[MAX_KNX_TELEGRAM_SIZE];
cemiBuffer[0] = 0x29; cemiBuffer[0] = 0x29;