test schedule

Author: bertmelis

src/Datapoint/ConversionHelpers.cpp

@@ -0,0 +1,97 @@
+/*
+Copyright (c) 2023 Bert Melis. All rights reserved.
+
+This work is licensed under the terms of the MIT license.  
+For a copy, see <https://opensource.org/licenses/MIT> or
+the LICENSE file.
+*/
+
+#include "ConversionHelpers.h"
+
+bool isDigit(const char c) {
+  return c >= '0' && c <= '9';
+}
+
+namespace VitoWiFi {
+
+std::size_t encodeSchedule(const char* schedule, std::size_t len, uint8_t* output) {
+  enum ScheduleParserStep {
+    Hours1,
+    Hours2,
+    Minutes1,
+    Minutes2,
+    Space,
+  };
+
+  std::size_t i = 0 - 1;  // first operation in iteration is ++i
+  std::size_t scheduleIndex = 0;
+  ScheduleParserStep step = ScheduleParserStep::Hours1;
+  unsigned int hour = 0;
+  unsigned int minutes = 0;
+
+  while (++i < len) {
+    if (step == ScheduleParserStep::Hours1) {
+      if (isDigit(schedule[i])) {
+        hour = schedule[i] - '0';
+        step = ScheduleParserStep::Hours2;
+        continue;
+      }
+    } else if (step == ScheduleParserStep::Hours2) {
+      if (isDigit(schedule[i])) {
+        hour = hour * 10 + (schedule[i] - '0');
+        continue;
+      } else if (schedule[i] == ':') {
+        step = ScheduleParserStep::Minutes1;
+        continue;
+      }
+    } else if (step == ScheduleParserStep::Minutes1) {
+      if (isDigit(schedule[i])) {
+        minutes = schedule[i] - '0';
+        step = ScheduleParserStep::Minutes2;
+        continue;
+      }
+    } else if (step == ScheduleParserStep::Minutes2) {
+      if (schedule[i] == '0') {
+        minutes = minutes * 10 + (schedule[i] - '0');
+        // parsing is possibly complete
+        if (hour <= 23 || minutes <= 59) {
+          output[scheduleIndex] = (0xF8 & hour << 3) | minutes / 10;
+          ++scheduleIndex;
+          step = ScheduleParserStep::Space;
+          continue;
+        }
+      }
+    } else {  // step == ScheduleParserStep::Space
+      if (schedule[i] == ' ') {
+        step = ScheduleParserStep::Hours1;
+        continue;
+      }
+    }
+    return 0;
+  }
+  if (scheduleIndex % 2 == 0 && step == ScheduleParserStep::Space) {
+    // TODO(bertmelis): hours have to be ordered
+    return (scheduleIndex + 1) / 2;
+  }
+  return 0;
+}
+
+std::size_t encodeSchedule(const char* schedule, uint8_t* output) {
+  return encodeSchedule(schedule, strlen(schedule), output);
+}
+
+std::size_t decodeSchedule(const uint8_t* data, std::size_t len, char* output, std::size_t maxLen) {
+  assert(len == 8);
+  assert(maxLen >= 48);  // 8 times 07:30, 7 spaces and 0-terminator --> 8 * 5 + 7 * 1 + 1
+
+  std::size_t pos = 0;
+  for (std::size_t i = 0; i < 8; ++i) {
+    unsigned int hour = std::min(23, data[i] >> 3);
+    unsigned int minutes = std::min(59, (data[i] & 0x07) * 10);
+    int res = snprintf("%u.02:%u.02");
+    if (i < 7)
+  }
+
+}
+
+}  // end namespace VitoWiFi

src/Datapoint/ConversionHelpers.h

@@ -0,0 +1,45 @@
+/*
+Copyright (c) 2025 Bert Melis. All rights reserved.
+
+This work is licensed under the terms of the MIT license.  
+For a copy, see <https://opensource.org/licenses/MIT> or
+the LICENSE file.
+*/
+
+#pragma once
+
+#include <cassert>
+#include <cstdint>
+#include <cstddef>
+#include <cstring>
+
+namespace VitoWiFi {
+
+/*
+Encodes a c-string containing a schedule to an 8-byte schedule sequence.
+Returns the number of pairs encoded
+Per byte: 
+  - b7-b3 hour
+  - b2-b1 minute * 10
+
+Output needs to be at least 8 bytes
+
+A scedule consists of time pairs with minutes rounded to a multiple of 10min.
+Hours can be with leading zero or not.
+
+Valid:
+  - 7:30 8:30 15:00 23:50
+  - 07:30 8:30 15:00 23:50
+
+Invalid:
+  - hours not specified in pairs
+  - (hours not ordered earliest to latest)
+  - no colons or spaces used
+  - minutes not rounded to multiples of 10
+*/
+std::size_t encodeSchedule(const char* schedule, std::size_t len, uint8_t* output);
+std::size_t encodeSchedule(const char* schedule, uint8_t* output);
+
+std::size_t decodeSchedule(const uint8_t* data, std::size_t len, char* output, std::size_t maxLen);
+
+};  // end namespace VitoWiFi

src/Datapoint/Converter.h

@@ -14,6 +14,7 @@ the LICENSE file.
 #include <cstring>
 
 #include "../Logging.h"
+#include "ConversionHelpers.h"
 
 namespace VitoWiFi {
 

test/test_Datapoint/test_Datapoint.cpp

@@ -204,6 +204,19 @@ void test_COPEncode() {
   TEST_ASSERT_EQUAL_HEX8_ARRAY(expected, buffer, len);
 }
 
+void test_Schedule() {
+  const char* schedule = "7:30 08:30 16:20 23:10";
+  const uint8_t expected[] = {0x3B, 0x43, 0x82, 0xB9, 0x00, 0x00, 0x00, 0x00};
+  const size_t numSchedules = 4;
+  const std::size_t len = 8;
+  uint8_t buffer[len];
+
+  std::size_t result = VitoWiFi::encodeSchedule(schedule, buffer);
+
+  TEST_ASSERT_EQUAL(len, result);
+  TEST_ASSERT_EQUAL_HEX8_ARRAY(expected, buffer, len);
+}
+
 int main() {
   UNITY_BEGIN();
   RUN_TEST(test_Converter);
@@ -222,5 +235,6 @@ int main() {
   RUN_TEST(test_CountShortEncode);
   RUN_TEST(test_COPDecode);
   RUN_TEST(test_COPEncode);
+  RUN_TEST(test_Schedule);
   return UNITY_END();
 }