comparison src/divemenu_tree.asm @ 583:6636cbe64c6d

optical input work
author heinrichsweikamp
date Tue, 27 Feb 2018 12:27:31 +0100
parents b455b31ce022
children ca4556fb60b9
comparison
equal deleted inserted replaced
582:b455b31ce022 583:6636cbe64c6d
61 MENU_CALL tDivemenu_ToggleGF, do_toggle_gf 61 MENU_CALL tDivemenu_ToggleGF, do_toggle_gf
62 MENU_CALL tExit, do_exit_divemode_menu 62 MENU_CALL tExit, do_exit_divemode_menu
63 MENU_END 63 MENU_END
64 64
65 main_divemenu_pscr: 65 main_divemenu_pscr:
66 btfsc analog_o2_input ; do we have an analog input? 66 btfsc analog_o2_input ; do we have an analog input?
67 bra main_divemenu_pscr_sensors ; YES 67 bra main_divemenu_pscr_sensors ; YES
68 btfsc s8_digital ; do we have a digital input? 68 btfsc s8_digital ; do we have a digital input?
69 bra main_divemenu_pscr_sensors ; YES 69 bra main_divemenu_pscr_sensors ; YES
70 btfsc optical_input ; do we have an optical input?
71 bra main_divemenu_pscr_sensors ; YES
70 72
71 main_divemenu_pscr_no_sensors: 73 main_divemenu_pscr_no_sensors:
72 MENU_BEGIN tMainMenu, .6 74 MENU_BEGIN tMainMenu, .6
73 MENU_CALL tDiveBailout, do_divemode_gaslist_bail 75 MENU_CALL tDiveBailout, do_divemode_gaslist_bail
74 MENU_CALL tDivemenu_Gaslist, do_divemode_gaslist 76 MENU_CALL tDivemenu_Gaslist, do_divemode_gaslist
321 movwf menupos1 ; set to first option in divemode menu 323 movwf menupos1 ; set to first option in divemode menu
322 324
323 do_divemode_splist_common: 325 do_divemode_splist_common:
324 btfsc analog_o2_input ; do we have an analog input? 326 btfsc analog_o2_input ; do we have an analog input?
325 bra do_divemode_splist_sensor ; YES 327 bra do_divemode_splist_sensor ; YES
326 btfsc s8_digital ; do we have a digital input? 328 btfsc s8_digital ; do we have a digital input?
329 bra do_divemode_splist_sensor ; YES
330 btfsc optical_input ; do we have an optical input?
327 bra do_divemode_splist_sensor ; YES 331 bra do_divemode_splist_sensor ; YES
328 332
329 do_divemode_splist_no_sensor: 333 do_divemode_splist_no_sensor:
330 MENU_BEGIN tGaslist, .5 334 MENU_BEGIN tGaslist, .5
331 MENU_DYNAMIC gaslist_strcat_setpoint, do_switch_sp 335 MENU_DYNAMIC gaslist_strcat_setpoint, do_switch_sp