Cleanup and add todos

2 files changed, 14 insertions, 27 deletions

diff --git a/Makefile b/Makefile
index 99f8680..bdce54d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,7 @@
+.PHONY: all
+all:
+        CGO_ENABLED=0 go build -o mfi_homekit main.go
+
 .PHONY: docker
 docker:
         cp mfi_homekit docker/mfi_homekit; \
diff --git a/main.go b/main.go
index 5545b65..8926c4d 100644
--- a/main.go
+++ b/main.go
@@ -4,18 +4,18 @@ import (
         "encoding/json"
         "errors"
         "fmt"
+        "io/ioutil"
+        "net"
+        "time"
+
         "github.com/brutella/hc"
         "github.com/brutella/hc/accessory"
         "github.com/brutella/hc/characteristic"
         "golang.org/x/crypto/ssh"
-        "io/ioutil"
-        "net"
-        "time"
 )
 
 const (
-        CMD_PATH     = "/var/etc/persistent/power_control.sh"
-        NO_BLINK_CMD = "/usr/bin/sh -c 'echo 0 > /proc/led/freq && echo 1 > /proc/led/status'"
+        CMD_PATH = "/var/etc/persistent/power_control.sh"
 )
 
 type Device struct {
@@ -173,15 +173,6 @@ func (d *Device) Toggle(n string, on bool) ([]DeviceOutput, error) {
         }
 }
 
-func (d *Device) DisableBlink() error {
-        _, err := d.runCommand(NO_BLINK_CMD)
-        if err != nil {
-                return err
-        } else {
-                return nil
-        }
-}
-
 func (d *Device) GetReport() ([]DeviceOutput, error) {
         out, err := d.runCommand(fmt.Sprintf("%s report", CMD_PATH))
         if err != nil {
@@ -249,18 +240,6 @@ func GatherReports(devs []*Device) {
         }
 }
 
-func StopBlinking(devs []*Device) {
-        t := time.NewTicker(10 * time.Second)
-        defer t.Stop()
-
-        for {
-                <-t.C
-                for _, d := range devs {
-                        d.DisableBlink()
-                }
-        }
-}
-
 func main() {
         devs, err := LoadAppConfig("config.json")
         if err != nil {
@@ -271,9 +250,13 @@ func main() {
         reg := []*accessory.Accessory{}
         accs := make(map[*characteristic.Characteristic]*Output, 10)
 
+        // TODO: Do this in a goroutine and add retries for devices so one device
+        // doesn't block booting the whole controller
         for _, k := range devs {
                 fmt.Printf("Connecting to %s\n", k.Name)
 
+                // TODO: Upgrade or install controller script when first connecting
+
                 if err = k.Connect(); err != nil {
                         panic(err)
                 }
@@ -283,6 +266,7 @@ func main() {
                         panic(err)
                 }
 
+                // TODO: Allow the homekit app to provide device and output names
                 for i, d := range k.Devices {
                         // Unnamed outputs are unused
                         if d == "" {
@@ -318,6 +302,5 @@ func main() {
 
         // Gathering reports also keeps the SSH connections alive
         go GatherReports(devs)
-        go StopBlinking(devs)
         t.Start()
 }