comparison src/menu_tree.asm @ 113:f3062a611eef

Merge
author heinrichsweikamp
date Mon, 23 Jun 2014 16:14:33 +0200
parents 223579e905c3
children e0b758865e91
comparison
equal deleted inserted replaced
112:a24581f0b372 113:f3062a611eef
63 return_ccr_menu: 63 return_ccr_menu:
64 call menu_processor_pop ; drop exit line. 64 call menu_processor_pop ; drop exit line.
65 call menu_processor_pop ; back to last gas. 65 call menu_processor_pop ; back to last gas.
66 66
67 do_ccr_menu: 67 do_ccr_menu:
68 bcf menu_show_sensors ; Set flag 68 bcf menu_show_sensors ; Clear flag
69 MENU_BEGIN tCCRSetup, .5 69 bcf menu_show_sensors2 ; Clear flag
70 MENU_BEGIN tCCRSetup, .6
70 MENU_OPTION tCCRMode, oCCRMode, 0 71 MENU_OPTION tCCRMode, oCCRMode, 0
71 MENU_CALL tCCRSensor, do_ccr_sensor 72 MENU_CALL tCCRSensor, do_ccr_sensor
73 MENU_CALL tCalibrateMenu, do_calibrate_menu
72 MENU_CALL tDiluentSetup, do_diluent_setup 74 MENU_CALL tDiluentSetup, do_diluent_setup
73 MENU_CALL tFixedSetpoints, do_fixed_setpoints 75 MENU_CALL tFixedSetpoints, do_fixed_setpoints
74 MENU_CALL tExit, do_continue_main_menu 76 MENU_CALL tExit, do_continue_main_menu
75 MENU_END 77 MENU_END
78
79 do_calibrate_menu:
80 btfss c3_hardware
81 bra return_ccr_menu ; Not for normal OSTC3 hardware
82 call enable_ir ; Enable IR-Port
83 bsf menu_show_sensors2 ; Set flag
84 do_calibrate_menu2:
85 MENU_BEGIN tCalibrateMenu, .6
86 MENU_CALL tDiveHudMask1, 0
87 MENU_CALL tDiveHudMask2, 0
88 MENU_CALL tDiveHudMask3, 0
89 MENU_OPTION tCalibrationGas,oCalGasO2, 0
90 MENU_CALL tCalibrate, do_calibrate_mix
91 MENU_CALL tExit, return_ccr_menu
92 MENU_END
93
94 do_calibrate_mix:
95 extern calibrate_mix
96 call calibrate_mix ; Calibrate with opt_calibration_O2_ratio, also calibrate S8 HUD if connected
97 goto restart ; Restart into surface mode
76 98
77 do_ccr_sensor: 99 do_ccr_sensor:
78 call enable_ir ; Enable IR-Port 100 call enable_ir ; Enable IR-Port
79 bsf menu_show_sensors ; Set flag 101 bsf menu_show_sensors ; Set flag
80 MENU_BEGIN tCCRSensor, .4 102 MENU_BEGIN tCCRSensor, .4