Mercurial > public > hwos_code

diff src/menu_tree.asm @ 243:ee81f46714cb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
auto-select correct settings menu
author heinrichsweikamp
date Wed, 04 Mar 2015 16:25:44 +0100
parents 633c7a6de5bc
children 1207cf9a9408
line wrap: on
line diff
--- a/src/menu_tree.asm	Tue Mar 03 12:09:24 2015 +0100
+++ b/src/menu_tree.asm	Wed Mar 04 16:25:44 2015 +0100
@@ -336,9 +336,10 @@
 
     
 do_settings_menu_more:
-    btfsc   rechargeable
+    btfsc   rechargeable            ; piezo buttons available
     bra     do_settings_menu_more_c3
-
+    btfsc   ble_available           ; ble available
+    bra     do_settings_menu_more_ble
     MENU_BEGIN  tSystSets, .6
         MENU_CALL   tCompassMenu,   do_compass_menu
 		MENU_CALL	tLogOffset,					do_log_offset_menu
@@ -360,6 +361,7 @@
     MENU_END
 
     extern  comm_mode0
+
 do_settings_cr_menu:        ; Menu with features only available in cR hardware
     MENU_BEGIN  tSystSets, .4
         MENU_CALL   tUsbTitle,  comm_mode0
@@ -368,7 +370,16 @@
         MENU_CALL   tExit,          do_settings_menu_more_c3
     MENU_END
 
-
+do_settings_menu_more_ble:  ; 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   tExit,          do_return_settings
+    MENU_END
 
 do_compass_menu:
     MENU_BEGIN  tSystSets, .2