Mercurial > public > ostc4
view Small_CPU/Src/tm_stm32f4_otp.c @ 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 |
line wrap: on
line source
/** * |---------------------------------------------------------------------- * | Copyright (C) Tilen Majerle, 2014 * | * | 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 * | 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/>. * |---------------------------------------------------------------------- */ #include "tm_stm32f4_otp.h" HAL_StatusTypeDef TM_OTP_Write(uint8_t block, uint8_t byte, uint8_t data) { HAL_StatusTypeDef answer; /* Check input parameters */ if ( block >= OTP_BLOCKS || byte >= OTP_BYTES_IN_BLOCK ) { /* Invalid parameters */ return HAL_ERROR; } if(*(uint8_t *)(OTP_START_ADDR + block * OTP_BYTES_IN_BLOCK + byte) != 0xFF) return HAL_ERROR; /* Unlock FLASH */ HAL_FLASH_Unlock(); answer = HAL_FLASH_Program(FLASH_TYPEPROGRAM_BYTE, (OTP_START_ADDR + block * OTP_BYTES_IN_BLOCK + byte), data); /* Lock FLASH */ HAL_FLASH_Lock(); return answer; } uint8_t TM_OTP_Read(uint8_t block, uint8_t byte) { uint8_t data; /* Check input parameters */ if ( block >= OTP_BLOCKS || byte >= OTP_BYTES_IN_BLOCK ) { /* Invalid parameters */ return HAL_ERROR; } /* Get value */ data = *(__IO uint8_t *)(OTP_START_ADDR + block * OTP_BYTES_IN_BLOCK + byte); /* Return data */ return data; }