Convert hat values

Author: fredemmott

lib/MappableFAVHIDOutput.cpp

@@ -21,7 +21,7 @@ MappableFAVHIDOutput::MappableFAVHIDOutput(uint8_t favhid_id)
   : MappableFAVHIDOutput(std::make_shared<FAVHIDDevice>(favhid_id)) {
 }
 
-static decltype(FAVHID::FAVJoyState2::Report::x) ConvertAxisValue(
+static constexpr decltype(FAVHID::FAVJoyState2::Report::x) ConvertAxisValue(
   Axis::Value input) {
   int64_t value = input;
   value -= Axis::MIN;
@@ -209,14 +209,21 @@ std::shared_ptr<OutputDevice> MappableFAVHIDOutput::getDevice() const {
 
 ButtonSinkPtr MappableFAVHIDOutput::button(uint8_t id) const {
   return [this, id](Button::Value value) {
-    p->mState.SetButton(id, value);
+    p->mState.SetButton(id - 1, value);
     p->mDevice->set(p->mState);
   };
 }
 
+static constexpr int8_t ConvertHatValue(Hat::Value value) {
+  if (value == Hat::CENTER) {
+    return 0b1111;
+  }
+  return value / 4500;
+}
+
 HatSinkPtr MappableFAVHIDOutput::hat(uint8_t id) const {
   return [this, id](Hat::Value value) {
-    p->mState.SetPOV(id, value);
+    p->mState.SetPOV(id - 1, ConvertHatValue(value));
     p->mDevice->set(p->mState);
   };
 }

third-party/favhidclient.cmake

@@ -1,11 +1,12 @@
 include(FetchContent)
 find_package(Git)
+
+set(FAVHID_REVISION "12979fd7b6021975407a39080d13327504c878ba")
 FetchContent_Declare(
     favhidclient
     GIT_REPOSITORY https://github.com/fredemmott/favhid-client.git
     GIT_TAG main
-    UPDATE_COMMAND
-    "${GIT_EXECUTABLE}" reset --hard e3d4f8a471c73ef7da3081544850b7604fb9c764
+    PATCH_COMMAND "${GIT_EXECUTABLE}" reset --hard "${FAVHID_REVISION}"
     EXCLUDE_FROM_ALL
 )