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

add SW reset (#107)

Browse Source
This commit is contained in:
tomaszduda23 2022-09-12 11:53:52 +02:00 committed by GitHub
parent ce43938d28
commit 615863a848
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 106 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hid/lib/drivers-avr/factory.cpp
View File

@ -73,4 +73,11 @@ namespace DRIVERS {
}
}
Board* Factory::makeBoard(type _type) {
switch (_type) {
default:
return new Board(DRIVERS::DUMMY);
}
}
}

38
hid/lib/drivers-stm32/board-stm32.h Normal file
View File

@ -0,0 +1,38 @@
/*****************************************************************************
# #
# KVMD - The main PiKVM daemon. #
# #
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
# #
# 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 "board.h"
namespace DRIVERS {
class BoardStm32 : public Board {
public:
BoardStm32() : Board(BOARD){
}
void reset() override {
nvic_sys_reset();
}
};
}

11
hid/lib/drivers-stm32/factory.cpp
View File

@ -26,6 +26,7 @@
#include "usb/mouse-absolute-stm32.h"
#include "usb/mouse-relative-stm32.h"
#include "backup-register.h"
#include "board-stm32.h"
#ifndef __STM32F1__
# error "Only STM32F1 is supported"
@ -72,4 +73,14 @@ namespace DRIVERS {
return new Storage(DRIVERS::DUMMY);
}
}
Board* Factory::makeBoard(type _type) {
switch (_type) {
case BOARD:
return new BoardStm32();
default:
return new Board(DRIVERS::DUMMY);
}
}
}

32
hid/lib/drivers/board.h Normal file
View File

@ -0,0 +1,32 @@
/*****************************************************************************
# #
# KVMD - The main PiKVM daemon. #
# #
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
# #
# 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"
namespace DRIVERS {
struct Board : public Driver {
using Driver::Driver;
virtual void reset() {}
};
}

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

@ -34,6 +34,7 @@ namespace DRIVERS {
USB_KEYBOARD,
PS2_KEYBOARD,
NON_VOLATILE_STORAGE,
BOARD,
};
class Driver {

2
hid/lib/drivers/factory.h
View File

@ -24,6 +24,7 @@
#include "keyboard.h"
#include "mouse.h"
#include "storage.h"
#include "board.h"
namespace DRIVERS {
@ -31,5 +32,6 @@ namespace DRIVERS {
static Keyboard *makeKeyboard(type _type);
static Mouse *makeMouse(type _type);
static Storage* makeStorage(type _type);
static Board* makeBoard(type _type);
};
}

18
hid/src/main.cpp
View File

@ -41,27 +41,35 @@
#ifdef AUM
# include "aum.h"
#endif
#include "board.h"
#include "outputs.h"
static DRIVERS::Board* _board;
static Outputs _out;
#ifdef HID_DYNAMIC
static bool _reset_required = false;
static unsigned long _reset_timestamp;
#define RESET_TIMEOUT (500000)
#endif
// -----------------------------------------------------------------------------
static void _resetRequest() {
_reset_required = true;
_reset_timestamp = micros();
}
static void _cmdSetKeyboard(const uint8_t *data) { // 1 bytes
# ifdef HID_DYNAMIC
_out.writeOutputs(PROTO::OUTPUTS1::KEYBOARD::MASK, data[0], false);
_reset_required = true;
_resetRequest();
# endif
}
static void _cmdSetMouse(const uint8_t *data) { // 1 bytes
# ifdef HID_DYNAMIC
_out.writeOutputs(PROTO::OUTPUTS1::MOUSE::MASK, data[0], false);
_reset_required = true;
_resetRequest();
# endif
}
@ -150,6 +158,9 @@ static void _sendResponse(uint8_t code) {
# ifdef HID_DYNAMIC
if (_reset_required) {
response[1] |= PROTO::PONG::RESET_REQUIRED;
if (is_micros_timed_out(_reset_timestamp, RESET_TIMEOUT)) {
_board->reset();
}
}
response[2] = PROTO::OUTPUTS1::DYNAMIC;
# endif
@ -221,6 +232,7 @@ void setup() {
# elif defined(CMD_SPI)
spiBegin();
# endif
_board = DRIVERS::Factory::makeBoard(DRIVERS::BOARD);
}
void loop() {