Mercurial > public > ostc4
view Small_CPU/Inc/baseCPU2.h @ 173:05c770dc2911 max-depth
Bugfix: make max depth move with current depth (part 1)
The display in dive mode of the max depth was updated before the actual
depth, which looks very strange. The reason for this was conceptually
simple. The depth value was averaged over a set of depth samples, but
the current depth was only taken from the current sample. So, per
definition, on an initial descend, the current depth is always bigger
(deeper) than any average from previous shallower samples.
This part 1 commit introduces a new function that is used immediate
after reception of the new sample from the RTE. This function does the
trivial average of a set of samples. Notice that also the surface and
ambient mbar pressures are taken into account (which are used heavily
over the entire code). This is a consistency thing. We should base any
further calculation from the data presented in the UI, instead of
presenting A, and use A' for further calculations.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
author | Jan Mulder <jlmulder@xs4all.nl> |
---|---|
date | Mon, 11 Mar 2019 19:48:57 +0100 |
parents | 5f11787b4f42 |
children |
line wrap: on
line source
/** ****************************************************************************** * @file GPIO/GPIO_IOToggle/Inc/main.h * @author MCD Application Team * @version V1.1.0 * @date 26-June-2014 * @brief Header for main.c module ****************************************************************************** * @attention * * <h2><center>© COPYRIGHT(c) 2014 STMicroelectronics</center></h2> * * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: * 1. Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright notice, * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * 3. Neither the name of STMicroelectronics nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ****************************************************************************** */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef BASE_CPU2_H #define BASE_CPU2_H //#define DEBUGMODE /* Includes ------------------------------------------------------------------*/ #include "stm32f4xx_hal.h" #include "settings.h" /* Exported types ------------------------------------------------------------*/ /* Exported constants --------------------------------------------------------*/ //new uint8_t firmwareVersionHigh(void); uint8_t firmwareVersionLow(void); /* Definition for I2Cx clock resources */ #define I2Cx I2C1 #define I2Cx_CLK_ENABLE() __I2C1_CLK_ENABLE() #define I2Cx_SDA_GPIO_CLK_ENABLE() __GPIOB_CLK_ENABLE() #define I2Cx_SCL_GPIO_CLK_ENABLE() __GPIOB_CLK_ENABLE() #define I2Cx_FORCE_RESET() __I2C1_FORCE_RESET() #define I2Cx_RELEASE_RESET() __I2C1_RELEASE_RESET() /* Definition for I2Cx Pins */ #define I2Cx_SCL_PIN GPIO_PIN_8 #define I2Cx_SCL_GPIO_PORT GPIOB #define I2Cx_SCL_AF GPIO_AF4_I2C1 #define I2Cx_SDA_PIN GPIO_PIN_9 #define I2Cx_SDA_GPIO_PORT GPIOB #define I2Cx_SDA_AF GPIO_AF4_I2C1 /* Definition for I2Cx's NVIC */ #define I2Cx_EV_IRQn I2C1_EV_IRQn #define I2Cx_EV_IRQHandler I2C1_EV_IRQHandler #define I2Cx_ER_IRQn I2C1_ER_IRQn #define I2Cx_ER_IRQHandler I2C1_ER_IRQHandler /* Size of Transmission buffer */ //#define TXBUFFERSIZE (COUNTOF(aTxBuffer) - 1) /* Size of Reception buffer */ //#define RXBUFFERSIZE TXBUFFERSIZE /* Exported macro ------------------------------------------------------------*/ //#define COUNTOF(__BUFFER__) (sizeof(__BUFFER__) / sizeof(*(__BUFFER__))) /* Exported functions ------------------------------------------------------- */ void SYSCLKConfig_STOP(void); //void SystemClock_Config(void); in baseCPU2.c only void HAL_I2C_ManualControl_MspInit(void); #endif /* BASE_CPU2_H */ /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/