Mercurial > public > ostc4
view Discovery/Inc/unit.h @ 303:90e65971f15d cleanup-4
bugfix, cleanup: simplify stopwatch logic and fix fallout
The previous 2 commits (making the depth switch between surface
and diving consistent) increased the time difference (in the
simulator) to about 4 seconds. This commit fixes this again, and
we are back at 1 sec. difference between the 2 timers (notice:
in the simulator). Still not the wanted 0 sec. difference, but
the old stopwatch logic logic was rather convoluted. Resetting to
1 second (instead of 0), and second-1 logic. Basically, this feels
like a bug fixed with a second bug on top to mask it. The code
is now much more logic and consistent (despite the fact that the
real reason for the 1 sec. difference is not yet found).
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
author | Jan Mulder <jlmulder@xs4all.nl> |
---|---|
date | Mon, 20 May 2019 12:57:31 +0200 |
parents | 5f11787b4f42 |
children | 1c95f811967c |
line wrap: on
line source
/////////////////////////////////////////////////////////////////////////////// /// -*- coding: UTF-8 -*- /// /// \file Discovery/Inc/unit.h /// \brief input to meter/celsius or feet/farenheit /// \author heinrichs weikamp gmbh /// \date 24-Feb-2015 /// /// $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/>. ////////////////////////////////////////////////////////////////////////////// /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef UNIT_H #define UNIT_H #ifdef __cplusplus extern "C" { #endif /* Includes ------------------------------------------------------------------*/ #include "stm32f4xx_hal.h" /** @addtogroup Template * @{ */ /* Exported variables --------------------------------------------------------*/ /* Exported functions --------------------------------------------------------*/ float unit_depth_float(float input_meter); uint16_t unit_depth_integer(uint16_t input_meter); float unit_temperature_float(float input_celsius); uint16_t unit_speed_integer(uint16_t input_meterPerMinute); int unit_SeaLevelRelation_integer(int input_atmospheric_mbar); char unit_depth_char1(void); char unit_depth_char2(void); char unit_depth_char1_T105(void); char unit_depth_char2_T105(void); #ifdef __cplusplus } #endif #endif /* UNIT_H */ /************************ (C) COPYRIGHT heinrichs weikamp *****END OF FILE****/