test str to varval

Author: bertmelis

src/Datapoint/Converter.cpp

@@ -17,6 +17,11 @@ int Converter::toString(char* buf, std::size_t maxLen, VariantValue value) const
   return 0;
 }
 
+void Converter::fromString(const char* buf, VariantValue* result) const {
+  (void) buf;
+  return VariantValue(0ULL);
+}
+
 VariantValue Div10Convert::decode(const uint8_t* data, uint8_t len) const {
   assert(len == 1 || len == 2);
   float retVal = 0;
@@ -46,6 +51,15 @@ int Div10Convert::toString(char* buf, std::size_t maxLen, VariantValue value) co
   return snprintf(buf, maxLen, "%.1f", static_cast<float>(value));
 }
 
+void Div10Convert::fromString(const char* buf, VariantValue* result) const {
+  char* end = nullptr;
+  float ret = std::strtof(buf, &end);
+  if (buf == end || ret == HUGE_VALF) {
+    vw_log_e("Could not convert string to float");
+  }
+  result = VariantValue(ret);
+}
+
 VariantValue Div2Convert::decode(const uint8_t* data, uint8_t len) const {
   assert(len == 1);
   float retVal = 0;

src/Datapoint/Converter.h

@@ -13,6 +13,7 @@ the LICENSE file.
 #include <cmath>
 #include <cstring>
 #include <cstddef>
+#include <cstdlib>  // std::stof... conversions
 
 #include "../Logging.h"
 #include "ConversionHelpers.h"
@@ -55,6 +56,7 @@ class Converter {
   virtual VariantValue decode(const uint8_t* data, uint8_t len) const = 0;
   virtual void encode(uint8_t* buf, uint8_t len, const VariantValue& val) const = 0;
   virtual int toString(char* buf, std::size_t maxLen, VariantValue value) const;
+  virtual void fromString(const char* buf, VariantValue* result) const;
   bool operator==(const Converter& rhs) const {
     return (this == &rhs);
   }
@@ -65,6 +67,7 @@ class Div10Convert : public Converter {
   VariantValue decode(const uint8_t* data, uint8_t len) const override;
   void encode(uint8_t* buf, uint8_t len, const VariantValue& val) const override;
   int toString(char* buf, std::size_t maxLen, VariantValue value) const override;
+  void fromString(const char* buf, VariantValue* result) const override;  // C-string = 0-terminated
 };
 
 class Div2Convert : public Converter {

src/Datapoint/Datapoint.cpp

@@ -51,6 +51,13 @@ void Datapoint::encode(uint8_t* buf, uint8_t len, const VariantValue& value) con
   return (*_converter).encode(buf, len, value);
 }
 
+void Datapoint::encode(uint8_t* buf, uint8_t len, const char* value) const {
+  VariantValue convertedVal;
+  if ((*_converter).fromString(value, &convertedVal)) {
+    encode(buf, len, convertedVal);
+  }
+}
+
 int Datapoint::decodeToString(char* buffer, std::size_t maxLen, const uint8_t* data, uint8_t length) const {
   return (*_converter).toString(buffer, maxLen, (*_converter).decode(data, length));
 }

src/Datapoint/Datapoint.h

@@ -28,6 +28,7 @@ class Datapoint {
   int decodeToString(char* buffer, std::size_t maxLen, const uint8_t* data, uint8_t length) const;
   int decodeToString(char* buffer, std::size_t maxLen, const PacketVS2& packet) const;
   void encode(uint8_t* buf, uint8_t len, const VariantValue& value) const;
+  void encode(uint8_t* buf, uint8_t len, const char* value) const;
 
  protected:
   const char* _name;

test/test_Datapoint/test_Datapoint.cpp

@@ -74,6 +74,18 @@ void test_TempEncode() {
   TEST_ASSERT_EQUAL_HEX8_ARRAY(expected, buffer, len);
 }
 
+void test_TempEncodeStr() {
+  Datapoint dp("temp", 0x0000, 2, VitoWiFi::div10);
+  const uint8_t expected[] = {0x07, 0x01};
+  const char* value = "26.3";
+  const uint8_t len = 2;
+  uint8_t buffer[len] = {0};
+
+  dp.encode(buffer, len, value);
+
+  TEST_ASSERT_EQUAL_HEX8_ARRAY(expected, buffer, len);
+}
+
 void test_TempShortDecode() {
   Datapoint dp("temp", 0x0000, 1, VitoWiFi::noconv);
   const uint8_t data[] = {0x10};