sravan/system76-embedded-controller
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement charging light

Browse Source
This commit is contained in:
Jeremy Soller 2020-01-21 16:04:03 -07:00
parent 1a88f3e056
commit bb985e265c
No known key found for this signature in database
GPG Key ID: E988B49EE78A7FB1
6 changed files with 45 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/board/system76/darp5/battery.c
View File

@ -1,3 +1,4 @@
#include <board/gpio.h>
#include <common/debug.h> #include <common/debug.h>
#include <ec/i2c.h> #include <ec/i2c.h>
@ -75,6 +76,7 @@ uint16_t battery_current = 0;
uint16_t battery_charge = 0; uint16_t battery_charge = 0;
uint16_t battery_remaining_capacity = 0; uint16_t battery_remaining_capacity = 0;
uint16_t battery_full_capacity = 0; uint16_t battery_full_capacity = 0;
uint16_t battery_status = 0;
uint16_t battery_design_capacity = 0; uint16_t battery_design_capacity = 0;
uint16_t battery_design_voltage = 0; uint16_t battery_design_voltage = 0;
@ -85,7 +87,6 @@ void battery_event(void) {
res = smbus_read(0x0B, V, &N); \ res = smbus_read(0x0B, V, &N); \
if (res < 0) { \ if (res < 0) { \
N = 0; \ N = 0; \
return; \
} \ } \
} }
@ -95,10 +96,27 @@ void battery_event(void) {
command(battery_charge, 0x0D); command(battery_charge, 0x0D);
command(battery_remaining_capacity, 0x0F); command(battery_remaining_capacity, 0x0F);
command(battery_full_capacity, 0x10); command(battery_full_capacity, 0x10);
command(battery_status, 0x16);
command(battery_design_capacity, 0x18); command(battery_design_capacity, 0x18);
command(battery_design_voltage, 0x19); command(battery_design_voltage, 0x19);
#undef command #undef command
if (gpio_get(&ACIN_N)) {
// Discharging (no AC adapter)
gpio_set(&LED_BAT_CHG, false);
gpio_set(&LED_BAT_FULL, false);
} else if (battery_status & 0x0020) {
// Fully charged
// TODO: turn off charger
gpio_set(&LED_BAT_CHG, false);
gpio_set(&LED_BAT_FULL, true);
} else {
// Charging
// TODO: detect no battery connected
gpio_set(&LED_BAT_CHG, true);
gpio_set(&LED_BAT_FULL, false);
}
} }
void battery_debug(void) { void battery_debug(void) {
@ -120,6 +138,7 @@ void battery_debug(void) {
command(Voltage, 0x0B, 0x09); command(Voltage, 0x0B, 0x09);
command(Current, 0x0B, 0x0A); command(Current, 0x0B, 0x0A);
command(Charge, 0x0B, 0x0D); command(Charge, 0x0B, 0x0D);
command(Status, 0x0B, 0x16);
DEBUG("Charger:\n"); DEBUG("Charger:\n");
command(ChargeOption0, 0x09, 0x12); command(ChargeOption0, 0x09, 0x12);

1
src/board/system76/darp5/include/board/battery.h
View File

@ -9,6 +9,7 @@ extern uint16_t battery_current;
extern uint16_t battery_charge; extern uint16_t battery_charge;
extern uint16_t battery_remaining_capacity; extern uint16_t battery_remaining_capacity;
extern uint16_t battery_full_capacity; extern uint16_t battery_full_capacity;
extern uint16_t battery_status;
extern uint16_t battery_design_capacity; extern uint16_t battery_design_capacity;
extern uint16_t battery_design_voltage; extern uint16_t battery_design_voltage;

21
src/board/system76/galp3-c/battery.c
View File

@ -1,3 +1,4 @@
#include <board/gpio.h>
#include <common/debug.h> #include <common/debug.h>
#include <ec/i2c.h> #include <ec/i2c.h>
@ -75,6 +76,7 @@ uint16_t battery_current = 0;
uint16_t battery_charge = 0; uint16_t battery_charge = 0;
uint16_t battery_remaining_capacity = 0; uint16_t battery_remaining_capacity = 0;
uint16_t battery_full_capacity = 0; uint16_t battery_full_capacity = 0;
uint16_t battery_status = 0;
uint16_t battery_design_capacity = 0; uint16_t battery_design_capacity = 0;
uint16_t battery_design_voltage = 0; uint16_t battery_design_voltage = 0;
@ -85,7 +87,6 @@ void battery_event(void) {
res = smbus_read(0x0B, V, &N); \ res = smbus_read(0x0B, V, &N); \
if (res < 0) { \ if (res < 0) { \
N = 0; \ N = 0; \
return; \
} \ } \
} }
@ -95,10 +96,27 @@ void battery_event(void) {
command(battery_charge, 0x0D); command(battery_charge, 0x0D);
command(battery_remaining_capacity, 0x0F); command(battery_remaining_capacity, 0x0F);
command(battery_full_capacity, 0x10); command(battery_full_capacity, 0x10);
command(battery_status, 0x16);
command(battery_design_capacity, 0x18); command(battery_design_capacity, 0x18);
command(battery_design_voltage, 0x19); command(battery_design_voltage, 0x19);
#undef command #undef command
if (gpio_get(&ACIN_N)) {
// Discharging (no AC adapter)
gpio_set(&LED_BAT_CHG, false);
gpio_set(&LED_BAT_FULL, false);
} else if (battery_status & 0x0020) {
// Fully charged
// TODO: turn off charger
gpio_set(&LED_BAT_CHG, false);
gpio_set(&LED_BAT_FULL, true);
} else {
// Charging
// TODO: detect no battery connected
gpio_set(&LED_BAT_CHG, true);
gpio_set(&LED_BAT_FULL, false);
}
} }
void battery_debug(void) { void battery_debug(void) {
@ -120,6 +138,7 @@ void battery_debug(void) {
command(Voltage, 0x0B, 0x09); command(Voltage, 0x0B, 0x09);
command(Current, 0x0B, 0x0A); command(Current, 0x0B, 0x0A);
command(Charge, 0x0B, 0x0D); command(Charge, 0x0B, 0x0D);
command(Status, 0x0B, 0x16);
DEBUG("Charger:\n"); DEBUG("Charger:\n");
command(ChargeOption0, 0x09, 0x12); command(ChargeOption0, 0x09, 0x12);

1
src/board/system76/galp3-c/include/board/battery.h
View File

@ -9,6 +9,7 @@ extern uint16_t battery_current;
extern uint16_t battery_charge; extern uint16_t battery_charge;
extern uint16_t battery_remaining_capacity; extern uint16_t battery_remaining_capacity;
extern uint16_t battery_full_capacity; extern uint16_t battery_full_capacity;
extern uint16_t battery_status;
extern uint16_t battery_design_capacity; extern uint16_t battery_design_capacity;
extern uint16_t battery_design_voltage; extern uint16_t battery_design_voltage;

3
src/board/system76/lemp9/battery.c
View File

@ -75,6 +75,7 @@ uint16_t battery_current = 0;
uint16_t battery_charge = 0; uint16_t battery_charge = 0;
uint16_t battery_remaining_capacity = 0; uint16_t battery_remaining_capacity = 0;
uint16_t battery_full_capacity = 0; uint16_t battery_full_capacity = 0;
uint16_t battery_status = 0;
uint16_t battery_design_capacity = 0; uint16_t battery_design_capacity = 0;
uint16_t battery_design_voltage = 0; uint16_t battery_design_voltage = 0;
@ -85,7 +86,6 @@ void battery_event(void) {
res = smbus_read(0x0B, V, &N); \ res = smbus_read(0x0B, V, &N); \
if (res < 0) { \ if (res < 0) { \
N = 0; \ N = 0; \
return; \
} \ } \
} }
@ -95,6 +95,7 @@ void battery_event(void) {
command(battery_charge, 0x0D); command(battery_charge, 0x0D);
command(battery_remaining_capacity, 0x0F); command(battery_remaining_capacity, 0x0F);
command(battery_full_capacity, 0x10); command(battery_full_capacity, 0x10);
command(battery_status, 0x16);
command(battery_design_capacity, 0x18); command(battery_design_capacity, 0x18);
command(battery_design_voltage, 0x19); command(battery_design_voltage, 0x19);

1
src/board/system76/lemp9/include/board/battery.h
View File

@ -9,6 +9,7 @@ extern uint16_t battery_current;
extern uint16_t battery_charge; extern uint16_t battery_charge;
extern uint16_t battery_remaining_capacity; extern uint16_t battery_remaining_capacity;
extern uint16_t battery_full_capacity; extern uint16_t battery_full_capacity;
extern uint16_t battery_status;
extern uint16_t battery_design_capacity; extern uint16_t battery_design_capacity;
extern uint16_t battery_design_voltage; extern uint16_t battery_design_voltage;