From 24a1b19d6b6671284f05c63b03e420a408828bb9 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sun, 21 Jun 2015 22:47:21 +0200 Subject: dos2unix for all files --- usb-pwm/Makefile | 94 +++++++++++------------ usb-pwm/usb-pwm.c | 224 +++++++++++++++++++++++++++--------------------------- 2 files changed, 159 insertions(+), 159 deletions(-) (limited to 'usb-pwm') diff --git a/usb-pwm/Makefile b/usb-pwm/Makefile index dcc7a11..9a33e68 100644 --- a/usb-pwm/Makefile +++ b/usb-pwm/Makefile @@ -1,47 +1,47 @@ -## -## spreadspace avr utils -## -## -## Copyright (C) 2013-2014 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-pwm -BOARD_TYPE := teensy2 -OBJ := $(NAME).o -LIBS := util led lufa-descriptor-usbserial usbio -EXTERNAL_LIBS := lufa -SPREADAVR_PATH := .. -RESET_FUNC := $(SPREADAVR_PATH)/tools/reset_lufa_cdc -RESET_PARAM := 'r' - -LUFA_PATH := $(SPREADAVR_PATH)/contrib/LUFA-120219 -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\"" -D USB_MANUFACTURER_LEN=7 -LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace usb-pwm example\"" -D USB_PRODUCT_LEN=27 - -LUFA_COMPONENTS := USB USBCLASS - -include $(SPREADAVR_PATH)/include.mk +## +## spreadspace avr utils +## +## +## Copyright (C) 2013-2014 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-pwm +BOARD_TYPE := teensy2 +OBJ := $(NAME).o +LIBS := util led lufa-descriptor-usbserial usbio +EXTERNAL_LIBS := lufa +SPREADAVR_PATH := .. +RESET_FUNC := $(SPREADAVR_PATH)/tools/reset_lufa_cdc +RESET_PARAM := 'r' + +LUFA_PATH := $(SPREADAVR_PATH)/contrib/LUFA-120219 +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\"" -D USB_MANUFACTURER_LEN=7 +LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace usb-pwm example\"" -D USB_PRODUCT_LEN=27 + +LUFA_COMPONENTS := USB USBCLASS + +include $(SPREADAVR_PATH)/include.mk diff --git a/usb-pwm/usb-pwm.c b/usb-pwm/usb-pwm.c index a6fe2ad..14f42fb 100644 --- a/usb-pwm/usb-pwm.c +++ b/usb-pwm/usb-pwm.c @@ -1,112 +1,112 @@ -/* - * spreadspace avr utils - * - * - * Copyright (C) 2013-2014 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 "usbio.h" - - -#define PWM_VAL OCR1BL - -void pwm_init(void) -{ - DDRB |= (1< 0) - PWM_VAL--; -} - - -void handle_cmd(uint8_t cmd) -{ - switch(cmd) { - case '0': pwm_off(); led_off(); printf("ok\r\n"); break; - case '1': pwm_on(); led_on(); printf("ok\r\n"); break; - case '+': pwm_inc(); printf("pwm = %d\r\n", PWM_VAL); break; - case '-': pwm_dec(); printf("pwm = %d\r\n", PWM_VAL); break; - case 'r': reset2bootloader(); break; - default: printf("error\r\n"); return; - } - -} - -int main(void) -{ - MCUSR &= ~(1 << WDRF); - wdt_disable(); - - cpu_init(); - led_init(); - usbio_init(); - pwm_init(); - sei(); - - for(;;) { - int16_t BytesReceived = usbio_bytes_received(); - while(BytesReceived > 0) { - int ReceivedByte = fgetc(stdin); - if(ReceivedByte != EOF) { - handle_cmd(ReceivedByte); - } - BytesReceived--; - } - - usbio_task(); - } -} +/* + * spreadspace avr utils + * + * + * Copyright (C) 2013-2014 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 "usbio.h" + + +#define PWM_VAL OCR1BL + +void pwm_init(void) +{ + DDRB |= (1< 0) + PWM_VAL--; +} + + +void handle_cmd(uint8_t cmd) +{ + switch(cmd) { + case '0': pwm_off(); led_off(); printf("ok\r\n"); break; + case '1': pwm_on(); led_on(); printf("ok\r\n"); break; + case '+': pwm_inc(); printf("pwm = %d\r\n", PWM_VAL); break; + case '-': pwm_dec(); printf("pwm = %d\r\n", PWM_VAL); break; + case 'r': reset2bootloader(); break; + default: printf("error\r\n"); return; + } + +} + +int main(void) +{ + MCUSR &= ~(1 << WDRF); + wdt_disable(); + + cpu_init(); + led_init(); + usbio_init(); + pwm_init(); + sei(); + + for(;;) { + int16_t BytesReceived = usbio_bytes_received(); + while(BytesReceived > 0) { + int ReceivedByte = fgetc(stdin); + if(ReceivedByte != EOF) { + handle_cmd(ReceivedByte); + } + BytesReceived--; + } + + usbio_task(); + } +} -- cgit v1.2.3