Implemented scroll wheel rate limtis

remdeskd/mod/remdeshid/handler.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"log"
 	"net/http"
+	"time"
 
 	"github.com/gorilla/websocket"
 )
@@ -59,6 +60,16 @@ func (c *Controller) HIDWebSocketHandler(w http.ResponseWriter, r *http.Request)
 			continue
 		}
 
+		if bytes[0] == OPR_TYPE_MOUSE_SCROLL {
+			currentTime := time.Now().UnixMilli()
+			//Sending scroll too fast will cause the HID controller to glitch
+			if currentTime-c.lastScrollTime < 20 {
+				log.Println("Ignoring scroll event due to rate limiting")
+				continue
+			}
+			c.lastScrollTime = currentTime
+		}
+
 		fmt.Println("Sending bytes:", bytes)
 
 		//Write the bytes to the serial port

remdeskd/mod/remdeshid/hidcomm.go

@@ -7,7 +7,9 @@ package remdeshid
 	that can be sent over the USBKVM device
 
 */
-import "fmt"
+import (
+	"fmt"
+)
 
 // Append the keyboard event subtypes to the data
 func appendKeyboardEventSubtypes(data []byte, cmd HIDCommand) ([]byte, error) {
@@ -173,25 +175,25 @@ func appendMouseMoveEventSubtypes(data []byte, cmd HIDCommand) ([]byte, error) {
 }
 
 // Append the mouse scroll event subtypes to the data
-// The sensitivityDivider is used to divide the scroll value to make it less sensitive
 func appendMouseScrollEventSubtypes(data []byte, cmd HIDCommand) ([]byte, error) {
 	//The mouse scroll command PosY contains the scroll value
 	//The scroll command require a direction byte and a scroll value byte
 	scrollValue := cmd.PosY
+	var sensitivity byte = 0x02
 	if scrollValue < 0 {
 		//Scroll up
-		data = append(data, 0x00)
-		data = append(data, 0x01)
+		data = append(data, 0x00)        //Up
+		data = append(data, sensitivity) //Sensitive
 	} else {
 		//Scroll down
-		data = append(data, 0x01)
-		data = append(data, 0x01)
+		data = append(data, 0x01)        //Down
+		data = append(data, sensitivity) //Sensitive
 	}
 
 	return data, nil
 }
 
-//Entry function for converting a HIDCommand to bytes that can be sent over the USBKVM device
+// Entry function for converting a HIDCommand to bytes that can be sent over the USBKVM device
 func ConvHIDCommandToBytes(cmd HIDCommand) ([]byte, error) {
 	// Convert the HID command to bytes
 	var data []byte
@@ -211,6 +213,12 @@ func ConvHIDCommandToBytes(cmd HIDCommand) ([]byte, error) {
 		/* Mouse Scroll Event */
 		data = []byte{OPR_TYPE_MOUSE_SCROLL}
 		return appendMouseScrollEventSubtypes(data, cmd)
+	} else if cmd.EventType == FRONT_END_OPR_RESET {
+		/* Reset Event */
+		data = []byte{OPR_TYPE_DATA_RESET, //Reset the data queue
+			OPR_TYPE_KEYBOARD_WRITE, SUBTYPE_KEYBOARD_SPECIAL_RESET, 0x00, //Reset the keyboard press state
+			OPR_TYPE_MOUSE_WRITE, SUBTYPE_MOUSE_RESET, 0x00} //Reset the mouse press state
+		return data, nil
 	}
 
 	return nil, fmt.Errorf("invalid HID command type: %s", cmd.EventType)

remdeskd/mod/remdeshid/hidconv.go

@@ -109,6 +109,11 @@ const (
 	PAYLOAD_MOUSE_BTN_MID   = 0x03
 )
 
+// Control Code
+const (
+	FRONT_END_OPR_RESET = "reset" // Reset all the mouse and keyboard states
+)
+
 // Response Codes
 const (
 	RESP_OK                = 0x00

remdeskd/mod/remdeshid/remdeshid.go

@@ -20,12 +20,13 @@ type Config struct {
 
 // Controller is a struct that represents a HID controller
 type Controller struct {
-	Config        *Config
-	serialPort    *serial.Port
-	serialRunning bool
-	readStopChan  chan bool
-	writeStopChan chan bool
-	writeQueue    chan []byte
+	Config         *Config
+	serialPort     *serial.Port
+	serialRunning  bool
+	readStopChan   chan bool
+	writeStopChan  chan bool
+	writeQueue     chan []byte
+	lastScrollTime int64
 }
 
 func NewHIDController(config *Config) *Controller {
@@ -87,7 +88,7 @@ func (c *Controller) Connect() error {
 
 	//Create a loop to write to the serial port
 	c.writeStopChan = make(chan bool)
-	c.writeQueue = make(chan []byte, 10)
+	c.writeQueue = make(chan []byte, 1)
 	c.serialRunning = true
 	go func() {
 		for {

remdeskd/www/index.html

@@ -31,11 +31,24 @@
         document.getElementById('capture').addEventListener('click', function(event) {
             event.preventDefault();
             event.stopPropagation();
+
+            // Remove old listeners if they exist
+            document.removeEventListener('mousemove', handleMouseMove);
+            document.removeEventListener('mousedown', handleMouseDown);
+            document.removeEventListener('mouseup', handleMouseUp);
+            document.removeEventListener('wheel', handleScroll);
+
+            // Add new listeners
             document.body.requestPointerLock();
             document.addEventListener('mousemove', handleMouseMove);
             document.addEventListener('mousedown', handleMouseDown);
             document.addEventListener('mouseup', handleMouseUp);
             document.addEventListener('wheel', handleScroll);
+
+            if (socket) {
+                // Reset USBKVM state to avoid stuck keys
+                socket.send(JSON.stringify({ t: 'reset'}));
+            }
         });
 
         function handleMouseDown(event) {

usbkvm/usbkvm_fw/mouse_emu.ino

@@ -83,15 +83,14 @@ uint8_t mouse_move(uint8_t ux, uint8_t uy, uint8_t dx, uint8_t dy) {
 
 //Handle mouse move, direction accept 0x00 (down / right) or 0x01 (up / left)
 uint8_t mouse_wheel(uint8_t direction, uint8_t utilt) {
-  int8_t tilt;
   if (utilt >= 0x7E) {
-    tilt = 126;
-  }else{
-    tilt = (int8_t)utilt;
+    utilt = 0x7E;
   }
+
+  int8_t tilt = utilt;
   if (direction == 0x01) {
     //Down
-    tilt = tilt * -1;
+    tilt = -tilt;
   }
 #ifdef ENABLE_MOUSE_DEBUG
   Serial0_write(resp_start_of_info_msg);
@@ -99,15 +98,13 @@ uint8_t mouse_wheel(uint8_t direction, uint8_t utilt) {
   Serial0_write(resp_end_of_msg);
 #endif
   Mouse_scroll(tilt);
-  delay(MIN_KEY_EVENTS_DELAY);
-  Mouse_scroll(0);
+  Mouse_scroll(0);                                  
   return resp_ok;
 }
 
 uint8_t mouse_emulation(uint8_t subtype, uint8_t value) {
   switch (subtype) {
     case SUBTYPE_MOUSE_CLICK:
-      Mouse_move(0,0);
       if (value == PAYLOAD_MOUSE_BTN_LEFT) {
         Mouse_click(MOUSE_LEFT);
       } else if (value == PAYLOAD_MOUSE_BTN_RIGHT) {
@@ -119,7 +116,6 @@ uint8_t mouse_emulation(uint8_t subtype, uint8_t value) {
       }
       return resp_ok;
     case SUBTYPE_MOUSE_PRESS:
-      Mouse_move(0,0);
       if (value == PAYLOAD_MOUSE_BTN_LEFT) {
         Mouse_press(MOUSE_LEFT);
       } else if (value == PAYLOAD_MOUSE_BTN_RIGHT) {
@@ -156,12 +152,12 @@ uint8_t mouse_emulation(uint8_t subtype, uint8_t value) {
       } else {
         return resp_invalid_key_value;
       }
-      Mouse_move(0,0);
       return resp_ok;
     case SUBTYPE_MOUSE_RESET:
       Mouse_release(MOUSE_LEFT);
       Mouse_release(MOUSE_RIGHT);
       Mouse_release(MOUSE_MIDDLE);
+      Mouse_scroll(0);
       delay(MIN_KEY_EVENTS_DELAY);
       return resp_ok;
     default:

usbkvm/usbkvm_fw/src/remdesHid/USBHIDKeyboardMouse.c

@@ -18,7 +18,7 @@ volatile __xdata uint8_t UpPoint1_Busy =
     0; // Flag of whether upload pointer is busy
 
 __xdata uint8_t HIDKey[8] = {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0};
-__xdata uint8_t HIDMouse[4] = {0x0, 0x0, 0x0, 0x0};
+__xdata uint8_t HIDMouse[5] = {0x0, 0x0, 0x0, 0x0, 0x0};
 
 #define SHIFT 0x80
 __code uint8_t _asciimap[128] = {
@@ -155,6 +155,8 @@ __code uint8_t _asciimap[128] = {
 
 typedef void (*pTaskFn)(void);
 
+#define MIN_USB_REPORT_TIME 300 //microseconds
+
 void delayMicroseconds(uint16_t us);
 
 void USBInit() {
@@ -343,6 +345,10 @@ uint8_t Mouse_move(__data int8_t x, __xdata int8_t y) {
   HIDMouse[1] = x;
   HIDMouse[2] = y;
   USB_EP1_send(2);
+  //Prevent drifting when move follow by scroll
+  delayMicroseconds(MIN_USB_REPORT_TIME);
+  HIDMouse[1] = 0; 
+  HIDMouse[2] = 0;
   return 1;
 }
 

usbkvm/usbkvm_fw/usbkvm_fw.h

@@ -75,11 +75,11 @@
 #define PAYLOAD_NUMPAD_NUMLOCK 0x10
 
 /* Mouse Subtypes */
-#define SUBTYPE_MOUSE_CLICK 0x01    //Mouse button click
-#define SUBTYPE_MOUSE_PRESS 0x02    //Mouse button press
-#define SUBTYPE_MOUSE_RELEASE 0x03  //Mouse button release
-#define SUBTYPE_MOUSE_SETPOS 0x04   //Mouse presets position
-#define SUBTYPE_MOUSE_RESET 0x05    //Reset all mouse button states
+#define SUBTYPE_MOUSE_CLICK 0x01
+#define SUBTYPE_MOUSE_PRESS 0x02  
+#define SUBTYPE_MOUSE_RELEASE 0x03  
+#define SUBTYPE_MOUSE_SETPOS 0x04
+#define SUBTYPE_MOUSE_RESET 0x05
 
 /* Mouse Buttons IDs */
 #define PAYLOAD_MOUSE_BTN_LEFT 0x01

usbkvm/usbkvm_fw/usbkvm_fw.ino

@@ -8,7 +8,9 @@
   remdeskvmd via a USB 2.0 connection.
 
   Upload Settings
-  CH552G 24Mhz
+  CH552G  
+  24Mhz (Internal)
+  USB CODE /w 148B USB RAM
 */
 
 #ifndef USER_USB_RAM
@@ -51,7 +53,6 @@ uint8_t opr_payload = 0x00;
   that requires to move the cursor position
 */
 uint8_t cursor_direction_data[2] = { 0x00, 0x00 };
-
 uint8_t serial_data = 0x00;
 
 /* Function Prototypes */
@@ -95,8 +96,8 @@ void loop() {
     serial_data = 0x00;
     serial_data = Serial0_read();
 
+//Debug print the Serial input message
 #ifdef ENABLE_DEBUG_PRINT
-    //Debug print the Serial input message
     Serial0_write(resp_start_of_info_msg);
     Serial0_write(serial_data);
     Serial0_write(resp_end_of_msg);
@@ -122,13 +123,13 @@ void loop() {
     } else if (opr_type == OPR_TYPE_MOUSE_MOVE) {
       //Special case where mouse move requires 4 opcodes
       if (instr_count == 2) {
-        opr_payload = serial_data; //y-steps, reusing payload for lower memory consumption
+        opr_payload = serial_data;  //y-steps, reusing payload for lower memory consumption
         instr_count++;
       } else if (instr_count == 3) {
-        cursor_direction_data[0] = serial_data; //x-direction
+        cursor_direction_data[0] = serial_data;  //x-direction
         instr_count++;
       } else if (instr_count == 4) {
-        cursor_direction_data[1] = serial_data; //y-direction
+        cursor_direction_data[1] = serial_data;  //y-direction
         opr_type = OPR_TYPE_RESERVED;
         instr_count = 0;
         mouse_move(opr_subtype, opr_payload, cursor_direction_data[0], cursor_direction_data[1]);