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

refactoring

Browse Source
This commit is contained in:
Maxim Devaev 2023-03-04 19:41:12 +02:00
parent 52ac8d93a1
commit 79e1b457b7
6 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hid/lib/drivers-avr/spi.cpp
View File

@ -21,8 +21,9 @@
#include "spi.h" #include "spi.h"
#ifdef CMD_SPI #ifdef CMD_SPI
#include <SPI.h>
static volatile uint8_t _spi_in[8] = {0}; static volatile uint8_t _spi_in[8] = {0};
static volatile uint8_t _spi_in_index = 0; static volatile uint8_t _spi_in_index = 0;
@ -30,6 +31,7 @@ static volatile uint8_t _spi_in_index = 0;
static volatile uint8_t _spi_out[8] = {0}; static volatile uint8_t _spi_out[8] = {0};
static volatile uint8_t _spi_out_index = 0; static volatile uint8_t _spi_out_index = 0;
namespace DRIVERS { namespace DRIVERS {
void Spi::begin() { void Spi::begin() {
pinMode(MISO, OUTPUT); pinMode(MISO, OUTPUT);
@ -77,4 +79,5 @@ ISR(SPI_STC_vect) {
SPDR = 0; SPDR = 0;
} }
} }
#endif #endif

2
hid/lib/drivers-avr/spi.h
View File

@ -23,8 +23,10 @@
#pragma once #pragma once
#include <Arduino.h> #include <Arduino.h>
#include "connection.h" #include "connection.h"
namespace DRIVERS { namespace DRIVERS {
struct Spi : public Connection { struct Spi : public Connection {
Spi() : Connection(CONNECTION) {} Spi() : Connection(CONNECTION) {}

5
hid/lib/drivers/connection.h
View File

@ -25,9 +25,10 @@
#include "driver.h" #include "driver.h"
#include "stdint.h" #include "stdint.h"
namespace DRIVERS { namespace DRIVERS {
typedef void(*DataHandler)(const uint8_t * data, size_t len); typedef void (*DataHandler)(const uint8_t *data, size_t size);
typedef void(*TimeoutHandler)(); typedef void (*TimeoutHandler)();
struct Connection : public Driver { struct Connection : public Driver {
using Driver::Driver; using Driver::Driver;

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

@ -21,12 +21,14 @@
#pragma once #pragma once
#ifdef CMD_SERIAL #ifdef CMD_SERIAL
#include "connection.h" #include "connection.h"
namespace DRIVERS { namespace DRIVERS {
#ifdef Serial #ifdef Serial
#undef Serial # undef Serial
#endif #endif
struct Serial : public Connection { struct Serial : public Connection {
Serial() : Connection(CONNECTION) {} Serial() : Connection(CONNECTION) {}

1
hid/platformio-avr.ini
View File

@ -11,7 +11,6 @@ lib_deps =
git+https://github.com/Harvie/ps2dev#v0.0.3 git+https://github.com/Harvie/ps2dev#v0.0.3
digitalWriteFast@1.0.0 digitalWriteFast@1.0.0
HID@1.0 HID@1.0
SPI
drivers-avr drivers-avr
extra_scripts = extra_scripts =
pre:avrdude.py pre:avrdude.py

4
hid/src/main.cpp
View File

@ -115,7 +115,7 @@ static uint8_t _handleRequest(const uint8_t *data) { // 8 bytes
if (data[0] == PROTO::MAGIC && PROTO::crc16(data, 6) == PROTO::merge8(data[6], data[7])) { if (data[0] == PROTO::MAGIC && PROTO::crc16(data, 6) == PROTO::merge8(data[6], data[7])) {
# define HANDLE(_handler) { _handler(data + 2); return PROTO::PONG::OK; } # define HANDLE(_handler) { _handler(data + 2); return PROTO::PONG::OK; }
switch (data[1]) { switch (data[1]) {
case PROTO::CMD::PING: return PROTO::PONG::OK; case PROTO::CMD::PING: return PROTO::PONG::OK;
case PROTO::CMD::SET_KEYBOARD: HANDLE(_cmdSetKeyboard); case PROTO::CMD::SET_KEYBOARD: HANDLE(_cmdSetKeyboard);
case PROTO::CMD::SET_MOUSE: HANDLE(_cmdSetMouse); case PROTO::CMD::SET_MOUSE: HANDLE(_cmdSetMouse);
case PROTO::CMD::SET_CONNECTED: HANDLE(_cmdSetConnected); case PROTO::CMD::SET_CONNECTED: HANDLE(_cmdSetConnected);
@ -220,7 +220,7 @@ static void _onTimeout() {
_sendResponse(PROTO::RESP::TIMEOUT_ERROR); _sendResponse(PROTO::RESP::TIMEOUT_ERROR);
} }
static void _onData(const uint8_t * data, size_t len) { static void _onData(const uint8_t *data, size_t size) {
_sendResponse(_handleRequest(data)); _sendResponse(_handleRequest(data));
} }