From 88acee75179d9aec1129c5557c7b372e3ea98bc7 Mon Sep 17 00:00:00 2001
From: Hector Martin <marcan@marcan.st>
Date: Fri, 8 Dec 2023 18:46:04 +0900
Subject: [PATCH] conf, audump: Add tempcos to speakers

We only have real values for spp3 machines, so everything else gets a
default.

Signed-off-by: Hector Martin <marcan@marcan.st>
---
 conf/apple/j180.conf |  4 ++++
 conf/apple/j274.conf |  2 ++
 conf/apple/j293.conf |  8 ++++++++
 conf/apple/j313.conf |  4 ++++
 conf/apple/j314.conf | 12 ++++++++++++
 conf/apple/j316.conf | 12 ++++++++++++
 conf/apple/j413.conf |  8 ++++++++
 conf/apple/j415.conf | 12 ++++++++++++
 conf/apple/j456.conf |  8 ++++++++
 docs/audump.py       |  8 +++++++-
 10 files changed, 77 insertions(+), 1 deletion(-)

diff --git a/conf/apple/j180.conf b/conf/apple/j180.conf
index a7745c7..6e45fde 100644
--- a/conf/apple/j180.conf
+++ b/conf/apple/j180.conf
@@ -23,6 +23,8 @@ tau_magnet = 530.00
 t_limit = 130.0
 t_headroom = 10.0
 z_nominal = 3.80
+a_t_20c = 0.0037
+a_t_35c = 0.0037
 is_scale = 3.75
 vs_scale = 14
 is_chan = 0
@@ -37,6 +39,8 @@ tau_magnet = 225.00
 t_limit = 120.0
 t_headroom = 10.0
 z_nominal = 3.60
+a_t_20c = 0.0037
+a_t_35c = 0.0037
 is_scale = 3.75
 vs_scale = 14
 is_chan = 2
diff --git a/conf/apple/j274.conf b/conf/apple/j274.conf
index d23fcb3..6417afa 100644
--- a/conf/apple/j274.conf
+++ b/conf/apple/j274.conf
@@ -23,6 +23,8 @@ tau_magnet = 250.00
 t_limit = 140.0
 t_headroom = 40.0
 z_nominal = 4.60
+a_t_20c = 0.0037
+a_t_35c = 0.0037
 is_scale = 3.75
 vs_scale = 14
 is_chan = 0
diff --git a/conf/apple/j293.conf b/conf/apple/j293.conf
index 605b432..fa9d462 100644
--- a/conf/apple/j293.conf
+++ b/conf/apple/j293.conf
@@ -23,6 +23,8 @@ tau_magnet = 79.70
 t_limit = 130.0
 t_headroom = 10.0
 z_nominal = 9.70
+a_t_20c = 0.0037
+a_t_35c = 0.0037
 is_scale = 3.75
 vs_scale = 14
 is_chan = 0
@@ -37,6 +39,8 @@ tau_magnet = 79.70
 t_limit = 130.0
 t_headroom = 10.0
 z_nominal = 9.70
+a_t_20c = 0.0037
+a_t_35c = 0.0037
 is_scale = 3.75
 vs_scale = 14
 is_chan = 2
@@ -51,6 +55,8 @@ tau_magnet = 79.70
 t_limit = 130.0
 t_headroom = 10.0
 z_nominal = 9.70
+a_t_20c = 0.0037
+a_t_35c = 0.0037
 is_scale = 3.75
 vs_scale = 14
 is_chan = 4
@@ -65,6 +71,8 @@ tau_magnet = 79.70
 t_limit = 130.0
 t_headroom = 10.0
 z_nominal = 9.70
+a_t_20c = 0.0037
+a_t_35c = 0.0037
 is_scale = 3.75
 vs_scale = 14
 is_chan = 6
diff --git a/conf/apple/j313.conf b/conf/apple/j313.conf
index bc9d565..269c636 100644
--- a/conf/apple/j313.conf
+++ b/conf/apple/j313.conf
@@ -23,6 +23,8 @@ tau_magnet = 80.00
 t_limit = 120.0
 t_headroom = 15.0
 z_nominal = 4.90
+a_t_20c = 0.0037
+a_t_35c = 0.0037
 is_scale = 3.75
 vs_scale = 14
 is_chan = 0
@@ -37,6 +39,8 @@ tau_magnet = 80.00
 t_limit = 120.0
 t_headroom = 15.0
 z_nominal = 4.90
+a_t_20c = 0.0037
+a_t_35c = 0.0037
 is_scale = 3.75
 vs_scale = 14
 is_chan = 2
diff --git a/conf/apple/j314.conf b/conf/apple/j314.conf
index f6cb196..111d307 100644
--- a/conf/apple/j314.conf
+++ b/conf/apple/j314.conf
@@ -24,6 +24,8 @@ t_limit = 140.0
 t_headroom = 10.0
 z_nominal = 3.20
 z_shunt = 0.09
+a_t_20c = 0.00383214
+a_t_35c = 0.00362404
 is_scale = 3.75
 vs_scale = 14
 is_chan = 0
@@ -39,6 +41,8 @@ t_limit = 140.0
 t_headroom = 10.0
 z_nominal = 3.20
 z_shunt = 0.09
+a_t_20c = 0.00383214
+a_t_35c = 0.00362404
 is_scale = 3.75
 vs_scale = 14
 is_chan = 2
@@ -54,6 +58,8 @@ t_limit = 140.0
 t_headroom = 10.0
 z_nominal = 3.20
 z_shunt = 0.09
+a_t_20c = 0.00354779
+a_t_35c = 0.00329538
 is_scale = 3.75
 vs_scale = 14
 is_chan = 4
@@ -69,6 +75,8 @@ t_limit = 140.0
 t_headroom = 10.0
 z_nominal = 3.20
 z_shunt = 0.09
+a_t_20c = 0.00354779
+a_t_35c = 0.00329538
 is_scale = 3.75
 vs_scale = 14
 is_chan = 6
@@ -84,6 +92,8 @@ t_limit = 140.0
 t_headroom = 10.0
 z_nominal = 3.20
 z_shunt = 0.09
+a_t_20c = 0.00383214
+a_t_35c = 0.00362404
 is_scale = 3.75
 vs_scale = 14
 is_chan = 8
@@ -99,6 +109,8 @@ t_limit = 140.0
 t_headroom = 10.0
 z_nominal = 3.20
 z_shunt = 0.09
+a_t_20c = 0.00383214
+a_t_35c = 0.00362404
 is_scale = 3.75
 vs_scale = 14
 is_chan = 10
diff --git a/conf/apple/j316.conf b/conf/apple/j316.conf
index 7dd605c..fe35eb6 100644
--- a/conf/apple/j316.conf
+++ b/conf/apple/j316.conf
@@ -24,6 +24,8 @@ t_limit = 140.0
 t_headroom = 10.0
 z_nominal = 3.60
 z_shunt = 0.09
+a_t_20c = 0.00374895
+a_t_35c = 0.00354903
 is_scale = 3.75
 vs_scale = 14
 is_chan = 0
@@ -39,6 +41,8 @@ t_limit = 140.0
 t_headroom = 10.0
 z_nominal = 3.60
 z_shunt = 0.09
+a_t_20c = 0.00374895
+a_t_35c = 0.00354903
 is_scale = 3.75
 vs_scale = 14
 is_chan = 2
@@ -54,6 +58,8 @@ t_limit = 140.0
 t_headroom = 10.0
 z_nominal = 3.60
 z_shunt = 0.09
+a_t_20c = 0.00382045
+a_t_35c = 0.00361650
 is_scale = 3.75
 vs_scale = 14
 is_chan = 4
@@ -69,6 +75,8 @@ t_limit = 140.0
 t_headroom = 10.0
 z_nominal = 3.60
 z_shunt = 0.09
+a_t_20c = 0.00382045
+a_t_35c = 0.00361650
 is_scale = 3.75
 vs_scale = 14
 is_chan = 6
@@ -84,6 +92,8 @@ t_limit = 140.0
 t_headroom = 10.0
 z_nominal = 3.60
 z_shunt = 0.09
+a_t_20c = 0.00374895
+a_t_35c = 0.00354903
 is_scale = 3.75
 vs_scale = 14
 is_chan = 8
@@ -99,6 +109,8 @@ t_limit = 140.0
 t_headroom = 10.0
 z_nominal = 3.60
 z_shunt = 0.09
+a_t_20c = 0.00374895
+a_t_35c = 0.00354903
 is_scale = 3.75
 vs_scale = 14
 is_chan = 10
diff --git a/conf/apple/j413.conf b/conf/apple/j413.conf
index a230eae..a5f01e0 100644
--- a/conf/apple/j413.conf
+++ b/conf/apple/j413.conf
@@ -24,6 +24,8 @@ t_limit = 140.0
 t_headroom = 10.0
 z_nominal = 4.00
 z_shunt = 0.00
+a_t_20c = 0.00370036
+a_t_35c = 0.00351349
 is_scale = 3.75
 vs_scale = 14
 is_chan = 0
@@ -39,6 +41,8 @@ t_limit = 140.0
 t_headroom = 10.0
 z_nominal = 4.00
 z_shunt = 0.00
+a_t_20c = 0.00370036
+a_t_35c = 0.00351349
 is_scale = 3.75
 vs_scale = 14
 is_chan = 2
@@ -54,6 +58,8 @@ t_limit = 140.0
 t_headroom = 10.0
 z_nominal = 3.72
 z_shunt = 0.00
+a_t_20c = 0.00371053
+a_t_35c = 0.00350437
 is_scale = 3.75
 vs_scale = 14
 is_chan = 4
@@ -69,6 +75,8 @@ t_limit = 140.0
 t_headroom = 10.0
 z_nominal = 3.72
 z_shunt = 0.00
+a_t_20c = 0.00371053
+a_t_35c = 0.00350437
 is_scale = 3.75
 vs_scale = 14
 is_chan = 6
diff --git a/conf/apple/j415.conf b/conf/apple/j415.conf
index 5bf3afd..7410733 100644
--- a/conf/apple/j415.conf
+++ b/conf/apple/j415.conf
@@ -24,6 +24,8 @@ t_limit = 140.0
 t_headroom = 10.0
 z_nominal = 4.20
 z_shunt = 0.00
+a_t_20c = 0.00352082
+a_t_35c = 0.00328147
 is_scale = 3.75
 vs_scale = 14
 is_chan = 0
@@ -39,6 +41,8 @@ t_limit = 140.0
 t_headroom = 10.0
 z_nominal = 4.20
 z_shunt = 0.00
+a_t_20c = 0.00352082
+a_t_35c = 0.00328147
 is_scale = 3.75
 vs_scale = 14
 is_chan = 2
@@ -54,6 +58,8 @@ t_limit = 140.0
 t_headroom = 10.0
 z_nominal = 3.76
 z_shunt = 0.00
+a_t_20c = 0.00347480
+a_t_35c = 0.00336649
 is_scale = 3.75
 vs_scale = 14
 is_chan = 4
@@ -69,6 +75,8 @@ t_limit = 140.0
 t_headroom = 10.0
 z_nominal = 3.76
 z_shunt = 0.00
+a_t_20c = 0.00347480
+a_t_35c = 0.00336649
 is_scale = 3.75
 vs_scale = 14
 is_chan = 6
@@ -84,6 +92,8 @@ t_limit = 140.0
 t_headroom = 10.0
 z_nominal = 4.00
 z_shunt = 0.00
+a_t_20c = 0.00352082
+a_t_35c = 0.00328147
 is_scale = 3.75
 vs_scale = 14
 is_chan = 8
@@ -99,6 +109,8 @@ t_limit = 140.0
 t_headroom = 10.0
 z_nominal = 4.00
 z_shunt = 0.00
+a_t_20c = 0.00352082
+a_t_35c = 0.00328147
 is_scale = 3.75
 vs_scale = 14
 is_chan = 10
diff --git a/conf/apple/j456.conf b/conf/apple/j456.conf
index f8535a1..c188e52 100644
--- a/conf/apple/j456.conf
+++ b/conf/apple/j456.conf
@@ -23,6 +23,8 @@ tau_magnet = 391.00
 t_limit = 120.0
 t_headroom = 20.0
 z_nominal = 7.00
+a_t_20c = 0.0037
+a_t_35c = 0.0037
 # TODO is_scale = 3.75
 # TODO vs_scale = 14
 # TODO is_chan = 4
@@ -37,6 +39,8 @@ tau_magnet = 391.00
 t_limit = 120.0
 t_headroom = 20.0
 z_nominal = 7.00
+a_t_20c = 0.0037
+a_t_35c = 0.0037
 # TODO is_scale = 3.75
 # TODO vs_scale = 14
 # TODO is_chan = 6
@@ -51,6 +55,8 @@ tau_magnet = 115.00
 t_limit = 120.0
 t_headroom = 40.0
 z_nominal = 5.50
+a_t_20c = 0.0037
+a_t_35c = 0.0037
 # TODO is_scale = 3.75
 # TODO vs_scale = 14
 # TODO is_chan = 0
@@ -65,6 +71,8 @@ tau_magnet = 115.00
 t_limit = 120.0
 t_headroom = 40.0
 z_nominal = 5.50
+a_t_20c = 0.0037
+a_t_35c = 0.0037
 # TODO is_scale = 3.75
 # TODO vs_scale = 14
 # TODO is_chan = 2
diff --git a/docs/audump.py b/docs/audump.py
index 8514769..54ac644 100644
--- a/docs/audump.py
+++ b/docs/audump.py
@@ -204,6 +204,8 @@ t_limit = {p["temperature limit"]:.1f}
 t_headroom = {p["hard temp limit headroom"]:.1f}
 z_nominal = {p["Reb_ref"]:.2f}
 z_shunt = {p["Rshunt"]:.2f}
+a_t_20c = {chp["CL"]["a_t_20C"]:.8f}
+a_t_35c = {chp["CL"]["a_t_35C"]:.8f}
 is_scale = 3.75
 vs_scale = 14
 is_chan = {2 * ch}
@@ -218,6 +220,7 @@ t_window = 20.0
 channels = {channels}
 period = 4096
 link_gains = True
+uclamp_max = 64
 
 [Controls]
 vsense = VSENSE Switch
@@ -248,7 +251,7 @@ def process_atsp(e):
             if ch & (1 << i):
                 channels += 2
                 spkrs += f"""
-                
+
 [Speaker/{gn}_ch{i}]
 group = {gid}
 tr_coil = {d[p + "VoiceCoil: thermal resistance [C/Watt]"]:.2f}
@@ -258,6 +261,8 @@ tau_magnet = {d[p + "Magnet: thermal time constant [s]"]:.2f}
 t_limit = {d[p + "Temperature limit [C]"]:.1f}
 t_headroom = {d[p + "Temperature hard limit headroom [C]"]:.1f}
 z_nominal = {d[p + "VoiceCoil: DC resistance [Ohms]"]:.2f}
+a_t_20c = 0.0037
+a_t_35c = 0.0037
 is_scale = 3.75
 vs_scale = 14
 is_chan = {2 * i}
@@ -272,6 +277,7 @@ t_window = 20.0
 channels = {channels}
 period = 4096
 link_gains = {bool(d["Gain link all audio channels"])}
+uclamp_max = 64
 
 [Controls]
 vsense = VSENSE Switch