float fix 2

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
-  variable.Label = "Temperature"
-  variable.Variable = ""
-  variable.Unit = "°C"
-  variable.Value = fmt.Sprintf("%f", temperatureF)
-  measurement.Values = make(map[string]database.VariableType)
-  measurement.Values["Value"] = variable
 
-  // log.Printf("Prepared measurement item: %s", measurement)
+	var variable database.VariableType
-  self.dbh.StoreMeasurement(&measurement)
+	variable.Label = "Temperature"
-  self.S()
+	variable.Variable = ""
+	variable.Unit = "°C"
+	variable.Value = temperatureF
+	measurement.Values = make(map[string]database.VariableType)
+	measurement.Values["Value"] = variable
+
+	// log.Printf("Prepared measurement item: %s", measurement)
+	self.dbh.StoreMeasurement(&measurement)
+	self.S()
 }
-
-