Mercurial > public > hwos_code

diff src/menu_tree.asm @ 269:1207cf9a9408

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
adjust menu for different hardware versions
author heinrichsweikamp
date Mon, 20 Apr 2015 11:18:30 +0200
parents ee81f46714cb
children 653a3ab08062
line wrap: on
line diff
--- a/src/menu_tree.asm	Sun Apr 19 20:41:48 2015 +0200
+++ b/src/menu_tree.asm	Mon Apr 20 11:18:30 2015 +0200
@@ -337,9 +337,9 @@
     
 do_settings_menu_more:
     btfsc   rechargeable            ; piezo buttons available
-    bra     do_settings_menu_more_c3
+    bra     do_settings_menu_more_piezo
     btfsc   ble_available           ; ble available
-    bra     do_settings_menu_more_ble
+    bra     do_settings_menu_more_ostc3p
     MENU_BEGIN  tSystSets, .6
         MENU_CALL   tCompassMenu,   do_compass_menu
 		MENU_CALL	tLogOffset,					do_log_offset_menu
@@ -349,7 +349,7 @@
         MENU_CALL   tExit,          do_return_settings
     MENU_END
 
-do_settings_menu_more_c3:
+do_settings_menu_more_piezo:
     MENU_BEGIN  tSystSets, .7
         MENU_CALL   tCompassMenu,   do_compass_menu
 		MENU_CALL	tLogOffset,					do_log_offset_menu
@@ -362,22 +362,35 @@
 
     extern  comm_mode0
 
-do_settings_cr_menu:        ; Menu with features only available in cR hardware
+do_settings_cr_menu:        
+    btfsc   ble_available           ; ble available
+    bra     do_settings_menu_more_ostc2
+    ; Menu with features only available in cR hardware
     MENU_BEGIN  tSystSets, .4
         MENU_CALL   tUsbTitle,  comm_mode0
         MENU_OPTION tButtonleft,ocR_button_left  ,0  ; left button sensitivity
         MENU_OPTION tButtonright,ocR_button_right,0  ; right button sensitivity
-        MENU_CALL   tExit,          do_settings_menu_more_c3
+        MENU_CALL   tExit,          do_settings_menu_more_piezo
     MENU_END
 
-do_settings_menu_more_ble:  ; Menu with BLE feature
+do_settings_menu_more_ostc2:
+    ; Menu OSTC2
+    MENU_BEGIN  tSystSets, .4
+        MENU_CALL   tBleTitle,  comm_mode0
+        MENU_OPTION tButtonleft,ocR_button_left  ,0  ; left button sensitivity
+        MENU_OPTION tButtonright,ocR_button_right,0  ; right button sensitivity
+        MENU_CALL   tExit,          do_settings_menu_more_piezo
+    MENU_END
+    
+
+do_settings_menu_more_ostc3p:  ; Menu with BLE feature
     MENU_BEGIN  tSystSets, .7
         MENU_CALL   tCompassMenu,   do_compass_menu
 		MENU_CALL	tLogOffset,					do_log_offset_menu
         MENU_OPTION tUnits,    oUnits,          0
         MENU_OPTION tSamplingrate,oSamplingRate,0
         MENU_OPTION tDvSalinity,oDiveSalinity,  0
-        MENU_CALL   tUsbTitle,  comm_mode0
+        MENU_CALL   tBleTitle,  comm_mode0
         MENU_CALL   tExit,          do_return_settings
     MENU_END