# HG changeset patch # User heinrichsweikamp # Date 1433081996 -7200 # Node ID 2fe34fc0e2ae132cc44b4680ffbe8b0b74a9dfa8 # Parent 65f6a7bfc205678769e72e5c6785b2333970ee9d new submenu for gas consumption, show actual mix instead of GAS1-GAS5 in deco planner diff -r 65f6a7bfc205 -r 2fe34fc0e2ae src/menu_tree.asm --- a/src/menu_tree.asm Sun May 31 10:42:47 2015 +0200 +++ b/src/menu_tree.asm Sun May 31 16:19:56 2015 +0200 @@ -259,15 +259,24 @@ do_planner_menu: extern do_demo_planner - MENU_BEGIN tPlan, .6 + MENU_BEGIN tPlan, .7 MENU_CALL tInter, do_demo_divemode MENU_OPTION tIntvl, odiveInterval, 0 MENU_OPTION tBtTm, obottomTime, 0 MENU_OPTION tMxDep, obottomDepth, 0 MENU_CALL tDeco, do_demo_planner + MENU_CALL tSystSets, do_planner_config MENU_CALL tExit, do_continue_main_menu MENU_END +do_planner_config: + MENU_BEGIN tPlan, .3 + MENU_OPTION tSetBotUse, obottom_usage, 0 + MENU_OPTION tSetDecoUse, odeco_usage, 0 + MENU_CALL tExit, do_planner_menu + MENU_END + + ;============================================================================= ; Divemode menu diff -r 65f6a7bfc205 -r 2fe34fc0e2ae src/option_table.asm --- a/src/option_table.asm Sun May 31 10:42:47 2015 +0200 +++ b/src/option_table.asm Sun May 31 16:19:56 2015 +0200 @@ -86,6 +86,7 @@ extern char_I_deco_model, char_I_saturation_multiplier, char_I_desaturation_multiplier extern char_I_extra_time extern tDefName + extern char_I_bottom_usage,char_I_deco_usage,tLitersMinute ; Option table ; OPTION_UINT8 Label, min, max, default, text-string, EEPROM location (-1 for RAM only), RAM location global option_table_begin @@ -196,6 +197,8 @@ OPTION_BOOL oFlipScreen, 0, .151, opt_flip_screen ; =1: Flip the screen OPTION_UINT8p10 ocR_button_left,.20, .100, .40, tPercent, .152, opt_cR_button_left ; left button sensitivity OPTION_UINT8p10 ocR_button_right,.20, .100, .40, tPercent, .153, opt_cR_button_right ; right button sensitivity + OPTION_UINT8 obottom_usage, .5,.50, .20,tLitersMinute, .154, char_I_bottom_usage ; l/min + OPTION_UINT8 odeco_usage, .5,.50, .20,tLitersMinute, .155, char_I_deco_usage ; l/min ;============================================================================= ; Set Time/Set Date (RAM only) diff -r 65f6a7bfc205 -r 2fe34fc0e2ae src/p2_deco.c --- a/src/p2_deco.c Sun May 31 10:42:47 2015 +0200 +++ b/src/p2_deco.c Sun May 31 16:19:56 2015 +0200 @@ -2151,9 +2151,8 @@ // Gas list. // char_I_first_gas is the bottom gas. // decoplan (char_O_deco_depth, char_O_deco_time). -// CF#54 == TRUE if shallowest stop first. -// CF#56 == bottom liters/minutes (5 .. 50) or bar/min. -// CF#57 == deco liters/minutes (5 .. 50) or bar/min. +// char_I_bottom_usage is bottom liters/minutes (5 .. 50) or bar/min. +// char_I_deco_usage is deco liters/minutes (5 .. 50) or bar/min. // Output: int_O_gas_volumes[0..4] in litters * 0.1 // void deco_gas_volumes(void) @@ -2168,9 +2167,8 @@ for(i=0; i