diff --git a/hwreset/.gitignore b/hwreset/.gitignore new file mode 100644 index 0000000..21cb4bb --- /dev/null +++ b/hwreset/.gitignore @@ -0,0 +1,8 @@ +*.o +*.hex +*.elf +*.bin +*.map +*.lst +*.d +firmware/hwreset diff --git a/hwreset/config.h b/hwreset/config.h new file mode 100644 index 0000000..35b7e95 --- /dev/null +++ b/hwreset/config.h @@ -0,0 +1,7 @@ +#define DEVICE_VID 0x16c0 +#define DEVICE_PID 0x05dc + +#define USBRQ_VENDOR_RESET 0 +#define USBRQ_VENDOR_SET 1 +#define USBRQ_VENDOR_GET 2 +#define USBRQ_VENDOR_PULSE 3 diff --git a/hwreset/firmware/Makefile b/hwreset/firmware/Makefile new file mode 100644 index 0000000..e7339fb --- /dev/null +++ b/hwreset/firmware/Makefile @@ -0,0 +1,438 @@ +# Hey Emacs, this is a -*- makefile -*- +#---------------------------------------------------------------------------- +# avr-gcc Makefile +# +# by Steffen Vogel +# +# Released to the Public Domain - Credits to: +# Eric B. Weddington, Jörg Wunsch, Peter Fleury, Tim Henigan Colin O'Flynn, +# Reiner Patommel, Markus Pfaff, Sander Pool, Frederik Rouleau, Carlos Lamas +#---------------------------------------------------------------------------- +# On command line: +# +# make all = Make software +# +# make clean = Clean out built project files +# +# make program = Download the hex file to the device, using avrdude +# Please customize the avrdude settings below first! +# +# make filename.s = Just compile filename.c into the assembler code only +# +# make filename.i = Create a preprocessed source file for use in submitting +# bug reports to the GCC project. +# +# To rebuild project do "make clean" then "make all". +#---------------------------------------------------------------------------- + +#------------------------------ General Options ----------------------------- +# MCU name +MCU = atmega8 + +# Processor frequency +# This will define a symbol, F_CPU, in all source code files equal to the +# processor frequency. You can then use this symbol in your source code to +# calculate timings. Do NOT tack on a 'UL' at the end, this will be done +# automatically to create a 32-bit value in your source code. +# Typical values are: +F_CPU = 12000000 +#F_CPU = 1843200 +#F_CPU = 2000000 +#F_CPU = 3686400 +#F_CPU = 4000000 +#F_CPU = 7372800 +#F_CPU = 8000000 +#F_CPU = 11059200 +#F_CPU = 14745600 +#F_CPU = 16000000 +#F_CPU = 18432000 +#F_CPU = 20000000 + +# Output format +#FORMAT = srec +#FORMAT = binary +FORMAT = ihex + +# Target file name (without extension) +TARGET = hwreset + +# List C source files here (C dependencies are automatically generated) +SRC = $(TARGET).c usbdrv/usbdrv.c usbdrv/oddebug.c + +# List C++ source files here (C dependencies are automatically generated) +CPPSRC = + +# List Assembler source files here +# Make them always end in a capital .S. Files ending in a lowercase .s +# will not be considered source files but generated files (assembler +# output from the compiler), and will be deleted upon "make clean"! +# Even though the DOS/Win* filesystem matches both .s and .S the same, +# it will preserve the spelling of the filenames, and gcc itself does +# are about how the name is spelled on its command-line. +ASRC = usbdrv/usbdrvasm.S + +# Optimization level, can be [0, 1, 2, 3, ..., s] +# 0 = turn off optimization +# s = optimize for size +# (Note: 3 is not always the best optimization level. See avr-libc FAQ.) +OPT = s + +# Debugging format +# Native formats for AVR-GCC's -g are dwarf-2 [default] or stabs. +# AVR Studio 4.10 requires dwarf-2. +# AVR [Extended] COFF format requires stabs, plus an avr-objcopy run. +DEBUG = dwarf-2 + +# List any extra directories to look for include files here. +# Each directory must be seperated by a space. +# Use forward slashes for directory separators. +# For a directory that has spaces, enclose it in quotes. +EXTRAINCDIRS = usbdrv/ + +# Compiler flag to set the C Standard level +# c89 = "ANSI" C +# gnu89 = c89 plus GCC extensions +# c99 = ISO C99 standard (not yet fully implemented) +# gnu99 = c99 plus GCC extensions +CSTANDARD = -std=gnu99 + +# Place -D or -U options here for C sources +CDEFS = -DF_CPU=$(F_CPU)UL + +# Place -D or -U options here for C++ sources +#CPPDEFS += -D__STDC_LIMIT_MACROS +#CPPDEFS += -D__STDC_CONSTANT_MACROS +CPPDEFS = -DF_CPU=$(F_CPU)UL + +#------------------------------ Compiler Options ----------------------------- +# C Compiler Options +# -g generate debugging information +# -O optimization level +# -f tuning, see GCC manual and avr-libc documentation +# -Wall warning level +# -Wa tell GCC to pass this to the assembler. +# -adhlns create assembler listing +#CFLAGS = -g$(DEBUG) +#CFLAGS += -mint8 +#CFLAGS += -mshort-calls +#CFLAGS += -Wunreachable-code +#CFLAGS += -Wsign-compare +CFLAGS += -Wall +CFLAGS += -Wstrict-prototypes +CFLAGS += -Wundef +#CFLAGS += -fno-unit-at-a-time +CFLAGS += -funsigned-char +CFLAGS += -funsigned-bitfields +CFLAGS += -fpack-struct +CFLAGS += -fshort-enums +CFLAGS += $(CDEFS) +CFLAGS += -O$(OPT) +CFLAGS += -Wa,-adhlns=$(<:%.c=%.lst) +CFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS)) +CFLAGS += $(CSTANDARD) + +# C++ Compiler Options +# -g generate debugging information +# -O optimization level +# -f tuning, see GCC manual and avr-libc documentation +# -Wall warning level +# -Wa tell GCC to pass this to the assembler. +# -adhlns create assembler listing +#CPPFLAGS = -g$(DEBUG) +#CPPFLAGS += -mint8 +#CPPFLAGS += -mshort-calls +#CPPFLAGS += $(CSTANDARD) +#CPPFLAGS += -Wstrict-prototypes +#CPPFLAGS += -Wunreachable-code +#CPPFLAGS += -Wsign-compare +CPPFLAGS += -Wall +CFLAGS += -Wundef +#CPPFLAGS += -fno-unit-at-a-time +CPPFLAGS += -funsigned-char +CPPFLAGS += -funsigned-bitfields +CPPFLAGS += -fpack-struct +CPPFLAGS += -fshort-enums +CPPFLAGS += -fno-exceptions +CPPFLAGS += $(CPPDEFS) +CPPFLAGS += -O$(OPT) +CPPFLAGS += -Wa,-adhlns=$(<:%.cpp=%.lst) +CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS)) + +# Assembler Options +# -Wa tell GCC to pass this to the assembler. +# -adhlms create listing +# -gstabs have the assembler create line number information; +# note that for use in COFF files, additional information +# about filenames and function names needs to be present +# in the assembler source files +ASFLAGS = -Wa,-adhlns=$(<:%.S=%.lst),-gstabs + + +#------------------------------ Library Options ------------------------------ +# Minimalistic printf version +PRINTF_LIB_MIN = -Wl,-u,vfprintf -lprintf_min + +# Floating point printf version (requires MATH_LIB = -lm below) +PRINTF_LIB_FLOAT = -Wl,-u,vfprintf -lprintf_flt + +# If this is left blank, then it will use the Standard printf version. +#PRINTF_LIB = $(PRINTF_LIB_MIN) +#PRINTF_LIB = $(PRINTF_LIB_FLOAT) +PRINTF_LIB = + +# Minimalistic scanf version +SCANF_LIB_MIN = -Wl,-u,vfscanf -lscanf_min + +# Floating point + %[ scanf version (requires MATH_LIB = -lm below) +SCANF_LIB_FLOAT = -Wl,-u,vfscanf -lscanf_flt + +# If this is left blank, then it will use the Standard scanf version. +#SCANF_LIB = $(SCANF_LIB_MIN) +#SCANF_LIB = $(SCANF_LIB_FLOAT) +SCANF_LIB = + +MATH_LIB = -lm + +#-------------------------- External Memory Options -------------------------- +# 64 KB of external RAM, starting after internal RAM (ATmega128!), +# used for variables (.data/.bss) and heap (malloc()). +#EXTMEMOPTS = -Wl,-Tdata=0x801100,--defsym=__heap_end=0x80ffff + +# 64 KB of external RAM, starting after internal RAM (ATmega128!), +# only used for heap (malloc()). +#EXTMEMOPTS = -Wl,--defsym=__heap_start=0x801100,--defsym=__heap_end=0x80ffff +EXTMEMOPTS = + + +#------------------------------- Linker Options ------------------------------ +# -Wl tell GCC to pass this to linker. +# -Map create map file +# --cref add cross reference to map file +LDFLAGS = -Wl,-Map=$(TARGET).map,--cref +LDFLAGS += $(EXTMEMOPTS) +LDFLAGS += $(PRINTF_LIB) $(SCANF_LIB) $(MATH_LIB) + + +#------------------------ Programmer Options (avrdude) ----------------------- +# Programmer hardware +# avr910 +# avrisp +# arduino +# picoweb +# pony-stk200 +# stk200 +# stk500 +# "avrdude -c ?" to get a full listing +#AVRDUDE_PROGRAMMER = avr910 +#AVRDUDE_PROGRAMMER = arduino +AVRDUDE_PROGRAMMER = usbasp + +# The port your programmer is connected to +#AVRDUDE_PORT = /dev/ttyUSB0 +#AVRDUDE_PORT = /dev/ttyS0 +#AVRDUDE_PORT = /dev/ttyACM0 +AVRDUDE_PORT = usb + +AVRDUDE_WRITE_FLASH = -U flash:w:$(TARGET).hex +AVRDUDE_WRITE_EEPROM = -U eeprom:w:$(TARGET).eep + +# Uncomment the following if you want avrdude's erase cycle counter. +# Note that this counter needs to be initialized first using -Yn, +# see avrdude manual. +#AVRDUDE_ERASE_COUNTER = -y + +# Uncomment the following if you do /not/ wish a verification to be +# performed after programming the device. +#AVRDUDE_NO_VERIFY = -V + +#AVRDUDE_NO_ERASE = -D + +# Increase verbosity level +#AVRDUDE_VERBOSE = -v -v + +AVRDUDE_FLAGS = -p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER) +AVRDUDE_FLAGS += $(AVRDUDE_NO_VERIFY) +AVRDUDE_FLAGS += $(AVRDUDE_NO_ERASE) +AVRDUDE_FLAGS += $(AVRDUDE_VERBOSE) +AVRDUDE_FLAGS += $(AVRDUDE_ERASE_COUNTER) + + +#=========================== End of Configuration =========================== +# Define programs and commands. +SHELL = bash +CC = avr-gcc +OBJCOPY = avr-objcopy +OBJDUMP = avr-objdump +SIZE = avr-size +NM = avr-nm +AVRDUDE = avrdude +REMOVE = rm -f +REMOVEDIR = rm -rf +COPY = cp + +# Define messages (english) +MSG_ERRORS_NONE = Errors: none +MSG_SIZE_BEFORE = Size before: +MSG_SIZE_AFTER = Size after: +MSG_FLASH = Creating load file for Flash: +MSG_EEPROM = Creating load file for EEPROM: +MSG_BINARY = Creating binary: +MSG_EXTENDED_LISTING = Creating Extended Listing: +MSG_SYMBOL_TABLE = Creating Symbol Table: +MSG_LINKING = Linking: +MSG_COMPILING = Compiling C: +MSG_COMPILING_CPP = Compiling C++: +MSG_ASSEMBLING = Assembling: +MSG_CLEANING = Cleaning project: +MSG_CREATING_LIBRARY = Creating library: +MSG_PROGRAM = Flashing controller: + +# Define all object files +OBJ = $(SRC:%.c=%.o) $(CPPSRC:%.cpp=%.o) $(ASRC:%.S=%.o) + +# Define all listing files +LST = $(SRC:%.c=%.lst) $(CPPSRC:%.cpp=%.lst) $(ASRC:%.S=%.lst) + +# Compiler flags to generate dependency files +GENDEPFLAGS = -MD -MP -MF .dep/$(@F).d + +# Combine all necessary flags and optional flags +# Add target processor to flags +ALL_CFLAGS = -mmcu=$(MCU) -I. $(CFLAGS) $(GENDEPFLAGS) +ALL_CPPFLAGS = -mmcu=$(MCU) -I. -x c++ $(CPPFLAGS) $(GENDEPFLAGS) +ALL_ASFLAGS = -mmcu=$(MCU) -I. -x assembler-with-cpp $(ASFLAGS) + +# Default target +all: gccversion sizebefore build sizeafter + +# Change the build target to build a HEX file or a library +build: elf hex eep bin lss sym + +elf: $(TARGET).elf +hex: $(TARGET).hex +eep: $(TARGET).eep +bin: $(TARGET).bin +lss: $(TARGET).lss +sym: $(TARGET).sym +lib: $(LIBNAME) + +# Display size of file +HEXSIZE = $(SIZE) --target=$(FORMAT) $(TARGET).hex +ELFSIZE = $(SIZE) -A $(TARGET).elf + +sizebefore: + @if test -f $(TARGET).elf; then echo; echo $(MSG_SIZE_BEFORE); $(ELFSIZE); \ + $(SHELL) avr-mem.sh $(TARGET) $(MCU); fi + +sizeafter: + @if test -f $(TARGET).elf; then echo; echo $(MSG_SIZE_AFTER); $(ELFSIZE); \ + $(SHELL) avr-mem.sh $(TARGET) $(MCU); fi + +# Display compiler version information +gccversion: + @$(CC) --version + +# Program the device +program: build + @echo $(MSG_PROGRAM) + @echo + $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) \ + $(AVRDUDE_WRITE_EEPROM) + +# Create final output files (.hex, .eep) from ELF output file +%.hex: %.elf + @echo + @echo $(MSG_FLASH) $@ + $(OBJCOPY) -O $(FORMAT) -R .eeprom $< $@ + +%.eep: %.elf + @echo + @echo $(MSG_EEPROM) $@ + $(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" \ +--change-section-lma .eeprom=0 -O $(FORMAT) $< $@ + +# Create binary output +%.bin: %.elf + @echo + @echo $(MSG_BINARY) $@ + $(OBJCOPY) $(TARGET).elf -R .eeprom -O binary $(TARGET).bin + +# Create extended listing file from ELF output file +%.lss: %.elf + @echo + @echo $(MSG_EXTENDED_LISTING) $@ + $(OBJDUMP) -h -S $< > $@ + +# Create a symbol table from ELF output file +%.sym: %.elf + @echo + @echo $(MSG_SYMBOL_TABLE) $@ + $(NM) -n $< > $@ + +# Create library from object files +.SECONDARY: $(TARGET).a +.PRECIOUS: $(OBJ) +%.a: $(OBJ) + @echo + @echo $(MSG_CREATING_LIBRARY) $@ + $(AR) $@ $(OBJ) + +# Link: create ELF output file from object files +.SECONDARY : $(TARGET).elf +.PRECIOUS : $(OBJ) +%.elf: $(OBJ) + @echo + @echo $(MSG_LINKING) $@ + $(CC) $(ALL_CFLAGS) $^ -o $@ $(LDFLAGS) + +# Compile: create object files from C source files +%.o : %.c + @echo $(MSG_COMPILING) $< + $(CC) -c $(ALL_CFLAGS) $< -o $@ + +# Compile: create object files from C++ source files +%.o : %.cpp + @echo + @echo $(MSG_COMPILING_CPP) $< + $(CC) -c $(ALL_CPPFLAGS) $< -o $@ + +# Compile: create assembler files from C source files +%.s : %.c + $(CC) -S $(ALL_CFLAGS) $< -o $@ + +# Compile: create assembler files from C++ source files +%.s : %.cpp + $(CC) -S $(ALL_CPPFLAGS) $< -o $@ + +# Assemble: create object files from assembler source files +%.o : %.S + @echo + @echo $(MSG_ASSEMBLING) $< + $(CC) -c $(ALL_ASFLAGS) $< -o $@ + +# Create preprocessed source for use in sending a bug report +%.i : %.c + $(CC) -E -mmcu=$(MCU) -I. $(CFLAGS) $< -o $@ + +# Clean project +clean: + @echo $(MSG_CLEANING) + $(REMOVE) $(OBJ) + $(REMOVE) $(TARGET).hex + $(REMOVE) $(TARGET).bin + $(REMOVE) $(TARGET).eep + $(REMOVE) $(TARGET).elf + $(REMOVE) $(TARGET).map + $(REMOVE) $(TARGET).sym + $(REMOVE) $(TARGET).lss + $(REMOVE) $(TARGET).lst + $(REMOVE) $(SRC:.c=.s) + $(REMOVEDIR) .dep + +# Include the dependency files +-include $(shell mkdir .dep 2>/dev/null) $(wildcard .dep/*) + +# Listing of phony targets +.PHONY: all finish sizebefore sizeafter gccversion \ +build elf hex eep lss sym \ +clean program diff --git a/hwreset/firmware/avr-mem.sh b/hwreset/firmware/avr-mem.sh new file mode 100755 index 0000000..2e89d0d --- /dev/null +++ b/hwreset/firmware/avr-mem.sh @@ -0,0 +1,26 @@ +#!/bin/bash +MAXPERCENT=40 +IMAGESIZE=$(ls -l $1.bin | awk '{ print $5 }') +FLASHSIZE=$(perl -e "print 0x$(echo -e "#include \nFLASHEND" | avr-cpp -mmcu=$2 | tail -n 1 |cut -c3-);") +FLASHSIZE=$[$FLASHSIZE + 1] +PERCENT=$(perl -e "printf('%.2f', $IMAGESIZE.0 / $FLASHSIZE.0 *100.0);" ) +PER=$(perl -e "printf('%i', $IMAGESIZE / $FLASHSIZE *$MAXPERCENT);" ) + +echo "Imagesize: $IMAGESIZE/$FLASHSIZE bytes (${PERCENT}%)" +if [ $IMAGESIZE -gt $FLASHSIZE ];then + echo " WARNING! Your Image is too big for the selected chip. WARNING!" + echo "" + exit 1 +else + echo -n " [" + COUNTER=0 + while [ $COUNTER -lt $MAXPERCENT ]; do + if [ $COUNTER -lt $PER ]; then + echo -n "=" + else + echo -n "-" + fi + let COUNTER=COUNTER+1 + done + echo "]" +fi diff --git a/hwreset/firmware/hwreset.c b/hwreset/firmware/hwreset.c new file mode 100644 index 0000000..da709d0 --- /dev/null +++ b/hwreset/firmware/hwreset.c @@ -0,0 +1,142 @@ +#include +#include +#include + +#include +#include +#include +#include + +#include + +#include "../config.h" + +uint8_t buffer; +uint16_t countdown; + +void pgm_read_block(uint8_t *pTarget, const uint8_t *pSource, size_t len) { + for(size_t i = 0; i < len; i++) { + *pTarget++ = pgm_read_byte(pSource++); + } +} + +void usbReset() { + DDRB |= (1 << PB0) | (1 << PB1); /* enable USB pins as output */ + _delay_ms(15); /* sleeping for 15ms */ + DDRB &= ~(1 << PB0) & ~(1 << PB1); /* disbale USB pins as output */ +} + +void hardwareInit() { + usbReset(); + + /* Relay Ports */ + DDRB |= (1 << PB3) | (1 << PB5); + PORTB &= ~(1 << PB3) & ~(1 << PB5); + + /* LEDs */ + DDRC |= (1 << PC0) | (1 << PC1); /* set LED pins as output */ + PORTC |= (1 << PC0) | (1 << PC1); /* clear LEDs (active low) */ + + /* Countdown Timer */ + TIMSK = (1 << OCIE1A); + OCR1A = 12000; +} + +ISR(TIMER1_COMPA_vect) { + countdown--; + + if (!countdown) { + PORTC |= (1 << PC0) | (1 << PC1); + PORTB &= ~(1 << PB3) & ~(1 << PB5); + TCCR1B = 0; /* stop timer */ + } +} + +void delay_1ms(uint16_t ms) { + uint16_t i; + + for(i=0; ibmRequestType & USBRQ_TYPE_MASK) == USBRQ_TYPE_VENDOR) { + switch (rq->bRequest) { + case USBRQ_VENDOR_PULSE: { + char port = 0; + if (rq->wValue.bytes[0] & 0x01) { + port |= (1 << PB3); + PORTC &= ~(1 << PC0); + } + if (rq->wValue.bytes[0] & 0x02) { + port |= (1 << PB5); + PORTC &= ~(1 << PC1); + } + + PORTB |= port; + + countdown = rq->wIndex.word; + TCCR1B = (1 << CS10) | (1 << WGM12); /* start countdown timer */ + + buffer = 0; + return 1; + } + + case USBRQ_VENDOR_SET: { + char port = 0; + PORTC |= (1 << PC0) | (1 << PC1); + + if (rq->wValue.bytes[0] & 0x01) { + port |= (1 << PB3); + PORTC &= ~(1 << PC0); + } + if (rq->wValue.bytes[0] & 0x02) { + port |= (1 << PB5); + PORTC &= ~(1 << PC1); + } + + PORTB = port | (PORTB & ~((1 << PB3) | (1 << PB5))); + + buffer = 0; + return 1; + } + + case USBRQ_VENDOR_GET: { + buffer = 0; + if (PINB & (1 << PB3)) + buffer |= 0x01; + if (PINB & (1 << PB5)) + buffer |= 0x02; + if (PINB & (1 << PB2)) + buffer |= 0x04; + if (PINB & (1 << PB4)) + buffer |= 0x08; + + return 1; + } + } + } + + return 0; +} + +int main(void) { + wdt_enable(WDTO_2S); /* enable watchdog timer 2s */ + + usbInit(); /* initialize USB stack processing */ + hardwareInit(); /* setup io & starts timer */ + sei(); /* enable global interrupts */ + + usbMsgPtr = &buffer; + + /* main loop */ + for (;;) { + wdt_reset(); /* reset the watchdog */ + usbPoll(); /* poll the USB stack */ + } + + return 0; +} + diff --git a/hwreset/firmware/usbconfig.h b/hwreset/firmware/usbconfig.h new file mode 100644 index 0000000..40afdc3 --- /dev/null +++ b/hwreset/firmware/usbconfig.h @@ -0,0 +1,376 @@ +/* Name: usbconfig.h + * Project: V-USB, virtual USB port for Atmel's(r) AVR(r) microcontrollers + * Author: Christian Starkjohann + * Creation Date: 2005-04-01 + * Tabsize: 4 + * Copyright: (c) 2005 by OBJECTIVE DEVELOPMENT Software GmbH + * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt) + * This Revision: $Id: usbconfig-prototype.h 785 2010-05-30 17:57:07Z cs $ + */ + +#ifndef __usbconfig_h_included__ +#define __usbconfig_h_included__ + +/* +General Description: +This file is an example configuration (with inline documentation) for the USB +driver. It configures V-USB for USB D+ connected to Port D bit 2 (which is +also hardware interrupt 0 on many devices) and USB D- to Port D bit 4. You may +wire the lines to any other port, as long as D+ is also wired to INT0 (or any +other hardware interrupt, as long as it is the highest level interrupt, see +section at the end of this file). ++ To create your own usbconfig.h file, copy this file to your project's ++ firmware source directory) and rename it to "usbconfig.h". ++ Then edit it accordingly. +*/ + +/* ---------------------------- Hardware Config ---------------------------- */ + +#define USB_CFG_IOPORTNAME B +/* This is the port where the USB bus is connected. When you configure it to + * "B", the registers PORTB, PINB and DDRB will be used. + */ +#define USB_CFG_DMINUS_BIT 0 +/* This is the bit number in USB_CFG_IOPORT where the USB D- line is connected. + * This may be any bit in the port. + */ +#define USB_CFG_DPLUS_BIT 1 +/* This is the bit number in USB_CFG_IOPORT where the USB D+ line is connected. + * This may be any bit in the port. Please note that D+ must also be connected + * to interrupt pin INT0! [You can also use other interrupts, see section + * "Optional MCU Description" below, or you can connect D- to the interrupt, as + * it is required if you use the USB_COUNT_SOF feature. If you use D- for the + * interrupt, the USB interrupt will also be triggered at Start-Of-Frame + * markers every millisecond.] + */ +#define USB_CFG_CLOCK_KHZ 12000 +/* Clock rate of the AVR in kHz. Legal values are 12000, 12800, 15000, 16000, + * 16500, 18000 and 20000. The 12.8 MHz and 16.5 MHz versions of the code + * require no crystal, they tolerate +/- 1% deviation from the nominal + * frequency. All other rates require a precision of 2000 ppm and thus a + * crystal! + * Since F_CPU should be defined to your actual clock rate anyway, you should + * not need to modify this setting. + */ +#define USB_CFG_CHECK_CRC 0 +/* Define this to 1 if you want that the driver checks integrity of incoming + * data packets (CRC checks). CRC checks cost quite a bit of code size and are + * currently only available for 18 MHz crystal clock. You must choose + * USB_CFG_CLOCK_KHZ = 18000 if you enable this option. + */ + +/* ----------------------- Optional Hardware Config ------------------------ */ + +/* #define USB_CFG_PULLUP_IOPORTNAME D */ +/* If you connect the 1.5k pullup resistor from D- to a port pin instead of + * V+, you can connect and disconnect the device from firmware by calling + * the macros usbDeviceConnect() and usbDeviceDisconnect() (see usbdrv.h). + * This constant defines the port on which the pullup resistor is connected. + */ +/* #define USB_CFG_PULLUP_BIT 4 */ +/* This constant defines the bit number in USB_CFG_PULLUP_IOPORT (defined + * above) where the 1.5k pullup resistor is connected. See description + * above for details. + */ + +/* --------------------------- Functional Range ---------------------------- */ + +#define USB_CFG_HAVE_INTRIN_ENDPOINT 0 +/* Define this to 1 if you want to compile a version with two endpoints: The + * default control endpoint 0 and an interrupt-in endpoint (any other endpoint + * number). + */ +#define USB_CFG_HAVE_INTRIN_ENDPOINT3 0 +/* Define this to 1 if you want to compile a version with three endpoints: The + * default control endpoint 0, an interrupt-in endpoint 3 (or the number + * configured below) and a catch-all default interrupt-in endpoint as above. + * You must also define USB_CFG_HAVE_INTRIN_ENDPOINT to 1 for this feature. + */ +#define USB_CFG_EP3_NUMBER 3 +/* If the so-called endpoint 3 is used, it can now be configured to any other + * endpoint number (except 0) with this macro. Default if undefined is 3. + */ +/* #define USB_INITIAL_DATATOKEN USBPID_DATA1 */ +/* The above macro defines the startup condition for data toggling on the + * interrupt/bulk endpoints 1 and 3. Defaults to USBPID_DATA1. + * Since the token is toggled BEFORE sending any data, the first packet is + * sent with the oposite value of this configuration! + */ +#define USB_CFG_IMPLEMENT_HALT 0 +/* Define this to 1 if you also want to implement the ENDPOINT_HALT feature + * for endpoint 1 (interrupt endpoint). Although you may not need this feature, + * it is required by the standard. We have made it a config option because it + * bloats the code considerably. + */ +#define USB_CFG_SUPPRESS_INTR_CODE 0 +/* Define this to 1 if you want to declare interrupt-in endpoints, but don't + * want to send any data over them. If this macro is defined to 1, functions + * usbSetInterrupt() and usbSetInterrupt3() are omitted. This is useful if + * you need the interrupt-in endpoints in order to comply to an interface + * (e.g. HID), but never want to send any data. This option saves a couple + * of bytes in flash memory and the transmit buffers in RAM. + */ +#define USB_CFG_INTR_POLL_INTERVAL 10 +/* If you compile a version with endpoint 1 (interrupt-in), this is the poll + * interval. The value is in milliseconds and must not be less than 10 ms for + * low speed devices. + */ +#define USB_CFG_IS_SELF_POWERED 0 +/* Define this to 1 if the device has its own power supply. Set it to 0 if the + * device is powered from the USB bus. + */ +#define USB_CFG_MAX_BUS_POWER 50 +/* Set this variable to the maximum USB bus power consumption of your device. + * The value is in milliamperes. [It will be divided by two since USB + * communicates power requirements in units of 2 mA.] + */ +#define USB_CFG_IMPLEMENT_FN_WRITE 0 +/* Set this to 1 if you want usbFunctionWrite() to be called for control-out + * transfers. Set it to 0 if you don't need it and want to save a couple of + * bytes. + */ +#define USB_CFG_IMPLEMENT_FN_READ 0 +/* Set this to 1 if you need to send control replies which are generated + * "on the fly" when usbFunctionRead() is called. If you only want to send + * data from a static buffer, set it to 0 and return the data from + * usbFunctionSetup(). This saves a couple of bytes. + */ +#define USB_CFG_IMPLEMENT_FN_WRITEOUT 0 +/* Define this to 1 if you want to use interrupt-out (or bulk out) endpoints. + * You must implement the function usbFunctionWriteOut() which receives all + * interrupt/bulk data sent to any endpoint other than 0. The endpoint number + * can be found in 'usbRxToken'. + */ +#define USB_CFG_HAVE_FLOWCONTROL 0 +/* Define this to 1 if you want flowcontrol over USB data. See the definition + * of the macros usbDisableAllRequests() and usbEnableAllRequests() in + * usbdrv.h. + */ +#define USB_CFG_DRIVER_FLASH_PAGE 0 +/* If the device has more than 64 kBytes of flash, define this to the 64 k page + * where the driver's constants (descriptors) are located. Or in other words: + * Define this to 1 for boot loaders on the ATMega128. + */ +#define USB_CFG_LONG_TRANSFERS 0 +/* Define this to 1 if you want to send/receive blocks of more than 254 bytes + * in a single control-in or control-out transfer. Note that the capability + * for long transfers increases the driver size. + */ +/* #define USB_RX_USER_HOOK(data, len) if(usbRxToken == (uchar)USBPID_SETUP) blinkLED(); */ +/* This macro is a hook if you want to do unconventional things. If it is + * defined, it's inserted at the beginning of received message processing. + * If you eat the received message and don't want default processing to + * proceed, do a return after doing your things. One possible application + * (besides debugging) is to flash a status LED on each packet. + */ +/* #define USB_RESET_HOOK(resetStarts) if(!resetStarts){hadUsbReset();} */ +/* This macro is a hook if you need to know when an USB RESET occurs. It has + * one parameter which distinguishes between the start of RESET state and its + * end. + */ +/* #define USB_SET_ADDRESS_HOOK() hadAddressAssigned(); */ +/* This macro (if defined) is executed when a USB SET_ADDRESS request was + * received. + */ +#define USB_COUNT_SOF 0 +/* define this macro to 1 if you need the global variable "usbSofCount" which + * counts SOF packets. This feature requires that the hardware interrupt is + * connected to D- instead of D+. + */ +/* #ifdef __ASSEMBLER__ + * macro myAssemblerMacro + * in YL, TCNT0 + * sts timer0Snapshot, YL + * endm + * #endif + * #define USB_SOF_HOOK myAssemblerMacro + * This macro (if defined) is executed in the assembler module when a + * Start Of Frame condition is detected. It is recommended to define it to + * the name of an assembler macro which is defined here as well so that more + * than one assembler instruction can be used. The macro may use the register + * YL and modify SREG. If it lasts longer than a couple of cycles, USB messages + * immediately after an SOF pulse may be lost and must be retried by the host. + * What can you do with this hook? Since the SOF signal occurs exactly every + * 1 ms (unless the host is in sleep mode), you can use it to tune OSCCAL in + * designs running on the internal RC oscillator. + * Please note that Start Of Frame detection works only if D- is wired to the + * interrupt, not D+. THIS IS DIFFERENT THAN MOST EXAMPLES! + */ +#define USB_CFG_CHECK_DATA_TOGGLING 0 +/* define this macro to 1 if you want to filter out duplicate data packets + * sent by the host. Duplicates occur only as a consequence of communication + * errors, when the host does not receive an ACK. Please note that you need to + * implement the filtering yourself in usbFunctionWriteOut() and + * usbFunctionWrite(). Use the global usbCurrentDataToken and a static variable + * for each control- and out-endpoint to check for duplicate packets. + */ +#define USB_CFG_HAVE_MEASURE_FRAME_LENGTH 0 +/* define this macro to 1 if you want the function usbMeasureFrameLength() + * compiled in. This function can be used to calibrate the AVR's RC oscillator. + */ +#define USB_USE_FAST_CRC 0 +/* The assembler module has two implementations for the CRC algorithm. One is + * faster, the other is smaller. This CRC routine is only used for transmitted + * messages where timing is not critical. The faster routine needs 31 cycles + * per byte while the smaller one needs 61 to 69 cycles. The faster routine + * may be worth the 32 bytes bigger code size if you transmit lots of data and + * run the AVR close to its limit. + */ + +/* -------------------------- Device Description --------------------------- */ + +#define USB_CFG_VENDOR_ID 0xc0, 0x16 /* = 0x16c0 = 5824 = voti.nl */ +/* USB vendor ID for the device, low byte first. If you have registered your + * own Vendor ID, define it here. Otherwise you may use one of obdev's free + * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! + * *** IMPORTANT NOTE *** + * This template uses obdev's shared VID/PID pair for Vendor Class devices + * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand + * the implications! + */ +#define USB_CFG_DEVICE_ID 0xdc, 0x05 /* = 0x05dc = 1500 */ +/* This is the ID of the product, low byte first. It is interpreted in the + * scope of the vendor ID. If you have registered your own VID with usb.org + * or if you have licensed a PID from somebody else, define it here. Otherwise + * you may use one of obdev's free shared VID/PID pairs. See the file + * USB-IDs-for-free.txt for details! + * *** IMPORTANT NOTE *** + * This template uses obdev's shared VID/PID pair for Vendor Class devices + * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand + * the implications! + */ +#define USB_CFG_DEVICE_VERSION 0x01, 0x01 +/* Version number of the device: Minor number first, then major number. + */ +#define USB_CFG_VENDOR_NAME '/', 'd', 'e', 'v', '/', 'n', 'u', 'l', 'l', 'l' +#define USB_CFG_VENDOR_NAME_LEN 10 +/* These two values define the vendor name returned by the USB device. The name + * must be given as a list of characters under single quotes. The characters + * are interpreted as Unicode (UTF-16) entities. + * If you don't want a vendor name string, undefine these macros. + * ALWAYS define a vendor name containing your Internet domain name if you use + * obdev's free shared VID/PID pair. See the file USB-IDs-for-free.txt for + * details. + */ +#define USB_CFG_DEVICE_NAME 'h', 'w', 'r', 'e', 's', 'e', 't' +#define USB_CFG_DEVICE_NAME_LEN 7 +/* Same as above for the device name. If you don't want a device name, undefine + * the macros. See the file USB-IDs-for-free.txt before you assign a name if + * you use a shared VID/PID. + */ +#define USB_CFG_SERIAL_NUMBER '1', '3', '3', '7' +#define USB_CFG_SERIAL_NUMBER_LEN 4 +/* Same as above for the serial number. If you don't want a serial number, + * undefine the macros. + * It may be useful to provide the serial number through other means than at + * compile time. See the section about descriptor properties below for how + * to fine tune control over USB descriptors such as the string descriptor + * for the serial number. + */ +#define USB_CFG_DEVICE_CLASS 0xff /* set to 0 if deferred to interface */ +#define USB_CFG_DEVICE_SUBCLASS 0 +/* See USB specification if you want to conform to an existing device class. + * Class 0xff is "vendor specific". + */ +#define USB_CFG_INTERFACE_CLASS 0 +#define USB_CFG_INTERFACE_SUBCLASS 0 +#define USB_CFG_INTERFACE_PROTOCOL 0 +/* See USB specification if you want to conform to an existing device class or + * protocol. The following classes must be set at interface level: + * HID class is 3, no subclass and protocol required (but may be useful!) + * CDC class is 2, use subclass 2 and protocol 1 for ACM + */ +#define USB_CFG_HID_REPORT_DESCRIPTOR_LENGTH 0 +/* Define this to the length of the HID report descriptor, if you implement + * an HID device. Otherwise don't define it or define it to 0. + * If you use this define, you must add a PROGMEM character array named + * "usbHidReportDescriptor" to your code which contains the report descriptor. + * Don't forget to keep the array and this define in sync! + */ + +/* #define USB_PUBLIC static */ +/* Use the define above if you #include usbdrv.c instead of linking against it. + * This technique saves a couple of bytes in flash memory. + */ + +/* ------------------- Fine Control over USB Descriptors ------------------- */ +/* If you don't want to use the driver's default USB descriptors, you can + * provide our own. These can be provided as (1) fixed length static data in + * flash memory, (2) fixed length static data in RAM or (3) dynamically at + * runtime in the function usbFunctionDescriptor(). See usbdrv.h for more + * information about this function. + * Descriptor handling is configured through the descriptor's properties. If + * no properties are defined or if they are 0, the default descriptor is used. + * Possible properties are: + * + USB_PROP_IS_DYNAMIC: The data for the descriptor should be fetched + * at runtime via usbFunctionDescriptor(). If the usbMsgPtr mechanism is + * used, the data is in FLASH by default. Add property USB_PROP_IS_RAM if + * you want RAM pointers. + * + USB_PROP_IS_RAM: The data returned by usbFunctionDescriptor() or found + * in static memory is in RAM, not in flash memory. + * + USB_PROP_LENGTH(len): If the data is in static memory (RAM or flash), + * the driver must know the descriptor's length. The descriptor itself is + * found at the address of a well known identifier (see below). + * List of static descriptor names (must be declared PROGMEM if in flash): + * char usbDescriptorDevice[]; + * char usbDescriptorConfiguration[]; + * char usbDescriptorHidReport[]; + * char usbDescriptorString0[]; + * int usbDescriptorStringVendor[]; + * int usbDescriptorStringDevice[]; + * int usbDescriptorStringSerialNumber[]; + * Other descriptors can't be provided statically, they must be provided + * dynamically at runtime. + * + * Descriptor properties are or-ed or added together, e.g.: + * #define USB_CFG_DESCR_PROPS_DEVICE (USB_PROP_IS_RAM | USB_PROP_LENGTH(18)) + * + * The following descriptors are defined: + * USB_CFG_DESCR_PROPS_DEVICE + * USB_CFG_DESCR_PROPS_CONFIGURATION + * USB_CFG_DESCR_PROPS_STRINGS + * USB_CFG_DESCR_PROPS_STRING_0 + * USB_CFG_DESCR_PROPS_STRING_VENDOR + * USB_CFG_DESCR_PROPS_STRING_PRODUCT + * USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER + * USB_CFG_DESCR_PROPS_HID + * USB_CFG_DESCR_PROPS_HID_REPORT + * USB_CFG_DESCR_PROPS_UNKNOWN (for all descriptors not handled by the driver) + * + * Note about string descriptors: String descriptors are not just strings, they + * are Unicode strings prefixed with a 2 byte header. Example: + * int serialNumberDescriptor[] = { + * USB_STRING_DESCRIPTOR_HEADER(6), + * 'S', 'e', 'r', 'i', 'a', 'l' + * }; + */ + +#define USB_CFG_DESCR_PROPS_DEVICE 0 +#define USB_CFG_DESCR_PROPS_CONFIGURATION 0 +#define USB_CFG_DESCR_PROPS_STRINGS 0 +#define USB_CFG_DESCR_PROPS_STRING_0 0 +#define USB_CFG_DESCR_PROPS_STRING_VENDOR 0 +#define USB_CFG_DESCR_PROPS_STRING_PRODUCT 0 +#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER 0 +#define USB_CFG_DESCR_PROPS_HID 0 +#define USB_CFG_DESCR_PROPS_HID_REPORT 0 +#define USB_CFG_DESCR_PROPS_UNKNOWN 0 + +/* ----------------------- Optional MCU Description ------------------------ */ + +/* The following configurations have working defaults in usbdrv.h. You + * usually don't need to set them explicitly. Only if you want to run + * the driver on a device which is not yet supported or with a compiler + * which is not fully supported (such as IAR C) or if you use a differnt + * interrupt than INT0, you may have to define some of these. + */ +/* #define USB_INTR_CFG MCUCR */ +/* #define USB_INTR_CFG_SET ((1 << ISC00) | (1 << ISC01)) */ +/* #define USB_INTR_CFG_CLR 0 */ +/* #define USB_INTR_ENABLE GIMSK */ +/* #define USB_INTR_ENABLE_BIT INT0 */ +/* #define USB_INTR_PENDING GIFR */ +/* #define USB_INTR_PENDING_BIT INTF0 */ +/* #define USB_INTR_VECTOR INT0_vect */ + +#endif /* __usbconfig_h_included__ */ diff --git a/hwreset/firmware/usbdrv b/hwreset/firmware/usbdrv new file mode 120000 index 0000000..3a925a7 --- /dev/null +++ b/hwreset/firmware/usbdrv @@ -0,0 +1 @@ +vusb/usbdrv/ \ No newline at end of file diff --git a/hwreset/host/Makefile b/hwreset/host/Makefile new file mode 100644 index 0000000..602e75d --- /dev/null +++ b/hwreset/host/Makefile @@ -0,0 +1,5 @@ +all: + gcc hwreset.c -o hwreset -lusb-1.0 + +clean: + rm hwreset diff --git a/hwreset/host/hwreset.c b/hwreset/host/hwreset.c new file mode 100644 index 0000000..2fffd7e --- /dev/null +++ b/hwreset/host/hwreset.c @@ -0,0 +1,128 @@ +#include +#include +#include +#include + +#include + +#include "../config.h" + +void usage() { + printf("usage: hwreset COMMAND [OPTIONS]\n"); + printf(" available COMMANDs and their specific OPTIONS:\n\n"); + printf(" push [power/reset] DURATION press button for DURATION miliseconds\n"); + printf(" set [power/reset] [on/off] set button on or off\n"); + printf(" status return status of power led\n\n"); + printf("hwreset 0.1 - by Steffen Vogel \n"); + printf("please send bugreports to http://bugs.0l.de\n"); +} + +int main(int argc, char *argv[]) { + uint8_t ret = 0; + + /* initalize libusb */ + int r = libusb_init(NULL); + if (r < 0) { + return EXIT_FAILURE; + } + + /* search & open device */ + struct libusb_device_handle *handle = libusb_open_device_with_vid_pid(NULL, DEVICE_VID, DEVICE_PID); + if (handle == NULL) { + fprintf(stderr, "failed to open the device\n"); + return EXIT_FAILURE; + } + + struct libusb_device_descriptor desc; + r = libusb_get_device_descriptor(libusb_get_device(handle), &desc); + if (r < 0) { + fprintf(stderr, "failed to get device descriptor\n"); + return EXIT_FAILURE; + } + + if (argc == 1) { + usage(); + exit(EXIT_FAILURE); + } + else if (argc == 2 && !strcmp(argv[1], "status")) { + libusb_control_transfer( + handle, + LIBUSB_ENDPOINT_IN | LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_DEVICE, /* bmRequestType */ + USBRQ_VENDOR_GET, /* bRequest */ + 0, /* wValue */ + 0, /* wIndex */ + &ret, /* data */ + 1, /* wLength */ + 500 /* timeout */ + ); + } + else if (argc == 4 && !strcmp(argv[1], "push")) { + uint16_t port; + uint16_t duration = atoi(argv[3]); + + if (!strcmp(argv[2], "reset")) + port = 1; + else if (!strcmp(argv[2], "power")) + port = 2; + else if (!strcmp(argv[2], "both")) + port = 3; + + printf("hitting the %s button for %u ms...\n", argv[2], duration); + + libusb_control_transfer( + handle, + LIBUSB_ENDPOINT_IN | LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_DEVICE, /* bmRequestType */ + USBRQ_VENDOR_PULSE, /* bRequest */ + port, /* wValue */ + duration, /* wIndex */ + &ret, /* data */ + 1, /* wLength */ + 500 /* timeout */ + ); + } + else if (argc == 4 && !strcmp(argv[1], "set")) { + uint16_t port; + uint16_t state; + + if (!strcmp(argv[2], "reset")) + port = 1; + else if (!strcmp(argv[2], "power")) + port = 2; + else if (!strcmp(argv[2], "both")) + port = 3; + else { + usage(); + exit(EXIT_FAILURE); + } + + if (!strcmp(argv[3], "on")) + state = port; + else if (!strcmp(argv[3], "off")) + state = 0; + else { + usage(); + exit(EXIT_FAILURE); + } + + printf("set %s button %s...\n", argv[2], argv[3]); + + libusb_control_transfer( + handle, + LIBUSB_ENDPOINT_IN | LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_DEVICE, /* bmRequestType */ + USBRQ_VENDOR_SET, /* bRequest */ + state, /* wValue */ + 0, /* wIndex */ + &ret, /* data */ + 1, /* wLength */ + 500 /* timeout */ + ); + } + else { + usage(); + exit(EXIT_FAILURE); + } + + printf("r = %u\n", ret); + + return ret; +}