From 927e13f5b2f681ffede83114ed292e0b8bb2bd32 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Fri, 5 Mar 2021 09:34:22 -0700
Subject: [PATCH 1/2] Fix requiring sudo to run power.sh

---
 scripts/power.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/power.sh b/scripts/power.sh
index 970d58840..b17e89f03 100755
--- a/scripts/power.sh
+++ b/scripts/power.sh
@@ -60,7 +60,7 @@ do
     else
         F="$(date "+%T")"
 
-        last_E="$(cat /sys/class/powercap/intel-rapl\:0/energy_uj)"
+        last_E="$(sudo cat /sys/class/powercap/intel-rapl\:0/energy_uj)"
         sleep 1
 
         if [ "${has_bat}" == "1" ]
@@ -73,15 +73,15 @@ do
             F="${F}\t$(printf "%.2f" "${bat_W}")"
         fi
 
-        E="$(cat /sys/class/powercap/intel-rapl\:0/energy_uj)"
+        E="$(sudo cat /sys/class/powercap/intel-rapl\:0/energy_uj)"
         W="$(echo "(${E} - ${last_E})/1000000" | bc -lq)"
         F="${F}\t$(printf "%.1f" "${W}")"
 
-        PL1_uW="$(cat /sys/class/powercap/intel-rapl\:0/constraint_0_power_limit_uw)"
+        PL1_uW="$(sudo cat /sys/class/powercap/intel-rapl\:0/constraint_0_power_limit_uw)"
         PL1_W="$(echo "${PL1_uW}/1000000" | bc -lq)"
         F="${F}\t$(printf "%.1f" "${PL1_W}")"
 
-        PL2_uW="$(cat /sys/class/powercap/intel-rapl\:0/constraint_1_power_limit_uw)"
+        PL2_uW="$(sudo cat /sys/class/powercap/intel-rapl\:0/constraint_1_power_limit_uw)"
         PL2_W="$(echo "${PL2_uW}/1000000" | bc -lq)"
         F="${F}\t$(printf "%.1f" "${PL2_W}")"
 

From 15c8f96e8ea2988003cdf26d998d5ff304ee3cf6 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Fri, 5 Mar 2021 09:35:16 -0700
Subject: [PATCH 2/2] oryp6, oryp7: Improved fan curve for video chat

---
 src/board/system76/oryp6/board.mk | 26 ++++++++++++++++----------
 src/board/system76/oryp7/board.mk | 26 ++++++++++++++++----------
 2 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/src/board/system76/oryp6/board.mk b/src/board/system76/oryp6/board.mk
index b880fc1dc..0e31f0748 100644
--- a/src/board/system76/oryp6/board.mk
+++ b/src/board/system76/oryp6/board.mk
@@ -38,11 +38,14 @@ CFLAGS+=\
 CFLAGS+=-DBOARD_HEATUP=5
 CFLAGS+=-DBOARD_COOLDOWN=20
 CFLAGS+=-DBOARD_FAN_POINTS="\
-	FAN_POINT(60, 40), \
-	FAN_POINT(65, 60), \
-	FAN_POINT(70, 75), \
-	FAN_POINT(75, 90), \
-	FAN_POINT(80, 100) \
+	FAN_POINT(50, 20), \
+	FAN_POINT(60, 25), \
+	FAN_POINT(65, 30), \
+	FAN_POINT(70, 40), \
+	FAN_POINT(75, 60), \
+	FAN_POINT(80, 75), \
+	FAN_POINT(85, 90), \
+	FAN_POINT(90, 100) \
 "
 
 # Enable DGPU support
@@ -50,11 +53,14 @@ CFLAGS+=-DHAVE_DGPU=1
 CFLAGS+=-DBOARD_DGPU_HEATUP=5
 CFLAGS+=-DBOARD_DGPU_COOLDOWN=20
 CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\
-	FAN_POINT(60, 40), \
-	FAN_POINT(65, 60), \
-	FAN_POINT(70, 75), \
-	FAN_POINT(75, 90), \
-	FAN_POINT(80, 100) \
+	FAN_POINT(50, 20), \
+	FAN_POINT(60, 25), \
+	FAN_POINT(65, 30), \
+	FAN_POINT(70, 40), \
+	FAN_POINT(75, 60), \
+	FAN_POINT(80, 75), \
+	FAN_POINT(85, 90), \
+	FAN_POINT(90, 100) \
 "
 
 # Add system76 common code
diff --git a/src/board/system76/oryp7/board.mk b/src/board/system76/oryp7/board.mk
index b880fc1dc..0e31f0748 100644
--- a/src/board/system76/oryp7/board.mk
+++ b/src/board/system76/oryp7/board.mk
@@ -38,11 +38,14 @@ CFLAGS+=\
 CFLAGS+=-DBOARD_HEATUP=5
 CFLAGS+=-DBOARD_COOLDOWN=20
 CFLAGS+=-DBOARD_FAN_POINTS="\
-	FAN_POINT(60, 40), \
-	FAN_POINT(65, 60), \
-	FAN_POINT(70, 75), \
-	FAN_POINT(75, 90), \
-	FAN_POINT(80, 100) \
+	FAN_POINT(50, 20), \
+	FAN_POINT(60, 25), \
+	FAN_POINT(65, 30), \
+	FAN_POINT(70, 40), \
+	FAN_POINT(75, 60), \
+	FAN_POINT(80, 75), \
+	FAN_POINT(85, 90), \
+	FAN_POINT(90, 100) \
 "
 
 # Enable DGPU support
@@ -50,11 +53,14 @@ CFLAGS+=-DHAVE_DGPU=1
 CFLAGS+=-DBOARD_DGPU_HEATUP=5
 CFLAGS+=-DBOARD_DGPU_COOLDOWN=20
 CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\
-	FAN_POINT(60, 40), \
-	FAN_POINT(65, 60), \
-	FAN_POINT(70, 75), \
-	FAN_POINT(75, 90), \
-	FAN_POINT(80, 100) \
+	FAN_POINT(50, 20), \
+	FAN_POINT(60, 25), \
+	FAN_POINT(65, 30), \
+	FAN_POINT(70, 40), \
+	FAN_POINT(75, 60), \
+	FAN_POINT(80, 75), \
+	FAN_POINT(85, 90), \
+	FAN_POINT(90, 100) \
 "
 
 # Add system76 common code