diff options
author | Maxim Devaev <[email protected]> | 2023-03-04 19:41:12 +0200 |
---|---|---|
committer | Maxim Devaev <[email protected]> | 2023-03-04 19:41:12 +0200 |
commit | 79e1b457b7fff18577745cfbb0b96d03c60281eb (patch) | |
tree | 8a43c3ef0b0585922ea886591c8428df3e76e877 /hid/lib | |
parent | 52ac8d93a18521f19dc45e9b4283417ed06f63d8 (diff) |
refactoring
Diffstat (limited to 'hid/lib')
-rw-r--r-- | hid/lib/drivers-avr/spi.cpp | 5 | ||||
-rw-r--r-- | hid/lib/drivers-avr/spi.h | 2 | ||||
-rw-r--r-- | hid/lib/drivers/connection.h | 5 | ||||
-rw-r--r-- | hid/lib/drivers/serial.h | 4 |
4 files changed, 12 insertions, 4 deletions
diff --git a/hid/lib/drivers-avr/spi.cpp b/hid/lib/drivers-avr/spi.cpp index ae54f545..d01c7070 100644 --- a/hid/lib/drivers-avr/spi.cpp +++ b/hid/lib/drivers-avr/spi.cpp @@ -21,8 +21,9 @@ #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; @@ -30,6 +31,7 @@ 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); @@ -77,4 +79,5 @@ ISR(SPI_STC_vect) { SPDR = 0; } } + #endif diff --git a/hid/lib/drivers-avr/spi.h b/hid/lib/drivers-avr/spi.h index 4fb43d89..aade0a26 100644 --- a/hid/lib/drivers-avr/spi.h +++ b/hid/lib/drivers-avr/spi.h @@ -23,8 +23,10 @@ #pragma once #include <Arduino.h> + #include "connection.h" + namespace DRIVERS { struct Spi : public Connection { Spi() : Connection(CONNECTION) {} diff --git a/hid/lib/drivers/connection.h b/hid/lib/drivers/connection.h index 20560571..39973a5a 100644 --- a/hid/lib/drivers/connection.h +++ b/hid/lib/drivers/connection.h @@ -25,9 +25,10 @@ #include "driver.h" #include "stdint.h" + namespace DRIVERS { - typedef void(*DataHandler)(const uint8_t * data, size_t len); - typedef void(*TimeoutHandler)(); + typedef void (*DataHandler)(const uint8_t *data, size_t size); + typedef void (*TimeoutHandler)(); struct Connection : public Driver { using Driver::Driver; diff --git a/hid/lib/drivers/serial.h b/hid/lib/drivers/serial.h index d88c8fb4..8eaadaff 100644 --- a/hid/lib/drivers/serial.h +++ b/hid/lib/drivers/serial.h @@ -21,12 +21,14 @@ #pragma once + #ifdef CMD_SERIAL #include "connection.h" + namespace DRIVERS { #ifdef Serial -#undef Serial +# undef Serial #endif struct Serial : public Connection { Serial() : Connection(CONNECTION) {} |