GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2025-12-15 10:40:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

PWAY plugin fix: Normalize pin/channel index to 0-based (#78)

Browse Source 
* PWAY plugin fix: Normalize pin/channel index to 1-based

* Normalize to 0-based instead
This commit is contained in:
Kenny Younger 2022-01-24 10:04:52 -06:00 committed by GitHub
parent 954ec769c6
commit a614be7d76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
kvmd/plugins/ugpio/pway.py
View File

@ -144,7 +144,7 @@ class Plugin(BaseUserGpioDriver): # pylint: disable=too-many-instance-attribute
# Switch and then recieve the state. # Switch and then recieve the state.
# FIXME: Get actual state without modifying the current. # FIXME: Get actual state without modifying the current.
# I'm lazy and like the idea of the KVM resetting to port 1 on reboot of the PiKVM. # I'm lazy and like the idea of the KVM resetting to port 1 on reboot of the PiKVM.
self.__send_channel(tty, 0) self.__reset(tty)
while not self.__stop_event.is_set(): while not self.__stop_event.is_set():
(channel, data) = self.__recv_channel(tty, data) (channel, data) = self.__recv_channel(tty, data)
@ -180,15 +180,17 @@ class Plugin(BaseUserGpioDriver): # pylint: disable=too-many-instance-attribute
def __send_channel(self, tty: serial.Serial, channel: int) -> None: def __send_channel(self, tty: serial.Serial, channel: int) -> None:
# Set a channel by sending PS [1-16] # Set a channel by sending PS [1-16]
# Note that the recv is 0-based index, while send is 1-based. We add 1 to the "channel" to
# normalize for the 1-based index on send
cmd = (b"PS") cmd = (b"PS")
if channel == 0: tty.write(b"%s %d\r" % (cmd, channel + 1))
# when it initializes this will push us to port 1 and set us back to defaults. tty.flush()
tty.write(b"%s\r" % (cmd))
tty.flush() def __reset(self, tty: serial.Serial) -> None:
else: # Reset by sending PS without port number
# Basically send `PS [1-15]` that switches the port cmd = (b"PS")
tty.write(b"%s %d\r" % (cmd, channel)) tty.write(b"%s\r" % (cmd))
tty.flush() tty.flush()
def __str__(self) -> str: def __str__(self) -> str:
return f"PWAY({self._instance_name})" return f"PWAY({self._instance_name})"