Mirrors/knx
1
0
Fork 0
mirror of https://github.com/thelsing/knx.git synced 2025-10-08 11:14:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

save work

Browse Source
This commit is contained in:
Nanosonde 2020-07-15 17:32:16 +02:00
parent 5ced388133
commit de7742a444
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/knx/router_object_filtertable.cpp
View File

@ -63,7 +63,7 @@ RouterObjectFilterTable::RouterObjectFilterTable(Memory& memory)
obj->functionRouteTableControl(false, data, length, resultData, resultLength);
}),
new DataProperty( PID_FILTER_TABLE_USE, false, PDT_BINARY_INFORMATION, 1, ReadLv3 | WriteLv0, (uint16_t) 0 ), // TODO
new DataProperty( PID_FILTER_TABLE_USE, true, PDT_BINARY_INFORMATION, 1, ReadLv3 | WriteLv0, (uint16_t) 0 ), // default: invalid filter table, do not use
new FunctionProperty<RouterObjectFilterTable>(this, PID_RF_ENABLE_SBC,
// Command Callback of PID_RF_ENABLE_SBC
@ -395,3 +395,22 @@ void RouterObjectFilterTable::masterReset(EraseCode eraseCode, uint8_t channel)
println("Factory reset of router object with filter table requested.");
}
}
bool RouterObjectFilterTable::isGroupAddressInFilterTable(uint16_t groupAddress)
{
uint8_t filterTableUse = 0x00;
if (property(PID_FILTER_TABLE_USE)->read(filterTableUse) == 0)
return false;
if (filterTableUse != 0x00)
{
// octet_address = GA_value div 8
// bit_position = GA_value mod 8
uint16_t octetAddress = groupAddress / 8;
uint8_t bitPosition = groupAddress % 8;
return (_data[octetAddress] & (1 << bitPosition)) == (1 << bitPosition);
}
return false;
}

2
src/knx/router_object_filtertable.h
View File

@ -12,6 +12,8 @@ class RouterObjectFilterTable: public RouterObject
public:
RouterObjectFilterTable(Memory& memory);
bool isGroupAddressInFilterTable(uint16_t groupAddress);
bool isRfSbcRoutingEnabled();
virtual void masterReset(EraseCode eraseCode, uint8_t channel) override;