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

link_layer: Add a way to enable debug traces

Browse Source
This commit is contained in:
Fabien Proriol 2019-11-24 08:49:11 +01:00
parent f252201b87
commit 000346bd4e
1 changed files with 75 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/knx/data_link_layer.cpp
View File

@ -5,6 +5,7 @@
#include "device_object.h" #include "device_object.h"
#include "address_table_object.h" #include "address_table_object.h"
//#define DEBUG_DATA_LINK_LAYER
DataLinkLayer::DataLinkLayer(DeviceObject& devObj, AddressTableObject& addrTab, DataLinkLayer::DataLinkLayer(DeviceObject& devObj, AddressTableObject& addrTab,
NetworkLayer& layer, Platform& platform) : NetworkLayer& layer, Platform& platform) :
@ -60,6 +61,42 @@ void DataLinkLayer::frameRecieved(CemiFrame& frame)
uint16_t ownAddr = _deviceObject.induvidualAddress(); uint16_t ownAddr = _deviceObject.induvidualAddress();
SystemBroadcast systemBroadcast = frame.systemBroadcast(); SystemBroadcast systemBroadcast = frame.systemBroadcast();
#ifdef DEBUG_DATA_LINK_LAYER
println("Link RX:");
print("\tSRC: ");
print((source >> 12) & 0x0F);
print(".");
print((source >> 8) & 0x0F);
print(".");
println(source & 0xFF);
if (addrType == InduvidualAddress)
{
print("\tDST: ");
print((destination >> 12) & 0x0F);
print(".");
print((destination >> 8) & 0x0F);
print(".");
println(destination & 0xFF);
}
else
{
if(destination == 0)
{
println("\tSystem Broadcast");
}
else
{
print("\tDST: ");
print((destination >> 11) & 0x0F);
print("/");
print((destination >> 8) & 0x07);
print("/");
println(destination & 0xFF);
}
}
#endif
if (source == ownAddr) if (source == ownAddr)
_deviceObject.induvidualAddressDuplication(true); _deviceObject.induvidualAddressDuplication(true);
@ -111,6 +148,43 @@ bool DataLinkLayer::sendTelegram(NPDU & npdu, AckType ack, uint16_t destinationA
return false; return false;
} }
#ifdef DEBUG_DATA_LINK_LAYER
uint16_t source = _deviceObject.induvidualAddress();
println("Link TX:");
print("\tSRC: ");
print((source >> 12) & 0x0F);
print(".");
print((source >> 8) & 0x0F);
print(".");
println(source & 0xFF);
if (addrType == InduvidualAddress)
{
print("\tDST: ");
print((destinationAddr >> 12) & 0x0F);
print(".");
print((destinationAddr >> 8) & 0x0F);
print(".");
println(destinationAddr & 0xFF);
}
else
{
if(destinationAddr == 0)
{
println("\tSystem Broadcast");
}
else
{
print("\tDST: ");
print((destinationAddr >> 11) & 0x0F);
print("/");
print((destinationAddr >> 8) & 0x07);
print("/");
println(destinationAddr & 0xFF);
}
}
#endif
// if (frame.npdu().octetCount() > 0) // if (frame.npdu().octetCount() > 0)
// { // {
// _print("<- DLL "); // _print("<- DLL ");