[OpenNeo-CVS] openuu main_menu.c,1.2,1.3

[Francois B <mrs...@us...>]

Update of /cvsroot/openneo/openuu
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27459

Modified Files:
	main_menu.c 
Log Message:
Updated UU main menu  Patch from jkozee

Index: main_menu.c
===================================================================
RCS file: /cvsroot/openneo/openuu/main_menu.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** main_menu.c	14 Sep 2005 04:16:56 -0000	1.2
--- main_menu.c	27 Sep 2005 02:01:21 -0000	1.3
***************
*** 1,4 ****
! #include "firmware_menu.h"
! #include "uu_menu.h"
  #include "menu.h"
  #include "lcd.h"
--- 1,3 ----
! #include "utility_menu.h"
  #include "menu.h"
  #include "lcd.h"
***************
*** 11,22 ****
  #include "screens.h"
  #include "lang.h"
  
  int show_logo( void )
  {
      lcd_clear_display();
!     lcd_puts(0, 0, "   Neo Car Jukebox  ");
!     lcd_puts(0, 1, "   Update Utility   ");
!     lcd_puts(0, 2, "    Version 1.10    ");
!     lcd_puts(0, 3, "ssiamerica.com/open ");
      
      return 0;
--- 10,26 ----
  #include "screens.h"
  #include "lang.h"
+ #include "update.h"
  
  int show_logo( void )
  {
      lcd_clear_display();
!     lcd_puts_center(0, "Neo Car Jukebox");
!     lcd_puts_center(1, str(LANG_OPEN_UU));
!     lcd_puts_center(2, appsversion);
!     lcd_puts_center(3, "ssiamerica.com/open");
!     //lcd_puts(0, 0, "   Neo Car Jukebox  ");
!     //lcd_puts(0, 1, "   Update Utility   ");
!     //lcd_puts(0, 2, "    Version 1.10    ");
!     //lcd_puts(0, 3, "ssiamerica.com/open ");
      
      return 0;
***************
*** 30,42 ****
      /* main menu */
      struct menu_items items[] = {
!         { str(LANG_UPDATE_FIRMWARE),    firmware_menu },
!         { str(LANG_UPDATE_UU),          uu_menu },
      };
  
!     m=menu_init( items, sizeof items / sizeof(struct menu_items) );
!     result = menu_run(m);
!     menu_exit(m);
  
!     return result;
  }
  
--- 34,63 ----
      /* main menu */
      struct menu_items items[] = {
!         { str(LANG_UPDATE_FIRMWARE),	flash_os },
!         { str(LANG_UPDATE_UU),			flash_uu },
!         { str(LANG_CHIP_INFO),			chip_menu },
!         { str(LANG_REBOOT),				reboot_menu },
      };
  
! 	//May as well see if we can do anything with chip installed.
! 	//The only real checks we do is for Manufacturer and size, but it's a start
! 	result = GetFlashInfo();
! 	if (result == false){
! 		ShowFlashInfo();
! 		lcd_puts_center(3, str(LANG_ANY_KEY_REBOOT)); //JRK_TODO ADD TO LANG
! 		button_get(true);
! 		reboot_menu();
! 	}else{
!     
! 		m=menu_init( items, sizeof items / sizeof(struct menu_items) );
! 		//Allow the user to back out of a menu and try something else
! 		//A reboot must be called to exit
! 		while ( true ){
! 			result = menu_run(m);
! 		}
! 		menu_exit(m);
  
! 	}
! 	return result;
  }