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

refactoring

Browse Source
This commit is contained in:
Maxim Devaev 2022-07-09 23:00:13 +03:00
parent 38fae01cc0
commit ad6a387941
5 changed files with 38 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hid/lib/drivers/driver.h
View File

@ -19,12 +19,13 @@
# #
*****************************************************************************/
#pragma once
#include <stdint.h>
namespace DRIVERS {
namespace DRIVERS {
enum type {
DUMMY = 0,
USB_MOUSE_ABSOLUTE,

11
hid/lib/drivers/keyboard.h
View File

@ -19,20 +19,21 @@
# #
*****************************************************************************/
#pragma once
#include <stdint.h>
#include "driver.h"
namespace DRIVERS {
namespace DRIVERS {
typedef struct {
bool caps;
bool scroll;
bool num;
} KeyboardLedsState;
struct Keyboard : public Driver {
using Driver::Driver;
@ -55,10 +56,12 @@ namespace DRIVERS {
/**
* False if online or unknown. Otherwise true.
*/
virtual bool isOffline() { return false; }
virtual bool isOffline() {
return false;
}
virtual KeyboardLedsState getLeds() {
KeyboardLedsState result = {};
KeyboardLedsState result = {0};
return result;
}

4
hid/lib/drivers/mouse.h
View File

@ -19,13 +19,15 @@
# #
*****************************************************************************/
#pragma once
#include <stdint.h>
#include "driver.h"
namespace DRIVERS {
namespace DRIVERS {
class Mouse : public Driver {
using Driver::Driver;
};

27
hid/src/main.cpp
View File

@ -113,12 +113,18 @@ static void _initOutputs() {
uint8_t kbd = outputs & PROTO::OUTPUTS1::KEYBOARD::MASK;
switch (kbd) {
# ifdef HID_WITH_USB
case PROTO::OUTPUTS1::KEYBOARD::USB: _kbd = new UsbKeyboard(); break;
case PROTO::OUTPUTS1::KEYBOARD::USB:
_kbd = new UsbKeyboard();
break;
# endif
# ifdef HID_WITH_PS2
case PROTO::OUTPUTS1::KEYBOARD::PS2: _kbd = new Ps2Keyboard(); break;
case PROTO::OUTPUTS1::KEYBOARD::PS2:
_kbd = new Ps2Keyboard();
break;
# endif
default: _kbd = new DRIVERS::Keyboard(DRIVERS::DUMMY); break;
default:
_kbd = new DRIVERS::Keyboard(DRIVERS::DUMMY);
break;
}
uint8_t mouse = outputs & PROTO::OUTPUTS1::MOUSE::MASK;
@ -130,7 +136,9 @@ static void _initOutputs() {
case PROTO::OUTPUTS1::MOUSE::USB_WIN98:
_usb_mouse_abs = new UsbMouseAbsolute(DRIVERS::USB_MOUSE_ABSOLUTE_WIN98);
break;
case PROTO::OUTPUTS1::MOUSE::USB_REL: _usb_mouse_rel = new UsbMouseRelative(); break;
case PROTO::OUTPUTS1::MOUSE::USB_REL:
_usb_mouse_rel = new UsbMouseRelative();
break;
# endif
}
@ -146,7 +154,9 @@ static void _initOutputs() {
# endif
_usb_mouse_abs->begin();
break;
case PROTO::OUTPUTS1::MOUSE::USB_REL: _usb_mouse_rel->begin(); break;
case PROTO::OUTPUTS1::MOUSE::USB_REL:
_usb_mouse_rel->begin();
break;
# endif
}
}
@ -274,14 +284,13 @@ static void _sendResponse(uint8_t code) {
}
response[2] = PROTO::OUTPUTS1::DYNAMIC;
# endif
if (DRIVERS::DUMMY != _kbd->getType()) {
if (_kbd->getType() != DRIVERS::DUMMY) {
response[1] |= (_kbd->isOffline() ? PROTO::PONG::KEYBOARD_OFFLINE : 0);
KeyboardLedsState leds = _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);
switch (_kbd->getType())
{
switch (_kbd->getType()) {
case DRIVERS::USB_KEYBOARD:
response[2] |= PROTO::OUTPUTS1::KEYBOARD::USB;
break;
@ -291,7 +300,7 @@ static void _sendResponse(uint8_t code) {
}
}
if (_usb_mouse_abs) {
response[1] |= _usb_mouse_abs->isOffline() ? PROTO::PONG::MOUSE_OFFLINE : 0;
response[1] |= (_usb_mouse_abs->isOffline() ? PROTO::PONG::MOUSE_OFFLINE : 0);
if (_usb_mouse_abs->getType() == DRIVERS::USB_MOUSE_ABSOLUTE_WIN98) {
response[2] |= PROTO::OUTPUTS1::MOUSE::USB_WIN98;
} else {

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

@ -69,6 +69,7 @@ using namespace DRIVERS;
#endif
class UsbKeyboard : public DRIVERS::Keyboard {
public:
UsbKeyboard() : DRIVERS::Keyboard(DRIVERS::USB_KEYBOARD) {}