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

Only reset TOOL kkey to FDSK on factory reset

Browse Source
This commit is contained in:
Nanosonde 2020-07-06 15:21:21 +02:00
parent b7fda6d151
commit 1fde999bd8
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
examples/knx-demo/.vscode/extensions.json vendored
View File

@ -1,7 +1,7 @@
{ {
// See http://go.microsoft.com/fwlink/?LinkId=827846 // See http://go.microsoft.com/fwlink/?LinkId=827846
// for the documentation about the extensions.json format // for the documentation about the extensions.json format
"recommendations": [ "recommendations": [
"platformio.platformio-ide" "platformio.platformio-ide"
] ]
} }

3
src/knx/bau57B0.cpp
View File

@ -26,7 +26,8 @@ Bau57B0::Bau57B0(Platform& platform)
_memory.addSaveRestore(&_ipParameters); _memory.addSaveRestore(&_ipParameters);
// Set Mask Version in Device Object depending on the BAU // Set Mask Version in Device Object depending on the BAU
_deviceObj.maskVersion(0x57B0); //_deviceObj.maskVersion(0x57B0);
_deviceObj.maskVersion(0x07B0); // FAKE TP device that is connected over IP/TP router
// Set which interface objects are available in the device object // Set which interface objects are available in the device object
// This differs from BAU to BAU with different medium types. // This differs from BAU to BAU with different medium types.

11
src/knx/security_interface_object.cpp
View File

@ -333,10 +333,13 @@ void SecurityInterfaceObject::errorCode(ErrorCode errorCode)
void SecurityInterfaceObject::masterReset(EraseCode eraseCode, uint8_t channel) void SecurityInterfaceObject::masterReset(EraseCode eraseCode, uint8_t channel)
{ {
// TODO handle different erase codes if (eraseCode == FactoryReset)
println("Factory reset of security interface object requested."); {
setSecurityMode(false); // TODO handle different erase codes
property(PID_TOOL_KEY)->write(1, 1, _fdsk); println("Factory reset of security interface object requested.");
setSecurityMode(false);
property(PID_TOOL_KEY)->write(1, 1, _fdsk);
}
} }
const uint8_t* SecurityInterfaceObject::toolKey() const uint8_t* SecurityInterfaceObject::toolKey()