Mirrors/knx
1
0
Fork 0
mirror of https://github.com/thelsing/knx.git synced 2024-10-20 20:07:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Using defines in ACK handling (#182)

Browse Source 
* Using defines in ACK handling

* added newline
This commit is contained in:
mptei 2022-02-24 21:23:57 +01:00 committed by GitHub
parent d27f420217
commit 9c48027d3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/knx/tpuart_data_link_layer.cpp
View File

@ -31,6 +31,9 @@
#define U_STOP_MODE_REQ 0x0E #define U_STOP_MODE_REQ 0x0E
#define U_EXIT_STOP_MODE_REQ 0x0F #define U_EXIT_STOP_MODE_REQ 0x0F
#define U_ACK_REQ 0x10 //-0x17 #define U_ACK_REQ 0x10 //-0x17
#define U_ACK_REQ_NACK 0x04
#define U_ACK_REQ_BUSY 0x02
#define U_ACK_REQ_ADRESSED 0x01
#define U_CONFIGURE_REQ 0x18 #define U_CONFIGURE_REQ 0x18
#define U_INT_REG_WR_REQ 0x28 #define U_INT_REG_WR_REQ 0x28
#define U_INT_REG_RD_REQ 0x38 #define U_INT_REG_RD_REQ 0x38
@ -258,7 +261,7 @@ void TpUartDataLinkLayer::loop()
if (millis() - _lastByteRxTime > EOPR_TIMEOUT) if (millis() - _lastByteRxTime > EOPR_TIMEOUT)
{ {
_rxState = RX_WAIT_START; _rxState = RX_WAIT_START;
print("EOPR inside RX_L_ADDR"); println("EOPR inside RX_L_ADDR");
break; break;
} }
if (!_platform.uartAvailable()) if (!_platform.uartAvailable())
@ -294,7 +297,7 @@ void TpUartDataLinkLayer::loop()
if (!_isEcho) if (!_isEcho)
{ {
uint8_t c = 0x10; uint8_t c = U_ACK_REQ;
// The bau knows everything and could either check the address table object (normal device) // The bau knows everything and could either check the address table object (normal device)
// or any filter tables (coupler) to see if we are addressed. // or any filter tables (coupler) to see if we are addressed.
@ -305,11 +308,11 @@ void TpUartDataLinkLayer::loop()
if (_cb.isAckRequired(addr, isGroupAddress)) if (_cb.isAckRequired(addr, isGroupAddress))
{ {
c |= 0x01; c |= U_ACK_REQ_ADRESSED;
} }
// Hint: We can send directly here, this doesn't disturb other transmissions // Hint: We can send directly here, this doesn't disturb other transmissions
// We don't have to update _lastByteTxTime because after ACK the timing is not so tight // We don't have to update _lastByteTxTime because after U_ACK_REQ the timing is not so tight
_platform.writeUart(c); _platform.writeUart(c);
} }
_rxState = RX_L_DATA; _rxState = RX_L_DATA;