added distclean target

added simple led usb example


git-svn-id: https://svn.spreadspace.org/avr/trunk@47 aa12f405-d877-488e-9caf-2d797e2a1cc7

3 files changed, 163 insertions, 2 deletions

diff --git a/include.mk b/include.mk
index 783aed2..9babf49 100644
--- a/include.mk
+++ b/include.mk
@@ -29,7 +29,7 @@ OBJ_LIB := $(LIBS:%=lib-%.o)
 SRC_LIB := $(LIBS:%=$(LIB_DIR)/%.c)
 DEP_LIB := $(LIBS:%=lib-%.d)
 
-.PHONY: prepare clean clean-external clean-lufa program erase flash reset run
+.PHONY: prepare clean clean-external distclean clean-lufa program erase flash reset run
 
 ELFFILE := $(NAME).elf
 HEXFILE := $(NAME).hex
@@ -77,7 +77,7 @@ lib-%.d: $(LIB_DIR)/%.c
   sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
   rm -f $@.$$$$; echo '(re)building $@'
 
-ifneq ($(MAKECMDGOALS),clean)
+ifneq ($(MAKECMDGOALS),distclean)
 -include $(DEP)
 -include $(DEP_LIB)
 endif
@@ -101,6 +101,7 @@ clean:
 	rm -f $(ELFFILE)
 	rm -f $(HEXFILE)
 
+distclean: clean-external clean
 
 ### DFU-Programmer
 define DFU/erase
diff --git a/usb-led/Makefile b/usb-led/Makefile
new file mode 100644
index 0000000..2872abd
--- /dev/null
+++ b/usb-led/Makefile
@@ -0,0 +1,39 @@
+##

+##  spreadspace avr utils

+##

+##

+##  Copyright (C) 2012 Christian Pointner <equinox@spreadspace.org>

+##

+##  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 <http://www.gnu.org/licenses/>.

+##

+

+NAME := usb-led

+BOARD_TYPE := teensy2

+OBJ := $(NAME).o

+LIBS := util led lufa-descriptor-usbserial

+EXTERNAL_LIBS := lufa

+

+LUFA_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

+

+include ../include.mk

diff --git a/usb-led/usb-led.c b/usb-led/usb-led.c
new file mode 100644
index 0000000..b58a180
--- /dev/null
+++ b/usb-led/usb-led.c
@@ -0,0 +1,121 @@
+/*

+ *  spreadspace avr utils

+ *

+ *

+ *  Copyright (C) 2012 Christian Pointner <equinox@spreadspace.org>

+ *

+ *  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 <http://www.gnu.org/licenses/>.

+ */

+

+

+/* this is based on the LUFA example Project USBtoSerial

+   this is their Copyright Header */

+

+/*

+             LUFA Library

+     Copyright (C) Dean Camera, 2012.

+

+  dean [at] fourwalledcubicle [dot] com

+           www.lufa-lib.org

+*/

+

+#include <avr/io.h>

+#include <avr/wdt.h>

+#include <avr/interrupt.h>

+#include <avr/power.h>

+

+#include "lufa-descriptor-usbserial.h"

+

+#include "util.h"

+#include "led.h"

+

+#include <LUFA/Drivers/USB/USB.h>

+

+    /* Function Prototypes: */

+void handle_cmd(uint8_t cmd);

+void EVENT_USB_Device_ConfigurationChanged(void);

+void EVENT_USB_Device_ControlRequest(void);

+

+/** LUFA CDC Class driver interface configuration and state information. This structure is

+ *  passed to all CDC Class driver functions, so that multiple instances of the same class

+ *  within a device can be differentiated from one another.

+ */

+USB_ClassInfo_CDC_Device_t VirtualSerial_CDC_Interface =

+  {

+    .Config =

+      {

+        .ControlInterfaceNumber         = 0,

+

+        .DataINEndpointNumber           = CDC_TX_EPNUM,

+        .DataINEndpointSize             = CDC_TXRX_EPSIZE,

+        .DataINEndpointDoubleBank       = false,

+

+        .DataOUTEndpointNumber          = CDC_RX_EPNUM,

+        .DataOUTEndpointSize            = CDC_TXRX_EPSIZE,

+        .DataOUTEndpointDoubleBank      = false,

+

+        .NotificationEndpointNumber     = CDC_NOTIFICATION_EPNUM,

+        .NotificationEndpointSize       = CDC_NOTIFICATION_EPSIZE,

+        .NotificationEndpointDoubleBank = false,

+      },

+  };

+

+

+int main(void)

+{

+  MCUSR &= ~(1 << WDRF);

+  wdt_disable();

+

+  cpu_init();

+  led_init();

+  USB_Init();

+  sei();

+

+  for(;;) {

+    int16_t BytesReceived = CDC_Device_BytesReceived(&VirtualSerial_CDC_Interface);

+    while(BytesReceived > 0) {

+      int16_t ReceivedByte = CDC_Device_ReceiveByte(&VirtualSerial_CDC_Interface);

+      if(!(ReceivedByte < 0)) {

+        handle_cmd(ReceivedByte);

+      }

+      BytesReceived--;

+    }

+

+    CDC_Device_USBTask(&VirtualSerial_CDC_Interface);

+    USB_USBTask();

+  }

+}

+

+void handle_cmd(uint8_t cmd)

+{

+  switch(cmd) {

+  case '0': led_off(); break;

+  case '1': led_on(); break;

+  case 't': led_toggle(); break;

+  default: CDC_Device_SendString(&VirtualSerial_CDC_Interface, "error\n"); return;

+  }

+  CDC_Device_SendString(&VirtualSerial_CDC_Interface, "ok\n");

+}

+

+void EVENT_USB_Device_ConfigurationChanged(void)

+{

+  CDC_Device_ConfigureEndpoints(&VirtualSerial_CDC_Interface);

+}

+

+void EVENT_USB_Device_ControlRequest(void)

+{

+  CDC_Device_ProcessControlRequest(&VirtualSerial_CDC_Interface);

+}