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

Fix cemi server and add missing MASK_VERSION definitions

Browse Source
This commit is contained in:
Nanosonde 2020-07-21 18:53:49 +02:00
parent e091ef6536
commit 720c72c3c6
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/knx-demo/platformio-ci.ini
View File

@ -34,6 +34,7 @@ lib_deps =
knx
build_flags =
-DMASK_VERSION=0x57B0
-Wno-unknown-pragmas
;---------------------------------------------------------
@ -48,4 +49,5 @@ lib_deps =
knx
build_flags =
-DMASK_VERSION=0x57B0
-Wno-unknown-pragmas

2
examples/knx-demo/platformio.ini
View File

@ -47,6 +47,7 @@ lib_deps =
knx
build_flags =
-DMASK_VERSION=0x57B0
-Wno-unknown-pragmas
;---------------------------------------------------------
@ -65,4 +66,5 @@ lib_deps =
knx
build_flags =
-DMASK_VERSION=0x57B0
-Wno-unknown-pragmas

6
src/knx/cemi_server.cpp
View File

@ -56,10 +56,10 @@ void CemiServer::dataConfirmationToTunnel(CemiFrame& frame)
void CemiServer::dataIndicationToTunnel(CemiFrame& frame)
{
bool isRf = _dataLinkLayer->isOpenMedium();
bool isRf = _dataLinkLayer->mediumType() == DptMedium::KNX_RF;
uint8_t data[frame.dataLength() + (isRf ? 10 : 0)];
if (_dataLinkLayer->isOpenMedium())
if (isRf)
{
data[0] = L_data_ind; // Message Code
data[1] = 0x0A; // Total additional info length
@ -90,7 +90,7 @@ void CemiServer::dataIndicationToTunnel(CemiFrame& frame)
void CemiServer::frameReceived(CemiFrame& frame)
{
bool isRf = _dataLinkLayer->isOpenMedium();
bool isRf = _dataLinkLayer->mediumType() == DptMedium::KNX_RF;
switch(frame.messageCode())
{