Fix build

OpenShock · Nov 28, 2023 · 35193ef · 35193ef
1 parent 38a7aaa
commit 35193ef
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/include/config/RFConfig.h b/include/config/RFConfig.h
@@ -5,6 +5,7 @@
 namespace OpenShock::Config {
   struct RFConfig : public ConfigBase<Serialization::Configuration::RFConfig> {
     std::uint8_t txPin;
+    bool keepAliveEnabled;
 
     void ToDefault() override;
 

diff --git a/src/config/RFConfig.cpp b/src/config/RFConfig.cpp
@@ -7,7 +7,8 @@ const char* const TAG = "Config::RFConfig";
 using namespace OpenShock::Config;
 
 void RFConfig::ToDefault() {
-  txPin = 0U;
+  txPin            = 0U;
+  keepAliveEnabled = true;
 }
 
 bool RFConfig::FromFlatbuffers(const Serialization::Configuration::RFConfig* config) {
@@ -16,13 +17,14 @@ bool RFConfig::FromFlatbuffers(const Serialization::Configuration::RFConfig* con
     return false;
   }
 
-  txPin = config->tx_pin();
+  txPin            = config->tx_pin();
+  keepAliveEnabled = config->keepalive_enabled();
 
   return true;
 }
 
 flatbuffers::Offset<OpenShock::Serialization::Configuration::RFConfig> RFConfig::ToFlatbuffers(flatbuffers::FlatBufferBuilder& builder) const {
-  return Serialization::Configuration::CreateRFConfig(builder, txPin);
+  return Serialization::Configuration::CreateRFConfig(builder, txPin, keepAliveEnabled);
 }
 
 bool RFConfig::FromJSON(const cJSON* json) {
@@ -44,13 +46,22 @@ bool RFConfig::FromJSON(const cJSON* json) {
 
   txPin = txPinJson->valueint;
 
+  const cJSON* keepAliveEnabledJson = cJSON_GetObjectItemCaseSensitive(json, "keepAliveEnabled");
+  if (!cJSON_IsBool(keepAliveEnabledJson)) {
+    ESP_LOGE(TAG, "value at 'keepAliveEnabled' is not a bool");
+    return false;
+  }
+
+  keepAliveEnabled = cJSON_IsTrue(keepAliveEnabledJson);
+
   return true;
 }
 
 cJSON* RFConfig::ToJSON() const {
   cJSON* root = cJSON_CreateObject();
 
   cJSON_AddNumberToObject(root, "txPin", txPin);
+  cJSON_AddBoolToObject(root, "keepAliveEnabled", keepAliveEnabled);
 
   return root;
 }