From bc9f09a51f4cff5ed4415e5751ebe886e11990bc Mon Sep 17 00:00:00 2001
From: nanosonde <2073569+nanosonde@users.noreply.github.com>
Date: Thu, 5 Dec 2019 15:03:58 +0100
Subject: [PATCH] Move code and remove commented code

---
 src/knx/cemi_server.cpp     | 6 ++++++
 src/knx/data_link_layer.cpp | 1 -
 src/knx/device_object.cpp   | 2 --
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/knx/cemi_server.cpp b/src/knx/cemi_server.cpp
index 7ee214d..4b5c766 100644
--- a/src/knx/cemi_server.cpp
+++ b/src/knx/cemi_server.cpp
@@ -37,6 +37,10 @@ void CemiServer::clientAddress(uint16_t value)
 
 void CemiServer::dataConfirmationToTunnel(CemiFrame& frame)
 {
+    MessageCode backupMsgCode = frame.messageCode();
+    
+    frame.messageCode(L_data_con);
+
     print("L_data_con: src: ");
     print(frame.sourceAddress(), HEX);
     print(" dst: ");
@@ -45,6 +49,8 @@ void CemiServer::dataConfirmationToTunnel(CemiFrame& frame)
     printHex(" frame: ", frame.data(), frame.dataLength());
 
     _usbTunnelInterface.sendCemiFrame(frame);
+
+    frame.messageCode(backupMsgCode);
 }
 
 void CemiServer::dataIndicationToTunnel(CemiFrame& frame)
diff --git a/src/knx/data_link_layer.cpp b/src/knx/data_link_layer.cpp
index 05d2e48..a8421e8 100644
--- a/src/knx/data_link_layer.cpp
+++ b/src/knx/data_link_layer.cpp
@@ -21,7 +21,6 @@ void DataLinkLayer::cemiServer(CemiServer& cemiServer)
 
 void DataLinkLayer::dataRequestFromTunnel(CemiFrame& frame)
 {
-    frame.messageCode(L_data_con);
     _cemiServer->dataConfirmationToTunnel(frame);
 
     frame.messageCode(L_data_ind);
diff --git a/src/knx/device_object.cpp b/src/knx/device_object.cpp
index 92b94e1..cfd7145 100644
--- a/src/knx/device_object.cpp
+++ b/src/knx/device_object.cpp
@@ -73,8 +73,6 @@ void DeviceObject::writeProperty(PropertyID id, uint32_t start, uint8_t* data, u
             _prgMode = data[0];
             break;
         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));
             break;
         case PID_SUBNET_ADDR: