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

refactoring

Browse Source
This commit is contained in:
Maxim Devaev 2023-03-04 20:02:28 +02:00
parent 79e1b457b7
commit 50b6237e98
4 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,7 +64,7 @@ namespace DRIVERS {
} }
} }
Storage* Factory::makeStorage(type _type) { Storage *Factory::makeStorage(type _type) {
switch (_type) { switch (_type) {
# ifdef HID_DYNAMIC # ifdef HID_DYNAMIC
case NON_VOLATILE_STORAGE: case NON_VOLATILE_STORAGE:
@ -75,14 +75,14 @@ namespace DRIVERS {
} }
} }
Board* Factory::makeBoard(type _type) { Board *Factory::makeBoard(type _type) {
switch (_type) { switch (_type) {
default: default:
return new Board(DRIVERS::DUMMY); return new Board(DRIVERS::DUMMY);
} }
} }
Connection* Factory::makeConnection(type _type) { Connection *Factory::makeConnection(type _type) {
# ifdef CMD_SERIAL # ifdef CMD_SERIAL
return new Serial(); return new Serial();
# elif defined(CMD_SPI) # elif defined(CMD_SPI)

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

@ -64,7 +64,7 @@ namespace DRIVERS {
} }
} }
Storage* Factory::makeStorage(type _type) { Storage *Factory::makeStorage(type _type) {
switch (_type) { switch (_type) {
# ifdef HID_DYNAMIC # ifdef HID_DYNAMIC
case NON_VOLATILE_STORAGE: case NON_VOLATILE_STORAGE:
@ -75,7 +75,7 @@ namespace DRIVERS {
} }
} }
Board* Factory::makeBoard(type _type) { Board *Factory::makeBoard(type _type) {
switch (_type) { switch (_type) {
case BOARD: case BOARD:
return new BoardStm32(); return new BoardStm32();
@ -84,7 +84,7 @@ namespace DRIVERS {
} }
} }
Connection* Factory::makeConnection(type _type) { Connection *Factory::makeConnection(type _type) {
# ifdef CMD_SERIAL # ifdef CMD_SERIAL
return new Serial(); return new Serial();
# else # else

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

@ -32,8 +32,8 @@ namespace DRIVERS {
struct Factory { struct Factory {
static Keyboard *makeKeyboard(type _type); static Keyboard *makeKeyboard(type _type);
static Mouse *makeMouse(type _type); static Mouse *makeMouse(type _type);
static Storage* makeStorage(type _type); static Storage *makeStorage(type _type);
static Board* makeBoard(type _type); static Board *makeBoard(type _type);
static Connection* makeConnection(type _type); static Connection *makeConnection(type _type);
}; };
} }

12
hid/src/main.cpp
View File

@ -24,19 +24,21 @@
#include "tools.h" #include "tools.h"
#include "proto.h" #include "proto.h"
#include "board.h"
#include "outputs.h"
#ifdef AUM #ifdef AUM
# include "aum.h" # include "aum.h"
#endif #endif
#include "board.h"
#include "outputs.h"
static DRIVERS::Connection* _conn;
static DRIVERS::Board* _board; static DRIVERS::Connection *_conn;
static DRIVERS::Board *_board;
static Outputs _out; static Outputs _out;
#ifdef HID_DYNAMIC #ifdef HID_DYNAMIC
# define RESET_TIMEOUT 500000
static bool _reset_required = false; static bool _reset_required = false;
static unsigned long _reset_timestamp; static unsigned long _reset_timestamp;
# define RESET_TIMEOUT 500000
#endif #endif