Merge pull request #54 from I-Connect/revert-52-fixes

Revert "Fix TimeValue struct size (plus a couple minor changes)"
I-Connect · May 23, 2024 · 0b35059 · 0b35059
2 parents 1e8a2ae + 0598f52
commit 0b35059
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/src/NukiBle.cpp b/src/NukiBle.cpp
@@ -40,8 +40,7 @@ NukiBle::NukiBle(const std::string& deviceName,
     deviceServiceUUID(deviceServiceUUID),
     gdioUUID(gdioUUID),
     userDataUUID(userDataUUID),
-    preferencesId(preferencedId),
-    errorCode(ErrorCode::ERROR_UNKNOWN) {
+    preferencesId(preferencedId) {
 }
 
 NukiBle::~NukiBle() {
@@ -537,11 +536,7 @@ Nuki::CmdResult NukiBle::updateTime(TimeValue time) {
 }
 
 bool NukiBle::saveSecurityPincode(const uint16_t pinCode) {
-  if (preferences.putBytes(SECURITY_PINCODE_STORE_NAME, &pinCode, 2) == 2) {
-    this->pinCode = pinCode;
-    return true;
-  }
-  return false;
+  return (preferences.putBytes(SECURITY_PINCODE_STORE_NAME, &pinCode, 2) == 2);
 }
 
 void NukiBle::saveCredentials() {

diff --git a/src/NukiConstants.h b/src/NukiConstants.h
@@ -360,6 +360,6 @@ struct __attribute__((packed)) TimeValue {
   uint8_t day;
   uint8_t hour;
   uint8_t minute;
-  uint8_t second;
+  uint16_t second;
 };
-} // namespace Nuki
+} // namespace Nuki