diff options
| -rw-r--r-- | README.md | 6 | ||||
| -rw-r--r-- | usb/.gitignore (renamed from keyboard/.gitignore) | 0 | ||||
| -rw-r--r-- | usb/Makefile (renamed from keyboard/Makefile) | 6 | ||||
| -rw-r--r-- | usb/README.md (renamed from keyboard/README.md) | 4 | ||||
| -rw-r--r-- | usb/usb.c (renamed from keyboard/keyboard.c) | 0 | ||||
| -rw-r--r-- | usb/usbdrv/Changelog.txt (renamed from keyboard/usbdrv/Changelog.txt) | 0 | ||||
| -rw-r--r-- | usb/usbdrv/CommercialLicense.txt (renamed from keyboard/usbdrv/CommercialLicense.txt) | 0 | ||||
| -rw-r--r-- | usb/usbdrv/License.txt (renamed from keyboard/usbdrv/License.txt) | 0 | ||||
| -rw-r--r-- | usb/usbdrv/Readme.txt (renamed from keyboard/usbdrv/Readme.txt) | 0 | ||||
| -rw-r--r-- | usb/usbdrv/USB-ID-FAQ.txt (renamed from keyboard/usbdrv/USB-ID-FAQ.txt) | 0 | ||||
| -rw-r--r-- | usb/usbdrv/USB-IDs-for-free.txt (renamed from keyboard/usbdrv/USB-IDs-for-free.txt) | 0 | ||||
| -rw-r--r-- | usb/usbdrv/asmcommon.inc (renamed from keyboard/usbdrv/asmcommon.inc) | 0 | ||||
| -rw-r--r-- | usb/usbdrv/oddebug.c (renamed from keyboard/usbdrv/oddebug.c) | 0 | ||||
| -rw-r--r-- | usb/usbdrv/oddebug.h (renamed from keyboard/usbdrv/oddebug.h) | 0 | ||||
| -rw-r--r-- | usb/usbdrv/usbconfig-prototype.h (renamed from keyboard/usbdrv/usbconfig-prototype.h) | 0 | ||||
| -rw-r--r-- | usb/usbdrv/usbconfig.h (renamed from keyboard/usbdrv/usbconfig.h) | 0 | ||||
| -rw-r--r-- | usb/usbdrv/usbdrv.c (renamed from keyboard/usbdrv/usbdrv.c) | 0 | ||||
| -rw-r--r-- | usb/usbdrv/usbdrv.h (renamed from keyboard/usbdrv/usbdrv.h) | 0 | ||||
| -rw-r--r-- | usb/usbdrv/usbdrvasm.S (renamed from keyboard/usbdrv/usbdrvasm.S) | 0 | ||||
| -rw-r--r-- | usb/usbdrv/usbdrvasm.asm (renamed from keyboard/usbdrv/usbdrvasm.asm) | 0 | ||||
| -rw-r--r-- | usb/usbdrv/usbdrvasm12.inc (renamed from keyboard/usbdrv/usbdrvasm12.inc) | 0 | ||||
| -rw-r--r-- | usb/usbdrv/usbdrvasm128.inc (renamed from keyboard/usbdrv/usbdrvasm128.inc) | 0 | ||||
| -rw-r--r-- | usb/usbdrv/usbdrvasm15.inc (renamed from keyboard/usbdrv/usbdrvasm15.inc) | 0 | ||||
| -rw-r--r-- | usb/usbdrv/usbdrvasm16.inc (renamed from keyboard/usbdrv/usbdrvasm16.inc) | 0 | ||||
| -rw-r--r-- | usb/usbdrv/usbdrvasm165.inc (renamed from keyboard/usbdrv/usbdrvasm165.inc) | 0 | ||||
| -rw-r--r-- | usb/usbdrv/usbdrvasm18-crc.inc (renamed from keyboard/usbdrv/usbdrvasm18-crc.inc) | 0 | ||||
| -rw-r--r-- | usb/usbdrv/usbdrvasm20.inc (renamed from keyboard/usbdrv/usbdrvasm20.inc) | 0 | ||||
| -rw-r--r-- | usb/usbdrv/usbportability.h (renamed from keyboard/usbdrv/usbportability.h) | 0 | ||||
| -rw-r--r-- | usb/usbtest.c (renamed from keyboard/usbtest.c) | 0 |
29 files changed, 8 insertions, 8 deletions
@@ -2,8 +2,8 @@ Various code for the [Digispark](http://digistump.com/wiki/digispark) - - [Blink](blink) - a simple blinking LED example - - [Keyboard](keyboard) - a basic USB device that flips the LED based on USB interrupts + - [Blink](blink) - a simple blinking LED example, start here + - [USB](usb) - a basic USB device that flips the LED based on USB interrupts ## Prerequisites @@ -23,7 +23,7 @@ $ sudo udevadm control --reload-rules ```bash $ cd blink $ make clean && make -$ micronucleus hello.hex +$ micronucleus blink.hex ``` ## License diff --git a/keyboard/.gitignore b/usb/.gitignore index c9f901b..c9f901b 100644 --- a/keyboard/.gitignore +++ b/usb/.gitignore diff --git a/keyboard/Makefile b/usb/Makefile index 081ebed..58230b3 100644 --- a/keyboard/Makefile +++ b/usb/Makefile @@ -4,9 +4,9 @@ OBJCOPY = avr-objcopy CFLAGS = -Wall -Os -Iusbdrv -mmcu=attiny85 -DF_CPU=16500000 OBJFLAGS = -j .text -j .data -O ihex -OBJECTS = usbdrv/usbdrv.o usbdrv/oddebug.o usbdrv/usbdrvasm.o keyboard.o +OBJECTS = usbdrv/usbdrv.o usbdrv/oddebug.o usbdrv/usbdrvasm.o usb.o -all: keyboard.hex usbtest +all: usb.hex usbtest clean: $(RM) *.o *.hex *.elf usbdrv/*.o usbtest @@ -14,7 +14,7 @@ clean: %.hex: %.elf $(OBJCOPY) $(OBJFLAGS) $< $@ -keyboard.elf: $(OBJECTS) +usb.elf: $(OBJECTS) $(CC) $(CFLAGS) $(OBJECTS) -o $@ $(OBJECTS): usbdrv/usbconfig.h diff --git a/keyboard/README.md b/usb/README.md index cee2f6a..5056908 100644 --- a/keyboard/README.md +++ b/usb/README.md @@ -1,4 +1,4 @@ -# Keyboard +# USB Neat and simple example of how the digispark can become a USB device and react to interrupts. Heavily based on http://codeandlife.com/2012/01/29/avr-attiny-usb-tutorial-part-3/ @@ -8,7 +8,7 @@ Build the program and flash it as usual to the digispark. ```bash $ make clean && make -$ micronucleus keyboard.hex +$ micronucleus usb.hex ``` After the program loads, you should see a new USB device: diff --git a/keyboard/keyboard.c b/usb/usb.c index 54b5281..54b5281 100644 --- a/keyboard/keyboard.c +++ b/usb/usb.c diff --git a/keyboard/usbdrv/Changelog.txt b/usb/usbdrv/Changelog.txt index 79b5215..79b5215 100644 --- a/keyboard/usbdrv/Changelog.txt +++ b/usb/usbdrv/Changelog.txt diff --git a/keyboard/usbdrv/CommercialLicense.txt b/usb/usbdrv/CommercialLicense.txt index de1a2b0..de1a2b0 100644 --- a/keyboard/usbdrv/CommercialLicense.txt +++ b/usb/usbdrv/CommercialLicense.txt diff --git a/keyboard/usbdrv/License.txt b/usb/usbdrv/License.txt index 4460cfb..4460cfb 100644 --- a/keyboard/usbdrv/License.txt +++ b/usb/usbdrv/License.txt diff --git a/keyboard/usbdrv/Readme.txt b/usb/usbdrv/Readme.txt index 970dc66..970dc66 100644 --- a/keyboard/usbdrv/Readme.txt +++ b/usb/usbdrv/Readme.txt diff --git a/keyboard/usbdrv/USB-ID-FAQ.txt b/usb/usbdrv/USB-ID-FAQ.txt index a4a6bd6..a4a6bd6 100644 --- a/keyboard/usbdrv/USB-ID-FAQ.txt +++ b/usb/usbdrv/USB-ID-FAQ.txt diff --git a/keyboard/usbdrv/USB-IDs-for-free.txt b/usb/usbdrv/USB-IDs-for-free.txt index d46517d..d46517d 100644 --- a/keyboard/usbdrv/USB-IDs-for-free.txt +++ b/usb/usbdrv/USB-IDs-for-free.txt diff --git a/keyboard/usbdrv/asmcommon.inc b/usb/usbdrv/asmcommon.inc index d2a4f7c..d2a4f7c 100644 --- a/keyboard/usbdrv/asmcommon.inc +++ b/usb/usbdrv/asmcommon.inc diff --git a/keyboard/usbdrv/oddebug.c b/usb/usbdrv/oddebug.c index 19bf142..19bf142 100644 --- a/keyboard/usbdrv/oddebug.c +++ b/usb/usbdrv/oddebug.c diff --git a/keyboard/usbdrv/oddebug.h b/usb/usbdrv/oddebug.h index 851f84d..851f84d 100644 --- a/keyboard/usbdrv/oddebug.h +++ b/usb/usbdrv/oddebug.h diff --git a/keyboard/usbdrv/usbconfig-prototype.h b/usb/usbdrv/usbconfig-prototype.h index 93721c2..93721c2 100644 --- a/keyboard/usbdrv/usbconfig-prototype.h +++ b/usb/usbdrv/usbconfig-prototype.h diff --git a/keyboard/usbdrv/usbconfig.h b/usb/usbdrv/usbconfig.h index e228c2d..e228c2d 100644 --- a/keyboard/usbdrv/usbconfig.h +++ b/usb/usbdrv/usbconfig.h diff --git a/keyboard/usbdrv/usbdrv.c b/usb/usbdrv/usbdrv.c index d838935..d838935 100644 --- a/keyboard/usbdrv/usbdrv.c +++ b/usb/usbdrv/usbdrv.c diff --git a/keyboard/usbdrv/usbdrv.h b/usb/usbdrv/usbdrv.h index 3fe84d5..3fe84d5 100644 --- a/keyboard/usbdrv/usbdrv.h +++ b/usb/usbdrv/usbdrv.h diff --git a/keyboard/usbdrv/usbdrvasm.S b/usb/usbdrv/usbdrvasm.S index 32ce8ef..32ce8ef 100644 --- a/keyboard/usbdrv/usbdrvasm.S +++ b/usb/usbdrv/usbdrvasm.S diff --git a/keyboard/usbdrv/usbdrvasm.asm b/usb/usbdrv/usbdrvasm.asm index fb66934..fb66934 100644 --- a/keyboard/usbdrv/usbdrvasm.asm +++ b/usb/usbdrv/usbdrvasm.asm diff --git a/keyboard/usbdrv/usbdrvasm12.inc b/usb/usbdrv/usbdrvasm12.inc index d3bd056..d3bd056 100644 --- a/keyboard/usbdrv/usbdrvasm12.inc +++ b/usb/usbdrv/usbdrvasm12.inc diff --git a/keyboard/usbdrv/usbdrvasm128.inc b/usb/usbdrv/usbdrvasm128.inc index 8f67bcc..8f67bcc 100644 --- a/keyboard/usbdrv/usbdrvasm128.inc +++ b/usb/usbdrv/usbdrvasm128.inc diff --git a/keyboard/usbdrv/usbdrvasm15.inc b/usb/usbdrv/usbdrvasm15.inc index 33bcf0e..33bcf0e 100644 --- a/keyboard/usbdrv/usbdrvasm15.inc +++ b/usb/usbdrv/usbdrvasm15.inc diff --git a/keyboard/usbdrv/usbdrvasm16.inc b/usb/usbdrv/usbdrvasm16.inc index 25b84e6..25b84e6 100644 --- a/keyboard/usbdrv/usbdrvasm16.inc +++ b/usb/usbdrv/usbdrvasm16.inc diff --git a/keyboard/usbdrv/usbdrvasm165.inc b/usb/usbdrv/usbdrvasm165.inc index ae91588..ae91588 100644 --- a/keyboard/usbdrv/usbdrvasm165.inc +++ b/usb/usbdrv/usbdrvasm165.inc diff --git a/keyboard/usbdrv/usbdrvasm18-crc.inc b/usb/usbdrv/usbdrvasm18-crc.inc index 0ff2f42..0ff2f42 100644 --- a/keyboard/usbdrv/usbdrvasm18-crc.inc +++ b/usb/usbdrv/usbdrvasm18-crc.inc diff --git a/keyboard/usbdrv/usbdrvasm20.inc b/usb/usbdrv/usbdrvasm20.inc index 5027edd..5027edd 100644 --- a/keyboard/usbdrv/usbdrvasm20.inc +++ b/usb/usbdrv/usbdrvasm20.inc diff --git a/keyboard/usbdrv/usbportability.h b/usb/usbdrv/usbportability.h index 0a861d0..0a861d0 100644 --- a/keyboard/usbdrv/usbportability.h +++ b/usb/usbdrv/usbportability.h diff --git a/keyboard/usbtest.c b/usb/usbtest.c index a86cb5f..a86cb5f 100644 --- a/keyboard/usbtest.c +++ b/usb/usbtest.c |