c2usb update; revert high-res scrolling workaround for Linux

Author: benedekkupper

ble-keyboard/prj.conf

@@ -65,3 +65,5 @@ CONFIG_USE_SEGGER_RTT=n
 # procedures which results in a procedure collision and disconnection.
 CONFIG_BT_GATT_AUTO_SEC_REQ=n
 CONFIG_BT_AUTO_PHY_UPDATE=n
+
+CONFIG_SHELL_STACK_SIZE=2048

ble-keyboard/src/main.cpp

@@ -224,7 +224,7 @@ static auto& hog_service()
     static const auto security = security::ENCRYPT;
     static const auto features = flags::NORMALLY_CONNECTABLE | flags::REMOTE_WAKE;
 
-    static service_instance<hid::report_protocol_properties(simple_keyboard<>::report_desc()),
+    static service_instance<hid::app::keyboard::app_report_descriptor<0>(),
                             boot_protocol_mode::KEYBOARD>
         hog{keyboard_app(), security, features};
     return hog;

usb-keyboard/src/main.cpp

@@ -5,13 +5,12 @@
 
 #include <port/zephyr/message_queue.hpp>
 #include <port/zephyr/udc_mac.hpp>
+#include <simple_keyboard.hpp>
 #include <usb/df/class/hid.hpp>
 #include <usb/df/device.hpp>
 
 LOG_MODULE_REGISTER(main, LOG_LEVEL_INF);
 
-#include "simple_keyboard.hpp"
-
 using namespace magic_enum::bitwise_operators;
 
 auto& kb_msgq()
@@ -63,7 +62,7 @@ int main(void)
         {
             if (ev == usb::df::device::event::CONFIGURATION_CHANGE)
             {
-                LOG_INF("USB configured: %u, granted current: %uuA", dev.configured(),
+                LOG_INF("USB configured: %u, granted current: %uuA", (unsigned)dev.configured(),
                         dev.granted_bus_current_uA());
             }
             else
@@ -110,14 +109,15 @@ int main(void)
         case INPUT_KEY_0:
             keyboard_app().send_key(hid::page::keyboard_keypad::KEYBOARD_CAPS_LOCK, msg.value);
             break;
-#if 0
         case INPUT_KEY_1:
-            keyboard_app().send_key(hid::page::keyboard_keypad::KEYBOARD_ENTER, msg.value);
+            keyboard_app().send_key(hid::page::keyboard_keypad::KEYBOARD_BACKSLASH_PIPE, msg.value);
             break;
         case INPUT_KEY_2:
+            keyboard_app().send_key(hid::page::keyboard_keypad::KEYBOARD_ENTER, msg.value);
+            break;
+        case INPUT_KEY_3:
             keyboard_app().send_key(hid::page::keyboard_keypad::KEYBOARD_F1, msg.value);
             break;
-#endif
         default:
             break;
         }

usb-mouse/src/main.cpp

@@ -68,49 +68,16 @@ int main(void)
         [](usb::df::device& dev, usb::df::device::event ev)
         {
             using event = enum usb::df::device::event;
-            using namespace std::literals;
-            static high_resolution_mouse<>::resolution_multiplier_report report_backup{};
-            static os::zephyr::tick_timer::time_point last_reset_time{};
-
-            /* Linux hosts produce erroneous behavior when waking up (on a subset of USB ports):
-             * 1. L2 -> L0
-             * 2. USB reset
-             * 3. L0 -> L2
-             * 4. L2 -> L0
-             * 5. USB re-enumeration, this time without negotiating high-resolution scrolling
-             */
             if (ev == event::CONFIGURATION_CHANGE)
             {
                 LOG_INF("USB configured: %u, granted current: %uuA", (unsigned)dev.configured(),
                         dev.granted_bus_current_uA());
-                if (!dev.configured())
-                {
-                    last_reset_time = os::zephyr::tick_timer::now();
-                }
             }
             else
             {
                 LOG_INF("USB power state: %s, granted current: %uuA",
                         magic_enum::enum_name(dev.power_state()).data(),
                         dev.granted_bus_current_uA());
-                if (dev.power_state() == usb::power::state::L2_SUSPEND)
-                {
-                    if (dev.configured())
-                    {
-                        report_backup = mouse().multiplier_report();
-                    }
-                    else if (std::chrono::duration_cast<std::chrono::milliseconds>(
-                                 os::zephyr::tick_timer::now() - last_reset_time) < 20ms)
-                    {
-                        // reset happened recently, restore the last known multiplier
-                        mouse().set_report(
-                            high_resolution_mouse<>::resolution_multiplier_report::type(),
-                            std::span<const uint8_t>(
-                                const_cast<const uint8_t*>(report_backup.data()),
-                                sizeof(report_backup)));
-                        LOG_INF("restored multiplier: %x", report_backup.resolutions);
-                    }
-                }
             }
         });
 

west.yml

@@ -16,7 +16,7 @@ manifest:
   projects:
     - name: c2usb
       remote: IntergatedCircuits
-      revision: 5d08c6739c6e17af8fb8099b4edde1507799c417
+      revision: 84575f528a530b631895d03673e371e6c20de1fa
       submodules: true
     - name: nrf
       repo-path: sdk-nrf