From 297ae4885a8c3f175afbb74456c198aa15fe3523 Mon Sep 17 00:00:00 2001
From: Tim Crawford <tcrawford@system76.com>
Date: Mon, 24 Aug 2020 06:58:12 -0600
Subject: [PATCH] board/system76: Set battery thresholds per board

---
 src/board/system76/addw2/board.mk   | 5 +++++
 src/board/system76/bonw14/board.mk  | 5 +++++
 src/board/system76/common/battery.c | 8 ++------
 src/board/system76/darp5/board.mk   | 5 +++++
 src/board/system76/galp3-c/board.mk | 5 +++++
 src/board/system76/gaze15/board.mk  | 5 +++++
 src/board/system76/lemp9/board.mk   | 5 +++++
 src/board/system76/oryp6/board.mk   | 5 +++++
 8 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/src/board/system76/addw2/board.mk b/src/board/system76/addw2/board.mk
index 52ed04a..e22aaa2 100644
--- a/src/board/system76/addw2/board.mk
+++ b/src/board/system76/addw2/board.mk
@@ -19,6 +19,11 @@ CFLAGS+=\
 	-DCHARGER_CHARGE_VOLTAGE=12600 \
 	-DCHARGER_INPUT_CURRENT=11800
 
+# Set battery charging thresholds
+CFLAGS+=\
+	-DBATTERY_START_THRESHOLD=0 \
+	-DBATTERY_END_THRESHOLD=100
+
 # Set CPU power limits in watts
 CFLAGS+=\
 	-DPOWER_LIMIT_AC=180 \
diff --git a/src/board/system76/bonw14/board.mk b/src/board/system76/bonw14/board.mk
index c32b5d5..a7380be 100644
--- a/src/board/system76/bonw14/board.mk
+++ b/src/board/system76/bonw14/board.mk
@@ -19,6 +19,11 @@ CFLAGS+=\
 	-DCHARGER_CHARGE_VOLTAGE=16800 \
 	-DCHARGER_INPUT_CURRENT=14000
 
+# Set battery charging thresholds
+CFLAGS+=\
+	-DBATTERY_START_THRESHOLD=0 \
+	-DBATTERY_END_THRESHOLD=100
+
 # Set CPU power limits in watts
 CFLAGS+=\
 	-DPOWER_LIMIT_AC=180 \
diff --git a/src/board/system76/common/battery.c b/src/board/system76/common/battery.c
index bf5960b..ca23e54 100644
--- a/src/board/system76/common/battery.c
+++ b/src/board/system76/common/battery.c
@@ -15,10 +15,6 @@
 // IDCHG Amplifier Gain
 #define SBC_IDCHC_GAIN      ((uint16_t)(1 << 3))
 
-// TODO: Make thresholds configurable
-#define BATTERY_START_THRESHOLD 0
-#define BATTERY_END_THRESHOLD   100
-
 // Default values to disable battery charging thresholds
 #define BATTERY_START_DEFAULT   0
 #define BATTERY_END_DEFAULT     100
@@ -26,12 +22,12 @@
 // Represents a battery percentage level, below which charging will begin.
 // Valid values are [0, 100]
 // A value of 0 turns off the start threshold control.
-static uint8_t battery_start_threshold = BATTERY_START_DEFAULT;
+static uint8_t battery_start_threshold = BATTERY_START_THRESHOLD;
 
 // Represents a battery percentage level, above which charging will stop.
 // Valid values are [0, 100]
 // A value of 100 turns off the stop threshold control.
-static uint8_t battery_end_threshold = BATTERY_END_DEFAULT;
+static uint8_t battery_end_threshold = BATTERY_END_THRESHOLD;
 
 uint8_t battery_get_start_threshold(void) {
     if (battery_start_threshold > 100)
diff --git a/src/board/system76/darp5/board.mk b/src/board/system76/darp5/board.mk
index d2058e1..686a64a 100644
--- a/src/board/system76/darp5/board.mk
+++ b/src/board/system76/darp5/board.mk
@@ -19,5 +19,10 @@ CFLAGS+=\
 	-DCHARGER_CHARGE_VOLTAGE=17600 \
 	-DCHARGER_INPUT_CURRENT=3200
 
+# Set battery charging thresholds
+CFLAGS+=\
+	-DBATTERY_START_THRESHOLD=0 \
+	-DBATTERY_END_THRESHOLD=100
+
 # Add system76 common code
 include src/board/system76/common/common.mk
diff --git a/src/board/system76/galp3-c/board.mk b/src/board/system76/galp3-c/board.mk
index a0c042c..278192e 100644
--- a/src/board/system76/galp3-c/board.mk
+++ b/src/board/system76/galp3-c/board.mk
@@ -16,5 +16,10 @@ CFLAGS+=\
 	-DCHARGER_CHARGE_VOLTAGE=13056 \
 	-DCHARGER_INPUT_CURRENT=1920
 
+# Set battery charging thresholds
+CFLAGS+=\
+	-DBATTERY_START_THRESHOLD=0 \
+	-DBATTERY_END_THRESHOLD=100
+
 # Add system76 common code
 include src/board/system76/common/common.mk
diff --git a/src/board/system76/gaze15/board.mk b/src/board/system76/gaze15/board.mk
index e933542..bb968d7 100644
--- a/src/board/system76/gaze15/board.mk
+++ b/src/board/system76/gaze15/board.mk
@@ -19,6 +19,11 @@ CFLAGS+=\
 	-DCHARGER_CHARGE_VOLTAGE=16800 \
 	-DCHARGER_INPUT_CURRENT=9230
 
+# Set battery charging thresholds
+CFLAGS+=\
+	-DBATTERY_START_THRESHOLD=0 \
+	-DBATTERY_END_THRESHOLD=100
+
 # Set CPU power limits in watts
 CFLAGS+=\
 	-DPOWER_LIMIT_AC=180 \
diff --git a/src/board/system76/lemp9/board.mk b/src/board/system76/lemp9/board.mk
index 43b2b53..22f0f10 100644
--- a/src/board/system76/lemp9/board.mk
+++ b/src/board/system76/lemp9/board.mk
@@ -17,5 +17,10 @@ CFLAGS+=\
 	-DCHARGER_CHARGE_VOLTAGE=8800 \
 	-DCHARGER_INPUT_CURRENT=1600
 
+# Set battery charging thresholds
+CFLAGS+=\
+	-DBATTERY_START_THRESHOLD=0 \
+	-DBATTERY_END_THRESHOLD=100
+
 # Add system76 common code
 include src/board/system76/common/common.mk
diff --git a/src/board/system76/oryp6/board.mk b/src/board/system76/oryp6/board.mk
index 0480570..2064396 100644
--- a/src/board/system76/oryp6/board.mk
+++ b/src/board/system76/oryp6/board.mk
@@ -19,6 +19,11 @@ CFLAGS+=\
 	-DCHARGER_CHARGE_VOLTAGE=16800 \
 	-DCHARGER_INPUT_CURRENT=13050
 
+# Set battery charging thresholds
+CFLAGS+=\
+	-DBATTERY_START_THRESHOLD=0 \
+	-DBATTERY_END_THRESHOLD=100
+
 # Set CPU power limits in watts
 CFLAGS+=\
 	-DPOWER_LIMIT_AC=180 \