view Discovery/Src/tMenuDeco.c @ 224:ceecabfddb57 div-fixes-3

Bugfix, deco: fix 2 (small) problems with calculated ceiling This fixes 1 trivial, and 1 not really trivial bug in the calculation of the ceiling. When simulating a bounce dive to 80m, things become clear (tried this on a CCR dive, fixed setpoint 1.2bar, about 15 minutes of bottom time). Closely watch the behavior of the ceiling data. At some point during the ascent, the ceiling begins to decrease in 10cm steps. Then suddenly (while still ascending), the ceiling increases again with 1m, does not change for some time, and then suddenly steps 1.1m less deep. While not very relevant to real deco diving, it is simply wrong. The reason for this is subtle. The algorithm used to find the ceiling is a sort of linear search, stepping down a meter, overshoot the depth, and search back in 10cm steps. It seems some numerical instability. Fixing this, was a bit more computational intensive search by stepping up down in equal steps of 10cm. But, I'm pretty sure that things can be speeded up here, as a ceiling does not change fast, so it should be not that difficult to limit the search space, or use a binary search algorithm instead. The trivial second problem fixed, is that the ceiling ends at the surface and not at 1m depth. This small issue became visible after changing the step down size above. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
author Jan Mulder <jlmulder@xs4all.nl>
date Sun, 31 Mar 2019 19:35:51 +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;
}