use i2c bus number instead of display number for ddcutil

client/brightness.py

@@ -37,12 +37,22 @@ if __name__ == "__main__":
     lux.check_connection(usb)
 
     disps = ddc.ddc_detect()
-    brightness = lux.read_brightness(usb)
-    print("Brightness:", brightness)
+    if len(disps) <= 0:
+        raise ValueError("no displays found")
 
     for d in disps:
-        d["prev"] = ddc.ddc_get(d["id"])
-        print("Display \"{}\" at {}".format(d["name"], d["prev"]))
+        # select i2c bus if available, id otherwise
+        if "bus" in d:
+            d["_id"] = d["bus"]
+        else:
+            d["_id"] = d["id"]
+
+        # get initial value
+        d["prev"] = ddc.ddc_get(d["_id"])
+        print("Display \"{}\" ({}) at {}".format(d["name"], d["_id"], d["prev"]))
+
+    brightness = lux.read_brightness(usb)
+    print("Brightness:", brightness)
 
     print()
     print("{}: Starting main loop".format(time.ctime()))
@@ -56,6 +66,6 @@ if __name__ == "__main__":
             if val != d["prev"]:
                 d["prev"] = val
                 print("{}: Setting \"{}\" to {}".format(time.ctime(), d["name"], val))
-                ddc.ddc_set(d["id"], val)
+                ddc.ddc_set(d["_id"], val)
 
         time.sleep(1.0)

client/ddc.py

@@ -17,26 +17,28 @@ def ddc_detect():
         if len(data) < 4:
             continue
 
-        # Display X
-        num = data[0].split()
-        if num[0] != "Display":
-            #raise ValueError("unexpected identifier (\"{}\" != \"Display\")".format(num[0]))
-            continue
-        field["id"] = num[1]
-
-        # Monitor: name ...
-        name = data[3].split()
-        if name[0] != "Monitor:":
-            #raise ValueError("unexpected identifier (\"{}\" != \"Monitor:\")".format(name[0]))
-            continue
-        field["name"] = ' '.join(name[1:])
-
-        out.append(field)
+        for d in data:
+            v = d.split()
+            if v[0] == "Display":
+                field["id"] = v[1]
+            elif (v[0] == "I2C") and (v[1] == "bus:"):
+                field["bus"] = v[2]
+            elif v[0] == "Monitor:":
+                field["name"] = ' '.join(v[1:])
+
+        # if id is not there it's an "Ivalid display"
+        if "id" in field:
+            out.append(field)
 
     return out
 
 def ddc_get(dev):
-    r = subprocess.run(["ddcutil", "-d", str(dev), "-t", "getvcp", "10"], capture_output=True)
+    if dev.startswith("/dev/i2c-"):
+        cmd = ["ddcutil", "--skip-ddc-checks", "--bus", dev.replace("/dev/i2c-", ""), "-t", "getvcp", "10"]
+    else:
+        cmd = ["ddcutil", "-d", str(dev), "-t", "getvcp", "10"]
+
+    r = subprocess.run(cmd, capture_output=True)
     if r.returncode != 0:
         raise ValueError("ddcutil returned {} \"{}\"".format(r.returncode, r.stderr.decode("utf-8")))
 
@@ -51,7 +53,12 @@ def ddc_set(dev, val):
     if (val < 0) or (val > 100):
         raise ValueError("out of range")
 
-    r = subprocess.run(["ddcutil", "-d", str(dev), "-t", "setvcp", "10", str(val)], capture_output=True)
+    if dev.startswith("/dev/i2c-"):
+        cmd = ["ddcutil", "--noverify", "--bus", dev.replace("/dev/i2c-", ""), "-t", "setvcp", "10", str(val)]
+    else:
+        cmd = ["ddcutil", "--noverify", "-d", str(dev), "-t", "setvcp", "10", str(val)]
+
+    r = subprocess.run(cmd, capture_output=True)
     if r.returncode != 0:
         raise ValueError("ddcutil returned {} \"{}\"".format(r.returncode, r.stderr.decode("utf-8")))