From d409ae68c329fb436a49bf1aac51c203cbd93bda Mon Sep 17 00:00:00 2001 From: tomaszduda23 Date: Thu, 14 Jul 2022 09:51:16 +0900 Subject: prepare avr for stm32 (#104) --- hid/lib/drivers-avr/factory.cpp | 5 +++++ hid/lib/drivers-avr/spi.h | 32 -------------------------------- hid/lib/drivers/spi.h | 32 ++++++++++++++++++++++++++++++++ hid/lib/drivers/storage.h | 1 + hid/src/main.cpp | 2 ++ 5 files changed, 40 insertions(+), 32 deletions(-) delete mode 100644 hid/lib/drivers-avr/spi.h create mode 100644 hid/lib/drivers/spi.h (limited to 'hid') diff --git a/hid/lib/drivers-avr/factory.cpp b/hid/lib/drivers-avr/factory.cpp index 989f4e2b..ccd1612c 100644 --- a/hid/lib/drivers-avr/factory.cpp +++ b/hid/lib/drivers-avr/factory.cpp @@ -21,10 +21,15 @@ #include "usb/hid.h" +#ifdef HID_WITH_PS2 #include "ps2/hid.h" +#endif #include "factory.h" #include "eeprom.h" +#ifndef ARDUINO_ARCH_AVR + #error "Only AVR is supported" +#endif namespace DRIVERS { Keyboard *Factory::makeKeyboard(type _type) { diff --git a/hid/lib/drivers-avr/spi.h b/hid/lib/drivers-avr/spi.h deleted file mode 100644 index 6a8e9e8c..00000000 --- a/hid/lib/drivers-avr/spi.h +++ /dev/null @@ -1,32 +0,0 @@ -/***************************************************************************** -# # -# KVMD - The main PiKVM daemon. # -# # -# Copyright (C) 2018-2022 Maxim Devaev # -# # -# 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 . # -# # -*****************************************************************************/ - - -#pragma once - -#include -#include - - -void spiBegin(); -bool spiReady(); -const uint8_t *spiGet(); -void spiWrite(const uint8_t *data); diff --git a/hid/lib/drivers/spi.h b/hid/lib/drivers/spi.h new file mode 100644 index 00000000..6a8e9e8c --- /dev/null +++ b/hid/lib/drivers/spi.h @@ -0,0 +1,32 @@ +/***************************************************************************** +# # +# KVMD - The main PiKVM daemon. # +# # +# Copyright (C) 2018-2022 Maxim Devaev # +# # +# 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 . # +# # +*****************************************************************************/ + + +#pragma once + +#include +#include + + +void spiBegin(); +bool spiReady(); +const uint8_t *spiGet(); +void spiWrite(const uint8_t *data); diff --git a/hid/lib/drivers/storage.h b/hid/lib/drivers/storage.h index 4f04f3c1..6af582d8 100644 --- a/hid/lib/drivers/storage.h +++ b/hid/lib/drivers/storage.h @@ -23,6 +23,7 @@ #pragma once #include "driver.h" +#include "stdlib.h" namespace DRIVERS { diff --git a/hid/src/main.cpp b/hid/src/main.cpp index 6f84fbc2..83a8d7f7 100644 --- a/hid/src/main.cpp +++ b/hid/src/main.cpp @@ -135,7 +135,9 @@ static void _initOutputs() { break; } +#ifdef ARDUINO_ARCH_AVR USBDevice.attach(); +#endif _kbd->begin(); _mouse->begin(); -- cgit v1.2.3