From 013104aad9a4a43e0acf545e6e80e39284245dd3 Mon Sep 17 00:00:00 2001 From: Nanosonde <2073569+nanosonde@users.noreply.github.com> Date: Mon, 8 Jun 2020 20:54:21 +0200 Subject: [PATCH] Add empty confirm methods --- src/knx/application_layer.cpp | 6 +++--- src/knx/bau.cpp | 14 ++++++++++++++ src/knx/bau.h | 8 ++++++++ src/knx/bau27B0.cpp | 10 ++++++++++ src/knx/bau27B0.h | 5 ++++- src/knx/bau_systemB.cpp | 7 ++++++- src/knx/bau_systemB.h | 4 +++- 7 files changed, 48 insertions(+), 6 deletions(-) diff --git a/src/knx/application_layer.cpp b/src/knx/application_layer.cpp index 09ca732..1bfad89 100644 --- a/src/knx/application_layer.cpp +++ b/src/knx/application_layer.cpp @@ -239,20 +239,20 @@ void ApplicationLayer::dataBroadcastConfirm(AckType ack, HopCountType hopType, P popByte(testInfo[1], data + 5); propertyId = (propertyId >> 4) & 0x0FFF;; testInfo[0] &= 0x0F; - //TODO: _bau.systemNetworkParameterReadLocalConfirm(priority, hopType, objectType, propertyId, testInfo, sizeof(testInfo), status); + _bau.systemNetworkParameterReadLocalConfirm(priority, hopType, objectType, propertyId, testInfo, sizeof(testInfo), status); break; } case DomainAddressSerialNumberWrite: { const uint8_t* knxSerialNumber = &data[1]; const uint8_t* domainAddress = &data[7]; - //TODO: _bau.domainAddressSerialNumberWriteLocalConfirm(priority, hopType, domainAddress, knxSerialNumber, status); + _bau.domainAddressSerialNumberWriteLocalConfirm(priority, hopType, domainAddress, knxSerialNumber, status); break; } case DomainAddressSerialNumberRead: { const uint8_t* knxSerialNumber = &data[1]; - //TODO: _bau.domainAddressSerialNumberReadLocalConfirm(priority, hopType, knxSerialNumber, status); + _bau.domainAddressSerialNumberReadLocalConfirm(priority, hopType, knxSerialNumber, status); break; } default: diff --git a/src/knx/bau.cpp b/src/knx/bau.cpp index e2b1a9d..f97466a 100644 --- a/src/knx/bau.cpp +++ b/src/knx/bau.cpp @@ -256,6 +256,20 @@ void BusAccessUnit::domainAddressSerialNumberReadIndication(Priority priority, H { } +void BusAccessUnit::systemNetworkParameterReadLocalConfirm(Priority priority, HopCountType hopType, uint16_t objectType, + uint16_t propertyId, uint8_t* testInfo, uint16_t testInfoLength, bool status) +{ +} + +void BusAccessUnit::domainAddressSerialNumberWriteLocalConfirm(Priority priority, HopCountType hopType, const uint8_t* rfDoA, + const uint8_t* knxSerialNumber, bool status) +{ +} + +void BusAccessUnit::domainAddressSerialNumberReadLocalConfirm(Priority priority, HopCountType hopType, const uint8_t* knxSerialNumber, bool status) +{ +} + void BusAccessUnit::propertyValueRead(ObjectType objectType, uint8_t objectInstance, uint8_t propertyId, uint8_t& numberOfElements, uint16_t startIndex, uint8_t** data, uint32_t& length) diff --git a/src/knx/bau.h b/src/knx/bau.h index a0e567c..f4ef160 100644 --- a/src/knx/bau.h +++ b/src/knx/bau.h @@ -119,6 +119,14 @@ class BusAccessUnit virtual void domainAddressSerialNumberReadIndication(Priority priority, HopCountType hopType, const uint8_t* knxSerialNumber); + virtual void systemNetworkParameterReadLocalConfirm(Priority priority, HopCountType hopType, uint16_t objectType, + uint16_t propertyId, uint8_t* testInfo, uint16_t testInfoLength, bool status); + + virtual void domainAddressSerialNumberWriteLocalConfirm(Priority priority, HopCountType hopType, const uint8_t* rfDoA, + const uint8_t* knxSerialNumber, bool status); + + virtual void domainAddressSerialNumberReadLocalConfirm(Priority priority, HopCountType hopType, const uint8_t* knxSerialNumber, bool status); + virtual void propertyValueRead(ObjectType objectType, uint8_t objectInstance, uint8_t propertyId, uint8_t& numberOfElements, uint16_t startIndex, uint8_t** data, uint32_t& length); diff --git a/src/knx/bau27B0.cpp b/src/knx/bau27B0.cpp index 9ed25da..a938dba 100644 --- a/src/knx/bau27B0.cpp +++ b/src/knx/bau27B0.cpp @@ -150,4 +150,14 @@ void Bau27B0::individualAddressSerialNumberReadIndication(Priority priority, Hop _appLayer.IndividualAddressSerialNumberReadResponse(priority, hopType, _rfMediumObj.rfDomainAddress(), knxSerialNumber); } +void Bau27B0::domainAddressSerialNumberWriteLocalConfirm(Priority priority, HopCountType hopType, const uint8_t* rfDoA, + const uint8_t* knxSerialNumber, bool status) +{ +} + +void Bau27B0::domainAddressSerialNumberReadLocalConfirm(Priority priority, HopCountType hopType, const uint8_t* knxSerialNumber, bool status) +{ +} + + #endif // #ifdef USE_RF diff --git a/src/knx/bau27B0.h b/src/knx/bau27B0.h index 8b270b6..678a659 100644 --- a/src/knx/bau27B0.h +++ b/src/knx/bau27B0.h @@ -34,5 +34,8 @@ class Bau27B0 : public BauSystemB void individualAddressSerialNumberWriteIndication(Priority priority, HopCountType hopType, uint16_t newIndividualAddress, uint8_t* knxSerialNumber) override; void individualAddressSerialNumberReadIndication(Priority priority, HopCountType hopType, uint8_t* knxSerialNumber) override; + void domainAddressSerialNumberWriteLocalConfirm(Priority priority, HopCountType hopType, const uint8_t* rfDoA, + const uint8_t* knxSerialNumber, bool status) override; + void domainAddressSerialNumberReadLocalConfirm(Priority priority, HopCountType hopType, const uint8_t* knxSerialNumber, bool status) override; }; -#endif \ No newline at end of file +#endif diff --git a/src/knx/bau_systemB.cpp b/src/knx/bau_systemB.cpp index 8f44ef1..80da679 100644 --- a/src/knx/bau_systemB.cpp +++ b/src/knx/bau_systemB.cpp @@ -393,6 +393,11 @@ void BauSystemB::systemNetworkParameterReadIndication(Priority priority, HopCoun } } +void BauSystemB::systemNetworkParameterReadLocalConfirm(Priority priority, HopCountType hopType, uint16_t objectType, + uint16_t propertyId, uint8_t* testInfo, uint16_t testInfoLength, bool status) +{ +} + void BauSystemB::propertyValueRead(ObjectType objectType, uint8_t objectInstance, uint8_t propertyId, uint8_t &numberOfElements, uint16_t startIndex, uint8_t **data, uint32_t &length) @@ -433,4 +438,4 @@ void BauSystemB::propertyValueWrite(ObjectType objectType, uint8_t objectInstanc Memory& BauSystemB::memory() { return _memory; -} \ No newline at end of file +} diff --git a/src/knx/bau_systemB.h b/src/knx/bau_systemB.h index b651150..91e816f 100644 --- a/src/knx/bau_systemB.h +++ b/src/knx/bau_systemB.h @@ -68,6 +68,8 @@ class BauSystemB : protected BusAccessUnit uint8_t* data, uint8_t dataLength) override; void systemNetworkParameterReadIndication(Priority priority, HopCountType hopType, uint16_t objectType, uint16_t propertyId, uint8_t* testInfo, uint16_t testinfoLength) override; + void systemNetworkParameterReadLocalConfirm(Priority priority, HopCountType hopType, uint16_t objectType, + uint16_t propertyId, uint8_t* testInfo, uint16_t testInfoLength, bool status) override; void connectConfirm(uint16_t tsap) override; virtual InterfaceObject* getInterfaceObject(uint8_t idx) = 0; @@ -97,4 +99,4 @@ class BauSystemB : protected BusAccessUnit bool _configured = true; RestartState _restartState = Idle; uint32_t _restartDelay = 0; -}; \ No newline at end of file +};