brightness: detect monitors by connector instead of model (#503)
* fix(brightness): change monitor detection to be based on connector using the model caused problems when using the same monitor twice * format + use connector for isDdc --------- Co-authored-by: 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com>
This commit is contained in:
parent
cc80951855
commit
d69a400f9f
1 changed files with 4 additions and 4 deletions
|
|
@ -60,8 +60,8 @@ Singleton {
|
||||||
command: ["ddcutil", "detect", "--brief"]
|
command: ["ddcutil", "detect", "--brief"]
|
||||||
stdout: StdioCollector {
|
stdout: StdioCollector {
|
||||||
onStreamFinished: root.ddcMonitors = text.trim().split("\n\n").filter(d => d.startsWith("Display ")).map(d => ({
|
onStreamFinished: root.ddcMonitors = text.trim().split("\n\n").filter(d => d.startsWith("Display ")).map(d => ({
|
||||||
model: d.match(/Monitor:.*:(.*):.*/)[1],
|
busNum: d.match(/I2C bus:[ ]*\/dev\/i2c-([0-9]+)/)[1],
|
||||||
busNum: d.match(/I2C bus:[ ]*\/dev\/i2c-([0-9]+)/)[1]
|
connector: d.match(/DRM connector:\s+(.*)/)[1].replace(/^card\d+-/, "") // strip "card1-"
|
||||||
}))
|
}))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -82,8 +82,8 @@ Singleton {
|
||||||
id: monitor
|
id: monitor
|
||||||
|
|
||||||
required property ShellScreen modelData
|
required property ShellScreen modelData
|
||||||
readonly property bool isDdc: root.ddcMonitors.some(m => m.model === modelData.model)
|
readonly property bool isDdc: root.ddcMonitors.some(m => m.connector === modelData.name)
|
||||||
readonly property string busNum: root.ddcMonitors.find(m => m.model === modelData.model)?.busNum ?? ""
|
readonly property string busNum: root.ddcMonitors.find(m => m.connector === modelData.name)?.busNum ?? ""
|
||||||
readonly property bool isAppleDisplay: root.appleDisplayPresent && modelData.model.startsWith("StudioDisplay")
|
readonly property bool isAppleDisplay: root.appleDisplayPresent && modelData.model.startsWith("StudioDisplay")
|
||||||
property real brightness
|
property real brightness
|
||||||
property real queuedBrightness: NaN
|
property real queuedBrightness: NaN
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue