Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
f63c22912a
|
|||
|
c37420a993
|
@@ -105,6 +105,7 @@
|
||||
"devicePart": "3",
|
||||
"valueFrom": "payload",
|
||||
"valuePart": "1",
|
||||
"valueType": "float",
|
||||
"unitFrom": "payload",
|
||||
"unitPart": "3"
|
||||
}
|
||||
|
||||
@@ -1,81 +1,75 @@
|
||||
package dt1t
|
||||
|
||||
import (
|
||||
"log"
|
||||
"fmt"
|
||||
"time"
|
||||
"strconv"
|
||||
"udi/handlers/handler"
|
||||
"udi/database"
|
||||
"udi/config"
|
||||
"log"
|
||||
"strconv"
|
||||
"time"
|
||||
"udi/config"
|
||||
"udi/database"
|
||||
"udi/handlers/handler"
|
||||
)
|
||||
|
||||
|
||||
type Dt1tHandler struct {
|
||||
handler.CommonHandler
|
||||
ready bool
|
||||
label string
|
||||
dbh *database.DatabaseHandle
|
||||
application string
|
||||
device string
|
||||
|
||||
handler.CommonHandler
|
||||
ready bool
|
||||
label string
|
||||
dbh *database.DatabaseHandle
|
||||
application string
|
||||
device string
|
||||
}
|
||||
|
||||
func New(id string, config config.HandlerConfigT) handler.Handler {
|
||||
t := &Dt1tHandler {
|
||||
}
|
||||
t := &Dt1tHandler{}
|
||||
|
||||
if config.Attributes["Application"] == "" {
|
||||
log.Println("Error: application not configured")
|
||||
return t
|
||||
}
|
||||
t.application = config.Attributes["Application"]
|
||||
if config.Attributes["Device"] == "" {
|
||||
log.Println("Error: device not configured")
|
||||
return t
|
||||
}
|
||||
t.device = config.Attributes["Device"]
|
||||
t.Id = id
|
||||
if config.Attributes["Application"] == "" {
|
||||
log.Println("Error: application not configured")
|
||||
return t
|
||||
}
|
||||
t.application = config.Attributes["Application"]
|
||||
if config.Attributes["Device"] == "" {
|
||||
log.Println("Error: device not configured")
|
||||
return t
|
||||
}
|
||||
t.device = config.Attributes["Device"]
|
||||
t.Id = id
|
||||
|
||||
t.dbh = database.NewDatabaseHandle()
|
||||
log.Printf("Handler DT1T %d initialized", id)
|
||||
t.ready = true
|
||||
return t
|
||||
t.dbh = database.NewDatabaseHandle()
|
||||
log.Printf("Handler DT1T %d initialized", id)
|
||||
t.ready = true
|
||||
return t
|
||||
}
|
||||
|
||||
func (self *Dt1tHandler) Handle(message handler.MessageT) {
|
||||
if ! self.ready {
|
||||
self.Lost("Handler is not marked as ready", nil, message)
|
||||
return
|
||||
}
|
||||
// log.Printf("Handler DT1T %d processing %s -> %s", self.id, message.Topic, message.Payload)
|
||||
if !self.ready {
|
||||
self.Lost("Handler is not marked as ready", nil, message)
|
||||
return
|
||||
}
|
||||
// log.Printf("Handler DT1T %d processing %s -> %s", self.id, message.Topic, message.Payload)
|
||||
|
||||
temperature, err := strconv.Atoi(message.Payload)
|
||||
if err != nil {
|
||||
self.Lost("Invalid raw value", err, message)
|
||||
return
|
||||
}
|
||||
if temperature & 0x8000 != 0{
|
||||
temperature = ((temperature - 1) ^ 0xffff) * -1
|
||||
}
|
||||
temperatureF := float32(temperature) / 10.0
|
||||
temperature, err := strconv.Atoi(message.Payload)
|
||||
if err != nil {
|
||||
self.Lost("Invalid raw value", err, message)
|
||||
return
|
||||
}
|
||||
if temperature&0x8000 != 0 {
|
||||
temperature = ((temperature - 1) ^ 0xffff) * -1
|
||||
}
|
||||
temperatureF := float32(temperature) / 10.0
|
||||
|
||||
var measurement database.Measurement
|
||||
measurement.Time = time.Now()
|
||||
measurement.Application = self.application
|
||||
measurement.Device = self.device
|
||||
var measurement database.Measurement
|
||||
measurement.Time = time.Now()
|
||||
measurement.Application = self.application
|
||||
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
|
||||
var variable database.VariableType
|
||||
variable.Label = "Temperature"
|
||||
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()
|
||||
// log.Printf("Prepared measurement item: %s", measurement)
|
||||
self.dbh.StoreMeasurement(&measurement)
|
||||
self.S()
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -1,23 +1,22 @@
|
||||
package sver
|
||||
|
||||
import (
|
||||
"time"
|
||||
"strconv"
|
||||
"strings"
|
||||
"regexp"
|
||||
"log"
|
||||
"udi/config"
|
||||
"udi/handlers/handler"
|
||||
"udi/database"
|
||||
"log"
|
||||
"regexp"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
"udi/config"
|
||||
"udi/database"
|
||||
"udi/handlers/handler"
|
||||
)
|
||||
|
||||
|
||||
type SingleValueExtractorRegexHandler struct {
|
||||
handler.CommonHandler
|
||||
ready bool
|
||||
config localConfig
|
||||
payloadRegex *regexp.Regexp
|
||||
dbh *database.DatabaseHandle
|
||||
handler.CommonHandler
|
||||
ready bool
|
||||
config localConfig
|
||||
payloadRegex *regexp.Regexp
|
||||
dbh *database.DatabaseHandle
|
||||
}
|
||||
|
||||
const TOPIC_SEL = "topic"
|
||||
@@ -26,175 +25,191 @@ const PAYLOAD_FULL_SEL = "payload-full"
|
||||
const CONSTANT_SEL = "constant"
|
||||
|
||||
type localConfig struct {
|
||||
application string
|
||||
deviceFrom string
|
||||
devicePart int
|
||||
device string
|
||||
valueFrom string
|
||||
valuePart int
|
||||
unitFrom string
|
||||
unitPart int
|
||||
unit string
|
||||
application string
|
||||
deviceFrom string
|
||||
devicePart int
|
||||
device string
|
||||
valueFrom string
|
||||
valuePart int
|
||||
valueType string
|
||||
unitFrom string
|
||||
unitPart int
|
||||
unit string
|
||||
}
|
||||
|
||||
|
||||
func New(id string, config config.HandlerConfigT) handler.Handler {
|
||||
t := &SingleValueExtractorRegexHandler {
|
||||
ready: false,
|
||||
}
|
||||
t := &SingleValueExtractorRegexHandler{
|
||||
ready: false,
|
||||
}
|
||||
|
||||
var localConfig localConfig
|
||||
if config.Attributes["application"] == "" {
|
||||
log.Println("Error: application not configured")
|
||||
return t
|
||||
}
|
||||
localConfig.application = config.Attributes["application"]
|
||||
var localConfig localConfig
|
||||
if config.Attributes["application"] == "" {
|
||||
log.Println("Error: application not configured")
|
||||
return t
|
||||
}
|
||||
localConfig.application = config.Attributes["application"]
|
||||
|
||||
payloadRegex := config.Attributes["payloadRegex"]
|
||||
if payloadRegex != "" {
|
||||
t.payloadRegex = regexp.MustCompile(payloadRegex)
|
||||
} else {
|
||||
t.payloadRegex = nil
|
||||
}
|
||||
payloadRegex := config.Attributes["payloadRegex"]
|
||||
if payloadRegex != "" {
|
||||
t.payloadRegex = regexp.MustCompile(payloadRegex)
|
||||
} else {
|
||||
t.payloadRegex = nil
|
||||
}
|
||||
|
||||
if config.Attributes["deviceFrom"] != TOPIC_SEL && config.Attributes["deviceFrom"] != PAYLOAD_SEL && config.Attributes["deviceFrom"] != CONSTANT_SEL {
|
||||
log.Printf("Error: invalid value %s for deviceFrom", config.Attributes["deviceFrom"])
|
||||
return t
|
||||
}
|
||||
localConfig.deviceFrom = config.Attributes["deviceFrom"]
|
||||
if config.Attributes["deviceFrom"] != TOPIC_SEL && config.Attributes["deviceFrom"] != PAYLOAD_SEL && config.Attributes["deviceFrom"] != CONSTANT_SEL {
|
||||
log.Printf("Error: invalid value %s for deviceFrom", config.Attributes["deviceFrom"])
|
||||
return t
|
||||
}
|
||||
localConfig.deviceFrom = config.Attributes["deviceFrom"]
|
||||
|
||||
devicePart, err1 := strconv.Atoi(config.Attributes["devicePart"])
|
||||
if err1 != nil {
|
||||
log.Printf("Error: unable to convert devicePart to number: %s", err1)
|
||||
return t
|
||||
}
|
||||
localConfig.devicePart = devicePart
|
||||
devicePart, err1 := strconv.Atoi(config.Attributes["devicePart"])
|
||||
if err1 != nil {
|
||||
log.Printf("Error: unable to convert devicePart to number: %s", err1)
|
||||
return t
|
||||
}
|
||||
localConfig.devicePart = devicePart
|
||||
|
||||
// empty device is valid
|
||||
localConfig.device = config.Attributes["device"]
|
||||
// empty device is valid
|
||||
localConfig.device = config.Attributes["device"]
|
||||
|
||||
if config.Attributes["valueFrom"] != PAYLOAD_SEL && config.Attributes["valueFrom"] != PAYLOAD_FULL_SEL {
|
||||
log.Printf("Error: invalid value %s for valueFrom", config.Attributes["valueFrom"])
|
||||
return t
|
||||
}
|
||||
localConfig.valueFrom = config.Attributes["valueFrom"]
|
||||
if config.Attributes["valueFrom"] != PAYLOAD_SEL && config.Attributes["valueFrom"] != PAYLOAD_FULL_SEL {
|
||||
log.Printf("Error: invalid value %s for valueFrom", config.Attributes["valueFrom"])
|
||||
return t
|
||||
}
|
||||
localConfig.valueFrom = config.Attributes["valueFrom"]
|
||||
|
||||
if config.Attributes["valueFrom"] == PAYLOAD_SEL {
|
||||
valuePart, err2 := strconv.Atoi(config.Attributes["valuePart"])
|
||||
if err2 != nil {
|
||||
log.Printf("Error: unable to convert valuePart to number: %s", err2)
|
||||
return t
|
||||
}
|
||||
localConfig.valuePart = valuePart
|
||||
}
|
||||
if config.Attributes["valueFrom"] == PAYLOAD_SEL {
|
||||
valuePart, err2 := strconv.Atoi(config.Attributes["valuePart"])
|
||||
if err2 != nil {
|
||||
log.Printf("Error: unable to convert valuePart to number: %s", err2)
|
||||
return t
|
||||
}
|
||||
localConfig.valuePart = valuePart
|
||||
}
|
||||
|
||||
if config.Attributes["unitFrom"] != PAYLOAD_SEL && config.Attributes["unitFrom"] != CONSTANT_SEL {
|
||||
log.Printf("Error: invalid value %s for unitFrom", config.Attributes["unitFrom"])
|
||||
return t
|
||||
}
|
||||
localConfig.unitFrom = config.Attributes["unitFrom"]
|
||||
if config.Attributes["valueType"] != "float" && config.Attributes["valueType"] != "string" {
|
||||
log.Printf("Error: invalid value %s for valueType", config.Attributes["valueType"])
|
||||
return t
|
||||
}
|
||||
localConfig.valueType = config.Attributes["valueType"]
|
||||
|
||||
if config.Attributes["unitFrom"] == PAYLOAD_SEL {
|
||||
unitPart, err3 := strconv.Atoi(config.Attributes["unitPart"])
|
||||
if err3 != nil {
|
||||
log.Printf("Error: unable to convert unitPart to number: %s", err3)
|
||||
return t
|
||||
}
|
||||
localConfig.unitPart = unitPart
|
||||
}
|
||||
if config.Attributes["unitFrom"] != PAYLOAD_SEL && config.Attributes["unitFrom"] != CONSTANT_SEL {
|
||||
log.Printf("Error: invalid value %s for unitFrom", config.Attributes["unitFrom"])
|
||||
return t
|
||||
}
|
||||
localConfig.unitFrom = config.Attributes["unitFrom"]
|
||||
|
||||
// empty unit is valid
|
||||
localConfig.unit = config.Attributes["unit"]
|
||||
if config.Attributes["unitFrom"] == PAYLOAD_SEL {
|
||||
unitPart, err3 := strconv.Atoi(config.Attributes["unitPart"])
|
||||
if err3 != nil {
|
||||
log.Printf("Error: unable to convert unitPart to number: %s", err3)
|
||||
return t
|
||||
}
|
||||
localConfig.unitPart = unitPart
|
||||
}
|
||||
|
||||
t.config = localConfig
|
||||
// empty unit is valid
|
||||
localConfig.unit = config.Attributes["unit"]
|
||||
|
||||
t.Id = id
|
||||
t.ready = true
|
||||
t.dbh = database.NewDatabaseHandle()
|
||||
log.Printf("Handler SVER %d initialized", id)
|
||||
return t
|
||||
t.config = localConfig
|
||||
|
||||
t.Id = id
|
||||
t.ready = true
|
||||
t.dbh = database.NewDatabaseHandle()
|
||||
log.Printf("Handler SVER %d initialized", id)
|
||||
return t
|
||||
}
|
||||
|
||||
func (self *SingleValueExtractorRegexHandler) Handle(message handler.MessageT) {
|
||||
if ! self.ready {
|
||||
self.Lost("Handler is not marked as ready", nil, message)
|
||||
return
|
||||
}
|
||||
//log.Printf("Handler SingleValueExtractor %d processing %s -> %s", self.id, message.Topic, message.Payload)
|
||||
if !self.ready {
|
||||
self.Lost("Handler is not marked as ready", nil, message)
|
||||
return
|
||||
}
|
||||
//log.Printf("Handler SingleValueExtractor %d processing %s -> %s", self.id, message.Topic, message.Payload)
|
||||
|
||||
var measurement database.Measurement
|
||||
measurement.Time = time.Now()
|
||||
measurement.Application = self.config.application
|
||||
var measurement database.Measurement
|
||||
measurement.Time = time.Now()
|
||||
measurement.Application = self.config.application
|
||||
|
||||
subTopics := strings.Split(message.Topic, "/")
|
||||
//log.Printf("Subtopics: %s", strings.Join(subTopics, ", "))
|
||||
subTopics := strings.Split(message.Topic, "/")
|
||||
//log.Printf("Subtopics: %s", strings.Join(subTopics, ", "))
|
||||
|
||||
var payloadMatches []string
|
||||
if self.payloadRegex != nil {
|
||||
payloadMatches = self.payloadRegex.FindStringSubmatch(message.Payload)
|
||||
//log.Printf("Matches: %s", strings.Join(payloadMatches, ", "))
|
||||
}
|
||||
var payloadMatches []string
|
||||
if self.payloadRegex != nil {
|
||||
payloadMatches = self.payloadRegex.FindStringSubmatch(message.Payload)
|
||||
//log.Printf("Matches: %s", strings.Join(payloadMatches, ", "))
|
||||
}
|
||||
|
||||
switch self.config.deviceFrom {
|
||||
case TOPIC_SEL:
|
||||
if self.config.devicePart >= len(subTopics) {
|
||||
self.Lost("devicePart out of range", nil, message)
|
||||
return
|
||||
}
|
||||
measurement.Device = subTopics[self.config.devicePart]
|
||||
case PAYLOAD_SEL:
|
||||
if self.payloadRegex == nil {
|
||||
self.Lost("no payloadRegex defined, devicePart can't be used", nil, message)
|
||||
return
|
||||
}
|
||||
if self.config.devicePart >= len(payloadMatches) {
|
||||
self.Lost("devicePart out of range", nil, message)
|
||||
return
|
||||
}
|
||||
measurement.Device = payloadMatches[self.config.devicePart]
|
||||
case CONSTANT_SEL:
|
||||
measurement.Device = self.config.device
|
||||
}
|
||||
switch self.config.deviceFrom {
|
||||
case TOPIC_SEL:
|
||||
if self.config.devicePart >= len(subTopics) {
|
||||
self.Lost("devicePart out of range", nil, message)
|
||||
return
|
||||
}
|
||||
measurement.Device = subTopics[self.config.devicePart]
|
||||
case PAYLOAD_SEL:
|
||||
if self.payloadRegex == nil {
|
||||
self.Lost("no payloadRegex defined, devicePart can't be used", nil, message)
|
||||
return
|
||||
}
|
||||
if self.config.devicePart >= len(payloadMatches) {
|
||||
self.Lost("devicePart out of range", nil, message)
|
||||
return
|
||||
}
|
||||
measurement.Device = payloadMatches[self.config.devicePart]
|
||||
case CONSTANT_SEL:
|
||||
measurement.Device = self.config.device
|
||||
}
|
||||
|
||||
measurement.Values = make(map[string]database.VariableType)
|
||||
var variable database.VariableType
|
||||
variable.Label = ""
|
||||
variable.Variable = ""
|
||||
measurement.Values = make(map[string]database.VariableType)
|
||||
var variable database.VariableType
|
||||
variable.Label = ""
|
||||
variable.Variable = ""
|
||||
|
||||
switch self.config.valueFrom {
|
||||
case PAYLOAD_SEL:
|
||||
if self.payloadRegex == nil {
|
||||
self.Lost("no payloadRegex defined, valuePart can't be used", nil, message)
|
||||
return
|
||||
}
|
||||
if self.config.valuePart >= len(payloadMatches) {
|
||||
self.Lost("valuePart out of range", nil, message)
|
||||
return
|
||||
}
|
||||
variable.Value = payloadMatches[self.config.valuePart]
|
||||
case PAYLOAD_FULL_SEL:
|
||||
variable.Value = message.Payload
|
||||
}
|
||||
var value string
|
||||
switch self.config.valueFrom {
|
||||
case PAYLOAD_SEL:
|
||||
if self.payloadRegex == nil {
|
||||
self.Lost("no payloadRegex defined, valuePart can't be used", nil, message)
|
||||
return
|
||||
}
|
||||
if self.config.valuePart >= len(payloadMatches) {
|
||||
self.Lost("valuePart out of range", nil, message)
|
||||
return
|
||||
}
|
||||
value = payloadMatches[self.config.valuePart]
|
||||
case PAYLOAD_FULL_SEL:
|
||||
value = message.Payload
|
||||
}
|
||||
if self.config.valueType == "float" {
|
||||
fValue, err := strconv.ParseFloat(value, 64)
|
||||
if err != nil {
|
||||
self.Lost("Unable to convert value to float", err, message)
|
||||
return
|
||||
}
|
||||
variable.Value = fValue
|
||||
} else {
|
||||
variable.Value = value
|
||||
}
|
||||
|
||||
switch self.config.unitFrom {
|
||||
case PAYLOAD_SEL:
|
||||
if self.payloadRegex == nil {
|
||||
self.Lost("no payloadRegex defined, unitPart can't be used", nil, message)
|
||||
return
|
||||
}
|
||||
if self.config.unitPart >= len(payloadMatches) {
|
||||
self.Lost("unitPart out of range", nil, message)
|
||||
return
|
||||
}
|
||||
variable.Unit = payloadMatches[self.config.unitPart]
|
||||
case CONSTANT_SEL:
|
||||
variable.Unit = self.config.unit
|
||||
}
|
||||
switch self.config.unitFrom {
|
||||
case PAYLOAD_SEL:
|
||||
if self.payloadRegex == nil {
|
||||
self.Lost("no payloadRegex defined, unitPart can't be used", nil, message)
|
||||
return
|
||||
}
|
||||
if self.config.unitPart >= len(payloadMatches) {
|
||||
self.Lost("unitPart out of range", nil, message)
|
||||
return
|
||||
}
|
||||
variable.Unit = payloadMatches[self.config.unitPart]
|
||||
case CONSTANT_SEL:
|
||||
variable.Unit = self.config.unit
|
||||
}
|
||||
|
||||
measurement.Values["Value"] = variable
|
||||
measurement.Values["Value"] = variable
|
||||
|
||||
//log.Printf("Prepared measurement item: %s", measurement)
|
||||
self.dbh.StoreMeasurement(&measurement)
|
||||
self.S()
|
||||
//log.Printf("Prepared measurement item: %s", measurement)
|
||||
self.dbh.StoreMeasurement(&measurement)
|
||||
self.S()
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user