Mercurial > public > ostc4
view Small_CPU/Src/batteryGasGauge.c @ 238:a9d798e8c11f div-fixes-5
cleanup, bugfix: do not mask I2C_SystemStatus with local variable
This commit is partly cleanup, and partly possible bugfix. Masking
the global I2C_SystemStatus with a local variable is (very) bad practice,
but more importantly, dangerous, as other code uses this I2C_SystemStatus
to base decisions on. So, this is definitely non-trivial, as it can
possibly change the flow of control. This said, its tested and seems to
have no negative effects (but also no positive, as I sort of hoped for),
so that is why I mark it cleanup as well. Constructs like this shall
be heavily documented in the code, when there is a reason to do things
like this.
Further, remove a 2nd rather useless construct. There is no reason
to & 0x03 the output of I2C_SystemStatus. This is the only location
in the entire code base where this is done, so, its not only useless
but also inconsistent and confusing the true intentions here.
Finally, littered to code with todo's that I will take care of in
next commits.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
author | Jan Mulder <jlmulder@xs4all.nl> |
---|---|
date | Mon, 08 Apr 2019 10:16:17 +0200 |
parents | f9ba924d188e |
children | b23de15e2861 |
line wrap: on
line source
/** ****************************************************************************** * @file batteryGasGauge.c * @author heinrichs weikamp gmbh * @version V0.0.1 * @date 09-Dec-2014 * @brief LTC2942 Battery Gas Gauge * @verbatim ============================================================================== ##### stm32f4xx_hal_i2c.c modification ##### ============================================================================== The LTC2942 requires an repeated start condition without stop condition for data reception. @endverbatim ****************************************************************************** * @attention * * <h2><center>© COPYRIGHT(c) 2014 heinrichs weikamp</center></h2> * ****************************************************************************** */ /* Includes ------------------------------------------------------------------*/ #include "batteryGasGauge.h" #include "baseCPU2.h" #include "stm32f4xx_hal.h" #include "i2c.h" static float battery_f_voltage = 0; static float battery_f_charge_percent = 0; #define BGG_BATTERY_OFFSET (26123) //; 65536-(3,35Ah/0,085mAh) #define BGG_BATTERY_DIVIDER (394) //; 3,35Ah/0,085mAh/100 [%] float get_voltage(void) { #ifdef OSTC_ON_DISCOVERY_HARDWARE return 3.0f; #endif return battery_f_voltage; } float get_charge(void) { #ifdef OSTC_ON_DISCOVERY_HARDWARE return 100.0f; #endif return battery_f_charge_percent; } void init_battery_gas_gauge(void) { #ifdef OSTC_ON_DISCOVERY_HARDWARE return; #endif uint8_t buffer[2]; buffer[0] = 0x01; // F8 = 11111000: // Vbat 3.0V (11) // Prescale M = 128 (111) // AL/CC pin disable (0) // Shutdown (0) buffer[1] = 0xF8; I2C_Master_Transmit(DEVICE_BATTERYGAUGE, buffer, 2); } void battery_gas_gauge_get_data(void) { #ifdef OSTC_ON_DISCOVERY_HARDWARE return; #endif float battery_f_voltage_local; float battery_f_charge_percent_local; uint8_t bufferReceive[10]; I2C_Master_Receive( DEVICE_BATTERYGAUGE, bufferReceive, 10); battery_f_voltage_local = (float)(bufferReceive[8] * 256); battery_f_voltage_local += (float)(bufferReceive[9]); battery_f_voltage_local *= (float)6 / (float)0xFFFF; // max/full: 0.085 mAh * 1 * 65535 = 5570 mAh battery_f_charge_percent_local = (float)(bufferReceive[2] * 256); battery_f_charge_percent_local += (float)(bufferReceive[3]); battery_f_charge_percent_local -= BGG_BATTERY_OFFSET; battery_f_charge_percent_local /= BGG_BATTERY_DIVIDER; if(battery_f_charge_percent_local < 0) battery_f_charge_percent_local = 0; battery_f_voltage = battery_f_voltage_local; battery_f_charge_percent = battery_f_charge_percent_local; } void battery_gas_gauge_set_charge_full(void) { #ifdef OSTC_ON_DISCOVERY_HARDWARE return; #endif uint8_t bufferSend[3]; bufferSend[0] = 0x02; bufferSend[1] = 0xFF; bufferSend[2] = 0xFF; I2C_Master_Transmit( DEVICE_BATTERYGAUGE, bufferSend, 3); } void battery_gas_gauge_set(float percentage) { #ifdef OSTC_ON_DISCOVERY_HARDWARE return; #endif uint16_t mAhSend; if(percentage >= 100) mAhSend = 0xFFFF; else { mAhSend = (percentage * BGG_BATTERY_DIVIDER) + BGG_BATTERY_OFFSET; } uint8_t bufferSend[3]; bufferSend[0] = 0x02; bufferSend[1] = (uint8_t)(mAhSend / 256); bufferSend[2] = (uint8_t)(mAhSend & 0xFF); I2C_Master_Transmit( DEVICE_BATTERYGAUGE, bufferSend, 3); } /************************ (C) COPYRIGHT heinrichs weikamp *****END OF FILE****/