Adding auto-restart support whenever USB gets into an odd state

[kiibohd-controller.git] / Output / usbMuxUart / output_com.c

diff --git a/Output/usbMuxUart/output_com.c b/Output/usbMuxUart/output_com.c
index 1d41a9b5c17bed0bd91cb7052334b441fa8125c2..9de42126e6420e537b57355b973514552cb42069 100644 (file)
--- a/Output/usbMuxUart/output_com.c
+++ b/Output/usbMuxUart/output_com.c
@@ -37,6 +37,7 @@
 #include <arm/usb_dev.h>
 #include <arm/usb_keyboard.h>
 #include <arm/usb_serial.h>
+#include "arm/usb_mouse.h"
 #endif
 
 // KLL
@@ -141,9 +142,11 @@ USBMouseChangeState USBMouse_Changed = 0;
 
 // the idle configuration, how often we send the report to the
 // host (ms * 4) even when it hasn't changed
-uint8_t  USBKeys_Idle_Config = 125;
+// 0 - Disables
+uint8_t  USBKeys_Idle_Config = 0;
 
-// count until idle timeout
+// Count until idle timeout
+uint32_t USBKeys_Idle_Expiry = 0;
 uint8_t  USBKeys_Idle_Count = 0;
 
 // Indicates whether the Output module is fully functional
@@ -653,6 +656,23 @@ inline void Output_send()
                for ( uint8_t c = USBKeys_Sent; c < USB_BOOT_MAX_KEYS; c++ )
                        USBKeys_Keys[c] = 0;
 
+       // XXX - Behaves oddly on Mac OSX, might help with corrupted packets specific to OSX? -HaaTa
+       /*
+       // Check if idle count has been exceed, this forces usb_keyboard_send and usb_mouse_send to update
+       // TODO Add joystick as well (may be endpoint specific, currently not kept track of)
+       if ( usb_configuration && USBKeys_Idle_Config && (
+               USBKeys_Idle_Expiry < systick_millis_count ||
+               USBKeys_Idle_Expiry + USBKeys_Idle_Config * 4 >= systick_millis_count ) )
+       {
+               USBKeys_Changed = USBKeyChangeState_All;
+               USBMouse_Changed = USBMouseChangeState_All;
+       }
+       */
+
+       // Process mouse actions
+       while ( USBMouse_Changed )
+               usb_mouse_send();
+
        // Send keypresses while there are pending changes
        while ( USBKeys_Changed )
                usb_keyboard_send();