Compare commits

..

2 Commits

Author SHA1 Message Date
42ff8b51ed float fix 3
All checks were successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2026-03-06 21:35:32 +01:00
f63c22912a float fix 2
All checks were successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2026-03-06 20:57:32 +01:00
2 changed files with 106 additions and 117 deletions

View File

@@ -2,15 +2,13 @@ package dt1t
import ( import (
"log" "log"
"fmt"
"time"
"strconv" "strconv"
"udi/handlers/handler" "time"
"udi/database"
"udi/config" "udi/config"
"udi/database"
"udi/handlers/handler"
) )
type Dt1tHandler struct { type Dt1tHandler struct {
handler.CommonHandler handler.CommonHandler
ready bool ready bool
@@ -18,12 +16,10 @@ type Dt1tHandler struct {
dbh *database.DatabaseHandle dbh *database.DatabaseHandle
application string application string
device string device string
} }
func New(id string, config config.HandlerConfigT) handler.Handler { 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")
@@ -69,7 +65,7 @@ func (self *Dt1tHandler) Handle(message handler.MessageT) {
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
@@ -77,5 +73,3 @@ func (self *Dt1tHandler) Handle(message handler.MessageT) {
self.dbh.StoreMeasurement(&measurement) self.dbh.StoreMeasurement(&measurement)
self.S() self.S()
} }

View File

@@ -1,15 +1,14 @@
package prepared package prepared
import ( import (
"time"
"log"
"encoding/json" "encoding/json"
"log"
"time"
"udi/config" "udi/config"
"udi/handlers/handler"
"udi/database" "udi/database"
"udi/handlers/handler"
) )
type PreparedHandler struct { type PreparedHandler struct {
handler.CommonHandler handler.CommonHandler
dbh *database.DatabaseHandle dbh *database.DatabaseHandle
@@ -18,7 +17,7 @@ type PreparedHandler struct {
type endpoint_t struct { 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"`
} }
@@ -29,10 +28,8 @@ type observation_t struct {
Variables map[string]endpoint_t `json:"variables"` Variables map[string]endpoint_t `json:"variables"`
} }
func New(id string, config config.HandlerConfigT) handler.Handler { 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)
@@ -75,5 +72,3 @@ func (self *PreparedHandler) Handle(message handler.MessageT) {
self.dbh.StoreMeasurement(&measurement) self.dbh.StoreMeasurement(&measurement)
self.S() self.S()
} }