summaryrefslogtreecommitdiff
path: root/hid/lib
diff options
context:
space:
mode:
Diffstat (limited to 'hid/lib')
-rw-r--r--hid/lib/drivers-avr/factory.cpp16
-rw-r--r--hid/lib/drivers-avr/spi.cpp36
-rw-r--r--hid/lib/drivers-avr/spi.h (renamed from hid/lib/drivers/spi.h)16
-rw-r--r--hid/lib/drivers-stm32/factory.cpp9
-rw-r--r--hid/lib/drivers/connection.h53
-rw-r--r--hid/lib/drivers/driver.h1
-rw-r--r--hid/lib/drivers/factory.h2
-rw-r--r--hid/lib/drivers/serial.h66
8 files changed, 174 insertions, 25 deletions
diff --git a/hid/lib/drivers-avr/factory.cpp b/hid/lib/drivers-avr/factory.cpp
index b4c18273..3fc02582 100644
--- a/hid/lib/drivers-avr/factory.cpp
+++ b/hid/lib/drivers-avr/factory.cpp
@@ -24,6 +24,8 @@
#include "ps2/hid.h"
#include "factory.h"
#include "eeprom.h"
+#include "serial.h"
+#include "spi.h"
#ifndef ARDUINO_ARCH_AVR
# error "Only AVR is supported"
@@ -70,13 +72,23 @@ namespace DRIVERS {
# endif
default:
return new Storage(DRIVERS::DUMMY);
- }
+ }
}
Board* Factory::makeBoard(type _type) {
switch (_type) {
default:
return new Board(DRIVERS::DUMMY);
- }
+ }
+ }
+
+ Connection* Factory::makeConnection(type _type) {
+# ifdef CMD_SERIAL
+ return new Serial();
+# elif defined(CMD_SPI)
+ return new Spi();
+# else
+# error CMD phy is not defined
+# endif
}
}
diff --git a/hid/lib/drivers-avr/spi.cpp b/hid/lib/drivers-avr/spi.cpp
index 66061692..ae54f545 100644
--- a/hid/lib/drivers-avr/spi.cpp
+++ b/hid/lib/drivers-avr/spi.cpp
@@ -21,7 +21,8 @@
#include "spi.h"
-
+#ifdef CMD_SPI
+#include <SPI.h>
static volatile uint8_t _spi_in[8] = {0};
static volatile uint8_t _spi_in_index = 0;
@@ -29,28 +30,26 @@ static volatile uint8_t _spi_in_index = 0;
static volatile uint8_t _spi_out[8] = {0};
static volatile uint8_t _spi_out_index = 0;
+namespace DRIVERS {
+ void Spi::begin() {
+ pinMode(MISO, OUTPUT);
+ SPCR = (1 << SPE) | (1 << SPIE); // Slave, SPI En, IRQ En
+ }
-void spiBegin() {
- pinMode(MISO, OUTPUT);
- SPCR = (1 << SPE) | (1 << SPIE); // Slave, SPI En, IRQ En
-}
-
-bool spiReady() {
- return (!_spi_out[0] && _spi_in_index == 8);
-}
-
-const uint8_t *spiGet() {
- return (const uint8_t *)_spi_in;
-}
+ void Spi::periodic() {
+ if (!_spi_out[0] && _spi_in_index == 8) {
+ _data_cb((const uint8_t *)_spi_in, 8);
+ }
+ }
-void spiWrite(const uint8_t *data) {
- // Меджик в нулевом байте разрешает начать ответ
- for (int index = 7; index >= 0; --index) {
- _spi_out[index] = data[index];
+ void Spi::write(const uint8_t *data, size_t size) {
+ // Меджик в нулевом байте разрешает начать ответ
+ for (int index = 7; index >= 0; --index) {
+ _spi_out[index] = data[index];
+ }
}
}
-
ISR(SPI_STC_vect) {
uint8_t in = SPDR;
if (_spi_out[0] && _spi_out_index < 8) {
@@ -78,3 +77,4 @@ ISR(SPI_STC_vect) {
SPDR = 0;
}
}
+#endif
diff --git a/hid/lib/drivers/spi.h b/hid/lib/drivers-avr/spi.h
index 6a8e9e8c..4fb43d89 100644
--- a/hid/lib/drivers/spi.h
+++ b/hid/lib/drivers-avr/spi.h
@@ -23,10 +23,16 @@
#pragma once
#include <Arduino.h>
-#include <SPI.h>
+#include "connection.h"
+namespace DRIVERS {
+ struct Spi : public Connection {
+ Spi() : Connection(CONNECTION) {}
-void spiBegin();
-bool spiReady();
-const uint8_t *spiGet();
-void spiWrite(const uint8_t *data);
+ void begin() override;
+
+ void periodic() override;
+
+ void write(const uint8_t *data, size_t size) override;
+ };
+}
diff --git a/hid/lib/drivers-stm32/factory.cpp b/hid/lib/drivers-stm32/factory.cpp
index 60145a4d..010eb507 100644
--- a/hid/lib/drivers-stm32/factory.cpp
+++ b/hid/lib/drivers-stm32/factory.cpp
@@ -27,6 +27,7 @@
#include "usb/mouse-relative-stm32.h"
#include "backup-register.h"
#include "board-stm32.h"
+#include "serial.h"
#ifndef __STM32F1__
# error "Only STM32F1 is supported"
@@ -82,4 +83,12 @@ namespace DRIVERS {
return new Board(DRIVERS::DUMMY);
}
}
+
+ Connection* Factory::makeConnection(type _type) {
+# ifdef CMD_SERIAL
+ return new Serial();
+# else
+# error CMD phy is not defined
+# endif
+ }
}
diff --git a/hid/lib/drivers/connection.h b/hid/lib/drivers/connection.h
new file mode 100644
index 00000000..20560571
--- /dev/null
+++ b/hid/lib/drivers/connection.h
@@ -0,0 +1,53 @@
+/*****************************************************************************
+# #
+# KVMD - The main PiKVM daemon. #
+# #
+# Copyright (C) 2018-2022 Maxim Devaev <[email protected]> #
+# #
+# 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
+
+#include "driver.h"
+#include "stdint.h"
+
+namespace DRIVERS {
+ typedef void(*DataHandler)(const uint8_t * data, size_t len);
+ typedef void(*TimeoutHandler)();
+
+ struct Connection : public Driver {
+ using Driver::Driver;
+
+ virtual void begin() {}
+
+ virtual void periodic() {}
+
+ void onTimeout(TimeoutHandler cb) {
+ _timeout_cb = cb;
+ }
+
+ void onData(DataHandler cb) {
+ _data_cb = cb;
+ }
+
+ virtual void write(const uint8_t *data, size_t size) = 0;
+
+ protected:
+ TimeoutHandler _timeout_cb = nullptr;
+ DataHandler _data_cb = nullptr;
+ };
+}
diff --git a/hid/lib/drivers/driver.h b/hid/lib/drivers/driver.h
index 8890c5ec..811a15b4 100644
--- a/hid/lib/drivers/driver.h
+++ b/hid/lib/drivers/driver.h
@@ -35,6 +35,7 @@ namespace DRIVERS {
PS2_KEYBOARD,
NON_VOLATILE_STORAGE,
BOARD,
+ CONNECTION,
};
class Driver {
diff --git a/hid/lib/drivers/factory.h b/hid/lib/drivers/factory.h
index b82c4e14..8dcfd571 100644
--- a/hid/lib/drivers/factory.h
+++ b/hid/lib/drivers/factory.h
@@ -25,6 +25,7 @@
#include "mouse.h"
#include "storage.h"
#include "board.h"
+#include "connection.h"
namespace DRIVERS {
@@ -33,5 +34,6 @@ namespace DRIVERS {
static Mouse *makeMouse(type _type);
static Storage* makeStorage(type _type);
static Board* makeBoard(type _type);
+ static Connection* makeConnection(type _type);
};
}
diff --git a/hid/lib/drivers/serial.h b/hid/lib/drivers/serial.h
new file mode 100644
index 00000000..d88c8fb4
--- /dev/null
+++ b/hid/lib/drivers/serial.h
@@ -0,0 +1,66 @@
+/*****************************************************************************
+# #
+# KVMD - The main PiKVM daemon. #
+# #
+# Copyright (C) 2018-2022 Maxim Devaev <[email protected]> #
+# #
+# 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
+#ifdef CMD_SERIAL
+#include "connection.h"
+
+namespace DRIVERS {
+#ifdef Serial
+#undef Serial
+#endif
+ struct Serial : public Connection {
+ Serial() : Connection(CONNECTION) {}
+
+ void begin() override {
+ CMD_SERIAL.begin(CMD_SERIAL_SPEED);
+ }
+
+ void periodic() override {
+ if (CMD_SERIAL.available() > 0) {
+ _buffer[_index] = (uint8_t)CMD_SERIAL.read();
+ if (_index == 7) {
+ _data_cb(_buffer, 8);
+ _index = 0;
+ } else {
+ _last = micros();
+ ++_index;
+ }
+ } else if (_index > 0) {
+ if (is_micros_timed_out(_last, CMD_SERIAL_TIMEOUT)) {
+ _timeout_cb();
+ _index = 0;
+ }
+ }
+ }
+
+ void write(const uint8_t *data, size_t size) override {
+ CMD_SERIAL.write(data, size);
+ }
+
+ private:
+ unsigned long _last = 0;
+ uint8_t _index = 0;
+ uint8_t _buffer[8];
+ };
+}
+#endif
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-24 08:54:08 +0000