comparison src/menu_tree.asm @ 331:8b9b03b70b14

Merged new_screen_layout into default
author Janos Kovacs <kovjanos@gmail.com>
date Fri, 26 Jun 2015 15:03:47 +0200
parents d21b172d5a7a
children 14b466f66a7f
comparison
equal deleted inserted replaced
329:7ac341bd5d38 331:8b9b03b70b14
341 MENU_CALL tResetMenu, do_reset_menu 341 MENU_CALL tResetMenu, do_reset_menu
342 MENU_CALL tMore, do_settings_menu_more 342 MENU_CALL tMore, do_settings_menu_more
343 MENU_CALL tExit, do_continue_main_menu 343 MENU_CALL tExit, do_continue_main_menu
344 MENU_END 344 MENU_END
345 345
346
347 do_return_settings_more:
348 call menu_processor_pop ; Drop exit entry
349 call menu_processor_pop ; Pop return line.
346 350
347 do_settings_menu_more: 351 do_settings_menu_more:
348 btfsc rechargeable ; piezo buttons available 352 btfsc rechargeable ; piezo buttons available
349 bra do_settings_menu_more_piezo 353 bra do_settings_menu_more_piezo
350 btfsc ble_available ; ble available 354 btfsc ble_available ; ble available
405 409
406 do_compass_menu: 410 do_compass_menu:
407 MENU_BEGIN tSystSets, .2 411 MENU_BEGIN tSystSets, .2
408 MENU_CALL tCompassMenu, compass_calibration_loop 412 MENU_CALL tCompassMenu, compass_calibration_loop
409 ; MENU_OPTION tCompassGain, oCompassGain, 0 413 ; MENU_OPTION tCompassGain, oCompassGain, 0
410 MENU_CALL tExit, do_return_settings 414 MENU_CALL tExit, do_return_settings_more
411 MENU_END 415 MENU_END
412 416
413 ;============================================================================= 417 ;=============================================================================
414 ; Reset and confirmation menu. 418 ; Reset and confirmation menu.
415 419
564 MENU_DYNAMIC TFT_LogOffset_Logtitle, 0 568 MENU_DYNAMIC TFT_LogOffset_Logtitle, 0
565 MENU_CALL tLogOffsetp1, do_logoffset_plus1 569 MENU_CALL tLogOffsetp1, do_logoffset_plus1
566 MENU_CALL tLogOffsetp10, do_logoffset_plus10 570 MENU_CALL tLogOffsetp10, do_logoffset_plus10
567 MENU_CALL tLogOffsetm1, do_logoffset_minus1 571 MENU_CALL tLogOffsetm1, do_logoffset_minus1
568 MENU_CALL tLogOffsetm10, do_logoffset_minus10 572 MENU_CALL tLogOffsetm10, do_logoffset_minus10
569 MENU_CALL tExit, do_dispsets_menu_3stack 573 MENU_CALL tExit, do_return_settings_more
570 MENU_END 574 MENU_END
571 575
572 576
573 do_logoffset_minus1: 577 do_logoffset_minus1:
574 call do_logoffset_common_read ; Read into lo:hi 578 call do_logoffset_common_read ; Read into lo:hi
617 MENU_BEGIN tDispSets, .6 621 MENU_BEGIN tDispSets, .6
618 MENU_OPTION tBright, oBrightness, 0 622 MENU_OPTION tBright, oBrightness, 0
619 MENU_CALL tColorScheme, do_color_scheme 623 MENU_CALL tColorScheme, do_color_scheme
620 MENU_OPTION tFlip, oFlipScreen, 0 624 MENU_OPTION tFlip, oFlipScreen, 0
621 MENU_OPTION tMODwarning, oMODwarning, 0 625 MENU_OPTION tMODwarning, oMODwarning, 0
622 MENU_OPTION tVSItextv2, oVSItextv2, 0 626 MENU_CALL tDispSetVSI, do_dispsets_VSI_menu
623 MENU_CALL tExit, do_return_settings 627 MENU_CALL tExit, do_return_settings
624 MENU_END 628 MENU_END
625 629
630 do_dispsets_VSI_menu:
631 MENU_BEGIN tDispSetVSItitle, .4
632 MENU_DYNAMIC TFT_VSImenu_dynamictitle, 0
633 MENU_OPTION tVSItext2, oVSItextv2, 0
634 MENU_OPTION tVSIgraph, oVSIgraph, 0
635 MENU_CALL tExit, do_dispsets_menu_3stack
636 MENU_END
626 637
627 extern oColorSetDive 638 extern oColorSetDive
628 do_color_scheme: 639 do_color_scheme:
629 bsf in_color_menu 640 bsf in_color_menu
630 MENU_BEGIN tColorScheme, .2 641 MENU_BEGIN tColorScheme, .2