Mercurial > public > ostc4
view Small_CPU/Src/i2c.c @ 305:305f251cc981 cleanup-4
bugfix, consistency: show deco/NDL really after 1 minute divetime
Related to commit 02d10d955be2. We intended to show deco/NDL after
1 minute divetime, but we included the surface seconds as well.
And yes, this can hardly be called a bugfix. Its simply more
consistent to relate the actual divetime on the display (which
is without surface seconds) with the appearance of deco/NDL after
exactly 1 minute, instead of about 1 minute.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
author | Jan Mulder <jlmulder@xs4all.nl> |
---|---|
date | Tue, 21 May 2019 11:11:05 +0200 |
parents | 2b9775f71e30 |
children | 4fe5400567e7 |
line wrap: on
line source
#include "baseCPU2.h" #include "i2c.h" #include "scheduler.h" /* Private typedef -----------------------------------------------------------*/ /* Private define ------------------------------------------------------------*/ /* Private macro -------------------------------------------------------------*/ // =============================================================================== // I2C addresses - see i2c.h // =============================================================================== I2C_HandleTypeDef I2cHandle; /* static void I2C_Error_Handler(void) { while(1) { } } */ GPIO_PinState HAL_I2C_Read_Data_PIN(void) { return HAL_GPIO_ReadPin(I2Cx_SDA_GPIO_PORT,I2Cx_SDA_PIN); } void HAL_I2C_Send_One_CLOCK(void) { HAL_GPIO_WritePin(I2Cx_SCL_GPIO_PORT, I2Cx_SCL_PIN, GPIO_PIN_RESET); HAL_Delay(10); HAL_GPIO_WritePin(I2Cx_SCL_GPIO_PORT, I2Cx_SCL_PIN, GPIO_PIN_SET); HAL_Delay(10); } GPIO_PinState MX_I2C1_TestAndClear(void) { I2C_DeInit(); HAL_I2C_ManualControl_MspInit(); for(int i=0; i<9;i++) { if(HAL_I2C_Read_Data_PIN() == GPIO_PIN_RESET) HAL_I2C_Send_One_CLOCK(); else break; } return HAL_I2C_Read_Data_PIN(); } HAL_StatusTypeDef MX_I2C1_Init(void) { I2cHandle.Instance = I2Cx; I2cHandle.Init.AddressingMode = I2C_ADDRESSINGMODE_7BIT; I2cHandle.Init.ClockSpeed = 100000;//400000; REDUCED for compatibility with HMC5583L + MMA8452Q I2cHandle.Init.DualAddressMode = I2C_DUALADDRESS_DISABLED; I2cHandle.Init.DutyCycle = I2C_DUTYCYCLE_2; I2cHandle.Init.GeneralCallMode = I2C_GENERALCALL_DISABLED; I2cHandle.Init.NoStretchMode = I2C_NOSTRETCH_DISABLED; I2cHandle.Init.OwnAddress1 = 0x01; global.I2C_SystemStatus = HAL_I2C_Init(&I2cHandle); HAL_I2CEx_AnalogFilter_Config(&I2cHandle, I2C_ANALOGFILTER_ENABLED); HAL_I2CEx_ConfigDigitalFilter(&I2cHandle,0x0F); if(global.dataSendToSlavePending) { scheduleSpecial_Evaluate_DataSendToSlave(); } return global.I2C_SystemStatus; } void I2C_DeInit(void) { HAL_I2C_DeInit(&I2cHandle); } static uint8_t i2c_errors = 0; void I2C_Error_count(void) { i2c_errors++; } HAL_StatusTypeDef I2C_Master_Transmit( uint16_t DevAddress, uint8_t *pData, uint16_t Size) { if(global.I2C_SystemStatus != HAL_OK) return global.I2C_SystemStatus; global.I2C_SystemStatus = HAL_I2C_Master_Transmit(&I2cHandle, DevAddress, pData, Size, 2); if(global.I2C_SystemStatus != HAL_OK) { I2C_Error_count(); } return global.I2C_SystemStatus; } HAL_StatusTypeDef I2C_Master_Receive( uint16_t DevAddress, uint8_t *pData, uint16_t Size) { if(global.I2C_SystemStatus != HAL_OK) return global.I2C_SystemStatus; global.I2C_SystemStatus = HAL_I2C_Master_Receive(&I2cHandle, DevAddress, pData, Size, 10); if(global.I2C_SystemStatus != HAL_OK) { I2C_Error_count(); } return global.I2C_SystemStatus; }