Merge pull request #35 from technyon/main

add lockactionToString() for opener
I-Connect · Feb 23, 2023 · 048469e · 048469e
2 parents 0ccb839 + 34e0405
commit 048469e
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 2 deletions.
diff --git a/src/NukiBle.cpp b/src/NukiBle.cpp
@@ -1201,8 +1201,7 @@ uint32_t NukiBle::getLastHeartbeat() {
   return lastHeartbeat;
 }
 
-const BLEAddress NukiBle::getBleAddress() const
-{
+const BLEAddress NukiBle::getBleAddress() const {
   return bleAddress;
 }
 

diff --git a/src/NukiLock.cpp b/src/NukiLock.cpp
@@ -77,6 +77,7 @@ Nuki::CmdResult NukiLock::requestBatteryReport(BatteryReport* retrievedBatteryRe
 Nuki::CmdResult NukiLock::requestConfig(Config* retrievedConfig) {
   Action action;
 
+  memset(&action, 0, sizeof(action));
   action.cmdType = Nuki::CommandType::CommandWithChallenge;
   action.command = Command::RequestConfig;
 
@@ -90,6 +91,7 @@ Nuki::CmdResult NukiLock::requestConfig(Config* retrievedConfig) {
 Nuki::CmdResult NukiLock::requestAdvancedConfig(AdvancedConfig* retrievedAdvancedConfig) {
   Action action;
 
+  memset(&action, 0, sizeof(action));
   action.cmdType = Nuki::CommandType::CommandWithChallenge;
   action.command = Command::RequestAdvancedConfig;
 

diff --git a/src/NukiOpener.cpp b/src/NukiOpener.cpp
@@ -40,6 +40,7 @@ Nuki::CmdResult NukiOpener::requestOpenerState(OpenerState* state) {
   Action action;
   uint16_t payload = (uint16_t)Command::KeyturnerStates;
 
+  memset(&action, 0, sizeof(action));
   action.cmdType = Nuki::CommandType::Command;
   action.command = Command::RequestData;
   memcpy(&action.payload[0], &payload, sizeof(payload));
@@ -62,6 +63,7 @@ Nuki::CmdResult NukiOpener::requestBatteryReport(BatteryReport* retrievedBattery
   Action action;
   uint16_t payload = (uint16_t)Command::BatteryReport;
 
+  memset(&action, 0, sizeof(action));
   action.cmdType = Nuki::CommandType::Command;
   action.command = Command::RequestData;
   memcpy(&action.payload[0], &payload, sizeof(payload));
@@ -78,6 +80,7 @@ Nuki::CmdResult NukiOpener::requestBatteryReport(BatteryReport* retrievedBattery
 Nuki::CmdResult NukiOpener::requestConfig(Config* retrievedConfig) {
   Action action;
 
+  memset(&action, 0, sizeof(action));
   action.cmdType = Nuki::CommandType::CommandWithChallenge;
   action.command = Command::RequestConfig;
 
@@ -91,6 +94,7 @@ Nuki::CmdResult NukiOpener::requestConfig(Config* retrievedConfig) {
 Nuki::CmdResult NukiOpener::requestAdvancedConfig(AdvancedConfig* retrievedAdvancedConfig) {
   Action action;
 
+  memset(&action, 0, sizeof(action));
   action.cmdType = Nuki::CommandType::CommandWithChallenge;
   action.command = Command::RequestAdvancedConfig;
 

diff --git a/src/NukiOpenerConstants.h b/src/NukiOpenerConstants.h
@@ -295,6 +295,38 @@ struct __attribute__((packed)) LogEntry {
   uint8_t data[8];
 };
 
+inline void lockactionToString(const LockAction action, char* str) {
+  switch (action) {
+    case LockAction::ActivateRTO:
+      strcpy(str, "ActivateRTO");
+      break;
+    case LockAction::DeactivateRTO:
+      strcpy(str, "DeactivateRTO");
+      break;
+    case LockAction::ElectricStrikeActuation:
+      strcpy(str, "ElectricStrikeActuation");
+      break;
+    case LockAction::ActivateCM:
+      strcpy(str, "ActivateCM");
+      break;
+    case LockAction::DeactivateCM:
+      strcpy(str, "DeactivateCM");
+      break;
+    case LockAction::FobAction1:
+      strcpy(str, "FobAction1");
+      break;
+    case LockAction::FobAction2:
+      strcpy(str, "FobAction2");
+      break;
+    case LockAction::FobAction3:
+      strcpy(str, "FobAction3");
+      break;
+    default:
+      strcpy(str, "Unknown");
+      break;
+  }
+}
+
 inline void lockstateToString(const LockState state, char* str) {
   switch (state) {
     case LockState::Uncalibrated: