reorganise sources, also combine fbscreenshot read and rotate passes

Author: cobaltgit

src/quark_hotkeyd/evdev.nim src/common/evdev.nimsrc/quark_hotkeyd/evdev.nim renamed to src/common/evdev.nim

@@ -575,3 +575,8 @@ type
     kind*: uint16
     code*: KeyCode
     value*: int32
+
+proc pollReadable*(fd: cint, timeoutMs: cint): bool =
+  var pfd = TPollfd(fd: fd, events: POLLIN, revents: 0)
+  let rc = poll(addr pfd, 1, timeoutMs)
+  result = rc > 0 and (pfd.revents and POLLIN) != 0

src/common.nim src/common/fbscreenshot.nimsrc/common.nim renamed to src/common/fbscreenshot.nim

@@ -15,34 +15,24 @@ proc fbscreenshot*(output: string) =
   if bytesRead != fbData.len:
     raise newException(IOError, "Failed to read complete framebuffer data")
 
-  var pixels = newSeq[uint8](FbWidth * FbHeight * 4)
-  
+  var rotatedPixels = newSeq[uint8](FbHeight * FbWidth * 4)
+
   for y in 0..<FbHeight:
     for x in 0..<FbWidth:
       let idx = (y * FbWidth * 2 + x * 2)
       let pixel = uint16(fbData[idx]) or (uint16(fbData[idx + 1]) shl 8)
-      
+
       let r = uint8((pixel shr 11) and 0x1F)
       let g = uint8((pixel shr 5) and 0x3F)
       let b = uint8(pixel and 0x1F)
-      
-      let pixelIdx = (y * FbWidth + x) * 4
-      pixels[pixelIdx + 0] = (r shl 3) or (r shr 2)
-      pixels[pixelIdx + 1] = (g shl 2) or (g shr 4)
-      pixels[pixelIdx + 2] = (b shl 3) or (b shr 2)
-      pixels[pixelIdx + 3] = 255
-  
-  var rotated = newSeq[uint8](FbHeight * FbWidth * 4)
-  for y in 0..<FbHeight:
-    for x in 0..<FbWidth:
-      let srcIdx = (y * FbWidth + x) * 4
+
       let dstX = FbHeight - 1 - y
       let dstY = x
-      let dstIdx = (dstY * FbHeight + dstX) * 4
-      
-      rotated[dstIdx + 0] = pixels[srcIdx + 0]
-      rotated[dstIdx + 1] = pixels[srcIdx + 1]
-      rotated[dstIdx + 2] = pixels[srcIdx + 2]
-      rotated[dstIdx + 3] = pixels[srcIdx + 3]
+      let dstIdx = (x * FbHeight + dstX) * 4
+
+      rotatedPixels[dstIdx] = (r shl 3) or (r shr 2)
+      rotatedPixels[dstIdx + 1] = (g shl 2) or (g shr 4)
+      rotatedPixels[dstIdx + 2] = (b shl 3) or (b shr 2)
+      rotatedPixels[dstIdx + 3] = 255
 
-  discard savePNG32(output, rotated, FbHeight, FbWidth)
+  discard savePNG32(output, rotatedPixels, FbHeight, FbWidth)

src/common/led.nim

@@ -0,0 +1,47 @@
+import std/strformat
+
+const SunxiLedPath = "/sys/devices/platform/sunxi-led/leds"
+
+type LedColour* = enum
+    Red = 1
+    Green = 2
+    Blue = 3
+
+type LedTrigger* = enum
+    On = "default-on"
+    Off = "none"
+    BatteryChargingOrFull = "lradc_battery-charging-or-full"
+    BatteryCharging = "lradc_battery-charging"
+    BatteryFull = "lradc_battery-full"
+    BatteryChargingBlinkFullSolid = "lradc_battery-charging-blink-full-solid"
+    MMC0 = "mmc0"
+    MMC1 = "mmc1"
+    MMC2 = "mmc2"
+    Timer = "timer"
+    Heartbeat = "heartbeat"
+    DoubleFlash = "doubleflash"
+    Backlight = "backlight"
+    GPIO = "gpio"
+
+proc setLedBrightness*(colour: LedColour, val: int) =
+    writeFile(
+        &"{SunxiLedPath}/led{colour.ord}/brightness",
+        $max(0, min(val, 255))
+    )
+
+proc setLedTrigger*(colour: LedColour, trigger: LedTrigger) =
+    writeFile(
+        &"{SunxiLedPath}/led{colour.ord}/trigger",
+        $trigger
+    )
+
+proc setLedTimer*(colour: LedColour, delayOff: int, delayOn: int) =
+    setLedTrigger(colour, LedTrigger.Timer)
+    writeFile(
+        &"{SunxiLedPath}/led{colour.ord}/delay_off",
+        $delayOff
+    )
+    writeFile(
+        &"{SunxiLedPath}/led{colour.ord}/delay_on",
+        $delayOn
+    )

src/fbscreenshot/fbscreenshot.nim

@@ -1,5 +1,5 @@
 import std/[cmdline, strformat]
-from ../common import fbscreenshot
+import ../common/fbscreenshot
 
 when isMainModule:
   if paramCount() < 1:

src/quark_hotkeyd/quark_hotkeyd.nim

@@ -1,8 +1,7 @@
 import std/[posix, strformat, strutils, times, osproc, os, sets, options, monotimes]
 from std/monotimes import MonoTime
 
-from ../common import fbscreenshot
-from evdev import InputEvent, EventKind, KeyCode
+import ../common/[fbscreenshot, evdev, led]
 
 const 
   InputDev = "/dev/input/event0"
@@ -170,7 +169,7 @@ proc killCmdToRun() =
       discard kill(Pid(pid), SIGTERM)
 
 proc screenshotHandler() =
-  setLed(2, true)
+  setLedTrigger(LedColour.Green, LedTrigger.On)
   let now = now()
   let filename = &"/mnt/SDCARD/Saves/screenshots/Screenshot_{now.year:04}{ord(now.month):02}{now.monthday:02}_{now.hour:02}{now.minute:02}{now.second:02}.png"
 
@@ -179,7 +178,7 @@ proc screenshotHandler() =
   except:
     discard
 
-  setLed(2, false)
+  setLedTrigger(LedColour.Green, LedTrigger.Off)
 
 proc quicksaveHandler() =
   discard startProcess("/bin/sh", args = @["/mnt/SDCARD/System/scripts/quicksave.sh"])
@@ -193,11 +192,6 @@ proc rebootHandler() =
   sync()
   discard execl("/mnt/SDCARD/System/bin/reboot", "reboot", nil)
 
-proc pollReadable(fd: cint, timeoutMs: cint): bool =
-  var pfd = TPollfd(fd: fd, events: POLLIN, revents: 0)
-  let rc = poll(addr pfd, 1, timeoutMs)
-  result = rc > 0 and (pfd.revents and POLLIN) != 0
-
 proc main() =
   let fd = posix.open(InputDev, O_RDONLY or O_NONBLOCK)
   if fd < 0: