diff options
| author | cpldcpu <cpldcpu@gmail.com> | 2014-01-03 20:50:08 +0100 |
|---|---|---|
| committer | cpldcpu <cpldcpu@gmail.com> | 2014-01-03 20:50:08 +0100 |
| commit | be508b4aa482d1677a894318fd4ad9da3a8fe5d4 (patch) | |
| tree | 65802d31d26b9262fc1380d8b1aee47d2d55266c /firmware | |
| parent | 8c4f3c3a798936de8126f3ebca8ccb6382ade93f (diff) | |
| download | micronucleus-be508b4aa482d1677a894318fd4ad9da3a8fe5d4.tar.gz micronucleus-be508b4aa482d1677a894318fd4ad9da3a8fe5d4.tar.bz2 micronucleus-be508b4aa482d1677a894318fd4ad9da3a8fe5d4.zip | |
firmware: typo, fix warning
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/main.c | 14 | ||||
| -rw-r--r-- | firmware/releases/release notes.txt | 8 |
2 files changed, 15 insertions, 7 deletions
diff --git a/firmware/main.c b/firmware/main.c index 3ad1a14..16cca65 100644 --- a/firmware/main.c +++ b/firmware/main.c @@ -1,9 +1,11 @@ /* * Project: Micronucleus - v1.11 * - * Author (c) 2012 Jenna Fox - * Optimizations after v1.06 (c) 2013 Tim Bo"scke - cpldcpu@gmail.com - * Further input (c) 2013 Shay Green + * Original author (c) 2012 Jenna Fox + * + * Optimizations v1.10/v1.11 (c) 2013 Tim Bo"scke - cpldcpu@gmail.com + * v1.11 (c) 2013 Shay Green + * * Based on USBaspLoader-tiny85 (c) 2012 Louis Beaudoin * Based on USBaspLoader (c) 2007 by OBJECTIVE DEVELOPMENT Software GmbH * @@ -25,6 +27,9 @@ #include <util/delay.h> #include "bootloaderconfig.h" + + + #include "usbdrv/usbdrv.c" // verify the bootloader address aligns with page size @@ -152,6 +157,9 @@ static void writeWordToPageBuffer(uint16_t data) { SREG=previous_sreg; } +// This function is never called, it is just here to suppress a compiler warning. +USB_PUBLIC usbMsgLen_t usbFunctionDescriptor(struct usbRequest *rq) { return 0; } + /* ------------------------------------------------------------------------ */ static uint8_t usbFunctionSetup(uint8_t data[8]) { usbRequest_t *rq = (void *)data; diff --git a/firmware/releases/release notes.txt b/firmware/releases/release notes.txt index 2bf2bff..09595aa 100644 --- a/firmware/releases/release notes.txt +++ b/firmware/releases/release notes.txt @@ -4,10 +4,10 @@ Firmware: - The bootloader will now always start if no user program was loaded, regardless of the entry condition. - The bootloader will not quit if no user program is loaded. This prevents periodic - reenumeration of the bootloader and should make driver installiation much easier. + re-enumeration of the bootloader and should make driver installation much easier. THe new "--erase-only" function of the commandline tool can be used to erase the - firmware and create a stabile device for easier installiation. - - New entrymodes can be selected in "bootloader.h". Please read the comments for details. + firmware and create a stable device for easier installiation. + - New entry modes can be selected in "bootloader.h". Please read the comments for details. + ENTRY_ALWAYS + ENTRY_WATCHDOG + ENTRY_EXT_RESET @@ -31,7 +31,7 @@ Commandline tool: - Client firmware version will now be displayed after connecting. o Internal changes: - Clean up of source code - - Bugixes (see commits) + - Bugfixes (see commits) == 1.10rc3 - 2013-12-15 == firmware: |