another bugfix try for #83

This commit is contained in:
Thomas Kunze 2020-11-17 17:49:54 +01:00
parent 4f1b7502f6
commit d962da414d
3 changed files with 5 additions and 5 deletions

View File

@ -138,8 +138,8 @@ bool Bau07B0::isAckRequired(uint16_t address, bool isGrpAddr)
return _addrTable.contains(address);
}
// Also ACK for our own individual address or broadcast
if (address == _deviceObj.individualAddress() || address == 0)
// Also ACK for our own individual address
if (address == _deviceObj.individualAddress())
return true;
return false;

View File

@ -98,8 +98,8 @@ bool NetworkLayerCoupler::isRoutedIndividualAddress(uint16_t individualAddress)
// This shall serve for protection purposes. (It is useful to prevent all parameterisation in one Subnetwork; the Coupler shall be protected
// too. A typical use case is the protection of a Subnetwork that is located outside a building)
// Also ACK for our own individual address or broadcast
if (individualAddress == _deviceObj.individualAddress() || individualAddress == 0)
// Also ACK for our own individual address
if (individualAddress == _deviceObj.individualAddress())
return true;
// use 2 for now

View File

@ -272,7 +272,7 @@ void TpUartDataLinkLayer::loop()
// or any filter tables (coupler) to see if we are addressed.
//check if individual or group address
bool isGroupAddress = (buffer[6] & 0x80) != 0;
bool isGroupAddress = (buffer[1] & 0x80) != 0;
uint16_t addr = getWord(buffer + 4);
if (_cb.isAckRequired(addr, isGroupAddress))