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

Move code and remove commented code

Browse Source
This commit is contained in:
nanosonde 2019-12-05 15:03:58 +01:00
parent 371f58a5a6
commit bc9f09a51f
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/knx/cemi_server.cpp
View File

@ -37,6 +37,10 @@ void CemiServer::clientAddress(uint16_t value)
void CemiServer::dataConfirmationToTunnel(CemiFrame& frame) void CemiServer::dataConfirmationToTunnel(CemiFrame& frame)
{ {
MessageCode backupMsgCode = frame.messageCode();
frame.messageCode(L_data_con);
print("L_data_con: src: "); print("L_data_con: src: ");
print(frame.sourceAddress(), HEX); print(frame.sourceAddress(), HEX);
print(" dst: "); print(" dst: ");
@ -45,6 +49,8 @@ void CemiServer::dataConfirmationToTunnel(CemiFrame& frame)
printHex(" frame: ", frame.data(), frame.dataLength()); printHex(" frame: ", frame.data(), frame.dataLength());
_usbTunnelInterface.sendCemiFrame(frame); _usbTunnelInterface.sendCemiFrame(frame);
frame.messageCode(backupMsgCode);
} }
void CemiServer::dataIndicationToTunnel(CemiFrame& frame) void CemiServer::dataIndicationToTunnel(CemiFrame& frame)

1
src/knx/data_link_layer.cpp
View File

@ -21,7 +21,6 @@ void DataLinkLayer::cemiServer(CemiServer& cemiServer)
void DataLinkLayer::dataRequestFromTunnel(CemiFrame& frame) void DataLinkLayer::dataRequestFromTunnel(CemiFrame& frame)
{ {
frame.messageCode(L_data_con);
_cemiServer->dataConfirmationToTunnel(frame); _cemiServer->dataConfirmationToTunnel(frame);
frame.messageCode(L_data_ind); frame.messageCode(L_data_ind);

2
src/knx/device_object.cpp
View File

@ -73,8 +73,6 @@ void DeviceObject::writeProperty(PropertyID id, uint32_t start, uint8_t* data, u
_prgMode = data[0]; _prgMode = data[0];
break; break;
case PID_RF_DOMAIN_ADDRESS_CEMI_SERVER: case PID_RF_DOMAIN_ADDRESS_CEMI_SERVER:
//for (uint8_t i = start; i < start + count; i++)
//_rfDomainAddress[i-1] = data[i - start];
memcpy(_rfDomainAddress, data, propertySize(PID_RF_DOMAIN_ADDRESS_CEMI_SERVER)); memcpy(_rfDomainAddress, data, propertySize(PID_RF_DOMAIN_ADDRESS_CEMI_SERVER));
break; break;
case PID_SUBNET_ADDR: case PID_SUBNET_ADDR: