godzil/quickdev16
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:optixx/quickdev16

Browse Source
This commit is contained in:
optixx 2009-11-02 07:55:22 +01:00
commit f12c8d811f
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
avr/bootloader/bootloader.c
View File

@ -471,13 +471,12 @@ int __attribute__ ((noreturn, OS_main)) main(void)
jump_to_app(); jump_to_app();
} }
#ifdef AVR_BTLDR_SWITCH ENABLE #if AVR_BTLDR_SWITCH_ENABLE
if ((AVR_BTLDR_EN_IN & ( 1 << AVR_BTLDR_EN_PIN)) == 0){ if ((AVR_BTLDR_EN_IN & ( 1 << AVR_BTLDR_EN_PIN)) == 0){
banner(); banner();
uart_puts("Bootloader flashing is disabled\n\r"); uart_puts("Bootloader flashing is disabled\n\r");
MCUSR = 0; MCUSR = 0;
leave_bootloader(); leave_bootloader();
} }
#endif #endif

1
avr/bootloader/config.h
View File

@ -20,3 +20,4 @@
#define DEBUG 1 #define DEBUG 1
#define DEBUG_USB 2 #define DEBUG_USB 2
#define AVR_BTLDR_SWITCH_ENABLE 1

2
avr/usbload/loader.h
View File

@ -1,6 +1,6 @@
/* /*
File: qd16boot01.smc File: qd16boot01.smc
Time: Sat, 24 Oct 2009 15:50:32 Time: Fri, 30 Oct 2009 16:49:11
*/ */
#ifndef __FIFO_H__ #ifndef __FIFO_H__
#define __FIFO_H__ #define __FIFO_H__