Browse Source

cleanup messages

optixx 14 years ago
parent
commit
b375b0d510
2 changed files with 23 additions and 13 deletions
  1. 11 6
      avr/bootloader/bootloader.c
  2. 12 7
      avr/usbload/main.c

+ 11 - 6
avr/bootloader/bootloader.c

@@ -406,9 +406,10 @@ void leave_bootloader(void)
      * disconnect usb 
      */
     usbDeviceDisconnect();
+#if 0    
     for (uint8_t i = 0; i < 50; i++)
         _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 
      */
@@ -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)
 {
@@ -441,16 +449,12 @@ int __attribute__ ((noreturn, OS_main)) main(void)
     uint16_t delay = 0;
     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 (reset & _BV(PORF)) {
+        banner();
         uart_puts("Found power on reset\n\r");
         MCUSR = 0;
         leave_bootloader();
@@ -466,6 +470,7 @@ int __attribute__ ((noreturn, OS_main)) main(void)
         jump_to_app();
     }
 
+    banner();
     uart_puts("Enter programming mode\n\r");
     /*
      * else: enter programming mode 

+ 12 - 7
avr/usbload/main.c

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