Merge branch 'master' of github.com:optixx/quickdev16
This commit is contained in:
commit
f12c8d811f
@ -471,13 +471,12 @@ int __attribute__ ((noreturn, OS_main)) main(void)
|
||||
jump_to_app();
|
||||
}
|
||||
|
||||
#ifdef AVR_BTLDR_SWITCH ENABLE
|
||||
#if AVR_BTLDR_SWITCH_ENABLE
|
||||
if ((AVR_BTLDR_EN_IN & ( 1 << AVR_BTLDR_EN_PIN)) == 0){
|
||||
banner();
|
||||
uart_puts("Bootloader flashing is disabled\n\r");
|
||||
MCUSR = 0;
|
||||
leave_bootloader();
|
||||
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
@ -20,3 +20,4 @@
|
||||
|
||||
#define DEBUG 1
|
||||
#define DEBUG_USB 2
|
||||
#define AVR_BTLDR_SWITCH_ENABLE 1
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
/*
|
||||
File: qd16boot01.smc
|
||||
Time: Sat, 24 Oct 2009 15:50:32
|
||||
Time: Fri, 30 Oct 2009 16:49:11
|
||||
*/
|
||||
#ifndef __FIFO_H__
|
||||
#define __FIFO_H__
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user