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

Change name to simplify interface getLedsAs->getLeds. (#93)

Browse Source
This commit is contained in:
tomaszduda23 2022-07-08 21:58:14 +02:00 committed by GitHub
parent b4c1cc9976
commit e864aafcf7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 49 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
hid/lib/drivers/keyboard.h Normal file
View File

@ -0,0 +1,29 @@
/*****************************************************************************
# #
# KVMD - The main PiKVM daemon. #
# #
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation, either version 3 of the License, or #
# (at your option) any later version. #
# #
# This program is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with this program. If not, see <https://www.gnu.org/licenses/>. #
# #
*****************************************************************************/
#pragma once
typedef struct
{
bool caps;
bool scroll;
bool num;
} KeyboardLedsState;

10
hid/src/main.cpp
View File

@ -285,11 +285,17 @@ static void _sendResponse(uint8_t code) {
# endif # endif
if (_usb_kbd) { if (_usb_kbd) {
response[1] |= _usb_kbd->isOffline() ? PROTO::PONG::KEYBOARD_OFFLINE : 0; response[1] |= _usb_kbd->isOffline() ? PROTO::PONG::KEYBOARD_OFFLINE : 0;
response[1] |= _usb_kbd->getLedsAs(PROTO::PONG::CAPS, PROTO::PONG::SCROLL, PROTO::PONG::NUM); KeyboardLedsState leds = _usb_kbd->getLeds();
response[1] |= leds.caps ? PROTO::PONG::CAPS : 0;
response[1] |= leds.num ? PROTO::PONG::NUM : 0;
response[1] |= leds.scroll ? PROTO::PONG::SCROLL : 0;
response[2] |= PROTO::OUTPUTS1::KEYBOARD::USB; response[2] |= PROTO::OUTPUTS1::KEYBOARD::USB;
} else if (_ps2_kbd) { } else if (_ps2_kbd) {
response[1] |= _ps2_kbd->isOffline() ? PROTO::PONG::KEYBOARD_OFFLINE : 0; response[1] |= _ps2_kbd->isOffline() ? PROTO::PONG::KEYBOARD_OFFLINE : 0;
response[1] |= _ps2_kbd->getLedsAs(PROTO::PONG::CAPS, PROTO::PONG::SCROLL, PROTO::PONG::NUM); KeyboardLedsState leds = _usb_kbd->getLeds();
response[1] |= leds.caps ? PROTO::PONG::CAPS : 0;
response[1] |= leds.num ? PROTO::PONG::NUM : 0;
response[1] |= leds.scroll ? PROTO::PONG::SCROLL : 0;
response[2] |= PROTO::OUTPUTS1::KEYBOARD::PS2; response[2] |= PROTO::OUTPUTS1::KEYBOARD::PS2;
} }
if (_usb_mouse_abs) { if (_usb_mouse_abs) {

11
hid/src/ps2/hid.h
View File

@ -25,6 +25,7 @@
#include <Arduino.h> #include <Arduino.h>
#include <ps2dev.h> #include <ps2dev.h>
#include "keyboard.h"
#include "keymap.h" #include "keymap.h"
// #define HID_PS2_KBD_CLOCK_PIN 7 // #define HID_PS2_KBD_CLOCK_PIN 7
@ -78,13 +79,13 @@ class Ps2Keyboard {
return false; return false;
} }
uint8_t getLedsAs(uint8_t caps, uint8_t scroll, uint8_t num) { KeyboardLedsState getLeds() {
uint8_t result = 0; KeyboardLedsState result;
periodic(); periodic();
if (_leds & 0b00000100) result |= caps; result.caps = _leds & 0b00000100;
if (_leds & 0b00000001) result |= scroll; result.scroll = _leds & 0b00000001;
if (_leds & 0b00000010) result |= num; result.num = _leds & 0b00000010;
return result; return result;
} }

11
hid/src/usb/hid.h
View File

@ -25,6 +25,7 @@
#include <Arduino.h> #include <Arduino.h>
#include <HID-Project.h> #include <HID-Project.h>
#include "keyboard.h"
#include "../tools.h" #include "../tools.h"
#ifdef AUM #ifdef AUM
# include "../aum.h" # include "../aum.h"
@ -104,12 +105,12 @@ class UsbKeyboard {
CLS_IS_OFFLINE(_kbd) CLS_IS_OFFLINE(_kbd)
uint8_t getLedsAs(uint8_t caps, uint8_t scroll, uint8_t num) { KeyboardLedsState getLeds() {
uint8_t leds = _kbd.getLeds(); uint8_t leds = _kbd.getLeds();
uint8_t result = 0; KeyboardLedsState result;
if (leds & LED_CAPS_LOCK) result |= caps; result.caps = leds & LED_CAPS_LOCK;
if (leds & LED_SCROLL_LOCK) result |= scroll; result.scroll = leds & LED_SCROLL_LOCK;
if (leds & LED_NUM_LOCK) result |= num; result.num = leds & LED_NUM_LOCK;
return result; return result;
} }