comparison src/menu_tree.asm @ 240:633c7a6de5bc

auto-select correct ccr menu
author heinrichsweikamp
date Mon, 02 Mar 2015 10:54:00 +0100
parents e2ea74646127
children ee81f46714cb
comparison
equal deleted inserted replaced
239:6c4ad243cb44 240:633c7a6de5bc
70 70
71 do_ccr_menu: 71 do_ccr_menu:
72 bcf menu_show_sensors ; Clear flag 72 bcf menu_show_sensors ; Clear flag
73 bcf menu_show_sensors2 ; Clear flag 73 bcf menu_show_sensors2 ; Clear flag
74 btfsc analog_o2_input 74 btfsc analog_o2_input
75 bra do_ccr_menu_c3 75 bra do_ccr_menu_cR
76 MENU_BEGIN tCCRSetup, .5 76 btfss optical_input
77 bra do_ccr_menu_ostc2
78
79 MENU_BEGIN tCCRSetup, .5 ; OSTC3 menu
77 MENU_OPTION tCCRMode, oCCRMode, 0 80 MENU_OPTION tCCRMode, oCCRMode, 0
78 MENU_CALL tCCRSensor, do_ccr_sensor 81 MENU_CALL tCCRSensor, do_ccr_sensor
79 MENU_CALL tDiluentSetup, do_diluent_setup 82 MENU_CALL tDiluentSetup, do_diluent_setup
80 MENU_CALL tFixedSetpoints, do_fixed_setpoints 83 MENU_CALL tFixedSetpoints, do_fixed_setpoints
81 MENU_CALL tExit, do_continue_main_menu 84 MENU_CALL tExit, do_continue_main_menu
82 MENU_END 85 MENU_END
83 86
84 do_ccr_menu_c3: ; including "Calibrate" 87 do_ccr_menu_cR: ; cR menu
85 MENU_BEGIN tCCRSetup, .6 88 MENU_BEGIN tCCRSetup, .6
86 MENU_OPTION tCCRMode, oCCRMode, 0 89 MENU_OPTION tCCRMode, oCCRMode, 0
87 MENU_CALL tCCRSensor, do_ccr_sensor 90 MENU_CALL tCCRSensor, do_ccr_sensor
88 MENU_CALL tCalibrateMenu, do_calibrate_menu 91 MENU_CALL tCalibrateMenu, do_calibrate_menu
89 MENU_CALL tDiluentSetup, do_diluent_setup 92 MENU_CALL tDiluentSetup, do_diluent_setup
90 MENU_CALL tFixedSetpoints, do_fixed_setpoints 93 MENU_CALL tFixedSetpoints, do_fixed_setpoints
91 MENU_CALL tExit, do_continue_main_menu 94 MENU_CALL tExit, do_continue_main_menu
92 MENU_END 95 MENU_END
96
97 do_ccr_menu_ostc2:
98 MENU_BEGIN tCCRSetup, .3 ; ostc2 menu
99 MENU_CALL tDiluentSetup, do_diluent_setup
100 MENU_CALL tFixedSetpoints, do_fixed_setpoints
101 MENU_CALL tExit, do_continue_main_menu
102 MENU_END
103
93 104
94 do_calibrate_menu: 105 do_calibrate_menu:
95 call enable_ir_s8 ; Enable IR/S8-Port 106 call enable_ir_s8 ; Enable IR/S8-Port
96 bsf menu_show_sensors2 ; Set flag 107 bsf menu_show_sensors2 ; Set flag
97 do_calibrate_menu2: 108 do_calibrate_menu2: