Map YardForce button/hall id from string

Author: rovo89

src/drivers/input/input_driver.hpp

@@ -11,7 +11,6 @@
 namespace xbot::driver::input {
 struct Input {
   enum { VIRTUAL = 255 };
-  enum class Type : uint8_t { BUTTON, HALL };
 
   // Configuration
   uint8_t idx;
@@ -29,15 +28,8 @@ struct Input {
     } worx;
 
     struct {
-      Input::Type type;
-      union {
-        struct {
-          uint8_t id;
-        } button;
-        struct {
-          uint8_t bit;
-        } hall;
-      };
+      bool button : 1;
+      uint8_t id_or_bit : 7;
     } yardforce;
   };
 

src/drivers/input/yard_force_input_driver.cpp

@@ -2,19 +2,52 @@
 
 #include <ulog.h>
 
+#include <crc_lookup_map.hpp>
 #include <json_stream.hpp>
 
 namespace xbot::driver::input {
 
+#pragma pack(push, 1)
+namespace {
+struct InputParams {
+  uint16_t crc;
+  bool button : 1;
+  uint8_t id_or_bit : 7;
+};
+}  // namespace
+#pragma pack(pop)
+
+static constexpr InputParams available_inputs[] = {
+    // Buttons
+    {crc16("home"), true, 2},
+    {crc16("play"), true, 3},
+    {crc16("s1"), true, 4},
+    {crc16("s2"), true, 5},
+    {crc16("lock"), true, 6},
+
+    // Halls
+    {crc16("stop1"), false, 1},
+    {crc16("stop2"), false, 2},
+    {crc16("lift"), false, 3},
+    {crc16("bump"), false, 4},
+    {crc16("liftx"), false, 5},
+    {crc16("rbump"), false, 6},
+};
+
+static_assert(HasUniqueCrcs(available_inputs), "CRC16 values are not unique");
+
 bool YardForceInputDriver::OnInputConfigValue(lwjson_stream_parser_t *jsp, const char *key, lwjson_stream_type_t type,
                                               Input &input) {
-  // TODO: We probably want to take strings here and map them to the ID.
-  if (strcmp(key, "button") == 0) {
-    input.yardforce.type = Input::Type::BUTTON;
-    return JsonGetNumber(jsp, type, input.yardforce.button.id);
-  } else if (strcmp(key, "hall") == 0) {
-    input.yardforce.type = Input::Type::HALL;
-    return JsonGetNumber(jsp, type, input.yardforce.hall.bit);
+  if (strcmp(key, "id") == 0) {
+    JsonExpectType(STRING);
+    const auto *id = jsp->data.str.buff;
+    if (auto *params = LookupByName(id, available_inputs)) {
+      input.yardforce.button = params->button;
+      input.yardforce.id_or_bit = params->id_or_bit;
+      return true;
+    }
+    ULOG_ERROR("Unknown ID \"%s\"", id);
+    return false;
   }
   ULOG_ERROR("Unknown attribute \"%s\"", key);
   return false;

src/drivers/ui/YardForceCoverUI/yard_force_cover_ui_driver.cpp

@@ -208,7 +208,7 @@ void YardForceCoverUIDriver::ProcessPacket() {
   } else if (encode_decode_buf_[0] == Get_Button && size == sizeof(struct msg_event_button)) {
     msg_event_button *msg = (struct msg_event_button *)encode_decode_buf_;
     for (auto &input : input_driver_.Inputs()) {
-      if (input.yardforce.type == Input::Type::BUTTON && input.yardforce.button.id == msg->button_id) {
+      if (input.yardforce.button && input.yardforce.id_or_bit == msg->button_id) {
         const bool long_press = msg->press_duration >= 1;
         input.InjectPress(long_press);
         break;
@@ -217,8 +217,8 @@ void YardForceCoverUIDriver::ProcessPacket() {
   } else if (encode_decode_buf_[0] == Get_Emergency && size == sizeof(struct msg_event_emergency)) {
     msg_event_emergency *msg = (struct msg_event_emergency *)encode_decode_buf_;
     for (auto &input : input_driver_.Inputs()) {
-      if (input.yardforce.type == Input::Type::HALL) {
-        input.Update(IS_BIT_SET(msg->state, input.yardforce.hall.bit));
+      if (!input.yardforce.button) {
+        input.Update(IS_BIT_SET(msg->state, input.yardforce.id_or_bit));
       }
     }
   } /* else if (encode_decode_buf_[0] == Get_Rain && size == sizeof(struct msg_event_rain)) {