adds abstraction for connection (#111)

4 files changed, 96 insertions, 6 deletions

diff --git a/hid/lib/drivers/spi.h b/hid/lib/drivers/connection.h
index 6a8e9e8c..20560571 100644
--- a/hid/lib/drivers/spi.h
+++ b/hid/lib/drivers/connection.h
@@ -22,11 +22,32 @@
 
 #pragma once
 
-#include <Arduino.h>
-#include <SPI.h>
+#include "driver.h"
+#include "stdint.h"
 
+namespace DRIVERS {
+	typedef void(*DataHandler)(const uint8_t * data, size_t len);
+	typedef void(*TimeoutHandler)();
 
-void spiBegin();
-bool spiReady();
-const uint8_t *spiGet();
-void spiWrite(const uint8_t *data);
+	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