Merge branch 'pikvm:master' into master

semool · Dec 8, 2024 · b3a29a2 · b3a29a2
2 parents f15cd80 + 8cca5a8
commit b3a29a2
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 11 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,7 +1,7 @@
 [bumpversion]
 commit = True
 tag = True
-current_version = 4.23
+current_version = 4.24
 parse = (?P<major>\d+)\.(?P<minor>\d+)(\.(?P<patch>\d+)(\-(?P<release>[a-z]+))?)?
 serialize = 
 	{major}.{minor}

diff --git a/PKGBUILD b/PKGBUILD
@@ -39,7 +39,7 @@ for _variant in "${_variants[@]}"; do
 	pkgname+=(kvmd-platform-$_platform-$_board)
 done
 pkgbase=kvmd
-pkgver=4.23
+pkgver=4.24
 pkgrel=1
 pkgdesc="The main PiKVM daemon"
 url="https://github.com/pikvm/kvmd"

diff --git a/configs/os/udev/common.rules b/configs/os/udev/common.rules
@@ -1,3 +1,4 @@
 # Here are described some bindings for PiKVM devices.
 # Do not edit this file.
 KERNEL=="ttyACM[0-9]*", SUBSYSTEM=="tty", SUBSYSTEMS=="usb", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="eda3", SYMLINK+="kvmd-hid-bridge"
+KERNEL=="ttyACM[0-9]*", SUBSYSTEM=="tty", SUBSYSTEMS=="usb", ATTRS{idVendor}=="2e8a", ATTRS{idProduct}=="1080", SYMLINK+="kvmd-switch"
diff --git a/hid/pico/Makefile b/hid/pico/Makefile
@@ -31,7 +31,7 @@ endef
 .tinyusb:
 	$(call libdep,tinyusb,hathach/tinyusb,d713571cd44f05d2fc72efc09c670787b74106e0)
 .ps2x2pico:
-	$(call libdep,ps2x2pico,No0ne/ps2x2pico,404aaf02949d5bee8013e3b5d0b3239abf6e13bd)
+	$(call libdep,ps2x2pico,No0ne/ps2x2pico,26ce89d597e598bb0ac636622e064202d91a9efc)
 deps: .pico-sdk .tinyusb .ps2x2pico
 
 

diff --git a/hid/pico/src/CMakeLists.txt b/hid/pico/src/CMakeLists.txt
@@ -19,7 +19,7 @@ target_sources(${target_name} PRIVATE
 	${PS2_PATH}/ps2in.c
 	${PS2_PATH}/ps2kb.c
 	${PS2_PATH}/ps2ms.c
-	${PS2_PATH}/scancodesets.c
+	${PS2_PATH}/scancodes.c
 )
 target_link_options(${target_name} PRIVATE -Xlinker --print-memory-usage)
 target_compile_options(${target_name} PRIVATE -Wall -Wextra)

diff --git a/kvmd/__init__.py b/kvmd/__init__.py
@@ -20,4 +20,4 @@
 # ========================================================================== #
 
 
-__version__ = "4.23"
+__version__ = "4.24"
diff --git a/kvmd/apps/kvmd/snapshoter.py b/kvmd/apps/kvmd/snapshoter.py
@@ -123,10 +123,10 @@ async def __wakeup(self) -> None:
 
         if self.__wakeup_key:
             logger.info("Waking up using key %r ...", self.__wakeup_key)
-            self.__hid.send_key_events([
-                (self.__wakeup_key, True),
-                (self.__wakeup_key, False),
-            ])
+            self.__hid.send_key_events(
+                keys=[(self.__wakeup_key, True), (self.__wakeup_key, False)],
+                no_ignore_keys=True,
+            )
 
         if self.__wakeup_move:
             logger.info("Waking up using mouse move for %d units ...", self.__wakeup_move)

diff --git a/setup.py b/setup.py
@@ -56,7 +56,7 @@ def main() -> None:
 
     setup(
         name="kvmd",
-        version="4.23",
+        version="4.24",
         url="https://github.com/pikvm/kvmd",
         license="GPLv3",
         author="Maxim Devaev",

diff --git a/web/share/js/kvm/ocr.js b/web/share/js/kvm/ocr.js
@@ -184,7 +184,7 @@ export function Ocr(__getGeometry) {
 			"ocr_left": __sel.left,
 			"ocr_top": __sel.top,
 			"ocr_right": __sel.right,
-			"orc_bottom": __sel.bottom,
+			"ocr_bottom": __sel.bottom,
 		};
 		tools.httpGet("/api/streamer/snapshot", params, function(http) {
 			if (http.status === 200) {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,4 +20,4 @@
		# ========================================================================== #


		__version__ = "4.23"
		__version__ = "4.24"