# HG changeset patch # User heinrichsweikamp # Date 1452336121 -3600 # Node ID 7be43d886bb12c87151115218ca4bfda0a37d8d4 # Parent a508afb8cb507812ebbeb85a81c89a3af9a1f54f Logbook marker can be set in dive mode menu (OC only) diff -r a508afb8cb50 -r 7be43d886bb1 src/changelog.txt --- a/src/changelog.txt Thu Dec 10 13:36:47 2015 +0100 +++ b/src/changelog.txt Sat Jan 09 11:42:01 2016 +0100 @@ -4,6 +4,7 @@ BUGFIX: Make sure SP1 is always selected on start in Auto-SP mode CHANGE: New segmented speed graph in divemode NEW: Safety Stop can be configured (Start-, End- and reset-depth + length of stop) via PC +NEW: Logbook marker can be set in dive mode menu (OC only) [1.93] - Stable Version - diff -r a508afb8cb50 -r 7be43d886bb1 src/divemenu_tree.asm --- a/src/divemenu_tree.asm Thu Dec 10 13:36:47 2015 +0100 +++ b/src/divemenu_tree.asm Sat Jan 09 11:42:01 2016 +0100 @@ -35,13 +35,20 @@ bcf is_bailout_menu movlw .1 movwf menupos ; Set to first option in divemode menu - MENU_BEGIN tMainMenu, .4 + MENU_BEGIN tMainMenu, .5 MENU_CALL tDivemenu_Gaslist, do_divemode_gaslist MENU_CALL tDivemenu_ResetAvr, do_divemode_resetavr MENU_CALL tDivemenu_ToggleGF, do_divemode_togglegf + MENU_CALL tDivemenu_Marker, do_set_marker MENU_CALL tExit, do_exit_divemode_menu MENU_END +do_set_marker: + movlw d'6' ; Type of Alarm (Manual Marker) + movwf AlarmType ; Copy to Alarm Register + bsf event_occured ; Set Event Flag + bra do_exit_divemode_menu ; And exit + main_divemenu_ccr: bsf ccr_diluent_setup ; For diluents movlw .1 diff -r a508afb8cb50 -r 7be43d886bb1 src/text_english.inc --- a/src/text_english.inc Thu Dec 10 13:36:47 2015 +0100 +++ b/src/text_english.inc Sat Jan 09 11:42:01 2016 +0100 @@ -23,6 +23,7 @@ TCODE tDivemenu_Setpoint, "Setpoint" ; Setpoint TCODE tDivemenu_UseSensor,"Use Sensor" ; Use Sensor TCODE tDivemenu_ToggleGF, "Toggle GF" ; Toggle GF + TCODE tDivemenu_Marker, "Set Marker" ; Set Marker ; Main menu TCODE tNext, "