view Discovery/Src/tMenuDeco.c @ 306:2f43419102c8 cleanup-4

bugfix, cleanup: do not clip depth to 0 A real dive with the previous commits shows that testing from the simulator cannot be fully trusted in relation to logic that is close to the depth sensor (that is obviously bypassed using the simulator). So 1) there is 3 second interval between the stopwatch and the divetime, and 2) the depth flips from 1m depth to surface 0m depth, and that is visible in the profile data. Point 2) is definitely caused by the removed code in this commit. It likely is not right to clip the depth value at all. It is fine to base decisions like is done in is_ambient_pressure_close_to_surface on it, but clipping the depth value itself is seems wrong. This has become more prominent with commit eba8d1eb5bef where the clipping depth changed from 40cm of depth to 1m of depth. When comparing profiles from an OSTC Plus, it shows that no depth clipping is present there, so that is one more argument to remove it here. Point 1) The 3 sec interval is likely not a coincidence. It is the time to travel for 1m depth with a default descend speed of 20m/min. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
author Jan Mulder <jlmulder@xs4all.nl>
date Wed, 22 May 2019 14:39:04 +0200
parents 8f8ea3a32e82
children 1b995079c045
line wrap: on
line source

///////////////////////////////////////////////////////////////////////////////
/// -*- coding: UTF-8 -*-
///
/// \file   Discovery/Src/tMenuDeco.c
/// \brief  Main Template file for Menu Page Deco
/// \author heinrichs weikamp gmbh
/// \date   31-July-2014
///
/// \details
///
/// $Id$
///////////////////////////////////////////////////////////////////////////////
/// \par Copyright (c) 2014-2018 Heinrichs Weikamp gmbh
///
///     This program is free software: you can redistribute it and/or modify
///     it under the terms of the GNU General Public License as published by
///     the Free Software Foundation, either version 3 of the License, or
///     (at your option) any later version.
///
///     This program is distributed in the hope that it will be useful,
///     but WITHOUT ANY WARRANTY; without even the implied warranty of
///     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
///     GNU General Public License for more details.
///
///     You should have received a copy of the GNU General Public License
///     along with this program.  If not, see <http://www.gnu.org/licenses/>.
//////////////////////////////////////////////////////////////////////////////

/* Includes ------------------------------------------------------------------*/
#include "tMenu.h"
#include "tMenuDeco.h"
#include "unit.h"

/* Exported functions --------------------------------------------------------*/

uint32_t tMDeco_refresh(uint8_t line, char *text, uint16_t *tab, char *subtext)
{
    uint8_t textPointer;
    uint8_t	futureTTS;
    double ppO2max_deco, ppO2max_std;
    char divemode, CcrModusTxtId;
    textPointer = 0;
    *tab = 370;
    *subtext = 0;

    SSettings *data = settingsGetPointer();

    futureTTS = data->future_TTS;
    ppO2max_std = data->ppO2_max_std;
    ppO2max_std /= 100.0;
    ppO2max_deco = data->ppO2_max_deco;
    ppO2max_deco /= 100.0;

    if((line == 0) || (line == 1))
    {
        switch(data->dive_mode)
        {
        case DIVEMODE_OC:
            divemode = TXT_OpenCircuit;
            break;
        case DIVEMODE_CCR:
            divemode = TXT_ClosedCircuit;
            break;
        case DIVEMODE_Gauge:
            divemode = TXT_Gauge;
            break;
        case DIVEMODE_Apnea:
            divemode = TXT_Apnoe;
            break;
        default :
        	divemode = TXT_OpenCircuit;
        	break;
        }
        textPointer += snprintf(&text[textPointer], 60,\
            "%c"
            "\t"
            "%c"
            , TXT_DiveMode, divemode
        );
    }
    strcpy(&text[textPointer],"\n\r");
    textPointer += 2;

    if(data->dive_mode == DIVEMODE_CCR)
    {
        if((line == 0) || (line == 2))
        {
            if(data->CCR_Mode == CCRMODE_Sensors)
                CcrModusTxtId = TXT_Sensor;
            else
                CcrModusTxtId = TXT_FixedSP;

            textPointer += snprintf(&text[textPointer], 60,\
                "%c"
                "\t"
                "%c"
                , TXT_CCRmode
                , CcrModusTxtId
            );
        }
        strcpy(&text[textPointer],"\n\r");
        textPointer += 2;
    }
    else
        if(line != 0)
            line++;

    if((line == 0) || (line == 3))
    {
        textPointer += snprintf(&text[textPointer], 60,\
            "ppO2"
            "\016\016"
            "max"
            "\017"
            "\t"
            "%0.2f"
            "\016\016"
            " bar "
            "  deco "
            "\017"
            "%0.2f"
            "\016\016"
            " bar"
            "\017"
            , ppO2max_std, ppO2max_deco
        );
    }
    strcpy(&text[textPointer],"\n\r");
    textPointer += 2;

    if((line == 0) || (line == 4))
    {
        textPointer += snprintf(&text[textPointer], 60,\
            "%c"
            "\t"
            "%u"
            "\016\016"
            " %c"
            "\017"
            "  @     "
            "%u"
            "\016\016"
            " %c%c"
            "\017"
            , TXT_SafetyStop
            , settingsGetPointer()->safetystopDuration
            ,TXT_Minutes
            , unit_depth_integer(settingsGetPointer()->safetystopDepth)
            , unit_depth_char1()
            , unit_depth_char2()
        );
    }
    strcpy(&text[textPointer],"\n\r");
    textPointer += 2;

    if((line == 0) || (line == 5))
    {
        textPointer += snprintf(&text[textPointer], 60,\
            "%c"
            "\t"
            "%u"
            "\016\016"
            " %c"
            "\017"
            ,TXT_FutureTTS
            ,futureTTS
            ,TXT_Minutes
        );
    }
    strcpy(&text[textPointer],"\n\r");
    textPointer += 2;

    if((line == 0) || (line == 6))
    {
        textPointer += snprintf(&text[textPointer], 60,\
            "%c"
            "\t"
            "%u"
            "\016\016"
            " %%"
            "\017"
            , TXT_Salinity
            , settingsGetPointer()->salinity
        );
    }
    strcpy(&text[textPointer],"\n\r");
    textPointer += 2;


    return StMDECO;
}