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

cleanup messages

Browse Source
This commit is contained in:
optixx 2009-08-27 21:00:32 +02:00
parent ced4b73075
commit b375b0d510
2 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
avr/bootloader/bootloader.c
View File

@ -406,9 +406,10 @@ void leave_bootloader(void)
* disconnect usb * disconnect usb
*/ */
usbDeviceDisconnect(); usbDeviceDisconnect();
#if 0
for (uint8_t i = 0; i < 50; i++) for (uint8_t i = 0; i < 50; i++)
_delay_ms(10); /* 0 means 0x10000, 38*1/f*0x10000 =~ 498ms */ _delay_ms(10); /* 0 means 0x10000, 38*1/f*0x10000 =~ 498ms */
#endif
/* /*
* enable watchdog to soft-reset the uC for clean startup of new application * enable watchdog to soft-reset the uC for clean startup of new application
*/ */
@ -421,6 +422,13 @@ void leave_bootloader(void)
} }
void banner(){
uart_puts("\n\r");
uart_puts("\n\r");
uart_puts("\n\r");
uart_puts("Quickdev16 Bootloader v0.2\n\r");
uart_puts("www.optixx.org\n\r");
}
int __attribute__ ((noreturn, OS_main)) main(void) int __attribute__ ((noreturn, OS_main)) main(void)
{ {
@ -441,16 +449,12 @@ int __attribute__ ((noreturn, OS_main)) main(void)
uint16_t delay = 0; uint16_t delay = 0;
timeout = TIMEOUT; timeout = TIMEOUT;
uart_puts("\n\r");
uart_puts("\n\r");
uart_puts("\n\r");
uart_puts("Quickdev16 Bootloader v0.2\n\r");
uart_puts("www.optixx.org\n\r");
/* /*
* if power-on reset, quit bootloader via watchdog reset * if power-on reset, quit bootloader via watchdog reset
*/ */
if (reset & _BV(PORF)) { if (reset & _BV(PORF)) {
banner();
uart_puts("Found power on reset\n\r"); uart_puts("Found power on reset\n\r");
MCUSR = 0; MCUSR = 0;
leave_bootloader(); leave_bootloader();
@ -466,6 +470,7 @@ int __attribute__ ((noreturn, OS_main)) main(void)
jump_to_app(); jump_to_app();
} }
banner();
uart_puts("Enter programming mode\n\r"); uart_puts("Enter programming mode\n\r");
/* /*
* else: enter programming mode * else: enter programming mode

19
avr/usbload/main.c
View File

@ -311,14 +311,9 @@ void boot_startup_rom()
send_reset(); send_reset();
} }
void banner(){
int main(void)
{
uint8_t i; uint8_t i;
uart_init(); for (i=0;i<40;i++)
stdout = &uart_stdout;
for (i=0;i<30;i++)
info("\n"); info("\n");
info(" ________ .__ __ ________ ____ ________\n"); info(" ________ .__ __ ________ ____ ________\n");
info(" \\_____ \\ __ __|__| ____ | | __\\______ \\ _______ _/_ |/ _____/\n"); info(" \\_____ \\ __ __|__| ____ | | __\\______ \\ _______ _/_ |/ _____/\n");
@ -328,7 +323,17 @@ int main(void)
info(" \\__> \\/ \\/ \\/ \\/ \\/ \n"); info(" \\__> \\/ \\/ \\/ \\/ \\/ \n");
info("\n"); info("\n");
info(" www.optixx.org\n"); info(" www.optixx.org\n");
info("\n");
info("System Hw: %s Sw: %s\n",HW_VERSION,SW_VERSION); info("System Hw: %s Sw: %s\n",HW_VERSION,SW_VERSION);
}
int main(void)
{
uart_init();
stdout = &uart_stdout;
banner();
system_init(); system_init();
info("Boot startup rom\n"); info("Boot startup rom\n");
boot_startup_rom(); boot_startup_rom();