update ui

Author: TeaRex-coder

ui/README.md

@@ -1,11 +1,21 @@
 # User Interface
 
-HardwareDDC's goal is to provide and easy and convenient way to adjust monitor settings. Therefore, I prioritized an efficient macro-based UX and have not yet release a GUI.
+HardwareDDC's goal is to provide and easy and convenient way to adjust monitor settings. Therefore, I prioritized an efficient macro-based UX and have not yet released a first-party GUI.
 
 Currently, HardwareDDC is controlled with hotkeys sending API requests.
 
 ## macOS
 
+### Lunar
+
+Lunar, _the defacto app for controlling monitors_, can be used as HardwareDDC's interface instead of Hammerspoon for those preferring a GUI.
+
+1. Install [Lunar](https://static.lunar.fyi/releases/Lunar.dmg)
+2. Disable all controls aside from _Network (Raspberry Pi)_
+3. Reset _Network Control_
+
+### Hammerspoon
+
 1. Install [Hammerspoon](https://www.hammerspoon.org)
 2. Add [hardware-ddc.lua](./macos/hardware-ddc.lua) to your Hammerspoon config `~/.hammerspoon/init.lua`
 
@@ -77,17 +87,17 @@ This is coming soon, but you're a Linux user, you can figure it out.
 Specify brightness percentage:
 
 ```bash
-curl -X GET "http://hardwareddc.local/brightness?value=<value 0-100>"
+curl -X GET "http://ddcutil.local:3485/1/brightness/<value 0-100>"
 ```
 
 Get current brightness:
 
 ```bash
-curl -X GET "http://hardwareddc.local/brightness"
+curl -X GET "http://ddcutil.local:3485/1/brightness"
 ```
 
 Change input source:
 
 ```bash
-curl -X GET "http://hardwareddc.local/set_source?value=<hexadecimal source code>"
+curl -X GET "http://ddcutil.local:3485/1/input_source<hexadecimal source>"
 ```

ui/macos/hardware-ddc.lua

@@ -1,5 +1,5 @@
 function setSource(value, name)
-    local url = "http://hardwareddc.local/set_source?value=" .. value
+    local url = "http://ddcutil.local:3485/1/input_source/" .. value
     hs.http.asyncGet(url, nil, function(status, body, headers)
     end)
 end
@@ -21,7 +21,7 @@ function setHDMI2()
 end
 
 function setBrightness(value)
-    local url = "http://hardwareddc.local/brightness?value=" .. value
+    local url = "http://ddcutil.local:3485/1/brightness/" .. value
     hs.http.asyncGet(url, nil, function(status, body, headers)
     end)
 end
@@ -47,8 +47,8 @@ function setBrightness100()
 end
 
 function getBrightness(callback)
-    hs.http.asyncGet("http://hardwareddc.local/brightness", nil, function(_, body)
-        local brightness = hs.json.decode(body).current_brightness
+    hs.http.asyncGet("http://ddcutil.local:3485/1/brightness", nil, function(status, body)
+        local brightness = tonumber(body)
         callback(brightness)
     end)
 end

ui/windows/hardware-ddc.ahk

@@ -1,32 +1,36 @@
-setSource(value) {
-    url := "http://hardwareddc.local/set_source?value=" value
-    Http := ComObjCreate("WinHttp.WinHttpRequest.5.1")
-    Http.Open("GET", url, false)
-    Http.Send()
+setSource(source) {
+    url := "http://ddcutil.local:3485/1/input_source/" source
+    HttpRequest(url)
 }
 
 setBrightness(value) {
-    url := "http://hardwareddc.local/brightness?value=" value
-    Http := ComObjCreate("WinHttp.WinHttpRequest.5.1")
-    Http.Open("GET", url, false)
-    Http.Send()
+    url := "http://ddcutil.local:3485/1/brightness/" value
+    HttpRequest(url)
 }
 
-getBrightness() {
-    url := "http://hardwareddc.local/brightness"
-    Http := ComObjCreate("WinHttp.WinHttpRequest.5.1")
-    Http.Open("GET", url, false)
-    Http.Send()
-    response := Http.ResponseText
-    RegExMatch(response, """current_brightness"":\s*(\d+)", match)
-    return match1
+adjustBrightness(amount) {
+    currentBrightness := currentBrightness()
+    if (currentBrightness != -1) {
+        newBrightness := currentBrightness + amount
+        if (newBrightness < 0) {
+            newBrightness := 0
+        } else if (newBrightness > 100) {
+            newBrightness := 100
+        }
+        setBrightness(newBrightness)
+    }
 }
 
-adjustBrightness(delta) {
-    currentBrightness := getBrightness()
-    newBrightness := currentBrightness + delta
-    newBrightness := Max(0, Min(100, newBrightness))
-    setBrightness(newBrightness)
+currentBrightness() {
+    url := "http://ddcutil.local:3485/1/brightness"
+    WebRequest := ComObjCreate("MSXML2.XMLHTTP")
+    WebRequest.Open("GET", url, false)
+    WebRequest.Send()
+    if (WebRequest.Status = 200) {
+        return WebRequest.ResponseText
+    } else {
+        return -1
+    }
 }
 
 increaseBrightness() {
@@ -37,6 +41,12 @@ decreaseBrightness() {
     adjustBrightness(-6)
 }
 
+HttpRequest(url) {
+    WebRequest := ComObjCreate("MSXML2.XMLHTTP")
+    WebRequest.Open("GET", url, false)
+    WebRequest.Send()
+}
+
 ^#!1::setSource(0x0f)
 ^#!2::setSource(0x10)
 ^#!3::setSource(0x11)
@@ -49,4 +59,4 @@ decreaseBrightness() {
 ^!5::setBrightness(0)
 
 ^f1::decreaseBrightness()
-^f2::increaseBrightness()
+^f2::increaseBrightness()