More abstractions

Author: netspencer

cmd/autodidact/main.go

@@ -5,46 +5,27 @@ import (
 	"os"
 	"strconv"
 
-	"github.com/brutella/hc"
-	"github.com/brutella/hc/accessory"
+	"github.com/mastery-la/autodidact/pkg/protocol/homekit"
 
 	"github.com/mastery-la/autodidact/pkg/bridge"
 
 	"github.com/joho/godotenv"
 )
 
 func main() {
-	info := accessory.Info{
-		Name:         "Thermostat",
-		SerialNumber: "TCAS3AS14AS3",
-		Manufacturer: "Honeywell",
-		Model:        "TCC01",
-	}
-	acc := accessory.NewThermostat(info, 22.0, 15.0, 32.0, 1.0)
-
-	config := hc.Config{Pin: "12344321", Port: "12345", StoragePath: "./.db"}
-	t, err := hc.NewIPTransport(config, acc.Accessory)
-	if err != nil {
-		log.Panic(err)
-	}
-
-	bridge, err := getBridge()
+	honeywell, err := getHoneywellThermostat()
 	if err != nil {
 		log.Panic(err)
 	}
 
-	acc.Thermostat.TargetTemperature.OnValueRemoteUpdate(func(temp float64) {
-		bridge.Thermostat.Thermostat.TargetTemperature.SetValue(temp)
-	})
+	transport := homekit.New("12344321", "12345", "./db")
 
-	hc.OnTermination(func() {
-		<-t.Stop()
-	})
+	transport.AddAccessory(homekit.NewThermostat(honeywell.Thermostat))
 
-	t.Start()
+	transport.Start()
 }
 
-func getBridge() (*bridge.HoneywellThermostat, error) {
+func getHoneywellThermostat() (*bridge.HoneywellThermostat, error) {
 	err := godotenv.Load()
 	if err != nil {
 		log.Fatal("Error loading .env file")

go.mod

@@ -3,6 +3,7 @@ module github.com/mastery-la/autodidact
 require (
 	github.com/brutella/hc v1.2.0
 	github.com/go-home-iot/honeywell v0.0.0-20161119014616-f4dde0984b6b
+	github.com/iancoleman/strcase v0.0.0-20190422225806-e506e3ef7365
 	github.com/joho/godotenv v1.3.0
 	github.com/labstack/echo v3.3.10+incompatible
 	github.com/labstack/gommon v0.3.0 // indirect

go.sum

@@ -10,6 +10,8 @@ github.com/go-home-iot/honeywell v0.0.0-20161119014616-f4dde0984b6b h1:GHDOb7k5x
 github.com/go-home-iot/honeywell v0.0.0-20161119014616-f4dde0984b6b/go.mod h1:wlxsHBYIAM/4V+1dTa5TehzXaght6AjqzG2v2dsWiu4=
 github.com/gosexy/to v0.0.0-20141221203644-c20e083e3123 h1:6Q7VB4v0aEgIE6BtsbJhEH0KgFE0f+FHAxXePQp9Klc=
 github.com/gosexy/to v0.0.0-20141221203644-c20e083e3123/go.mod h1:oQuuq9ZkoRpy+2mhINlY3ZrwgywR77yPXmFpP6vCr/w=
+github.com/iancoleman/strcase v0.0.0-20190422225806-e506e3ef7365 h1:ECW73yc9MY7935nNYXUkK7Dz17YuSUI9yqRqYS8aBww=
+github.com/iancoleman/strcase v0.0.0-20190422225806-e506e3ef7365/go.mod h1:SK73tn/9oHe+/Y0h39VT4UCxmurVJkR5NA7kMEAOgSE=
 github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc=
 github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
 github.com/labstack/echo v3.3.10+incompatible h1:pGRcYk231ExFAyoAjAfD85kQzRJCRI8bbnE7CX5OEgg=

pkg/attribute/attribute.go

@@ -7,26 +7,28 @@ type ChangeFunc func(a *Attribute, newValue, oldValue interface{})
 // Attribute represents a value of a Component and methods for changing
 // the internal value in a safe way, also notifying listerns of changes
 type Attribute struct {
-	attributeType string
-	format        string
-	value         interface{}
+	id     string
+	typ    string
+	format string
+	value  interface{}
 
 	onChange *ChangeFunc
 }
 
 // New returns an Attribute for a provided type
-func New(typ string) *Attribute {
+func New(id string, typ string) *Attribute {
 	a := new(Attribute)
 
-	a.attributeType = typ
+	a.id = id
+	a.typ = typ
 	a.value = nil
 
 	return a
 }
 
 // GetType returns the type of the Attribute
 func (a *Attribute) GetType() string {
-	return a.attributeType
+	return a.typ
 }
 
 // GetFormat returns the format of the Attribute

pkg/attribute/float.go

@@ -9,10 +9,10 @@ type Float struct {
 }
 
 // NewFloat returns a new Float Attribute
-func NewFloat(typ string) *Float {
+func NewFloat(id string, typ string) *Float {
 	f := new(Float)
 
-	f.Attribute = New(typ)
+	f.Attribute = New(id, typ)
 
 	f.format = FormatFloat
 	f.value = 0.0

pkg/attribute/temperature.go

@@ -13,10 +13,10 @@ type Temperature struct {
 }
 
 // NewTemperature returns a new Temperature Attribute
-func NewTemperature() *Temperature {
+func NewTemperature(id string) *Temperature {
 	temp := new(Temperature)
 
-	temp.Float = NewFloat(TypeTemperature)
+	temp.Float = NewFloat(id, TypeTemperature)
 
 	return temp
 }

pkg/bridge/honeywell.go

@@ -13,8 +13,8 @@ import (
 
 type HoneywellThermostat struct {
 	*Bridge
-	Thermostat          *node.Thermostat
-	TotalComfortControl *controller.TotalComfortControl
+	*node.Thermostat
+	controller *controller.TotalComfortControl
 }
 
 func NewHoneywellThermostat(deviceID int, login string, password string) (*HoneywellThermostat, error) {
@@ -31,7 +31,7 @@ func NewHoneywellThermostat(deviceID int, login string, password string) (*Honey
 		return nil, err
 	}
 
-	hw.TotalComfortControl = tcc
+	hw.controller = tcc
 	hw.AddController(tcc.Controller)
 
 	hw.setupBridge()
@@ -49,6 +49,6 @@ func (b *HoneywellThermostat) setupBridge() {
 
 			temp := newValue.(float64)
 			log.Printf("client wants %g", temp)
-			b.TotalComfortControl.SetCoolC(temp)
+			b.controller.SetCoolC(temp)
 		})
 }

pkg/component/component.go

@@ -8,17 +8,17 @@ import (
 // Component represents a compontent of a Node which is made
 // up of Attributes that can be read from and/or written to
 type Component struct {
-	id            string
-	componentType string
-	attributes    []*attribute.Attribute
+	id         string
+	typ        string
+	attributes []*attribute.Attribute
 }
 
 // New returns a new Component given an id and type
 func New(id string, typ string) *Component {
 	c := new(Component)
 
 	c.id = id
-	c.componentType = typ
+	c.typ = typ
 
 	return c
 }
@@ -30,7 +30,7 @@ func (c *Component) GetID() string {
 
 // GetType returns the type of the Component
 func (c *Component) GetType() string {
-	return c.componentType
+	return c.typ
 }
 
 // GetAttributes returns an array of all Attributes of the Component

pkg/component/switch.go

@@ -0,0 +1,26 @@
+package component
+
+import (
+	"github.com/mastery-la/autodidact/pkg/attribute"
+)
+
+// TypeSwitch is SwitchComponent
+const TypeSwitch = "SwitchComponent"
+
+// Switch is a type of Component that has an on/off attribute
+type Switch struct {
+	*Component
+	On *attribute.Temperature
+}
+
+// NewSwitch creates a Switch Component with a provided id
+func NewSwitch(id string) *Switch {
+	s := new(Switch)
+
+	s.Component = New(id, TypeSwitch)
+
+	s.On = attribute.NewTemperature("On")
+	s.AddAttribute(s.On.Attribute)
+
+	return s
+}

pkg/component/thermostat.go

@@ -22,10 +22,10 @@ func NewThermostat(id string) *Thermostat {
 
 	ts.Component = New(id, TypeThermostat)
 
-	ts.CurrentTemperature = attribute.NewTemperature()
+	ts.CurrentTemperature = attribute.NewTemperature("CurrentTemperature")
 	ts.AddAttribute(ts.CurrentTemperature.Attribute)
 
-	ts.TargetTemperature = attribute.NewTemperature()
+	ts.TargetTemperature = attribute.NewTemperature("TargetTemperature")
 	ts.AddAttribute(ts.TargetTemperature.Attribute)
 
 	return ts

pkg/controller/tccapi.go

@@ -3,6 +3,7 @@ package controller
 import (
 	"context"
 	"log"
+	"math"
 
 	"github.com/mastery-la/autodidact/pkg/util"
 
@@ -31,13 +32,15 @@ func NewTotalComfortControl(ctx context.Context, deviceID int, login string, pas
 }
 
 func (c *TotalComfortControl) SetCoolF(temp float64) {
-	log.Printf("setting cool point to %gºF\n", temp)
-	c.ts.CoolMode(c.ctx, float32(temp), 0)
+	setPoint := math.Round(temp)
+	log.Printf("setting cool point to %gºF\n", setPoint)
+	c.ts.CoolMode(c.ctx, float32(setPoint), 0)
 }
 
 func (c *TotalComfortControl) SetHeatF(temp float64) {
-	log.Printf("setting heat point to %gºF\n", temp)
-	c.ts.HeatMode(c.ctx, float32(temp), 0)
+	setPoint := math.Round(temp)
+	log.Printf("setting heat point to %gºF\n", setPoint)
+	c.ts.HeatMode(c.ctx, float32(setPoint), 0)
 }
 
 func (c *TotalComfortControl) SetCoolC(temp float64) {

pkg/node/node.go

@@ -3,6 +3,9 @@ package node
 
 import (
 	"encoding/json"
+	"strings"
+
+	"github.com/iancoleman/strcase"
 
 	"github.com/mastery-la/autodidact/pkg/component"
 )
@@ -11,28 +14,45 @@ import (
 // send messages to and query for metrics
 type Node struct {
 	id         string
-	nodeType   string
+	typ        string
 	components []*component.Component
+
+	Name         string
+	Manufacturer string
+	SerialNumber string
+	Model        string
 }
 
 // New returns a new Node given an id and type
 func New(id string, typ string) *Node {
 	node := new(Node)
 
 	node.id = id
-	node.nodeType = typ
+	node.typ = typ
+
+	node.Name = nameFromType(typ)
+	node.Manufacturer = ""
+	node.SerialNumber = ""
+	node.Model = ""
 
 	return node
 }
 
+func nameFromType(typ string) string {
+	s := strcase.ToDelimited(typ, '/')
+	ss := strings.Split(s, "/")
+
+	return ss[0]
+}
+
 // GetID returns the ID of the Node
 func (n *Node) GetID() string {
 	return n.id
 }
 
 // GetType returns the Type of the Node
 func (n *Node) GetType() string {
-	return n.nodeType
+	return n.typ
 }
 
 // GetComponents returns an array of all Components of the Node

pkg/node/thermostat.go

@@ -9,10 +9,12 @@ import (
 // TypeThermostat is ThermostatNode
 const TypeThermostat = "ThermostatNode"
 
-// Thermostat is a type of Node that represents a thermostat
+// Thermostat is a type of Node that represents a thermostat.
+// A Thermostat Node is made up of a Thermostat Component
 type Thermostat struct {
 	*Node
-	Thermostat *component.Thermostat
+	*component.Thermostat
+	*component.Switch
 }
 
 // NewThermostat creates a Thermostat Node with the provided id
@@ -27,21 +29,6 @@ func NewThermostat(id string) *Thermostat {
 	return ts
 }
 
-// SetTargetTemperature sets the target temperature set point for the thermostat
-func (t *Thermostat) SetTargetTemperature(temp float64) {
-	t.Thermostat.TargetTemperature.SetValue(temp)
-}
-
-// GetTargetTemperature gets the target temperature set point for the thermostat
-func (t *Thermostat) GetTargetTemperature() float64 {
-	return t.Thermostat.TargetTemperature.GetValue()
-}
-
-// GetCurrentTemperature gets the current temperature as measured by the thermostat
-func (t *Thermostat) GetCurrentTemperature() float64 {
-	return t.Thermostat.CurrentTemperature.GetValue()
-}
-
 type thermostatPayload struct {
 	Node       *Node                       `json:"node"`
 	Components thermostatComponentsPayload `json:"components"`