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

save work

Browse Source
This commit is contained in:
nanosonde 2019-11-18 17:39:55 +01:00
parent 2e1b61ec18
commit 941f121d71
4 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/cemi_server.cpp
View File

@ -1,7 +1,7 @@
#include "cemi_server.h" #include "cemi_server.h"
#include "cemi_frame.h" #include "cemi_frame.h"
#include "bau_systemB.h" #include "bau_systemB.h"
#include "usb_data_link_layer.h" #include "usb_tunnel_interface.h"
#include "data_link_layer.h" #include "data_link_layer.h"
#include "string.h" #include "string.h"
#include "bits.h" #include "bits.h"

4
src/knx/cemi_server.h
View File

@ -2,7 +2,7 @@
#include <stdint.h> #include <stdint.h>
#include "knx_types.h" #include "knx_types.h"
#include "usb_data_link_layer.h" #include "usb_tunnel_interface.h"
class BauSystemB; class BauSystemB;
class DataLinkLayer; class DataLinkLayer;
@ -46,5 +46,5 @@ class CemiServer
DataLinkLayer* _dataLinkLayer; DataLinkLayer* _dataLinkLayer;
BauSystemB& _bau; BauSystemB& _bau;
UsbDataLinkLayer _usbTunnelInterface; UsbTunnelInterface _usbTunnelInterface;
}; };

16
src/knx/usb_data_link_layer.cpp → src/knx/usb_tunnel_interface.cpp
View File

@ -1,5 +1,5 @@
#include "bits.h" #include "bits.h"
#include "usb_data_link_layer.h" #include "usb_tunnel_interface.h"
#include "cemi_server.h" #include "cemi_server.h"
#include "cemi_frame.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 mId,
uint16_t mV) uint16_t mV)
: _cemiServer(cemiServer) : _cemiServer(cemiServer)
@ -286,7 +286,7 @@ UsbDataLinkLayer::UsbDataLinkLayer(CemiServer& cemiServer,
maskVersion = mV; maskVersion = mV;
} }
void UsbDataLinkLayer::loop() void UsbTunnelInterface::loop()
{ {
// Make sure that the USB HW is also ready to send another report // Make sure that the USB HW is also ready to send another report
if (!isTxQueueEmpty() && usb_hid.ready()) if (!isTxQueueEmpty() && usb_hid.ready())
@ -323,14 +323,14 @@ void UsbDataLinkLayer::loop()
} }
} }
bool UsbDataLinkLayer::sendCemiFrame(CemiFrame& frame) bool UsbTunnelInterface::sendCemiFrame(CemiFrame& frame)
{ {
addFrameTxQueue(frame); addFrameTxQueue(frame);
return true; return true;
} }
void UsbDataLinkLayer::addFrameTxQueue(CemiFrame& frame) void UsbTunnelInterface::addFrameTxQueue(CemiFrame& frame)
{ {
_tx_queue_frame_t* tx_frame = new _tx_queue_frame_t; _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) if (_tx_queue.front == nullptr)
{ {
@ -366,7 +366,7 @@ bool UsbDataLinkLayer::isTxQueueEmpty()
return false; 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) if (_tx_queue.front == nullptr)
{ {

4
src/knx/usb_data_link_layer.h → src/knx/usb_tunnel_interface.h
View File

@ -7,10 +7,10 @@
class CemiServer; class CemiServer;
class CemiFrame; class CemiFrame;
class UsbDataLinkLayer class UsbTunnelInterface
{ {
public: public:
UsbDataLinkLayer(CemiServer& cemiServer, uint16_t manufacturerId, uint16_t maskVersion); UsbTunnelInterface(CemiServer& cemiServer, uint16_t manufacturerId, uint16_t maskVersion);
void loop(); void loop();