Fixed tilt issue

remdeskd/mod/remdeshid/hidcomm.go

@@ -174,27 +174,18 @@ 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, sensitivityDivider int) ([]byte, error) {
+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
 	if scrollValue < 0 {
 		//Scroll up
-		scrollValue = -scrollValue
-		if scrollValue > 0x7F {
-			scrollValue = 0x7E
-		}
-		scrollValue /= sensitivityDivider
 		data = append(data, 0x00)
-		data = append(data, byte(scrollValue))
+		data = append(data, 0x01)
 	} else {
-		//SCroll down
-		if scrollValue > 0x7F {
-			scrollValue = 0x7E
-		}
-		scrollValue /= sensitivityDivider
+		//Scroll down
+		data = append(data, 0x01)
 		data = append(data, 0x01)
-		data = append(data, byte(scrollValue))
 	}
 
 	return data, nil
@@ -219,7 +210,7 @@ func ConvHIDCommandToBytes(cmd HIDCommand) ([]byte, error) {
 	} else if cmd.EventType == FRONTEND_OPR_TYPE_MOUSE_SCROLL {
 		/* Mouse Scroll Event */
 		data = []byte{OPR_TYPE_MOUSE_SCROLL}
-		return appendMouseScrollEventSubtypes(data, cmd, 32)
+		return appendMouseScrollEventSubtypes(data, cmd)
 	}
 
 	return nil, fmt.Errorf("invalid HID command type: %s", cmd.EventType)

remdeskd/mod/remdeshid/remdeshid.go

@@ -3,7 +3,6 @@ package remdeshid
 import (
 	"fmt"
 	"log"
-	"time"
 
 	"github.com/tarm/serial"
 )
@@ -24,7 +23,9 @@ type Controller struct {
 	Config        *Config
 	serialPort    *serial.Port
 	serialRunning bool
-	stopChan      chan bool
+	readStopChan  chan bool
+	writeStopChan chan bool
+	writeQueue    chan []byte
 }
 
 func NewHIDController(config *Config) *Controller {
@@ -50,31 +51,58 @@ func (c *Controller) Connect() error {
 	}
 
 	c.serialPort = port
-
+	c.readStopChan = make(chan bool)
 	//Start reading from the serial port
 	go func() {
 		buf := make([]byte, 128)
 		for {
-			n, err := port.Read(buf)
-			if err != nil {
-				if c.Config.OnReadError != nil {
-					c.Config.OnReadError(err)
-				} else {
-					log.Println(err.Error())
-				}
+			select {
+			case <-c.readStopChan:
 				return
-			}
-			if n > 0 {
-				if c.Config.OnDataHandler != nil {
-					c.Config.OnDataHandler(buf[:n], nil)
-				} else {
-					fmt.Print("Received bytes: ")
-					for i := 0; i < n; i++ {
-						fmt.Printf("0x%02X ", buf[i])
+			default:
+				n, err := port.Read(buf)
+				if err != nil {
+					if c.Config.OnReadError != nil {
+						c.Config.OnReadError(err)
+					} else {
+						log.Println(err.Error())
+					}
+					return
+				}
+				if n > 0 {
+					if c.Config.OnDataHandler != nil {
+						c.Config.OnDataHandler(buf[:n], nil)
+					} else {
+						fmt.Print("Received bytes: ")
+						for i := 0; i < n; i++ {
+							fmt.Printf("0x%02X ", buf[i])
+						}
+						fmt.Println()
 					}
-					fmt.Println()
 				}
+			}
+		}
+	}()
 
+	//Create a loop to write to the serial port
+	c.writeStopChan = make(chan bool)
+	c.writeQueue = make(chan []byte, 10)
+	c.serialRunning = true
+	go func() {
+		for {
+			select {
+			case data := <-c.writeQueue:
+				_, err := port.Write(data)
+				if err != nil {
+					if c.Config.OnWriteError != nil {
+						c.Config.OnWriteError(err)
+					} else {
+						log.Println(err.Error())
+					}
+				}
+			case <-c.writeStopChan:
+				c.serialRunning = false
+				return
 			}
 		}
 	}()
@@ -100,20 +128,21 @@ func (c *Controller) Connect() error {
 }
 
 func (c *Controller) Send(data []byte) error {
-	n, err := c.serialPort.Write(data)
-	if err != nil {
-		return err
+	if !c.serialRunning {
+		return fmt.Errorf("serial port is not running")
 	}
-	if n != len(data) {
-		return fmt.Errorf("Failed to write all bytes to serial port")
-	}
-	time.Sleep(10 * time.Millisecond) //Minimum delay between writes
+	c.writeQueue <- data
 	return nil
 }
 
 func (c *Controller) Close() {
-	if c.stopChan != nil {
-		c.stopChan <- true
+	if c.readStopChan != nil {
+		c.readStopChan <- true
+	}
+
+	if c.writeStopChan != nil {
+		c.writeStopChan <- true
 	}
+
 	c.serialPort.Close()
 }

remdeskd/www/index.html

@@ -32,7 +32,7 @@
             document.addEventListener('mousemove', handleMouseMove);
             document.addEventListener('mousedown', handleMouseDown);
             document.addEventListener('mouseup', handleMouseUp);
-            //document.addEventListener('wheel', handleScroll);
+            document.addEventListener('wheel', handleScroll);
         });
 
         function handleMouseDown(event) {

usbkvm/usbkvm_fw/mouse_emu.ino

@@ -41,8 +41,8 @@ void move_cursor_to_pos(uint8_t x, uint8_t y) {
 }
 //Handle mouse move, x, y, and direction of x, y (positive: 0x00, negative 0x01)
 uint8_t mouse_move(uint8_t ux, uint8_t uy, uint8_t dx, uint8_t dy) {
-  if (ux > 0x7F) ux = 0x7F;
-  if (uy > 0x7F) uy = 0x7F;
+  if (ux > 0x7E) ux = 0x7E;
+  if (uy > 0x7E) uy = 0x7E;
 
   int8_t x = ux;
   int8_t y = uy;
@@ -78,6 +78,8 @@ 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);
   return resp_ok;
 }
 

usbkvm/usbkvm_fw/usb_switch.ino

@@ -0,0 +1,7 @@
+/*
+  USB Switch
+
+  This script handle commands that switch the USB mass storage device
+  to the host or slave side
+*/
+

usbkvm/usbkvm_fw/usbkvm_fw.ino

@@ -129,9 +129,12 @@ void loop() {
         instr_count++;
       } else if (instr_count == 4) {
         cursor_direction_data[1] = serial_data; //y-direction
-        mouse_move(opr_subtype, opr_payload, cursor_direction_data[0], cursor_direction_data[1]);
         opr_type = OPR_TYPE_RESERVED;
         instr_count = 0;
+        mouse_move(opr_subtype, opr_payload, cursor_direction_data[0], cursor_direction_data[1]);
+        cursor_direction_data[0] = 0x00;
+        cursor_direction_data[1] = 0x00;
+        opr_subtype = 0x00;
       }
       Serial0_write(resp_ok);
     } else {