tweak formula for prototype client

client/brightness.py

@@ -6,8 +6,7 @@ import time
 
 filter_fact = 0.9
 
-# out = out_b + out_a * in_a * (in_b + in)
-c_in = 1.0, -40.0, # in_a, in_b
+c_in = 0.6, -60.0, # in_a, in_b
 calibration = {
     "HPN:HP 27xq:CNK1072BJY": [
         1.0, 30.0, # out_a, out_b
@@ -19,7 +18,8 @@ calibration = {
 }
 
 def cal(v, c):
-    return c[1] + c[0] * c_in[0] * (c_in[1] + v)
+    # out = out_b + out_a * in_a * max(0, in_b + in)
+    return c[1] + c[0] * c_in[0] * max(0, c_in[1] + v)
 
 def filter_lux(old, new):
     return (old * filter_fact) + (new * (1.0 - filter_fact))
@@ -45,7 +45,7 @@ if __name__ == "__main__":
         print("Display \"{}\" at {}".format(d["name"], d["prev"]))
 
     print()
-    print("Starting main loop")
+    print("{}: Starting main loop".format(time.ctime()))
     print()
 
     while True:
@@ -55,7 +55,7 @@ if __name__ == "__main__":
             val = lux_to_disp(d["name"], brightness)
             if val != d["prev"]:
                 d["prev"] = val
-                print("Setting \"{}\" to {}".format(d["name"], val))
+                print("{}: Setting \"{}\" to {}".format(time.ctime(), d["name"], val))
                 ddc.ddc_set(d["id"], val)
 
         time.sleep(1.0)

client/ddc.py

@@ -5,7 +5,7 @@ import subprocess
 def ddc_detect():
     r = subprocess.run(["ddcutil", "detect", "-t"], capture_output=True)
     if r.returncode != 0:
-        raise ValueError("ddcutil returned {}".format(r.returncode))
+        raise ValueError("ddcutil returned {} \"{}\"".format(r.returncode))
 
     out = []
 
@@ -38,11 +38,11 @@ def ddc_detect():
 def ddc_get(dev):
     r = subprocess.run(["ddcutil", "-d", str(dev), "-t", "getvcp", "10"], capture_output=True)
     if r.returncode != 0:
-        raise ValueError("ddcutil returned {}".format(r.returncode))
+        raise ValueError("ddcutil returned {} \"{}\"".format(r.returncode, r.stderr.decode("utf-8")))
 
     s = r.stdout.decode("utf-8").split()
     if (s[0] != "VCP") or (s[1] != "10") or (s[2] != "C") or (s[4] != "100"):
-        raise ValueError("unexpected identifier")
+        raise ValueError("unexpected identifier \"{}\"".format(r.stdout.decode("utf-8")))
 
     return int(s[3])
 
@@ -53,7 +53,7 @@ def ddc_set(dev, val):
 
     r = subprocess.run(["ddcutil", "-d", str(dev), "-t", "setvcp", "10", str(val)], capture_output=True)
     if r.returncode != 0:
-        raise ValueError("ddcutil returned {}".format(r.returncode))
+        raise ValueError("ddcutil returned {} \"{}\"".format(r.returncode, r.stderr.decode("utf-8")))
 
 if __name__ == "__main__":
     devs = ddc_detect()