diff options
-rw-r--r-- | lib/anyio.c (renamed from usb-i2c-sl018/usb_serial.c) | 11 | ||||
-rw-r--r-- | lib/anyio.h (renamed from usb-i2c-sl018/usb_serial.h) | 13 | ||||
-rw-r--r-- | usb-i2c-sl018/Makefile | 4 | ||||
-rw-r--r-- | usb-i2c-sl018/keystore.c | 7 | ||||
-rw-r--r-- | usb-i2c-sl018/tuer-rfid.c | 8 |
5 files changed, 24 insertions, 19 deletions
diff --git a/usb-i2c-sl018/usb_serial.c b/lib/anyio.c index f08d9b3..38acb2c 100644 --- a/usb-i2c-sl018/usb_serial.c +++ b/lib/anyio.c @@ -23,7 +23,8 @@ #include <stdio.h> -#include "usb_serial.h" +#include "anyio.h" + #include <LUFA/Drivers/USB/USB.h> #include "lufa-descriptor-usbserial.h" #include "LUFA/Drivers/Peripheral/Serial.h" @@ -70,22 +71,22 @@ void EVENT_USB_Device_ControlRequest(void) FILE usb_stream; FILE serial_stream; -void usb_serial_init() +void anyio_init(const uint32_t baudrate, const uint8_t doublespeed) { - Serial_Init(115200,false); + Serial_Init(baudrate, doublespeed); Serial_CreateStream(&serial_stream); USB_Init(); CDC_Device_CreateStream(&VirtualSerial_CDC_Interface,&usb_stream); } -void usb_serial_task(void) +void anyio_task(void) { CDC_Device_USBTask(&VirtualSerial_CDC_Interface); USB_USBTask(); } -int16_t usb_serial_bytes_received(void) +int16_t anyio_bytes_received(void) { if(stdin == &usb_stream) return CDC_Device_BytesReceived(&VirtualSerial_CDC_Interface); diff --git a/usb-i2c-sl018/usb_serial.h b/lib/anyio.h index 31ac95e..64ac6c8 100644 --- a/usb-i2c-sl018/usb_serial.h +++ b/lib/anyio.h @@ -21,10 +21,13 @@ * along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef R3TUER_usb_serial_h_INCLUDED -#define R3TUER_usb_serial_h_INCLUDED +#ifndef SPREADSPACE_anyio_h_INCLUDED +#define SPREADSPACE_anyio_h_INCLUDED + +#include <stdint.h> + +void anyio_init(const uint32_t baudrate, const uint8_t doublespeed); +void anyio_task(void); +int16_t anyio_bytes_received(void); -void usb_serial_init(void); -void usb_serial_task(void); -int16_t usb_serial_bytes_received(void); #endif diff --git a/usb-i2c-sl018/Makefile b/usb-i2c-sl018/Makefile index a547d69..7b43a85 100644 --- a/usb-i2c-sl018/Makefile +++ b/usb-i2c-sl018/Makefile @@ -23,8 +23,8 @@ NAME := tuer-rfid BOARD_TYPE := teensy2 -OBJ := $(NAME).o heartbeat.o stepper.o ledmatrix.o sl018.o keystore.o usb_serial.o statemachine.o -LIBS := util led lufa-descriptor-usbserial +OBJ := $(NAME).o heartbeat.o stepper.o ledmatrix.o sl018.o keystore.o statemachine.o +LIBS := util led lufa-descriptor-usbserial anyio EXTERNAL_LIBS := lufa LUFA_PATH := ../contrib/LUFA-120219 diff --git a/usb-i2c-sl018/keystore.c b/usb-i2c-sl018/keystore.c index c04f90d..5718e3f 100644 --- a/usb-i2c-sl018/keystore.c +++ b/usb-i2c-sl018/keystore.c @@ -25,8 +25,9 @@ #include <avr/eeprom.h> #include <stdio.h> #include <string.h> -#include "usb_serial.h" + #include "led.h" +#include "anyio.h" #define EEPROM_SIZE 1024 typedef uint8_t keyslot_t[8]; @@ -40,9 +41,9 @@ void flash_keystore_from_stdio(void) printf("Flashing keys:\n\r"); fflush(stdout); for(uint8_t ks_pos=0;ks_pos<EEPROM_SIZE/sizeof(ks);) { - usb_serial_task(); + anyio_task(); - int16_t bytes_received = usb_serial_bytes_received(); + int16_t bytes_received = anyio_bytes_received(); while(bytes_received > 0) { ks[byte_pos++]=fgetc(stdin); bytes_received--; diff --git a/usb-i2c-sl018/tuer-rfid.c b/usb-i2c-sl018/tuer-rfid.c index d87bde5..69523f9 100644 --- a/usb-i2c-sl018/tuer-rfid.c +++ b/usb-i2c-sl018/tuer-rfid.c @@ -33,13 +33,13 @@ #include "util.h" #include "led.h" +#include "anyio.h" #include "heartbeat.h" #include "stepper.h" #include "ledmatrix.h" #include "sl018.h" #include "keystore.h" -#include "usb_serial.h" #include "statemachine.h" void handle_stdio(uint8_t cmd) @@ -114,7 +114,7 @@ int main(void) cpu_init(); led_init(); - usb_serial_init(); + anyio_init(115200, false); TWI_Init(TWI_BIT_PRESCALE_1, TWI_BITLENGTH_FROM_FREQ(1, 200000)); init_heartbeat(); init_stepper(); @@ -124,10 +124,10 @@ int main(void) sl018_reset(); for(;;) { + anyio_task(); statemachine_task(); - usb_serial_task(); - int16_t bytes_received = usb_serial_bytes_received(); + int16_t bytes_received = anyio_bytes_received(); if(bytes_received > 0) handle_stdio(fgetc(stdin)); |