diff --git a/right/src/macros/commands.c b/right/src/macros/commands.c index df1b8e79d..3bfc8567b 100644 --- a/right/src/macros/commands.c +++ b/right/src/macros/commands.c @@ -1771,6 +1771,10 @@ static macro_result_t processSwitchHostCommand(parser_context_t* ctx) return MacroResult_Finished; } +void ReportScrolls(void) { + Macros_ReportPrintf(NULL, "Scroll multipliers %d %d", (int)(VerticalScrollMultiplier()), (int)(HorizontalScrollMultiplier())); +} + static macro_result_t processCommand(parser_context_t* ctx) { if (*ctx->at == '$') { @@ -2295,6 +2299,11 @@ static macro_result_t processCommand(parser_context_t* ctx) else if (ConsumeToken(ctx, "statsRuntime")) { return Macros_ProcessStatsRuntimeCommand(); } + else if (ConsumeToken(ctx, "statsScroll")) { + ReportScrolls(); + + return MacroResult_Finished; + } else if (ConsumeToken(ctx, "statsRecordKeyTiming")) { return Macros_ProcessStatsRecordKeyTimingCommand(); } diff --git a/right/src/usb_composite_device.c b/right/src/usb_composite_device.c index 4cc4afb07..a61b61a24 100644 --- a/right/src/usb_composite_device.c +++ b/right/src/usb_composite_device.c @@ -202,11 +202,13 @@ static usb_status_t usbDeviceCallback(usb_device_handle handle, uint32_t event, break; case kUSB_DeviceEventSuspend: if (UsbCompositeDevice.attach) { + Macros_ReportPrintf(NULL, "USB suspended"); PowerMode_ActivateMode(PowerMode_Uhk60Sleep, false); status = kStatus_USB_Success; } break; case kUSB_DeviceEventResume: + Macros_ReportPrintf(NULL, "USB resumed"); PowerMode_ActivateMode(PowerMode_Awake, false); status = kStatus_USB_Success; break; @@ -214,6 +216,7 @@ static usb_status_t usbDeviceCallback(usb_device_handle handle, uint32_t event, uint8_t interface; UsbCompositeDevice.attach = 1; PowerMode_ActivateMode(PowerMode_Awake, false); + Macros_ReportPrintf(NULL, "Awake -> set configuration"); for (interface = 0; interface < USB_DEVICE_CONFIG_HID; ++interface) { usb_device_class_config_struct_t *intf = &UsbDeviceCompositeConfigList.config[interface]; diff --git a/right/src/usb_interfaces/usb_interface_mouse.c b/right/src/usb_interfaces/usb_interface_mouse.c index 22f0c0e76..5d041a800 100644 --- a/right/src/usb_interfaces/usb_interface_mouse.c +++ b/right/src/usb_interfaces/usb_interface_mouse.c @@ -3,6 +3,7 @@ #include #include "event_scheduler.h" #include "attributes.h" +#include "macros/status_buffer.h" #ifdef __ZEPHYR__ #include "usb/usb_compatibility.h" @@ -78,6 +79,7 @@ usb_status_t UsbMouseCallback(class_handle_t handle, uint32_t event, void *param switch (event) { case ((uint32_t)-kUSB_DeviceEventSetConfiguration): + Macros_ReportPrintf(NULL, "USB Mouse: Set Configuration -> 0"); usbMouseFeatBuffer[0] = 0; error = kStatus_USB_Success; break; @@ -138,6 +140,8 @@ usb_status_t UsbMouseCallback(class_handle_t handle, uint32_t event, void *param // all; but it only sends this report when it detects the // resolution multiplier, and the intention is to activate the // feature, so turn high-res mode on here. + + Macros_ReportPrintf(NULL, "USB Mouse: Request Report Buffer -> 1"); report->reportBuffer = usbMouseFeatBuffer; usbMouseFeatBuffer[0] = 0x1; error = kStatus_USB_Success; diff --git a/right/src/usb_interfaces/usb_interface_mouse.h b/right/src/usb_interfaces/usb_interface_mouse.h index eba52a35a..b0088ea18 100644 --- a/right/src/usb_interfaces/usb_interface_mouse.h +++ b/right/src/usb_interfaces/usb_interface_mouse.h @@ -49,6 +49,7 @@ usb_hid_protocol_t UsbMouseGetProtocol(void); #endif + void ReportScrolls(void); float VerticalScrollMultiplier(void); float HorizontalScrollMultiplier(void); void UsbMouseResetActiveReport(void);