From 879866867663e060f1e273829d69eb0231e4c6d9 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Wed, 30 May 2012 17:15:48 +0000 Subject: upgraded to new spreadspace avr tools git-svn-id: https://svn.spreadspace.org/mur.sat@489 7de4ea59-55d0-425e-a1af-a3118ea81d4c --- software/avr.defines.mk | 157 ++++++++++++++++ software/avr.include.mk | 158 +++++----------- software/avr.lib/led.c | 92 +++++++++ software/avr.lib/led.h | 31 +++ software/avr.lib/lufa-descriptor-usbserial.c | 271 +++++++++++++++++++++++++++ software/avr.lib/lufa-descriptor-usbserial.h | 89 +++++++++ software/avr.lib/util.c | 93 +++++++++ software/avr.lib/util.h | 29 +++ software/avr.lufa.mk | 42 +++++ software/hhd70dongle/Makefile | 3 +- software/hhd70dongle/led.c | 91 --------- software/hhd70dongle/led.h | 31 --- 12 files changed, 858 insertions(+), 229 deletions(-) create mode 100644 software/avr.defines.mk create mode 100644 software/avr.lib/led.c create mode 100644 software/avr.lib/led.h create mode 100644 software/avr.lib/lufa-descriptor-usbserial.c create mode 100644 software/avr.lib/lufa-descriptor-usbserial.h create mode 100644 software/avr.lib/util.c create mode 100644 software/avr.lib/util.h create mode 100644 software/avr.lufa.mk delete mode 100644 software/hhd70dongle/led.c delete mode 100644 software/hhd70dongle/led.h (limited to 'software') diff --git a/software/avr.defines.mk b/software/avr.defines.mk new file mode 100644 index 0000000..3924941 --- /dev/null +++ b/software/avr.defines.mk @@ -0,0 +1,157 @@ +## +## spreadspace avr utils +## +## +## Copyright (C) 2012 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 . +## + +ifeq ($(BOARD_TYPE),teensy1) + MCU := at90usb162 + ARCH = AVR8 + F_CPU := 16000000 + F_USB = $(F_CPU) + PROG := teensy + LUFA_BOARD = TEENSY +endif +ifeq ($(BOARD_TYPE),teensy2) + MCU := atmega32u4 + ARCH = AVR8 + F_CPU := 16000000 + F_USB = $(F_CPU) + PROG := teensy + LUFA_BOARD = TEENSY2 +endif +ifeq ($(BOARD_TYPE),teensy1pp) + MCU := at90usb646 + ARCH = AVR8 + F_CPU := 16000000 + F_USB = $(F_CPU) + PROG := teensy + LUFA_BOARD = TEENSY +endif +ifeq ($(BOARD_TYPE),teensy2pp) + MCU := at90usb1286 + ARCH = AVR8 + F_CPU := 16000000 + F_USB = $(F_CPU) + PROG := teensy + LUFA_BOARD = TEENSY2 +endif +ifeq ($(BOARD_TYPE),hhd70dongle) + MCU := atmega32u4 + ARCH = AVR8 + F_CPU := 16000000 + F_USB = $(F_CPU) + PROG := DFU +endif +ifeq ($(BOARD_TYPE),arduinoUno) + MCU := atmega328p + ARCH = AVR8 + F_CPU := 16000000 + PROG := avrdude + UPLOAD_RATE := 57600 + PROG_TYPE := stk500v1 + AVRDUDE_PORT := /dev/ttyUSB0 + RESET_FUNC := ../tools/reset_arduino + RESET_PARAM = $(AVRDUDE_PORT) +endif +ifeq ($(BOARD_TYPE),arduino2009v2) + MCU := atmega328p + ARCH = AVR8 + F_CPU := 16000000 + PROG := avrdude + UPLOAD_RATE := 57600 + PROG_TYPE := stk500v1 + AVRDUDE_PORT := /dev/ttyUSB0 + RESET_FUNC := ../tools/reset_arduino + RESET_PARAM = $(AVRDUDE_PORT) +endif +ifeq ($(BOARD_TYPE),arduino2009) + MCU := atmega168 + ARCH = AVR8 + F_CPU := 16000000 + PROG := avrdude + UPLOAD_RATE := 19200 + PROG_TYPE := stk500v1 + AVRDUDE_PORT := /dev/ttyUSB0 + RESET_FUNC := ../tools/reset_arduino + RESET_PARAM = $(AVRDUDE_PORT) +endif +ifeq ($(BOARD_TYPE),arduino10000) + MCU := atmega168 + ARCH = AVR8 + F_CPU := 16000000 + PROG := avrdude + UPLOAD_RATE := 19200 + PROG_TYPE := stk500v1 + AVRDUDE_PORT := /dev/ttyUSB0 + RESET_FUNC := ../tools/reset_arduino + RESET_PARAM = $(AVRDUDE_PORT) +endif +ifeq ($(BOARD_TYPE),arduinoNG) + MCU := atmega8 + ARCH = AVR8 + F_CPU := 16000000 + PROG := avrdude + UPLOAD_RATE := 19200 + PROG_TYPE := stk500v1 + AVRDUDE_PORT := /dev/ttyUSB0 + RESET_FUNC := ../tools/dummy_reset +endif +ifeq ($(BOARD_TYPE),AvrNetIo) + MCU := atmega32 + ARCH = AVR8 + F_CPU := 16000000 + PROG := avrdude + UPLOAD_RATE := 19200 + PROG_TYPE := stk500v2 + AVRDUDE_PORT := /dev/ttyS0 +endif + +CC = avr-gcc +OBJCOPY = avr-objcopy +AR = avr-ar rcs + +LIB_DIR = ../avr.lib + +DFU = dfu-programmer +teensy = teensy_loader_cli +avrdude = avrdude + +## Options common to compile, link and assembly rules +COMMON = -mmcu=$(MCU) + +## Compile options common for all C compilation units. +CFLAGS = $(COMMON) +CFLAGS += -O2 +CFLAGS += -funsigned-char +CFLAGS += -funsigned-bitfields +CFLAGS += -ffunction-sections +CFLAGS += -fpack-struct +CFLAGS += -fshort-enums +CFLAGS += -Wall +CFLAGS += -Wstrict-prototypes +CFLAGS += -I$(LIB_DIR) +CFLAGS += -DF_CPU=$(F_CPU)UL +CFLAGS += -D__BOARD_$(BOARD_TYPE)__ +CFLAGS += -std=c99 + + +## Linker flags +LDFLAGS = $(COMMON) +LDFLAGS += diff --git a/software/avr.include.mk b/software/avr.include.mk index 93a34fb..3950dd1 100644 --- a/software/avr.include.mk +++ b/software/avr.include.mk @@ -20,115 +20,56 @@ ## along with spreadspace avr utils. If not, see . ## -ifeq ($(BOARD_TYPE),teensy1) - MCU := at90usb162 - F_CPU := 16000000 - PROG := teensy -endif -ifeq ($(BOARD_TYPE),teensy2) - MCU := atmega32u4 - F_CPU := 16000000 - PROG := teensy -endif -ifeq ($(BOARD_TYPE),teensy1pp) - MCU := at90usb646 - F_CPU := 16000000 - PROG := teensy -endif -ifeq ($(BOARD_TYPE),teensy2pp) - MCU := at90usb1286 - F_CPU := 16000000 - PROG := teensy -endif -ifeq ($(BOARD_TYPE),hhd70dongle) - MCU := atmega32u4 - F_CPU := 16000000 - PROG := DFU -endif -ifeq ($(BOARD_TYPE),arduinoUno) - MCU := atmega328p - F_CPU := 16000000 - PROG := avrdude - UPLOAD_RATE := 57600 - PROG_TYPE := stk500v1 - AVRDUDE_PORT := /dev/ttyUSB0 - RESET_FUNC := ../tools/reset_arduino - RESET_PARAM = $(AVRDUDE_PORT) -endif -ifeq ($(BOARD_TYPE),arduino2009v2) - MCU := atmega328p - F_CPU := 16000000 - PROG := avrdude - UPLOAD_RATE := 57600 - PROG_TYPE := stk500v1 - AVRDUDE_PORT := /dev/ttyUSB0 - RESET_FUNC := ../tools/reset_arduino - RESET_PARAM = $(AVRDUDE_PORT) -endif -ifeq ($(BOARD_TYPE),arduino2009) - MCU := atmega168 - F_CPU := 16000000 - PROG := avrdude - UPLOAD_RATE := 19200 - PROG_TYPE := stk500v1 - AVRDUDE_PORT := /dev/ttyUSB0 - RESET_FUNC := ../tools/reset_arduino - RESET_PARAM = $(AVRDUDE_PORT) -endif -ifeq ($(BOARD_TYPE),arduino10000) - MCU := atmega168 - F_CPU := 16000000 - PROG := avrdude - UPLOAD_RATE := 19200 - PROG_TYPE := stk500v1 - AVRDUDE_PORT := /dev/ttyUSB0 - RESET_FUNC := ../tools/reset_arduino - RESET_PARAM = $(AVRDUDE_PORT) -endif -ifeq ($(BOARD_TYPE),arduinoNG) - MCU := atmega8 - F_CPU := 16000000 - PROG := avrdude - UPLOAD_RATE := 19200 - PROG_TYPE := stk500v1 - AVRDUDE_PORT := /dev/ttyUSB0 -endif - -CC = avr-gcc -OBJCOPY = avr-objcopy - -DFU = dfu-programmer -teensy = teensy_loader_cli -avrdude = avrdude - -## Options common to compile, link and assembly rules -COMMON = -mmcu=$(MCU) - -## Compile options common for all C compilation units. -CFLAGS = $(COMMON) -CFLAGS += -O2 -CFLAGS += -funsigned-char -CFLAGS += -funsigned-bitfields -CFLAGS += -ffunction-sections -CFLAGS += -fpack-struct -CFLAGS += -fshort-enums -CFLAGS += -Wall -CFLAGS += -Wstrict-prototypes -CFLAGS += -DF_CPU=$(F_CPU)UL -CFLAGS += -D__BOARD_$(BOARD_TYPE)__ - -## Linker flags -LDFLAGS = $(COMMON) -LDFLAGS += +include ../avr.defines.mk +## project-specific objects SRC := $(OBJ:%.o=%.c) +DEP := $(SRC:%.c=%.d) +OBJ_LIB := $(LIBS:%=lib-%.o) +SRC_LIB := $(LIBS:%=$(LIB_DIR)/%.c) +DEP_LIB := $(LIBS:%=lib-%.d) -.PHONY: clean program erase flash reset run +.PHONY: prepare clean clean-external distclean clean-lufa program erase flash reset run ELFFILE := $(NAME).elf HEXFILE := $(NAME).hex -all: $(HEXFILE) +all: prepare $(HEXFILE) + + +## external Libs +LDFLAGS += -L./ + +ifdef LUFA_PATH +CFLAGS += -I$(LUFA_PATH) +CFLAGS += -DF_USB=$(F_USB)UL +CFLAGS += -DBOARD=BOARD_$(LUFA_BOARD) -DARCH=ARCH_$(ARCH) +CFLAGS += $(LUFA_OPTS) +endif + +prepare: $(EXTERNAL_LIBS:%=build-%) +clean-external: $(EXTERNAL_LIBS:%=clean-%) + +export +build-lufa: liblufa.a + +liblufa.a: + @echo "building external LUFA lib ($(LUFA_PATH))" + make -f ../avr.lufa.mk liblufa.a + make -f ../avr.lufa.mk clean + +clean-lufa: + @echo "cleaning external LUFA lib ($(LUFA_PATH))" + make -f ../avr.lufa.mk clean + rm -f liblufa.a + + +## project-specific objects +lib-%.d: $(LIB_DIR)/%.c + @set -e; rm -f $@; \ + $(CC) -MM $(CFLAGS) $< > $@.$$$$; \ + sed 's,\($*\)\.o[ :]*,lib-\1.o $@ : ,g' < $@.$$$$ > $@; \ + rm -f $@.$$$$; echo '(re)building $@' %.d: %.c @set -e; rm -f $@; \ @@ -137,14 +78,18 @@ all: $(HEXFILE) rm -f $@.$$$$; echo '(re)building $@' ifneq ($(MAKECMDGOALS),distclean) --include $(SRC:%.c=%.d) +-include $(DEP) +-include $(DEP_LIB) endif +lib-%.o: $(LIB_DIR)/%.c + $(CC) $(CFLAGS) -c $< -o $@ + %.o: %.c - $(CC) $(CFLAGS) -c $< + $(CC) $(CFLAGS) -c $< -o $@ -$(ELFFILE): $(OBJ) - $(CC) $(OBJ) -o $@ $(LDFLAGS) +$(ELFFILE): $(OBJ) $(OBJ_LIB) $(EXTERNAL_LIBS:%=lib%.a) + $(CC) $(LDFLAGS) $(OBJ) $(OBJ_LIB) $(EXTERNAL_LIBS:%=-l%) -o $@ $(HEXFILE): $(ELFFILE) $(OBJCOPY) -O ihex -R .eeprom -R .fuse -R .lock -R .signature $< $@ @@ -156,6 +101,7 @@ clean: rm -f $(ELFFILE) rm -f $(HEXFILE) +distclean: clean-external clean ### DFU-Programmer define DFU/erase diff --git a/software/avr.lib/led.c b/software/avr.lib/led.c new file mode 100644 index 0000000..ea5bcc3 --- /dev/null +++ b/software/avr.lib/led.c @@ -0,0 +1,92 @@ +/* + * spreadspace avr utils + * + * + * Copyright (C) 2012 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 "led.h" + +#if defined(__BOARD_arduinoUno__) || defined(__BOARD_AvrNetIo__) +#define HAS_LED 0 +#else +#define HAS_LED 1 +#endif + +#if defined(__BOARD_teensy1__) || defined(__BOARD_teensy1pp__) +#define LED_DIR 0 +#else +#define LED_DIR 1 +#endif + +#if defined(__BOARD_teensy1__) || defined(__BOARD_teensy1pp__) || defined(__BOARD_teensy2__) || defined(__BOARD_teensy2pp__) +#define LED_PORT PORTD +#define LED_DDR DDRD +#define LED_PINNUM 6 +#endif + +#if defined(__BOARD_hhd70dongle__) +#define LED_PORT PORTE +#define LED_DDR DDRE +#define LED_PINNUM 6 +#endif + +#if defined(__BOARD_arduino2009v2__) || defined(__BOARD_arduino2009__) || defined(__BOARD_arduino10000__) || defined(__BOARD_arduinoNG__) +#define LED_PORT PORTB +#define LED_DDR DDRB +#define LED_PINNUM 5 +#endif + +void led_init(void) +{ +#if HAS_LED == 1 + led_off(); + LED_DDR = 1< + * + * 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 . + */ + +#ifndef SPREADSPACE_led_h_INCLUDED +#define SPREADSPACE_led_h_INCLUDED + +void led_init(void); +void led_on(void); +void led_off(void); +void led_toggle(void); + +#endif diff --git a/software/avr.lib/lufa-descriptor-usbserial.c b/software/avr.lib/lufa-descriptor-usbserial.c new file mode 100644 index 0000000..6e9f022 --- /dev/null +++ b/software/avr.lib/lufa-descriptor-usbserial.c @@ -0,0 +1,271 @@ +/* + LUFA Library + Copyright (C) Dean Camera, 2012. + + dean [at] fourwalledcubicle [dot] com + www.lufa-lib.org +*/ + +/* + Copyright 2012 Dean Camera (dean [at] fourwalledcubicle [dot] com) + + Permission to use, copy, modify, distribute, and sell this + software and its documentation for any purpose is hereby granted + without fee, provided that the above copyright notice appear in + all copies and that both that the copyright notice and this + permission notice and warranty disclaimer appear in supporting + documentation, and that the name of the author not be used in + advertising or publicity pertaining to distribution of the + software without specific, written prior permission. + + The author disclaim all warranties with regard to this + software, including all implied warranties of merchantability + and fitness. In no event shall the author be liable for any + special, indirect or consequential damages or any damages + whatsoever resulting from loss of use, data or profits, whether + in an action of contract, negligence or other tortious action, + arising out of or in connection with the use or performance of + this software. +*/ + +/** \file + * + * USB Device Descriptors, for library use when in USB device mode. Descriptors are special + * computer-readable structures which the host requests upon device enumeration, to determine + * the device's capabilities and functions. + */ + +#include "lufa-descriptor-usbserial.h" + +/* On some devices, there is a factory set internal serial number which can be automatically sent to the host as + * the device's serial number when the Device Descriptor's .SerialNumStrIndex entry is set to USE_INTERNAL_SERIAL. + * This allows the host to track a device across insertions on different ports, allowing them to retain allocated + * resources like COM port numbers and drivers. On demos using this feature, give a warning on unsupported devices + * so that the user can supply their own serial number descriptor instead or remove the USE_INTERNAL_SERIAL value + * from the Device Descriptor (forcing the host to generate a serial number for each device from the VID, PID and + * port location). + */ +#if (USE_INTERNAL_SERIAL == NO_DESCRIPTOR) + #warning USE_INTERNAL_SERIAL is not available on this AVR - please manually construct a device serial descriptor. +#endif + +/** Device descriptor structure. This descriptor, located in FLASH memory, describes the overall + * device characteristics, including the supported USB version, control endpoint size and the + * number of device configurations. The descriptor is read out by the USB host when the enumeration + * process begins. + */ +const USB_Descriptor_Device_t PROGMEM DeviceDescriptor = +{ + .Header = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device}, + + .USBSpecification = VERSION_BCD(01.10), + .Class = CDC_CSCP_CDCClass, + .SubClass = CDC_CSCP_NoSpecificSubclass, + .Protocol = CDC_CSCP_NoSpecificProtocol, + + .Endpoint0Size = FIXED_CONTROL_ENDPOINT_SIZE, + + .VendorID = 0x03EB, + .ProductID = 0x204B, + .ReleaseNumber = VERSION_BCD(00.01), + + .ManufacturerStrIndex = 0x01, + .ProductStrIndex = 0x02, + .SerialNumStrIndex = USE_INTERNAL_SERIAL, + + .NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS +}; + +/** Configuration descriptor structure. This descriptor, located in FLASH memory, describes the usage + * of the device in one of its supported configurations, including information about any device interfaces + * and endpoints. The descriptor is read out by the USB host during the enumeration process when selecting + * a configuration so that the host may correctly communicate with the USB device. + */ +const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = +{ + .Config = + { + .Header = {.Size = sizeof(USB_Descriptor_Configuration_Header_t), .Type = DTYPE_Configuration}, + + .TotalConfigurationSize = sizeof(USB_Descriptor_Configuration_t), + .TotalInterfaces = 2, + + .ConfigurationNumber = 1, + .ConfigurationStrIndex = NO_DESCRIPTOR, + + .ConfigAttributes = (USB_CONFIG_ATTR_RESERVED | USB_CONFIG_ATTR_SELFPOWERED), + + .MaxPowerConsumption = USB_CONFIG_POWER_MA(100) + }, + + .CDC_CCI_Interface = + { + .Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface}, + + .InterfaceNumber = 0, + .AlternateSetting = 0, + + .TotalEndpoints = 1, + + .Class = CDC_CSCP_CDCClass, + .SubClass = CDC_CSCP_ACMSubclass, + .Protocol = CDC_CSCP_ATCommandProtocol, + + .InterfaceStrIndex = NO_DESCRIPTOR + }, + + .CDC_Functional_Header = + { + .Header = {.Size = sizeof(USB_CDC_Descriptor_FunctionalHeader_t), .Type = DTYPE_CSInterface}, + .Subtype = CDC_DSUBTYPE_CSInterface_Header, + + .CDCSpecification = VERSION_BCD(01.10), + }, + + .CDC_Functional_ACM = + { + .Header = {.Size = sizeof(USB_CDC_Descriptor_FunctionalACM_t), .Type = DTYPE_CSInterface}, + .Subtype = CDC_DSUBTYPE_CSInterface_ACM, + + .Capabilities = 0x06, + }, + + .CDC_Functional_Union = + { + .Header = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface}, + .Subtype = CDC_DSUBTYPE_CSInterface_Union, + + .MasterInterfaceNumber = 0, + .SlaveInterfaceNumber = 1, + }, + + .CDC_NotificationEndpoint = + { + .Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint}, + + .EndpointAddress = (ENDPOINT_DIR_IN | CDC_NOTIFICATION_EPNUM), + .Attributes = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA), + .EndpointSize = CDC_NOTIFICATION_EPSIZE, + .PollingIntervalMS = 0xFF + }, + + .CDC_DCI_Interface = + { + .Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface}, + + .InterfaceNumber = 1, + .AlternateSetting = 0, + + .TotalEndpoints = 2, + + .Class = CDC_CSCP_CDCDataClass, + .SubClass = CDC_CSCP_NoDataSubclass, + .Protocol = CDC_CSCP_NoDataProtocol, + + .InterfaceStrIndex = NO_DESCRIPTOR + }, + + .CDC_DataOutEndpoint = + { + .Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint}, + + .EndpointAddress = (ENDPOINT_DIR_OUT | CDC_RX_EPNUM), + .Attributes = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA), + .EndpointSize = CDC_TXRX_EPSIZE, + .PollingIntervalMS = 0x01 + }, + + .CDC_DataInEndpoint = + { + .Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint}, + + .EndpointAddress = (ENDPOINT_DIR_IN | CDC_TX_EPNUM), + .Attributes = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA), + .EndpointSize = CDC_TXRX_EPSIZE, + .PollingIntervalMS = 0x01 + } +}; + +/** Language descriptor structure. This descriptor, located in FLASH memory, is returned when the host requests + * the string descriptor with index 0 (the first index). It is actually an array of 16-bit integers, which indicate + * via the language ID table available at USB.org what languages the device supports for its string descriptors. + */ +const USB_Descriptor_String_t PROGMEM LanguageString = +{ + .Header = {.Size = USB_STRING_LEN(1), .Type = DTYPE_String}, + + .UnicodeString = {LANGUAGE_ID_ENG} +}; + +/** Manufacturer descriptor string. This is a Unicode string containing the manufacturer's details in human readable + * form, and is read out upon request by the host when the appropriate string ID is requested, listed in the Device + * Descriptor. + */ +const USB_Descriptor_String_t PROGMEM ManufacturerString = +{ + .Header = {.Size = USB_STRING_LEN(11), .Type = DTYPE_String}, + + .UnicodeString = L"Dean Camera" +}; + +/** Product descriptor string. This is a Unicode string containing the product's details in human readable form, + * and is read out upon request by the host when the appropriate string ID is requested, listed in the Device + * Descriptor. + */ +const USB_Descriptor_String_t PROGMEM ProductString = +{ + .Header = {.Size = USB_STRING_LEN(23), .Type = DTYPE_String}, + + .UnicodeString = L"LUFA USB-RS232 Adapter" +}; + +/** This function is called by the library when in device mode, and must be overridden (see library "USB Descriptors" + * documentation) by the application code so that the address and size of a requested descriptor can be given + * to the USB library. When the device receives a Get Descriptor request on the control endpoint, this function + * is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the + * USB host. + */ +uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, + const uint8_t wIndex, + const void** const DescriptorAddress) +{ + const uint8_t DescriptorType = (wValue >> 8); + const uint8_t DescriptorNumber = (wValue & 0xFF); + + const void* Address = NULL; + uint16_t Size = NO_DESCRIPTOR; + + switch (DescriptorType) + { + case DTYPE_Device: + Address = &DeviceDescriptor; + Size = sizeof(USB_Descriptor_Device_t); + break; + case DTYPE_Configuration: + Address = &ConfigurationDescriptor; + Size = sizeof(USB_Descriptor_Configuration_t); + break; + case DTYPE_String: + switch (DescriptorNumber) + { + case 0x00: + Address = &LanguageString; + Size = pgm_read_byte(&LanguageString.Header.Size); + break; + case 0x01: + Address = &ManufacturerString; + Size = pgm_read_byte(&ManufacturerString.Header.Size); + break; + case 0x02: + Address = &ProductString; + Size = pgm_read_byte(&ProductString.Header.Size); + break; + } + + break; + } + + *DescriptorAddress = Address; + return Size; +} + diff --git a/software/avr.lib/lufa-descriptor-usbserial.h b/software/avr.lib/lufa-descriptor-usbserial.h new file mode 100644 index 0000000..97afd41 --- /dev/null +++ b/software/avr.lib/lufa-descriptor-usbserial.h @@ -0,0 +1,89 @@ +/* + LUFA Library + Copyright (C) Dean Camera, 2012. + + dean [at] fourwalledcubicle [dot] com + www.lufa-lib.org +*/ + +/* + Copyright 2012 Dean Camera (dean [at] fourwalledcubicle [dot] com) + + Permission to use, copy, modify, distribute, and sell this + software and its documentation for any purpose is hereby granted + without fee, provided that the above copyright notice appear in + all copies and that both that the copyright notice and this + permission notice and warranty disclaimer appear in supporting + documentation, and that the name of the author not be used in + advertising or publicity pertaining to distribution of the + software without specific, written prior permission. + + The author disclaim all warranties with regard to this + software, including all implied warranties of merchantability + and fitness. In no event shall the author be liable for any + special, indirect or consequential damages or any damages + whatsoever resulting from loss of use, data or profits, whether + in an action of contract, negligence or other tortious action, + arising out of or in connection with the use or performance of + this software. +*/ + +/** \file + * + * Header file for Descriptors.c. + */ + +#ifndef _DESCRIPTORS_H_ +#define _DESCRIPTORS_H_ + + /* Includes: */ + #include + + #include + + /* Macros: */ + /** Endpoint number of the CDC device-to-host notification IN endpoint. */ + #define CDC_NOTIFICATION_EPNUM 2 + + /** Endpoint number of the CDC device-to-host data IN endpoint. */ + #define CDC_TX_EPNUM 3 + + /** Endpoint number of the CDC host-to-device data OUT endpoint. */ + #define CDC_RX_EPNUM 4 + + /** Size in bytes of the CDC device-to-host notification IN endpoint. */ + #define CDC_NOTIFICATION_EPSIZE 8 + + /** Size in bytes of the CDC data IN and OUT endpoints. */ + #define CDC_TXRX_EPSIZE 16 + + /* Type Defines: */ + /** Type define for the device configuration descriptor structure. This must be defined in the + * application code, as the configuration descriptor contains several sub-descriptors which + * vary between devices, and which describe the device's usage to the host. + */ + typedef struct + { + USB_Descriptor_Configuration_Header_t Config; + + // CDC Command Interface + USB_Descriptor_Interface_t CDC_CCI_Interface; + USB_CDC_Descriptor_FunctionalHeader_t CDC_Functional_Header; + USB_CDC_Descriptor_FunctionalACM_t CDC_Functional_ACM; + USB_CDC_Descriptor_FunctionalUnion_t CDC_Functional_Union; + USB_Descriptor_Endpoint_t CDC_NotificationEndpoint; + + // CDC Data Interface + USB_Descriptor_Interface_t CDC_DCI_Interface; + USB_Descriptor_Endpoint_t CDC_DataOutEndpoint; + USB_Descriptor_Endpoint_t CDC_DataInEndpoint; + } USB_Descriptor_Configuration_t; + + /* Function Prototypes: */ + uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, + const uint8_t wIndex, + const void** const DescriptorAddress) + ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); + +#endif + diff --git a/software/avr.lib/util.c b/software/avr.lib/util.c new file mode 100644 index 0000000..d927f8e --- /dev/null +++ b/software/avr.lib/util.c @@ -0,0 +1,93 @@ +/* + * spreadspace avr utils + * + * + * Copyright (C) 2012 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 "util.h" + +#if defined(CLKPR) +#define CPU_PRESCALE(n) do { CLKPR = 0x80; CLKPR = (n); } while(0) +#else +#define CPU_PRESCALE(n) +#endif + +void cpu_init(void) +{ + CPU_PRESCALE(0); +} + +#if defined(__BOARD_teensy1__) + #define BOOTLOADER_VEC 0x3E00 +#elif defined(__BOARD_teensy2__) + #define BOOTLOADER_VEC 0x7E00 +#elif defined(__BOARD_teensy1pp__) + #define BOOTLOADER_VEC 0xFC00 +#elif defined(__BOARD_teensy2pp__) + #define BOOTLOADER_VEC 0x1FC00 +#elif defined(__BOARD_hhd70dongle__) + #define BOOTLOADER_VEC 0x3800 +#endif + +typedef void (*f_ptr_type)(void); +f_ptr_type start_bootloader = (f_ptr_type)BOOTLOADER_VEC; + +void reset2bootloader(void) +{ +#if defined(__BOARD_teensy1__) || defined(__BOARD_teensy1pp__) || defined(__BOARD_teensy2__) || defined(__BOARD_teensy2pp__) || defined(__BOARD_hhd70dongle__) + cli(); + // disable watchdog, if enabled + // disable all peripherals + UDCON = 1; + USBCON = (1< + * + * 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 . + */ + +#ifndef SPREADSPACE_util_h_INCLUDED +#define SPREADSPACE_util_h_INCLUDED + +void cpu_init(void); +void reset2bootloader(void); + +#endif diff --git a/software/avr.lufa.mk b/software/avr.lufa.mk new file mode 100644 index 0000000..24650af --- /dev/null +++ b/software/avr.lufa.mk @@ -0,0 +1,42 @@ +## +## spreadspace avr utils +## +## +## Copyright (C) 2012 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 ../avr.defines.mk + +## TODO: change BOARD names for our tools too??? +include $(LUFA_PATH)/LUFA/makefile +SRC = $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS) + +CFLAGS += -DF_USB=$(F_USB)UL +CFLAGS += -DBOARD=BOARD_$(LUFA_BOARD) -DARCH=ARCH_$(ARCH) +CFLAGS += $(LUFA_OPTS) + +OBJ = $(SRC:%.c=%.o) + +liblufa.a: $(OBJ) + $(AR) $@ $(OBJ) + +%.o: %.c + $(CC) -c $(CFLAGS) $< -o $@ + +clean: + rm -f $(SRC:%.c=%.o) diff --git a/software/hhd70dongle/Makefile b/software/hhd70dongle/Makefile index 0f5441f..c4d12be 100644 --- a/software/hhd70dongle/Makefile +++ b/software/hhd70dongle/Makefile @@ -21,7 +21,8 @@ ## NAME := hhd70dongle -OBJ := hhd70dongle.o led.o hhd70.o usb_rawhid.o c1101lib.o util.o +OBJ := $(NAME).o hhd70.o usb_rawhid.o c1101lib.o util.o +LIBS := led BOARD_TYPE := hhd70dongle RESET_FUNC := ../../tools/atmega324u_usbhid/reset diff --git a/software/hhd70dongle/led.c b/software/hhd70dongle/led.c deleted file mode 100644 index c945564..0000000 --- a/software/hhd70dongle/led.c +++ /dev/null @@ -1,91 +0,0 @@ -/* - * spreadspace avr utils - * - * - * Copyright (C) 2012 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 "avr/io.h" -#include "led.h" - -#if defined(__BOARD_arduinoUno__) -#define HAS_LED 0 -#else -#define HAS_LED 1 -#endif - -#if defined(__BOARD_teensy1__) || defined(__BOARD_teensy1pp__) -#define LED_DIR 0 -#else -#define LED_DIR 1 -#endif - -#if defined(__BOARD_teensy1__) || defined(__BOARD_teensy1pp__) || defined(__BOARD_teensy2__) || defined(__BOARD_teensy2pp__) -#define LED_PORT PORTD -#define LED_DDR DDRD -#define LED_PINNUM 6 -#endif - -#if defined(__BOARD_hhd70dongle__) -#define LED_PORT PORTE -#define LED_DDR DDRE -#define LED_PINNUM 6 -#endif - -#if defined(__BOARD_arduino2009v2__) || defined(__BOARD_arduino2009__) || defined(__BOARD_arduino10000__) || defined(__BOARD_arduinoNG__) -#define LED_PORT PORTB -#define LED_DDR DDRB -#define LED_PINNUM 5 -#endif - -void led_init(void) -{ -#if HAS_LED == 1 - led_off(); - LED_DDR = 1< - * - * 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 . - */ - -#ifndef SPREADSPACE_led_h_INCLUDED -#define SPREADSPACE_led_h_INCLUDED - -void led_init(void); -void led_on(void); -void led_off(void); -void led_toggle(void); - -#endif -- cgit v1.2.3