update hid-rp

CMakeLists.txt

@@ -31,3 +31,5 @@ target_link_libraries(${PROJECT_NAME} PUBLIC
     etl
     hid-rp
 )
+
+add_subdirectory(examples)

c2usb/c2usb.hpp

@@ -69,38 +69,6 @@ enum class result : int
     NO_CONNECTION = -ENOTCONN,
 };
 
-/// @brief  Lookup unsigned integer of matching size
-template <std::size_t SIZE, class T = void>
-struct sized_unsigned
-{};
-
-template <std::size_t SIZE>
-struct sized_unsigned<SIZE, std::enable_if_t<SIZE == 1>>
-{
-    typedef std::uint8_t type;
-};
-template <std::size_t SIZE>
-struct sized_unsigned<SIZE, std::enable_if_t<SIZE == 2>>
-{
-    typedef std::uint16_t type;
-};
-template <std::size_t SIZE>
-struct sized_unsigned<SIZE, std::enable_if_t<SIZE == 4>>
-{
-    typedef std::uint32_t type;
-};
-template <std::size_t SIZE>
-struct sized_unsigned<SIZE, std::enable_if_t<SIZE == 8>>
-{
-    typedef std::uint64_t type;
-};
-
-template <std::size_t SIZE>
-using sized_unsigned_t = typename sized_unsigned<SIZE>::type;
-
-template <typename T>
-concept IntegerConvertable = std::is_convertible_v<T, sized_unsigned_t<sizeof(T)>>;
-
 /// @brief  The interface base class is used by interface subclasses,
 ///         that contain only abstract virtual functions, and no member data.
 ///         This library limits multiple inheritance to interface subclasses.

c2usb/port/zephyr/bluetooth/gatt.hpp

@@ -18,7 +18,7 @@
 #include <magic_enum.hpp>
 #include <zephyr/bluetooth/gatt.h>
 
-#include "c2usb.hpp"
+#include "sized_unsigned.hpp"
 
 namespace bluetooth::zephyr
 {

c2usb/usb/df/message.hpp

@@ -15,6 +15,7 @@
 #include <new>
 #include <string_view>
 
+#include "sized_unsigned.hpp"
 #include "usb/control.hpp"
 #include "usb/df/transfer.hpp"
 

examples/CMakeLists.txt

@@ -1,12 +1,12 @@
-set(C2USB_EXAMPLES_PUBLIC_HEADERS
-    ${CMAKE_CURRENT_SOURCE_DIR}/leds_saving_keyboard.hpp
-    PARENT_SCOPE
+add_library(${PROJECT_NAME}-example-hid)
+target_sources(${PROJECT_NAME}-example-hid
+    PUBLIC
+        leds_saving_keyboard.hpp
 )
-
-set(C2USB_EXAMPLES_PRIVATE_HEADERS
-    PARENT_SCOPE
+target_include_directories(${PROJECT_NAME}-example-hid
+    PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR}
 )
-
-set(C2USB_EXAMPLES_SOURCES
-    PARENT_SCOPE
+target_link_libraries(${PROJECT_NAME}-example-hid PUBLIC
+    ${PROJECT_NAME}
 )

examples/leds_saving_keyboard.hpp

@@ -33,20 +33,11 @@ class leds_saving_keyboard : public hid::application
     }
 
     leds_saving_keyboard(hid::page::keyboard_keypad key, hid::page::leds led)
-        : hid::application(report_prot()),
-          key_(static_cast<uint8_t>(key)),
-          led_mask_(1 << (static_cast<uint8_t>(led) - 1))
+        : hid::application(report_prot()), key_(key), led_(led)
     {}
     auto send_key(bool set)
     {
-        if (set)
-        {
-            keys_buffer_.scancodes[0] = key_;
-        }
-        else
-        {
-            keys_buffer_.scancodes[0] = 0;
-        }
+        keys_buffer_.scancodes.set(key_, set);
         return send_report(&keys_buffer_);
     }
     void start(hid::protocol prot) override
@@ -59,15 +50,15 @@ class leds_saving_keyboard : public hid::application
     {
         auto* out_report = reinterpret_cast<const kb_leds_report*>(data.data());
 
-        if ((out_report->leds & led_mask_) != 0)
+        if (out_report->leds.test(led_))
         {
             send_key(true);
         }
         receive_report(&leds_buffer_);
     }
     void in_report_sent(const std::span<const uint8_t>& data) override
     {
-        if (keys_buffer_.scancodes[0] == key_)
+        if (keys_buffer_.scancodes.test(key_))
         {
             send_key(false);
         }
@@ -80,8 +71,8 @@ class leds_saving_keyboard : public hid::application
 
   private:
     C2USB_USB_TRANSFER_ALIGN(keys_report, keys_buffer_){};
-    const uint8_t key_{};
-    const uint8_t led_mask_{};
+    const hid::page::keyboard_keypad key_{};
+    const hid::page::leds led_{};
     C2USB_USB_TRANSFER_ALIGN(kb_leds_report, leds_buffer_){};
     hid::protocol prot_{};
 };