From 6c5075bc99ba07f46562f7f10db14e153d7a93ec Mon Sep 17 00:00:00 2001 From: jhansen Date: Mon, 26 Apr 2010 21:49:44 +0000 Subject: git-svn-id: https://mindboards.svn.sourceforge.net/svnroot/mindboards/lms_nbcnxc_128/trunk@6 c9361245-7fe8-9947-84e8-057757c4e366 --- AT91SAM7S256/Source/c_ui.c | 46 +++++++++++++++++++--------------------------- 1 file changed, 19 insertions(+), 27 deletions(-) (limited to 'AT91SAM7S256/Source/c_ui.c') diff --git a/AT91SAM7S256/Source/c_ui.c b/AT91SAM7S256/Source/c_ui.c index c79dca9..b47813a 100644 --- a/AT91SAM7S256/Source/c_ui.c +++ b/AT91SAM7S256/Source/c_ui.c @@ -168,43 +168,29 @@ enum STATUS_NO // Index in status icon collection file enum // String index in text string file { TXT_GENERAL_EMPTY, + TXT_FB_GENERIC_FAIL, // "Failed!" + // BlueTooth connect TXT_FB_BT_CONNECTING_WAIT, // "Connecting" TXT_FB_BT_CONNECT_BUSY_FAIL, // "Line is busy" - TXT_FB_BT_CONNECTING_FAIL, // "Failed!" // BlueTooth send file TXT_FB_BT_SENDING_NO_CONN_FAIL, // "Connection?" TXT_FB_BT_SENDING_WAIT, // "Sending file" - TXT_FB_BT_SENDING_FAIL, // "Failed!" // BlueTooth on/off TXT_FB_BT_TURNING_ON_WAIT, // "Turning on" - TXT_FB_BT_TURNING_ON_FAIL, // "Failed!" TXT_FB_BT_TURNING_OFF_WAIT, // "Turning off" - TXT_FB_BT_TURNING_OFF_FAIL, // "Failed!" // BlueTooth seach TXT_FB_BT_SEARCHING_WAIT, // "Searching" TXT_FB_BT_SEARCH_ABORTED_INFO, // "Aborted!" - TXT_FB_BT_SEARCHING_FAIL, // "Failed!" - - // BlueTooth device list - TXT_FB_BT_REMOVE_FAIL, // "Failed!" - - // BlueTooth connection list - TXT_FB_BT_DISCONNECT_FAIL, // "Failed!" // On Brick Programming TXT_FB_OBP_MEMORY_FULL_FAIL, // "Memory full!" - TXT_FB_OBP_FILE_SAVED_INFO, // "File saved" - TXT_FB_OBP_FILE_EXIST_FAIL, // "File exist" - TXT_FB_OBP_OVERWRITE_FAIL, // "overwrite!" - - // Datalogging - TXT_FB_DL_FILE_SAVED_INFO, // "File saved" - TXT_FB_DL_FILE_EXIST_FAIL, // "File exist" - TXT_FB_DL_OVERWRITE_FAIL, // "overwrite!" + TXT_FB_FILE_SAVED_INFO, // "File saved" + TXT_FB_FILE_EXIST_FAIL, // "File exist" + TXT_FB_OVERWRITE_FAIL, // "overwrite!" // File delete TXT_FB_FD_FILE_DELETED_INFO, // "File deleted" @@ -217,7 +203,7 @@ enum // String index in text string file TXT_FILERUN_RUNNING, // "Running" TXT_FILERUN_ABORTED, // "Aborted!" TXT_FILERUN_ENDED, // "Ended" - TXT_FILERUN_FILE_ERROR, // "File error!" + TXT_FILERUN_FILE_ERROR, // "File error! %d" // Files delete TXT_FILESDELETE_DELETING_ALL, // "Deleting all" @@ -250,13 +236,7 @@ enum // String index in text string file TXT_ONBRICKPROGRAMMING_BC_LR_MOTORS, // "B/C - L/R motors" // View - TXT_VIEW_SELECT, // "Select" - - // BlueTooth device list - TXT_BTDEVICELIST_SELECT, // "Select" - - // BlueTooth connection list - TXT_BTCONNECTLIST_SELECT, // "Select" + TXT_GENERIC_SELECT, // "Select" // Bluetooth list errors TXT_FB_BT_ERROR_LR_COULD_NOT_SAVE_1, // BT save data error! @@ -1286,6 +1266,18 @@ void cUiCtrl(void) */ // + if ((!(IOMapUi.Flags & UI_EXECUTE_LMS_FILE)) && (IOMapUi.State == INIT_INTRO)/* && ((pMapButton->State[BTN1] & PRESSED_STATE)!=PRESSED_STATE)*/) + { + UWORD LStatus; + if (LOADER_ERR(LStatus = pMapLoader->pFunc(FINDFIRST, UI_STARTUP_PROGRAM, NULL, NULL)) == SUCCESS) + { + //Close file handle returned by FINDFIRST + pMapLoader->pFunc(CLOSE, LOADER_HANDLE_P(LStatus), NULL, NULL); + strcpy((char*)IOMapUi.LMSfilename, UI_STARTUP_PROGRAM); + IOMapUi.Flags |= UI_EXECUTE_LMS_FILE; + IOMapUi.State = INIT_MENU; + } + } VarsUi.CRPasskey++; VarsUi.ButtonTimer++; -- cgit v1.2.3