Th3maz1ng/W800_Smart_Watch
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added an other charging state which wasn't an error : when both lines are high, this indicates that no charger is currently plugged to the watch

Browse Source
This commit is contained in:
anschrammh 2023-03-22 08:22:52 +01:00
parent 242fbc3df9
commit 099fe8cea7
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/W800_SDK_v1.00.10/app/app_drivers/watch_peripherals/watch_peripherals.c
View File

@ -59,7 +59,7 @@ void watch_peripherals_init(int8_t adcOffset)
} }
} }
uint16_t watch_peripherals_get_battery_voltage(Battery_Unit_e unit) uint16_t watch_peripherals_get_battery_voltage(battery_unit_e unit)
{ {
tls_gpio_write(BATTERY_VOLTAGE_DIVIDER_ENABLE, 1); tls_gpio_write(BATTERY_VOLTAGE_DIVIDER_ENABLE, 1);
int batteryVoltage = adc_get_inputVolt(BATTERY_VOLTAGE_ADC_CHANNEL, 1, 1) * 2 + _adc_offset; int batteryVoltage = adc_get_inputVolt(BATTERY_VOLTAGE_ADC_CHANNEL, 1, 1) * 2 + _adc_offset;
@ -67,10 +67,10 @@ uint16_t watch_peripherals_get_battery_voltage(Battery_Unit_e unit)
switch (unit) switch (unit)
{ {
case Battery_Unit_mV: case battery_unit_mv:
return batteryVoltage < 0 ? 0 : batteryVoltage; return batteryVoltage < 0 ? 0 : batteryVoltage;
break; break;
case Battery_Unit_percent: case battery_unit_percent:
return battery_voltage_to_percentage(batteryVoltage < 0 ? 0 : batteryVoltage); return battery_voltage_to_percentage(batteryVoltage < 0 ? 0 : batteryVoltage);
break; break;
default: default:
@ -107,8 +107,10 @@ battery_controller_status_e watch_peripherals_get_battery_controller_status(void
return BATTERY_CHARGING; return BATTERY_CHARGING;
else if(!charging && charged) else if(!charging && charged)
return BATTERY_CHARGED; return BATTERY_CHARGED;
else if (!charging && !charged)
return BATTERY_STATUS_ERROR; return BATTERY_DISCHARGING;
else
return BATTERY_ERROR;
} }
void watch_peripherals_vibrate(uint8_t strength, uint32_t durationMs) void watch_peripherals_vibrate(uint8_t strength, uint32_t durationMs)

13
src/W800_SDK_v1.00.10/app/app_drivers/watch_peripherals/watch_peripherals.h
View File

@ -6,17 +6,18 @@
#define WATCH_PERIPHERALS_H #define WATCH_PERIPHERALS_H
#include "wm_type_def.h" #include "wm_type_def.h"
typedef enum Battery_Unit typedef enum battery_unit
{ {
Battery_Unit_mV = 0, battery_unit_mv = 0,
Battery_Unit_percent battery_unit_percent
} Battery_Unit_e; } battery_unit_e;
typedef enum battery_controller_status typedef enum battery_controller_status
{ {
BATTERY_CHARGING = 0, BATTERY_CHARGING = 0,
BATTERY_CHARGED, BATTERY_CHARGED,
BATTERY_STATUS_ERROR BATTERY_DISCHARGING,
BATTERY_ERROR
} battery_controller_status_e; } battery_controller_status_e;
/** /**
@ -36,7 +37,7 @@ void watch_peripherals_init(int8_t adcOffset);
* @param unit the unit of the data to be returned : mV or corresponding capacity in percentage * @param unit the unit of the data to be returned : mV or corresponding capacity in percentage
* @return uint16_t the voltage in mV or the battery left capacity in % * @return uint16_t the voltage in mV or the battery left capacity in %
*/ */
uint16_t watch_peripherals_get_battery_voltage(Battery_Unit_e unit); uint16_t watch_peripherals_get_battery_voltage(battery_unit_e unit);
/** /**
* @brief Converts the given battery voltage to the corresponding battery capacity for a single cell LiPo only (4.2V to 3.2V) * @brief Converts the given battery voltage to the corresponding battery capacity for a single cell LiPo only (4.2V to 3.2V)