From 941f121d71e0c6fc016e12e8c031a29bae74bd28 Mon Sep 17 00:00:00 2001
From: nanosonde <2073569+nanosonde@users.noreply.github.com>
Date: Mon, 18 Nov 2019 17:39:55 +0100
Subject: [PATCH] save work

---
 src/knx/cemi_server.cpp                          |  2 +-
 src/knx/cemi_server.h                            |  4 ++--
 ...a_link_layer.cpp => usb_tunnel_interface.cpp} | 16 ++++++++--------
 ..._data_link_layer.h => usb_tunnel_interface.h} |  4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)
 rename src/knx/{usb_data_link_layer.cpp => usb_tunnel_interface.cpp} (95%)
 rename src/knx/{usb_data_link_layer.h => usb_tunnel_interface.h} (84%)

diff --git a/src/knx/cemi_server.cpp b/src/knx/cemi_server.cpp
index 1e3d303..c8405e9 100644
--- a/src/knx/cemi_server.cpp
+++ b/src/knx/cemi_server.cpp
@@ -1,7 +1,7 @@
 #include "cemi_server.h"
 #include "cemi_frame.h"
 #include "bau_systemB.h"
-#include "usb_data_link_layer.h"
+#include "usb_tunnel_interface.h"
 #include "data_link_layer.h"
 #include "string.h"
 #include "bits.h"
diff --git a/src/knx/cemi_server.h b/src/knx/cemi_server.h
index 0b8646c..289a89f 100644
--- a/src/knx/cemi_server.h
+++ b/src/knx/cemi_server.h
@@ -2,7 +2,7 @@
 
 #include <stdint.h>
 #include "knx_types.h"
-#include "usb_data_link_layer.h"
+#include "usb_tunnel_interface.h"
 
 class BauSystemB;
 class DataLinkLayer;
@@ -46,5 +46,5 @@ class CemiServer
 
     DataLinkLayer* _dataLinkLayer;
     BauSystemB& _bau;
-    UsbDataLinkLayer _usbTunnelInterface;
+    UsbTunnelInterface _usbTunnelInterface;
 };
diff --git a/src/knx/usb_data_link_layer.cpp b/src/knx/usb_tunnel_interface.cpp
similarity index 95%
rename from src/knx/usb_data_link_layer.cpp
rename to src/knx/usb_tunnel_interface.cpp
index ee6d480..78090f3 100644
--- a/src/knx/usb_data_link_layer.cpp
+++ b/src/knx/usb_tunnel_interface.cpp
@@ -1,5 +1,5 @@
 #include "bits.h"
-#include "usb_data_link_layer.h"
+#include "usb_tunnel_interface.h"
 #include "cemi_server.h"
 #include "cemi_frame.h"
 
@@ -275,9 +275,9 @@ void set_report_callback(uint8_t report_id, hid_report_type_t report_type, uint8
 	}
 }
 
-// class UsbDataLinkLayer
+// class UsbTunnelInterface
 
-UsbDataLinkLayer::UsbDataLinkLayer(CemiServer& cemiServer,
+UsbTunnelInterface::UsbTunnelInterface(CemiServer& cemiServer,
                                    uint16_t mId,
 								   uint16_t mV)
     : _cemiServer(cemiServer)
@@ -286,7 +286,7 @@ UsbDataLinkLayer::UsbDataLinkLayer(CemiServer& cemiServer,
 	maskVersion = mV;
 }
 
-void UsbDataLinkLayer::loop()
+void UsbTunnelInterface::loop()
 {
 	// Make sure that the USB HW is also ready to send another report
 	if (!isTxQueueEmpty() && usb_hid.ready())
@@ -323,14 +323,14 @@ void UsbDataLinkLayer::loop()
 	}
 }
 
-bool UsbDataLinkLayer::sendCemiFrame(CemiFrame& frame)
+bool UsbTunnelInterface::sendCemiFrame(CemiFrame& frame)
 {
     addFrameTxQueue(frame);
 
     return true;
 }
 
-void UsbDataLinkLayer::addFrameTxQueue(CemiFrame& frame)
+void UsbTunnelInterface::addFrameTxQueue(CemiFrame& frame)
 {
     _tx_queue_frame_t* tx_frame = new _tx_queue_frame_t;
 
@@ -357,7 +357,7 @@ void UsbDataLinkLayer::addFrameTxQueue(CemiFrame& frame)
     }
 }
 
-bool UsbDataLinkLayer::isTxQueueEmpty()
+bool UsbTunnelInterface::isTxQueueEmpty()
 {
     if (_tx_queue.front == nullptr)
     {
@@ -366,7 +366,7 @@ bool UsbDataLinkLayer::isTxQueueEmpty()
     return false;
 }
 
-void UsbDataLinkLayer::loadNextTxFrame(uint8_t** sendBuffer, uint16_t* sendBufferLength)
+void UsbTunnelInterface::loadNextTxFrame(uint8_t** sendBuffer, uint16_t* sendBufferLength)
 {
     if (_tx_queue.front == nullptr)
     {
diff --git a/src/knx/usb_data_link_layer.h b/src/knx/usb_tunnel_interface.h
similarity index 84%
rename from src/knx/usb_data_link_layer.h
rename to src/knx/usb_tunnel_interface.h
index 2f1977b..78f8238 100644
--- a/src/knx/usb_data_link_layer.h
+++ b/src/knx/usb_tunnel_interface.h
@@ -7,10 +7,10 @@
 class CemiServer;
 class CemiFrame;
 
-class UsbDataLinkLayer
+class UsbTunnelInterface
 {
   public:
-    UsbDataLinkLayer(CemiServer& cemiServer, uint16_t manufacturerId, uint16_t maskVersion);
+    UsbTunnelInterface(CemiServer& cemiServer, uint16_t manufacturerId, uint16_t maskVersion);
 
     void loop();