From 2091e6050ec89543d164c7d4f96c9925a3e0f1a9 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Tue, 30 Jun 2015 21:45:54 +0200 Subject: renamed usb-led2 example to usb-dual-led --- usb-dual-led/Makefile | 45 ++++++++++++++++++++++ usb-dual-led/usb-dual-led.c | 94 +++++++++++++++++++++++++++++++++++++++++++++ usb-led2/Makefile | 45 ---------------------- usb-led2/usb-led2.c | 94 --------------------------------------------- 4 files changed, 139 insertions(+), 139 deletions(-) create mode 100644 usb-dual-led/Makefile create mode 100644 usb-dual-led/usb-dual-led.c delete mode 100644 usb-led2/Makefile delete mode 100644 usb-led2/usb-led2.c diff --git a/usb-dual-led/Makefile b/usb-dual-led/Makefile new file mode 100644 index 0000000..d975a3d --- /dev/null +++ b/usb-dual-led/Makefile @@ -0,0 +1,45 @@ +## +## spreadspace avr utils +## +## +## Copyright (C) 2013-2015 Christian Pointner +## +## This file is part of spreadspace avr utils. +## +## spreadspace avr utils 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 +## any later version. +## +## spreadspace avr utils 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 spreadspace avr utils. If not, see . +## + +NAME := usb-dual-led +BOARD_TYPE := teensy2 +OBJ := $(NAME).o +LIBS := util led lufa-descriptor-usbdualserial dualusbio +EXTERNAL_LIBS := lufa +SPREADAVR_PATH := .. + +LUFA_PATH := $(SPREADAVR_PATH)/contrib/lufa-LUFA-140928 +LUFA_OPTS = -D USB_DEVICE_ONLY +LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0 +LUFA_OPTS += -D ORDERED_EP_CONFIG +LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8 +LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1 +LUFA_OPTS += -D USE_FLASH_DESCRIPTORS +LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +LUFA_OPTS += -D INTERRUPT_CONTROL_ENDPOINT + +LUFA_OPTS += -D USB_MANUFACTURER="L\"equinox\"" +LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace usb-dual-led example\"" + +LUFA_COMPONENTS := USB USBCLASS + +include $(SPREADAVR_PATH)/include.mk diff --git a/usb-dual-led/usb-dual-led.c b/usb-dual-led/usb-dual-led.c new file mode 100644 index 0000000..139e841 --- /dev/null +++ b/usb-dual-led/usb-dual-led.c @@ -0,0 +1,94 @@ +/* + * spreadspace avr utils + * + * + * Copyright (C) 2013-2015 Christian Pointner + * + * This file is part of spreadspace avr utils. + * + * spreadspace avr utils 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 + * any later version. + * + * spreadspace avr utils 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 spreadspace avr utils. If not, see . + */ + + +#include +#include +#include +#include +#include + +#include "util.h" +#include "led.h" +#include "dualusbio.h" + +uint8_t stdio_port = 0; + +void handle_cmd(uint8_t cmd) +{ + switch(cmd) { + case '0': led_off(); break; + case '1': led_on(); break; + case 't': led_toggle(); break; + case 's': printf("std: already stdio\r\n"); return; + default: printf("std: error\r\n"); return; + } + printf("std: ok\r\n"); +} + +void handle_cmd2(uint8_t p, uint8_t cmd) +{ + switch(cmd) { + case '0': led_on(); break; + case '1': led_off(); break; + case 't': led_toggle(); break; + case 's': stdio_port = p; dualusbio_make_stdio(stdio_port); break; + default: fprintf(usbio[p], "%d: error\r\n", p); return; + } + fprintf(usbio[p], "%d: ok\r\n", p); +} + +int main(void) +{ + MCUSR &= ~(1 << WDRF); + wdt_disable(); + + cpu_init(); + led_init(); + dualusbio_init(); + sei(); + + dualusbio_make_stdio(stdio_port); + + for(;;) { + int16_t BytesReceived = dualusbio_bytes_received_std(); + while(BytesReceived > 0) { + int ReceivedByte = fgetc(stdin); + if(ReceivedByte != EOF) { + handle_cmd(ReceivedByte); + } + BytesReceived--; + } + + uint8_t p = (stdio_port) ? 0 : 1; + BytesReceived = dualusbio_bytes_received(p); + while(BytesReceived > 0) { + int ReceivedByte = fgetc(usbio[p]); + if(ReceivedByte != EOF) { + handle_cmd2(p, ReceivedByte); + } + BytesReceived--; + } + + dualusbio_task(); + } +} diff --git a/usb-led2/Makefile b/usb-led2/Makefile deleted file mode 100644 index 2f7cb33..0000000 --- a/usb-led2/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -## -## spreadspace avr utils -## -## -## Copyright (C) 2013-2015 Christian Pointner -## -## This file is part of spreadspace avr utils. -## -## spreadspace avr utils 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 -## any later version. -## -## spreadspace avr utils 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 spreadspace avr utils. If not, see . -## - -NAME := usb-led2 -BOARD_TYPE := teensy2 -OBJ := $(NAME).o -LIBS := util led lufa-descriptor-usbdualserial dualusbio -EXTERNAL_LIBS := lufa -SPREADAVR_PATH := .. - -LUFA_PATH := $(SPREADAVR_PATH)/contrib/lufa-LUFA-140928 -LUFA_OPTS = -D USB_DEVICE_ONLY -LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0 -LUFA_OPTS += -D ORDERED_EP_CONFIG -LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8 -LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1 -LUFA_OPTS += -D USE_FLASH_DESCRIPTORS -LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" -LUFA_OPTS += -D INTERRUPT_CONTROL_ENDPOINT - -LUFA_OPTS += -D USB_MANUFACTURER="L\"equinox\"" -LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace usb-led2 example\"" - -LUFA_COMPONENTS := USB USBCLASS - -include $(SPREADAVR_PATH)/include.mk diff --git a/usb-led2/usb-led2.c b/usb-led2/usb-led2.c deleted file mode 100644 index 139e841..0000000 --- a/usb-led2/usb-led2.c +++ /dev/null @@ -1,94 +0,0 @@ -/* - * spreadspace avr utils - * - * - * Copyright (C) 2013-2015 Christian Pointner - * - * This file is part of spreadspace avr utils. - * - * spreadspace avr utils 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 - * any later version. - * - * spreadspace avr utils 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 spreadspace avr utils. If not, see . - */ - - -#include -#include -#include -#include -#include - -#include "util.h" -#include "led.h" -#include "dualusbio.h" - -uint8_t stdio_port = 0; - -void handle_cmd(uint8_t cmd) -{ - switch(cmd) { - case '0': led_off(); break; - case '1': led_on(); break; - case 't': led_toggle(); break; - case 's': printf("std: already stdio\r\n"); return; - default: printf("std: error\r\n"); return; - } - printf("std: ok\r\n"); -} - -void handle_cmd2(uint8_t p, uint8_t cmd) -{ - switch(cmd) { - case '0': led_on(); break; - case '1': led_off(); break; - case 't': led_toggle(); break; - case 's': stdio_port = p; dualusbio_make_stdio(stdio_port); break; - default: fprintf(usbio[p], "%d: error\r\n", p); return; - } - fprintf(usbio[p], "%d: ok\r\n", p); -} - -int main(void) -{ - MCUSR &= ~(1 << WDRF); - wdt_disable(); - - cpu_init(); - led_init(); - dualusbio_init(); - sei(); - - dualusbio_make_stdio(stdio_port); - - for(;;) { - int16_t BytesReceived = dualusbio_bytes_received_std(); - while(BytesReceived > 0) { - int ReceivedByte = fgetc(stdin); - if(ReceivedByte != EOF) { - handle_cmd(ReceivedByte); - } - BytesReceived--; - } - - uint8_t p = (stdio_port) ? 0 : 1; - BytesReceived = dualusbio_bytes_received(p); - while(BytesReceived > 0) { - int ReceivedByte = fgetc(usbio[p]); - if(ReceivedByte != EOF) { - handle_cmd2(p, ReceivedByte); - } - BytesReceived--; - } - - dualusbio_task(); - } -} -- cgit v1.2.3