Mirrors/knx
1
0
Fork 0
mirror of https://github.com/thelsing/knx.git synced 2024-12-29 00:05:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/thelsing/knx

Browse Source
This commit is contained in:
etrinh 2020-05-02 17:33:54 +02:00
commit 217794d219
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/knx/application_layer.cpp
View File

@ -429,7 +429,7 @@ void ApplicationLayer::systemNetworkParameterReadResponse(Priority priority, Hop
//TODO: ApplicationLayer::domainAddressSerialNumberWriteRequest() //TODO: ApplicationLayer::domainAddressSerialNumberWriteRequest()
//TODO: ApplicationLayer::domainAddressSerialNumberReadRequest() //TODO: ApplicationLayer::domainAddressSerialNumberReadRequest()
void ApplicationLayer::domainAddressSerialNumberReadResponse(Priority priority, HopCountType hopType, uint8_t* rfDoA, void ApplicationLayer::domainAddressSerialNumberReadResponse(Priority priority, HopCountType hopType, uint8_t* rfDoA,
uint8_t* knxSerialNumber) const uint8_t* knxSerialNumber)
{ {
CemiFrame frame(13); CemiFrame frame(13);
APDU& apdu = frame.apdu(); APDU& apdu = frame.apdu();

2
src/knx/application_layer.h
View File

@ -134,7 +134,7 @@ class ApplicationLayer
uint16_t propertyId, uint8_t* testInfo, uint16_t testInfoLength, uint16_t propertyId, uint8_t* testInfo, uint16_t testInfoLength,
uint8_t* testResult, uint16_t testResultLength); uint8_t* testResult, uint16_t testResultLength);
void domainAddressSerialNumberReadResponse(Priority priority, HopCountType hopType, uint8_t* rfDoA, void domainAddressSerialNumberReadResponse(Priority priority, HopCountType hopType, uint8_t* rfDoA,
uint8_t* knxSerialNumber); const uint8_t* knxSerialNumber);
void IndividualAddressSerialNumberReadResponse(Priority priority, HopCountType hopType, uint8_t* rfDoA, void IndividualAddressSerialNumberReadResponse(Priority priority, HopCountType hopType, uint8_t* rfDoA,
uint8_t* knxSerialNumber); uint8_t* knxSerialNumber);
#pragma endregion #pragma endregion

6
src/knx/bau27B0.cpp
View File

@ -116,8 +116,8 @@ void Bau27B0::loop()
#endif #endif
} }
void Bau27B0::domainAddressSerialNumberWriteIndication(Priority priority, HopCountType hopType, uint8_t* rfDoA, void Bau27B0::domainAddressSerialNumberWriteIndication(Priority priority, HopCountType hopType, const uint8_t* rfDoA,
uint8_t* knxSerialNumber) const uint8_t* knxSerialNumber)
{ {
// If the received serial number matches our serial number // If the received serial number matches our serial number
// then store the received RF domain address in the RF medium object // then store the received RF domain address in the RF medium object
@ -125,7 +125,7 @@ void Bau27B0::domainAddressSerialNumberWriteIndication(Priority priority, HopCou
_rfMediumObj.rfDomainAddress(rfDoA); _rfMediumObj.rfDomainAddress(rfDoA);
} }
void Bau27B0::domainAddressSerialNumberReadIndication(Priority priority, HopCountType hopType, uint8_t* knxSerialNumber) void Bau27B0::domainAddressSerialNumberReadIndication(Priority priority, HopCountType hopType, const uint8_t* knxSerialNumber)
{ {
// If the received serial number matches our serial number // If the received serial number matches our serial number
// then send a response with the current RF domain address stored in the RF medium object // then send a response with the current RF domain address stored in the RF medium object

10
src/knx/bau27B0.h
View File

@ -28,11 +28,11 @@ class Bau27B0 : public BauSystemB
CemiServerObject _cemiServerObject; CemiServerObject _cemiServerObject;
#endif #endif
void domainAddressSerialNumberWriteIndication(Priority priority, HopCountType hopType, uint8_t* rfDoA, void domainAddressSerialNumberWriteIndication(Priority priority, HopCountType hopType, const uint8_t* rfDoA,
uint8_t* knxSerialNumber); const uint8_t* knxSerialNumber) override;
void domainAddressSerialNumberReadIndication(Priority priority, HopCountType hopType, uint8_t* knxSerialNumber); void domainAddressSerialNumberReadIndication(Priority priority, HopCountType hopType, const uint8_t* knxSerialNumber) override;
void individualAddressSerialNumberWriteIndication(Priority priority, HopCountType hopType, uint16_t newIndividualAddress, void individualAddressSerialNumberWriteIndication(Priority priority, HopCountType hopType, uint16_t newIndividualAddress,
uint8_t* knxSerialNumber); uint8_t* knxSerialNumber) override;
void individualAddressSerialNumberReadIndication(Priority priority, HopCountType hopType, uint8_t* knxSerialNumber); void individualAddressSerialNumberReadIndication(Priority priority, HopCountType hopType, uint8_t* knxSerialNumber) override;
}; };
#endif #endif

2
src/knx/rf_medium_object.cpp
View File

@ -115,7 +115,7 @@ uint8_t* RfMediumObject::rfDomainAddress()
return _rfDomainAddress; return _rfDomainAddress;
} }
void RfMediumObject::rfDomainAddress(uint8_t* value) void RfMediumObject::rfDomainAddress(const uint8_t* value)
{ {
pushByteArray(value, 6, _rfDomainAddress); pushByteArray(value, 6, _rfDomainAddress);
} }

2
src/knx/rf_medium_object.h
View File

@ -15,7 +15,7 @@ public:
uint16_t saveSize() override; uint16_t saveSize() override;
uint8_t* rfDomainAddress(); uint8_t* rfDomainAddress();
void rfDomainAddress(uint8_t* value); void rfDomainAddress(const uint8_t* value);
protected: protected:
uint8_t propertyDescriptionCount() override; uint8_t propertyDescriptionCount() override;