allow agent on both transport concurrently (#355)

UltimateHackingKeyboard · Dec 5, 2024 · 1601c9c · 1601c9c
1 parent b7ec4ee
commit 1601c9c
Show file tree

Hide file tree

Showing 54 changed files with 253 additions and 234 deletions.
diff --git a/device/src/usb/command_app.cpp b/device/src/usb/command_app.cpp
@@ -3,18 +3,21 @@
 #include "hid/report_protocol.hpp"
 #include "zephyr/sys/printk.h"
 
-extern "C" bool CommandProtocolTx(const uint8_t *data, size_t size)
+extern "C" void UsbProtocolHandler(const uint8_t *GenericHidOutBuffer, uint8_t *GenericHidInBuffer);
+
+command_app &command_app::usb_handle()
 {
-    return command_app::handle().send(std::span<const uint8_t>(data, size));
+    static command_app app{};
+    return app;
 }
 
-extern "C" void CommandProtocolRxHandler(const uint8_t *data, size_t size);
-
+#if DEVICE_IS_UHK80_RIGHT
 command_app &command_app::handle()
 {
-    static command_app app{};
-    return app;
+    static command_app ble_app{};
+    return ble_app;
 }
+#endif
 
 void command_app::start(hid::protocol prot)
 {
@@ -32,7 +35,15 @@ void command_app::set_report(hid::report::type type, const std::span<const uint8
     receive_report(&out_buffer_[out_buffer_.active_side()]);
 
     auto &out = *reinterpret_cast<const report_out *>(data.data());
-    CommandProtocolRxHandler(out.payload.data(), data.size() - (report_out::has_id() ? 1 : 0));
+    auto buf_idx = in_buffer_.active_side();
+    auto &in = in_buffer_[buf_idx];
+    UsbProtocolHandler(out.payload.data(), in.payload.data());
+    auto err = send_report(&in);
+    if (err == hid::result::OK) {
+        in_buffer_.compare_swap(buf_idx);
+    } else {
+        printk("Command app failed to send report with: %d\n", (int)err);
+    }
 }
 
 void command_app::get_report(hid::report::selector select, const std::span<uint8_t> &buffer)
@@ -47,24 +58,6 @@ void command_app::get_report(hid::report::selector select, const std::span<uint8
     send_report(buffer.subspan(0, sizeof(report)));
 }
 
-bool command_app::send(std::span<const uint8_t> buffer)
-{
-    auto buf_idx = in_buffer_.active_side();
-    auto &report = in_buffer_[buf_idx];
-    if (buffer.size() > report.payload.max_size()) {
-        printk("Usb payload exceeded maximum size!\n");
-        return false;
-    }
-    std::copy(buffer.begin(), buffer.end(), report.payload.begin());
-    c2usb::result err = send_report(&in_buffer_[buf_idx]);
-    if (err == hid::result::OK) {
-        in_buffer_.compare_swap(buf_idx);
-        return true;
-    }
-    printk("Command app failed to send report with: %i\n", (int)err);
-    return false;
-}
-
 void command_app::in_report_sent(const std::span<const uint8_t> &data)
 {
     if (data.front() != report_ids::IN_COMMAND) {

diff --git a/device/src/usb/command_app.hpp b/device/src/usb/command_app.hpp
@@ -6,6 +6,7 @@
 #include "hid/rdf/descriptor.hpp"
 #include "hid/report_protocol.hpp"
 #include "report_ids.h"
+#include "../device.h"
 
 namespace hid::page {
 enum class ugl : uint8_t;
@@ -61,9 +62,10 @@ class command_app : public hid::application {
     using report_in = report_base<hid::report::type::INPUT, report_ids::IN_COMMAND>;
     using report_out = report_base<hid::report::type::OUTPUT, report_ids::OUT_COMMAND>;
 
+    static command_app& usb_handle();
+#if DEVICE_IS_UHK80_RIGHT
     static command_app& handle();
-
-    bool send(std::span<const uint8_t> buffer);
+#endif
 
     void start(hid::protocol prot) override;
     void set_report(hid::report::type type, const std::span<const uint8_t>& data) override;

diff --git a/device/src/usb/usb.cpp b/device/src/usb/usb.cpp
@@ -113,7 +113,7 @@ struct usb_manager {
         static usb::df::hid::function usb_kb{
             keyboard_app::handle(), usb::hid::boot_protocol_mode::KEYBOARD};
         static usb::df::hid::function usb_mouse{mouse_app::handle()};
-        static usb::df::hid::function usb_command{command_app::handle()};
+        static usb::df::hid::function usb_command{command_app::usb_handle()};
         static usb::df::hid::function usb_controls{controls_app::handle()};
         static usb::df::hid::function usb_gamepad{gamepad_app::handle()};
         static usb::df::microsoft::xfunction usb_xpad{gamepad_app::handle()};
@@ -128,17 +128,19 @@ struct usb_manager {
             usb::df::hid::config(usb_mouse, speed, usb::endpoint::address(0x82), 1),
             usb::df::hid::config(usb_command, speed, usb::endpoint::address(0x83), 10),
             usb::df::hid::config(usb_controls, speed, usb::endpoint::address(0x84), 1)
-#if !DEVICE_HAS_BATTERY
-        );
-#else
+#if DEVICE_HAS_BATTERY
                 ,
             usb::df::hid::config(usb_battery, speed, usb::endpoint::address(0x86), 1)
             // not very useful at the moment
+#endif
         );
-
-        static const auto battery_config = usb::df::config::make_config(config_header,
-            usb::df::hid::config(usb_battery, speed, usb::endpoint::address(0x86), 1));
+        static const auto inactive_config = usb::df::config::make_config(config_header,
+            usb::df::hid::config(usb_command, speed, usb::endpoint::address(0x83), 10)
+#if DEVICE_HAS_BATTERY
+                ,
+            usb::df::hid::config(usb_battery, speed, usb::endpoint::address(0x86), 1)
 #endif
+            );
 
         static const auto base_config =
             usb::df::config::make_config(config_header, shared_config_elems);
@@ -155,12 +157,8 @@ struct usb_manager {
         printk("USB config changing to %s\n", magic_enum::enum_name(conf).data());
         switch (conf) {
         case Hid_Empty:
-#if DEVICE_HAS_BATTERY
             ms_enum_.set_config({});
-            device_.set_config(battery_config);
-#else
-            assert(false);
-#endif
+            device_.set_config(inactive_config);
             break;
         case Hid_NoGamepad:
             ms_enum_.set_config({});

diff --git a/right/src/usb_commands/usb_command_apply_config.c b/right/src/usb_commands/usb_command_apply_config.c
@@ -19,33 +19,34 @@
 #include "main.h"
 #endif
 
-void updateUsbBuffer(uint8_t usbStatusCode, uint16_t parserOffset, parser_stage_t parserStage)
+void updateUsbBuffer(uint8_t *GenericHidInBuffer, uint8_t usbStatusCode, uint16_t parserOffset, parser_stage_t parserStage)
 {
     SetUsbTxBufferUint8(0, usbStatusCode);
     SetUsbTxBufferUint16(1, parserOffset);
     SetUsbTxBufferUint8(3, parserStage);
 }
 
-static uint8_t validateConfig() {
+static uint8_t validateConfig(uint8_t *GenericHidInBuffer) {
     // Validate the staging configuration.
     ParserRunDry = true;
     StagingUserConfigBuffer.offset = 0;
     uint8_t parseConfigStatus = ParseConfig(&StagingUserConfigBuffer);
-    updateUsbBuffer(UsbStatusCode_Success, StagingUserConfigBuffer.offset, ParsingStage_Validate);
-
+    if (GenericHidInBuffer) {
+        updateUsbBuffer(GenericHidInBuffer, UsbStatusCode_Success, StagingUserConfigBuffer.offset, ParsingStage_Validate);
+    }
     return parseConfigStatus;
 }
 
-void UsbCommand_ApplyConfigAsync(void) {
-    if (validateConfig() == UsbStatusCode_Success) {
+void UsbCommand_ApplyConfigAsync(const uint8_t *GenericHidOutBuffer, uint8_t *GenericHidInBuffer) {
+    if (validateConfig(GenericHidInBuffer) == UsbStatusCode_Success) {
         EventVector_Set(EventVector_ApplyConfig);
 #ifdef __ZEPHYR__
         Main_Wake();
 #endif
     }
 }
 
-void UsbCommand_ApplyFactory(void)
+void UsbCommand_ApplyFactory(const uint8_t *GenericHidOutBuffer, uint8_t *GenericHidInBuffer)
 {
     EventVector_Unset(EventVector_ApplyConfig);
 
@@ -63,12 +64,12 @@ void UsbCommand_ApplyFactory(void)
     LedManager_FullUpdate();
 }
 
-uint8_t UsbCommand_ApplyConfig(void)
+uint8_t UsbCommand_ApplyConfig(const uint8_t *GenericHidOutBuffer, uint8_t *GenericHidInBuffer)
 {
     static bool isBoot = true;
     EventVector_Unset(EventVector_ApplyConfig);
 
-    uint8_t parseConfigStatus = validateConfig();
+    uint8_t parseConfigStatus = validateConfig(GenericHidInBuffer);
 
     if (parseConfigStatus != UsbStatusCode_Success) {
         return parseConfigStatus;

diff --git a/right/src/usb_commands/usb_command_apply_config.h b/right/src/usb_commands/usb_command_apply_config.h
@@ -15,8 +15,8 @@
 
 // Functions:
 
-    uint8_t UsbCommand_ApplyConfig(void);
-    void UsbCommand_ApplyFactory(void);
-    void UsbCommand_ApplyConfigAsync(void);
+    uint8_t UsbCommand_ApplyConfig(const uint8_t *GenericHidOutBuffer, uint8_t *GenericHidInBuffer);
+    void UsbCommand_ApplyFactory(const uint8_t *GenericHidOutBuffer, uint8_t *GenericHidInBuffer);
+    void UsbCommand_ApplyConfigAsync(const uint8_t *GenericHidOutBuffer, uint8_t *GenericHidInBuffer);
 
 #endif
diff --git a/right/src/usb_commands/usb_command_draw_oled.c b/right/src/usb_commands/usb_command_draw_oled.c
@@ -15,7 +15,7 @@
 #include "debug.h"
 #include <stdint.h>
 
-void UsbCommand_DrawOled()
+void UsbCommand_DrawOled(const uint8_t *GenericHidOutBuffer, uint8_t *GenericHidInBuffer)
 {
 #if defined(__ZEPHYR__) && DEVICE_HAS_OLED
     uint8_t x = GetUsbRxBufferUint8(1);

diff --git a/right/src/usb_commands/usb_command_draw_oled.h b/right/src/usb_commands/usb_command_draw_oled.h
@@ -11,6 +11,6 @@
 
 // Functions:
 
-    void UsbCommand_DrawOled();
+    void UsbCommand_DrawOled(const uint8_t *GenericHidOutBuffer, uint8_t *GenericHidInBuffer);
 
 #endif
diff --git a/right/src/usb_commands/usb_command_exec_macro_command.c b/right/src/usb_commands/usb_command_exec_macro_command.c
@@ -14,7 +14,7 @@ char UsbMacroCommand[USB_GENERIC_HID_OUT_BUFFER_LENGTH+1];
 uint8_t UsbMacroCommandLength = 0;
 key_state_t dummyState;
 
-static void requestExecution()
+static void requestExecution(const uint8_t *GenericHidOutBuffer)
 {
     Utils_SafeStrCopy(UsbMacroCommand, ((char*)GenericHidOutBuffer) + 1, sizeof(GenericHidOutBuffer)-1);
     UsbMacroCommandLength = strlen(UsbMacroCommand);
@@ -41,9 +41,9 @@ void UsbMacroCommand_ExecuteSynchronously()
     EventVector_Unset(EventVector_UsbMacroCommandWaitingForExecution);
 }
 
-void UsbCommand_ExecMacroCommand()
+void UsbCommand_ExecMacroCommand(const uint8_t *GenericHidOutBuffer, uint8_t *GenericHidInBuffer)
 {
     if (canExecute()) {
-        requestExecution();
+        requestExecution(GenericHidOutBuffer);
     }
 }
diff --git a/right/src/usb_commands/usb_command_exec_macro_command.h b/right/src/usb_commands/usb_command_exec_macro_command.h
@@ -16,6 +16,6 @@
 // Functions:
 
     void UsbMacroCommand_ExecuteSynchronously();
-    void UsbCommand_ExecMacroCommand();
+    void UsbCommand_ExecMacroCommand(const uint8_t *GenericHidOutBuffer, uint8_t *GenericHidInBuffer);
 
 #endif
diff --git a/right/src/usb_commands/usb_command_get_adc_value.c b/right/src/usb_commands/usb_command_get_adc_value.c
@@ -2,7 +2,7 @@
 #include "usb_commands/usb_command_get_adc_value.h"
 #include "peripherals/adc.h"
 
-void UsbCommand_GetAdcValue(void)
+void UsbCommand_GetAdcValue(const uint8_t *GenericHidOutBuffer, uint8_t *GenericHidInBuffer)
 {
     SetUsbTxBufferUint32(1, ADC_Measure());
 }
diff --git a/right/src/usb_commands/usb_command_get_adc_value.h b/right/src/usb_commands/usb_command_get_adc_value.h
@@ -1,8 +1,12 @@
 #ifndef __USB_COMMAND_GET_ADC_VALUE_H__
 #define __USB_COMMAND_GET_ADC_VALUE_H__
 
+// Includes:
+
+    #include <stdint.h>
+
 // Functions:
 
-    void UsbCommand_GetAdcValue(void);
+    void UsbCommand_GetAdcValue(const uint8_t *GenericHidOutBuffer, uint8_t *GenericHidInBuffer);
 
 #endif
diff --git a/right/src/usb_commands/usb_command_get_debug_buffer.c b/right/src/usb_commands/usb_command_get_debug_buffer.c
@@ -19,7 +19,7 @@
 
 uint8_t DebugBuffer[USB_GENERIC_HID_IN_BUFFER_LENGTH];
 
-void UsbCommand_GetDebugBuffer(void)
+void UsbCommand_GetDebugBuffer(const uint8_t *GenericHidOutBuffer, uint8_t *GenericHidInBuffer)
 {
 #ifndef __ZEPHYR__
     SetDebugBufferUint32(1, I2C_Watchdog);

diff --git a/right/src/usb_commands/usb_command_get_debug_buffer.h b/right/src/usb_commands/usb_command_get_debug_buffer.h
@@ -11,7 +11,7 @@
 
 // Functions:
 
-    void UsbCommand_GetDebugBuffer(void);
+    void UsbCommand_GetDebugBuffer(const uint8_t *GenericHidOutBuffer, uint8_t *GenericHidInBuffer);
 
     void SetDebugBufferUint8(uint32_t offset, uint8_t value);
     void SetDebugBufferUint16(uint32_t offset, uint16_t value);

diff --git a/right/src/usb_commands/usb_command_get_device_property.c b/right/src/usb_commands/usb_command_get_device_property.c
@@ -25,7 +25,7 @@
 
 uint16_t configSizes[] = {HARDWARE_CONFIG_SIZE, USER_CONFIG_SIZE};
 
-void UsbCommand_GetDeviceProperty(void)
+void UsbCommand_GetDeviceProperty(const uint8_t *GenericHidOutBuffer, uint8_t *GenericHidInBuffer)
 {
     uint8_t propertyId = GetUsbRxBufferUint8(1);
     uint8_t *dest = GenericHidInBuffer + 1;
@@ -105,7 +105,7 @@ void UsbCommand_GetDeviceProperty(void)
     } break;
     case DevicePropertyId_NewPairings:
 #ifdef __ZEPHYR__
-        UsbCommand_GetNewPairings();
+        UsbCommand_GetNewPairings(GenericHidOutBuffer, GenericHidInBuffer);
 #endif
         break;
     default:

diff --git a/right/src/usb_commands/usb_command_get_device_property.h b/right/src/usb_commands/usb_command_get_device_property.h
@@ -1,6 +1,10 @@
 #ifndef __USB_COMMAND_GET_DEVICE_PROPERTY_H__
 #define __USB_COMMAND_GET_DEVICE_PROPERTY_H__
 
+// Includes:
+
+    #include <stdint.h>
+
 // Typedefs:
 
     typedef enum {
@@ -31,6 +35,6 @@
 
 // Functions:
 
-    void UsbCommand_GetDeviceProperty(void);
+    void UsbCommand_GetDeviceProperty(const uint8_t *GenericHidOutBuffer, uint8_t *GenericHidInBuffer);
 
 #endif
diff --git a/right/src/usb_commands/usb_command_get_device_state.c b/right/src/usb_commands/usb_command_get_device_state.c
@@ -29,7 +29,7 @@
     #define Bt_NewPairedDevice 0
 #endif
 
-void UsbCommand_GetKeyboardState(void)
+void UsbCommand_GetKeyboardState(const uint8_t *GenericHidOutBuffer, uint8_t *GenericHidInBuffer)
 {
 
 #ifdef __ZEPHYR__

diff --git a/right/src/usb_commands/usb_command_get_device_state.h b/right/src/usb_commands/usb_command_get_device_state.h
@@ -1,6 +1,10 @@
 #ifndef __USB_COMMAND_GET_KEYBOARD_STATE_H__
 #define __USB_COMMAND_GET_KEYBOARD_STATE_H__
 
+// Includes:
+
+    #include <stdint.h>
+
 // Typedefs:
 
 typedef enum {
@@ -18,6 +22,6 @@ typedef enum {
 
 // Functions:
 
-    void UsbCommand_GetKeyboardState(void);
+    void UsbCommand_GetKeyboardState(const uint8_t *GenericHidOutBuffer, uint8_t *GenericHidInBuffer);
 
 #endif
diff --git a/right/src/usb_commands/usb_command_get_module_property.c b/right/src/usb_commands/usb_command_get_module_property.c
@@ -10,7 +10,7 @@
 #include "utils.h"
 #include "versioning.h"
 
-void UsbCommand_GetModuleProperty()
+void UsbCommand_GetModuleProperty(const uint8_t *GenericHidOutBuffer, uint8_t *GenericHidInBuffer)
 {
     slot_t slotId = GetUsbRxBufferUint8(1);
 

diff --git a/right/src/usb_commands/usb_command_get_module_property.h b/right/src/usb_commands/usb_command_get_module_property.h
@@ -1,9 +1,13 @@
 #ifndef __USB_COMMAND_GET_MODULE_PROPERTY_H__
 #define __USB_COMMAND_GET_MODULE_PROPERTY_H__
 
+// Includes:
+
+    #include <stdint.h>
+
 // Functions:
 
-    void UsbCommand_GetModuleProperty();
+    void UsbCommand_GetModuleProperty(const uint8_t *GenericHidOutBuffer, uint8_t *GenericHidInBuffer);
 
 // Typedefs: