float fix 3

src/udi/handlers/dt1t/dt1t.go

@@ -1,81 +1,75 @@
 package dt1t
 
 import (
-  "log"
+	"log"
-  "fmt"
+	"strconv"
-  "time"
+	"time"
-  "strconv"
+	"udi/config"
-  "udi/handlers/handler"
+	"udi/database"
-  "udi/database"
+	"udi/handlers/handler"
-  "udi/config"
 )
 
-
 type Dt1tHandler struct {
-  handler.CommonHandler
+	handler.CommonHandler
-  ready bool
+	ready       bool
-  label string
+	label       string
-  dbh *database.DatabaseHandle
+	dbh         *database.DatabaseHandle
-  application string
+	application string
-  device string
+	device      string
-
 }
 
 func New(id string, config config.HandlerConfigT) handler.Handler {
-  t := &Dt1tHandler {
+	t := &Dt1tHandler{}
-  }
 
-  if config.Attributes["Application"] == "" {
+	if config.Attributes["Application"] == "" {
-    log.Println("Error: application not configured")
+		log.Println("Error: application not configured")
-    return t
+		return t
-  }
+	}
-  t.application = config.Attributes["Application"]
+	t.application = config.Attributes["Application"]
-  if config.Attributes["Device"] == "" {
+	if config.Attributes["Device"] == "" {
-    log.Println("Error: device not configured")
+		log.Println("Error: device not configured")
-    return t
+		return t
-  }
+	}
-  t.device = config.Attributes["Device"]
+	t.device = config.Attributes["Device"]
-  t.Id = id
+	t.Id = id
 
-  t.dbh = database.NewDatabaseHandle()
+	t.dbh = database.NewDatabaseHandle()
-  log.Printf("Handler DT1T %d initialized", id)
+	log.Printf("Handler DT1T %d initialized", id)
-  t.ready = true
+	t.ready = true
-  return t
+	return t
 }
 
 func (self *Dt1tHandler) Handle(message handler.MessageT) {
-  if ! self.ready {
+	if !self.ready {
-    self.Lost("Handler is not marked as ready", nil, message)
+		self.Lost("Handler is not marked as ready", nil, message)
-    return
+		return
-  }
+	}
-  // log.Printf("Handler DT1T %d processing %s -> %s", self.id, message.Topic, message.Payload)
+	// log.Printf("Handler DT1T %d processing %s -> %s", self.id, message.Topic, message.Payload)
 
-  temperature, err := strconv.Atoi(message.Payload)
+	temperature, err := strconv.Atoi(message.Payload)
-  if err != nil {
+	if err != nil {
-    self.Lost("Invalid raw value", err, message)
+		self.Lost("Invalid raw value", err, message)
-    return
+		return
-  }
+	}
-  if temperature & 0x8000 != 0{
+	if temperature&0x8000 != 0 {
-    temperature = ((temperature - 1) ^ 0xffff) * -1
+		temperature = ((temperature - 1) ^ 0xffff) * -1
-  }
+	}
-  temperatureF := float32(temperature) / 10.0
+	temperatureF := float32(temperature) / 10.0
 
-  var measurement database.Measurement
+	var measurement database.Measurement
-  measurement.Time = time.Now()
+	measurement.Time = time.Now()
-  measurement.Application = self.application
+	measurement.Application = self.application
-  measurement.Device = self.device
+	measurement.Device = self.device
 
-  var variable database.VariableType
+	var variable database.VariableType
-  variable.Label = "Temperature"
+	variable.Label = "Temperature"
-  variable.Variable = ""
+	variable.Variable = ""
-  variable.Unit = "°C"
+	variable.Unit = "°C"
-  variable.Value = fmt.Sprintf("%f", temperatureF)
+	variable.Value = temperatureF
-  measurement.Values = make(map[string]database.VariableType)
+	measurement.Values = make(map[string]database.VariableType)
-  measurement.Values["Value"] = variable
+	measurement.Values["Value"] = variable
 
-  // log.Printf("Prepared measurement item: %s", measurement)
+	// log.Printf("Prepared measurement item: %s", measurement)
-  self.dbh.StoreMeasurement(&measurement)
+	self.dbh.StoreMeasurement(&measurement)
-  self.S()
+	self.S()
 }
-
-

src/udi/handlers/prepared/prepared.go

@@ -1,79 +1,74 @@
 package prepared
 
 import (
-  "time"
+	"encoding/json"
-  "log"
+	"log"
-  "encoding/json"
+	"time"
-  "udi/config"
+	"udi/config"
-  "udi/handlers/handler"
+	"udi/database"
-  "udi/database"
+	"udi/handlers/handler"
 )
 
-
 type PreparedHandler struct {
-  handler.CommonHandler
+	handler.CommonHandler
-  dbh *database.DatabaseHandle
+	dbh *database.DatabaseHandle
 }
 
 type endpoint_t struct {
-  Label string `json:"label"`
+	Label    string      `json:"label"`
-  Variable string `json:"variable"`
+	Variable string      `json:"variable"`
-  Value string `json:"value"`
+	Value    interface{} `json:"value"`
-  Unit string `json:"unit"`
+	Unit     string      `json:"unit"`
-  Status string `json:"status"`
+	Status   string      `json:"status"`
 }
 
 type observation_t struct {
-  Device string `json:"device"`
+	Device    string                `json:"device"`
-  Label string `json:"label"`
+	Label     string                `json:"label"`
-  Variables map[string]endpoint_t `json:"variables"`
+	Variables map[string]endpoint_t `json:"variables"`
 }
 
-
 func New(id string, config config.HandlerConfigT) handler.Handler {
-  t := &PreparedHandler {
+	t := &PreparedHandler{}
-  }
+	t.Id = id
-  t.Id = id
+	t.dbh = database.NewDatabaseHandle()
-  t.dbh = database.NewDatabaseHandle()
+	log.Printf("Handler Prepared %d initialized", id)
-  log.Printf("Handler Prepared %d initialized", id)
+	return t
-  return t
 }
 
 func (self *PreparedHandler) Handle(message handler.MessageT) {
-  log.Printf("Handler Prepared %d processing %s -> %s", self.Id, message.Topic, message.Payload)
+	log.Printf("Handler Prepared %d processing %s -> %s", self.Id, message.Topic, message.Payload)
 
-  var observation observation_t
+	var observation observation_t
-  err := json.Unmarshal([]byte(message.Payload), &observation)
+	err := json.Unmarshal([]byte(message.Payload), &observation)
-  if err != nil {
+	if err != nil {
-    self.Lost("Unable to parse payload into Observation struct", err, message)
+		self.Lost("Unable to parse payload into Observation struct", err, message)
-    return
+		return
-  }
+	}
 
-  var measurement database.Measurement
+	var measurement database.Measurement
-  measurement.Time = time.Now()
+	measurement.Time = time.Now()
 
-  measurement.Application = self.Id
+	measurement.Application = self.Id
-  measurement.Device = observation.Device
+	measurement.Device = observation.Device
 
-  measurement.Attributes = map[string]interface{} {
+	measurement.Attributes = map[string]interface{}{
-    "Label": observation.Label,
+		"Label": observation.Label,
-  }
+	}
 
-  measurement.Values = make(map[string]database.VariableType)
+	measurement.Values = make(map[string]database.VariableType)
-  for k, v := range observation.Variables {
+	for k, v := range observation.Variables {
-    measurement.Values[k] = database.VariableType {
+		measurement.Values[k] = database.VariableType{
-      Label: v.Label,
+			Label:    v.Label,
-      Variable: v.Variable,
+			Variable: v.Variable,
-      Unit: v.Unit,
+			Unit:     v.Unit,
-      Value: v.Value,
+			Value:    v.Value,
-      Status: v.Status,
+			Status:   v.Status,
-    }
+		}
-  }
+	}
 
-  log.Printf("Prepared measurement item: %s", measurement)
+	log.Printf("Prepared measurement item: %s", measurement)
 
-  self.dbh.StoreMeasurement(&measurement)
+	self.dbh.StoreMeasurement(&measurement)
-  self.S()
+	self.S()
 }
-
-