Compare commits

...

3 Commits

  1. 4
      can/input.go
  2. 4
      can/input_test.go
  3. 16
      cli-mon.go
  4. 3
      go.mod
  5. 18
      go.sum
  6. 76
      ui/amqp.go
  7. 39
      ui/amqp_test.go
  8. 2
      ui/table.go
  9. 46
      ui/ui.go
  10. 52
      yabl/init.go
  11. 31
      yabl/protocol.go
  12. 24
      yabl/strings.go
  13. 7
      yabl/types.go

@ -52,11 +52,11 @@ func process(scanner *bufio.Scanner, ch chan<- *CanFrame) {
}
}
func ReadStdin() <-chan *CanFrame {
func ReadStdin(file *os.File) <-chan *CanFrame {
c := make(chan *CanFrame)
go func() {
scanner := bufio.NewScanner(os.Stdin)
scanner := bufio.NewScanner(file)
process(scanner, c)
close(c)
}()

@ -36,7 +36,7 @@ func Test_fromString(t *testing.T) {
want: &CanFrame{
Date: &time_m,
CanId: 0x4021,
Payload: []uint8{00, 00, 00, 00, 0xFC, 0xFF, 0xFF, 0xFF},
Payload: &[]uint8{00, 00, 00, 00, 0xFC, 0xFF, 0xFF, 0xFF},
},
},
{
@ -45,7 +45,7 @@ func Test_fromString(t *testing.T) {
want: &CanFrame{
Date: &time_p,
CanId: 0x100,
Payload: []uint8{00, 00, 00, 00, 00, 00, 0x64, 00},
Payload: &[]uint8{00, 00, 00, 00, 00, 00, 0x64, 00},
},
},
}

@ -4,7 +4,7 @@ import (
"cli-mon/can"
"cli-mon/ui"
"cli-mon/yabl"
"flag"
flag "flag"
"fmt"
"golang.org/x/sys/unix"
"os"
@ -13,16 +13,18 @@ import (
func main() {
filename := flag.String("f", "", "Candump filename")
canbus := flag.String("i", "", "CAN bus interface")
canbus := flag.String("i", "can0", "CAN bus interface")
stdin := flag.Bool("s", false, "Read from stdin")
gui := flag.Bool("gui", false, "Text mode gui")
gui := flag.Bool("gui", false, "Pseudo-GUI CLI interface")
amqp := flag.String("amqp", "", "Run output to AMQP broker url")
interval := time.Duration(*flag.Uint("t", 50, "Override data loss check interval, ms"))
flag.Parse()
var frames <-chan *can.CanFrame
switch {
case *stdin:
frames = can.ReadStdin()
frames = can.ReadStdin(os.Stdin)
case len(*filename) > 0:
frames = can.Readfile(filename)
case len(*canbus) > 0:
@ -69,12 +71,14 @@ func main() {
os.Exit(0)
}
converter := yabl.NewProtocolConverter()
converter := yabl.NewProtocolConverter("")
var display ui.UI
if *gui {
display = ui.NewUI()
} else if len(*amqp) > 0 {
display = ui.NewAmqp(*amqp)
} else {
display = ui.NewLog()
}
@ -92,7 +96,7 @@ func main() {
updates <- event
}
}
time.AfterFunc(50*time.Millisecond, f)
time.AfterFunc(interval*time.Millisecond, f)
}
time.AfterFunc(5*time.Second, f)

@ -3,13 +3,14 @@ module cli-mon
go 1.19
require (
github.com/gdamore/tcell/v2 v2.6.0
github.com/rabbitmq/amqp091-go v1.9.0
github.com/rivo/tview v0.0.0-20230621164836-6cc0565babaf
golang.org/x/sys v0.5.0
)
require (
github.com/gdamore/encoding v1.0.0 // indirect
github.com/gdamore/tcell/v2 v2.6.0 // indirect
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
github.com/mattn/go-runewidth v0.0.14 // indirect
github.com/rivo/uniseg v0.4.3 // indirect

@ -1,17 +1,31 @@
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdko=
github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg=
github.com/gdamore/tcell/v2 v2.6.0 h1:OKbluoP9VYmJwZwq/iLb4BxwKcwGthaa1YNBJIyCySg=
github.com/gdamore/tcell/v2 v2.6.0/go.mod h1:be9omFATkdr0D9qewWW3d+MEvl5dha+Etb5y65J2H8Y=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU=
github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/rabbitmq/amqp091-go v1.9.0 h1:qrQtyzB4H8BQgEuJwhmVQqVHB9O4+MNDJCCAcpc3Aoo=
github.com/rabbitmq/amqp091-go v1.9.0/go.mod h1:+jPrT9iY2eLjRaMSRHUhc3z14E/l85kv/f+6luSD3pc=
github.com/rivo/tview v0.0.0-20230621164836-6cc0565babaf h1:IchpMMtnfvzg7T3je672bP1nKWz1M4tW3kMZT6CbgoM=
github.com/rivo/tview v0.0.0-20230621164836-6cc0565babaf/go.mod h1:nVwGv4MP47T0jvlk7KuTTjjuSmrGO4JF0iaiNt4bufE=
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
github.com/rivo/uniseg v0.4.3 h1:utMvzDsuh3suAEnhH0RdHmoPbU648o6CvXxTx4SBMOw=
github.com/rivo/uniseg v0.4.3/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A=
go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
@ -40,3 +54,7 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

@ -0,0 +1,76 @@
package ui
import (
"cli-mon/yabl"
"context"
json "encoding/json"
"fmt"
amqp "github.com/rabbitmq/amqp091-go"
"time"
)
const exchange = "yabl-newproto-in"
type broker struct {
uri string
conn *amqp.Connection
ch *amqp.Channel
}
func NewAmqp(uri string) UI {
return &broker{uri: uri}
}
func (b *broker) Consume(event *yabl.Event) {
var bytes []byte
var err error
if bytes, err = json.Marshal(event); err != nil {
return
}
route := fmt.Sprintf(
"%s.%s.%s.%d",
*event.Tag,
*event.ActionName,
*event.Field,
event.GetUnitId())
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
defer cancel()
if err = b.ch.PublishWithContext(ctx,
exchange,
route,
false,
false,
amqp.Publishing{
ContentType: "application/json",
Body: bytes,
}); err != nil {
fmt.Printf("Can't publish msg: %v", err)
}
}
func (b *broker) Start() {
var err error
b.conn, err = amqp.Dial(b.uri)
if err != nil {
panic(fmt.Sprintf("Can't connect to AMQP: %v", err))
}
b.ch, err = b.conn.Channel()
if err != nil {
panic(fmt.Sprintf("Can't create AMQP channel: %v", err))
}
fmt.Printf("AMQP client connected to %v, sending data to server..", b.uri)
}
func (b *broker) Stop() {
if b.conn != nil {
b.conn.Close()
}
if b.ch != nil {
b.ch.Close()
}
}

@ -0,0 +1,39 @@
package ui
import (
"cli-mon/yabl"
"testing"
"time"
)
func TestNewAmqp(t *testing.T) {
t.Run("Amqp Test", func(t *testing.T) {
client := NewAmqp("amqp://user:password@localhost:5672/")
if client == nil {
t.Errorf("Can't create client")
}
client.Start()
now := time.Now()
field := yabl.FBoardReady
action := yabl.PPuErrors
tag := "localhost"
event := &yabl.Event{
Tag: &tag,
Field: &field,
ActionName: &action,
Object: nil,
//unit: 3,
Updated: &now,
Value: yabl.ERROR,
}
client.Consume(event)
client.Stop()
})
}

@ -21,7 +21,7 @@ type key struct {
}
func (t *table) update(event *yabl.Event) {
if cell, ok := t.views[key{event.ActionName, event.Field, event.GetUnitId()}]; ok {
if cell, ok := t.views[key{*event.ActionName, *event.Field, event.GetUnitId()}]; ok {
cell.SetText(fmt.Sprintf("%v", event.Value))
}
}

@ -67,48 +67,6 @@ func (g *gui) Consume(event *yabl.Event) {
g.convertersErrors.update(event)
g.cpu.update(event)
switch event.Object.(type) {
case *yabl.PuPresentEnergy:
break
case *yabl.PuPeriphery:
break
case *yabl.PuDebug:
break
case *yabl.PuErrors:
break
case *yabl.ContactorInternalErrors:
break
case *yabl.ContactorInternalDebug:
break
case *yabl.ContactorInternalState:
break
case *yabl.ContactorsInternalForce:
break
case *yabl.PeripheryState:
break
case *yabl.PeripheryInfo:
break
case *yabl.PeripheryDebug:
break
case *yabl.ConverterPresentEnergy:
break
case *yabl.ConverterErrors:
break
case *yabl.ConverterDebug:
break
case *yabl.CpuPresentEnergy:
break
case *yabl.CpuEnergySettings:
break
case *yabl.CpuErrors:
break
case *yabl.CpuPeriphery:
break
case *yabl.CpuDebug:
break
default:
return
}
g.redraw = true
}
@ -241,8 +199,8 @@ func (l log) Consume(event *yabl.Event) {
fmt.Printf(
"%v %v.%v [%d] %v\n",
event.Updated.Format("Jan _2 15:04:05.000"),
event.ActionName,
event.Field,
*event.ActionName,
*event.Field,
event.GetUnitId(),
event.Value)
}

@ -1,7 +1,7 @@
package yabl
func (c *converter) initialize() {
c.protocolMap = make(map[key]action)
c.protocolMap = make(map[key]*action)
for i := uint(1); i <= CONNECTOR_COUNT; i++ {
key := key{CanIdCpuPresentEnergy, i}
@ -12,7 +12,7 @@ func (c *converter) initialize() {
{length: 10, setter: cpe.setPresentCurrent, name: FPresentCurrent},
{length: 11, setter: cpe.setPresentVoltage, name: FPresentVoltage},
}
c.protocolMap[key] = action{fields: fields, interval: 50, name: PCpuPresentEnergy, object: cpe}
c.protocolMap[key] = &action{fields: fields, interval: 50, name: PCpuPresentEnergy, object: cpe}
}
c.cpuPeripheryInstance = &CpuPeriphery{unit: 0}
@ -21,7 +21,7 @@ func (c *converter) initialize() {
{length: 2, setter: c.cpuPeripheryInstance.setCircuitBreakerInput, name: FCircuitBreakerInput},
{length: 2, setter: c.cpuPeripheryInstance.setCircuitBreakerPowerCBInput, name: FCircuitBreakerPowerCBInput},
}
c.protocolMap[key{CanIdCpuPeriphery, 0}] = action{
c.protocolMap[key{CanIdCpuPeriphery, 0}] = &action{
fields: fields,
interval: 1000,
name: PCpuPeriphery,
@ -39,7 +39,7 @@ func (c *converter) initialize() {
{length: 11, setter: ces.setTargetBatteryVoltage, name: FTargetBatteryVoltage},
{length: 11, setter: ces.setTargetGoalVoltage, name: FTargetGoalVoltage},
}
c.protocolMap[key] = action{fields: fields, interval: 1000, name: PCpuEnergySettings, object: ces}
c.protocolMap[key] = &action{fields: fields, interval: 1000, name: PCpuEnergySettings, object: ces}
}
c.cpuErrorsInstance = &CpuErrors{unit: 0}
@ -63,7 +63,7 @@ func (c *converter) initialize() {
{length: 2, setter: c.cpuErrorsInstance.setContactorInputError, name: FContactorInputError},
{length: 2, setter: c.cpuErrorsInstance.setNotReadyPeriphery, name: FNotReadyPeriphery},
}
c.protocolMap[key{CanIdCpuErrors, 0}] = action{
c.protocolMap[key{CanIdCpuErrors, 0}] = &action{
fields: fields,
interval: 1000,
name: PCpuErrors,
@ -77,7 +77,7 @@ func (c *converter) initialize() {
{length: 3, setter: c.cpuDebugInstance.setDebugCircuitBreakerOn, name: FDebugCircuitBreakerOn},
{length: 3, setter: c.cpuDebugInstance.setDebugRedButtonSoftware, name: FDebugRedButtonSoftware},
}
c.protocolMap[key{CanIdCpuDebug, 0}] = action{
c.protocolMap[key{CanIdCpuDebug, 0}] = &action{
fields: fields,
interval: 1000,
name: PCpuDebug,
@ -94,7 +94,7 @@ func (c *converter) initialize() {
{length: 11, setter: ppe.setVoltageAfter, name: FVoltageAfter},
{length: 10, setter: ppe.setPresentCurrent, name: FPresentCurrent},
}
c.protocolMap[key] = action{fields: fields, interval: 50, name: PPuPresentEnergy, object: ppe}
c.protocolMap[key] = &action{fields: fields, interval: 50, name: PPuPresentEnergy, object: ppe}
}
for i := uint(1); i <= CONNECTOR_COUNT; i++ {
@ -111,7 +111,7 @@ func (c *converter) initialize() {
{length: 2, setter: pp.setPwmEnabled, name: FPwmEnabled},
{length: 9, setter: pp.setCpLineVoltage, name: FCpLineVoltage},
}
c.protocolMap[key] = action{fields: fields, interval: 1000, name: PPuPeriphery, object: pp}
c.protocolMap[key] = &action{fields: fields, interval: 1000, name: PPuPeriphery, object: pp}
}
for i := uint(1); i <= CONNECTOR_COUNT; i++ {
@ -136,7 +136,7 @@ func (c *converter) initialize() {
{length: 2, setter: pe.setOutputCircuitBreakerEnabled, name: FOutputCircuitBreakerEnabled},
{length: 12, setter: pe.setOutputCircuitBreakerEnabledValue, name: FOutputCircuitBreakerEnabledValue},
}
c.protocolMap[key] = action{fields: fields, interval: 1000, name: PPuErrors, object: pe}
c.protocolMap[key] = &action{fields: fields, interval: 1000, name: PPuErrors, object: pe}
}
for i := uint(0); i <= CONNECTOR_COUNT; i++ {
@ -147,7 +147,7 @@ func (c *converter) initialize() {
{length: 2, setter: pd.setDebugModeOn, name: FDebugModeOn},
{length: 3, setter: pd.setDebugContactorOutputOn, name: FDebugContactorOutputOn},
}
c.protocolMap[key] = action{fields: fields, interval: 1000, name: PPuDebug, object: pd}
c.protocolMap[key] = &action{fields: fields, interval: 1000, name: PPuDebug, object: pd}
}
for i := uint(1); i <= CONNECTOR_COUNT; i++ {
@ -160,7 +160,7 @@ func (c *converter) initialize() {
{length: 11, setter: ste.setTargetGoalVoltage, name: FTargetGoalVoltage},
{length: 10, setter: ste.setTargetCurrent, name: FTargetCurrent},
}
c.protocolMap[key] = action{fields: fields, interval: 1000, name: PSeccTargetEnergy, object: ste}
c.protocolMap[key] = &action{fields: fields, interval: 1000, name: PSeccTargetEnergy, object: ste}
}
for i := uint(1); i <= CONNECTOR_COUNT; i++ {
@ -171,7 +171,7 @@ func (c *converter) initialize() {
{length: 3, setter: se.setBoardReady, name: FBoardReady},
{length: 2, setter: se.setNotReadyLogic, name: FNotReadyLogic},
}
c.protocolMap[key] = action{fields: fields, interval: 1000, name: PSeccErrors, object: se}
c.protocolMap[key] = &action{fields: fields, interval: 1000, name: PSeccErrors, object: se}
}
for i := uint(0); i <= CONNECTOR_COUNT; i++ {
@ -182,7 +182,7 @@ func (c *converter) initialize() {
{length: 2, setter: la.setAuthMode, name: FAuthMode},
{length: 3, setter: la.setAuthState, name: FAuthState},
}
c.protocolMap[key] = action{fields: fields, interval: 1000, name: PLogicAuth, object: la}
c.protocolMap[key] = &action{fields: fields, interval: 1000, name: PLogicAuth, object: la}
}
for i := uint(0); i <= CONNECTOR_COUNT; i++ {
@ -195,7 +195,7 @@ func (c *converter) initialize() {
{length: 11, setter: lem.setVoltageMax, name: FVoltageMax},
{length: 14, setter: lem.setPowerMax, name: FPowerMax},
}
c.protocolMap[key] = action{fields: fields, interval: 1000, name: PLogicEnergyMode, object: lem}
c.protocolMap[key] = &action{fields: fields, interval: 1000, name: PLogicEnergyMode, object: lem}
}
c.logicErrorsInstance = &LogicErrors{unit: 0}
@ -203,7 +203,7 @@ func (c *converter) initialize() {
{length: 3, setter: c.logicErrorsInstance.setBoardReady, name: FBoardReady},
{length: 2, setter: c.logicErrorsInstance.setNotReadySettings, name: FNotReadySettings},
}
c.protocolMap[key{CanIdLogicErrors, 0}] = action{
c.protocolMap[key{CanIdLogicErrors, 0}] = &action{
fields: fields,
interval: 1000,
name: PLogicErrors,
@ -218,7 +218,7 @@ func (c *converter) initialize() {
{length: 5, setter: lwm.setTargetContactorMode, name: FTargetContactorMode},
{length: 2, setter: lwm.setAvailability, name: FAvailability},
}
c.protocolMap[key] = action{
c.protocolMap[key] = &action{
fields: fields,
interval: 1000,
name: PLogicWorkingMode,
@ -237,7 +237,7 @@ func (c *converter) initialize() {
{length: 2, setter: cis.setIsolated, name: FIsolated},
{length: 2, setter: cis.setDebugEnabled, name: FDebugEnabled},
}
c.protocolMap[key] = action{fields: fields, interval: 1000, name: PContactorInternalState, object: cis}
c.protocolMap[key] = &action{fields: fields, interval: 1000, name: PContactorInternalState, object: cis}
}
c.contactorInternalErrorsInstance = &ContactorInternalErrors{unit: 0}
@ -251,7 +251,7 @@ func (c *converter) initialize() {
{length: 2, setter: c.contactorInternalErrorsInstance.setDebug, name: FDebug},
{length: 5, setter: c.contactorInternalErrorsInstance.setPresentContactorMode, name: FPresentContactorMode},
}
c.protocolMap[key{CanIdContIntErr, 0}] = action{
c.protocolMap[key{CanIdContIntErr, 0}] = &action{
fields: fields,
interval: 1000,
name: PContactorInternalErrors,
@ -263,7 +263,7 @@ func (c *converter) initialize() {
{length: 2, setter: c.contactorsInternalForce.setForceModeEnabled, name: FForceModeEnabled},
{length: 4, setter: c.contactorsInternalForce.setForceModeValue, name: FForceModeValue},
}
c.protocolMap[key{CanIdContIntForce, 0}] = action{
c.protocolMap[key{CanIdContIntForce, 0}] = &action{
fields: fields,
interval: 1000,
name: PContactorsInternalForce,
@ -278,7 +278,7 @@ func (c *converter) initialize() {
{length: 2, setter: cid.setDebugModeOn, name: FDebugModeOn},
{length: 3, setter: cid.setDebugContactorOn, name: FDebugContactorOn},
}
c.protocolMap[key] = action{fields: fields, interval: 1000, name: PContactorInternalDebug, object: cid}
c.protocolMap[key] = &action{fields: fields, interval: 1000, name: PContactorInternalDebug, object: cid}
}
for i := uint(0); i <= CONNECTOR_COUNT; i++ {
@ -309,7 +309,7 @@ func (c *converter) initialize() {
{length: 2, setter: ps.setErrorContactorsInternalCircuitBreaker, name: FErrorContactorsInternalCircuitBreaker},
{length: 2, setter: ps.setErrorPlcCircuitBreaker, name: FErrorPlcCircuitBreaker},
}
c.protocolMap[key] = action{fields: fields, interval: 1000, name: PPeripheryState, object: ps}
c.protocolMap[key] = &action{fields: fields, interval: 1000, name: PPeripheryState, object: ps}
}
for i := uint(0); i <= CONNECTOR_COUNT; i++ {
@ -323,7 +323,7 @@ func (c *converter) initialize() {
{length: 2, setter: pi.setStateShsnFan, name: FStateShsnFan},
{length: 2, setter: pi.setStateShptFan, name: FStateShptFan},
}
c.protocolMap[key] = action{fields: fields, interval: 5000, name: PPeripheryInfo, object: pi}
c.protocolMap[key] = &action{fields: fields, interval: 5000, name: PPeripheryInfo, object: pi}
}
for i := uint(0); i <= CONNECTOR_COUNT; i++ {
@ -336,7 +336,7 @@ func (c *converter) initialize() {
{length: 3, setter: pd.setDebugShptFan, name: FDebugShptFan},
{length: 3, setter: pd.setDebugIoBoardTestLamp, name: FDebugIoBoardTestLamp},
}
c.protocolMap[key] = action{fields: fields, interval: 1000, name: PPeripheryDebug, object: pd}
c.protocolMap[key] = &action{fields: fields, interval: 1000, name: PPeripheryDebug, object: pd}
}
for i := uint(1); i < CONVERTERS_MAX; i++ {
@ -349,7 +349,7 @@ func (c *converter) initialize() {
{length: 10, setter: cpe.setPresentCurrent, name: FPresentCurrent},
{length: 8, setter: cpe.setConnectedOut, name: FConnectedOut},
}
c.protocolMap[key] = action{fields: fields, interval: 500, name: PConverterPresentEnergy, object: cpe}
c.protocolMap[key] = &action{fields: fields, interval: 500, name: PConverterPresentEnergy, object: cpe}
}
for i := uint(1); i < CONVERTERS_MAX; i++ {
@ -375,7 +375,7 @@ func (c *converter) initialize() {
{length: 2, setter: ce.setDebugConvEnabled, name: FDebugConvEnabled},
{length: 2, setter: ce.setDebugConvDisabled, name: FDebugConvDisabled},
}
c.protocolMap[key] = action{fields: fields, interval: 1000, name: PConverterErrors, object: ce}
c.protocolMap[key] = &action{fields: fields, interval: 1000, name: PConverterErrors, object: ce}
}
for i := uint(0); i < CONVERTERS_MAX; i++ {
@ -388,7 +388,7 @@ func (c *converter) initialize() {
{length: 11, setter: cd.setDebugTargetVoltage, name: FDebugTargetVoltage},
{length: 10, setter: cd.setDebugTargetCurrent, name: FDebugTargetCurrent},
}
c.protocolMap[key] = action{fields: fields, interval: 1000, name: PConverterDebug, object: cd}
c.protocolMap[key] = &action{fields: fields, interval: 1000, name: PConverterDebug, object: cd}
}
// set "null" values

@ -3,6 +3,7 @@ package yabl
import (
can "cli-mon/can"
"encoding/binary"
"os"
time "time"
)
@ -27,7 +28,8 @@ type key struct {
}
type converter struct {
protocolMap map[key]action
tag string
protocolMap map[key]*action
cpuPresentEnergyArray [CONNECTOR_MAX]*CpuPresentEnergy
cpuPeripheryInstance *CpuPeriphery
cpuEnergySettingsArray [CONNECTOR_MAX]*CpuEnergySettings
@ -60,8 +62,15 @@ type Converter interface {
CheckTimeouts(isOffline bool) ([]*Event, bool)
}
func NewProtocolConverter() Converter {
c := &converter{}
func NewProtocolConverter(tag string) Converter {
if len(tag) == 0 {
tag = os.Getenv("HOSTNAME")
if len(tag) == 0 {
tag, _ = os.Hostname()
}
}
c := &converter{tag: tag}
c.initialize()
return c
}
@ -86,9 +95,10 @@ func (c *converter) EventsFromFrame(frame *can.CanFrame) ([]*Event, bool) {
obj := f.setter(val)
event := &Event{
Field: f.name,
ActionName: param.name,
Object: param.object,
Tag: &c.tag,
Field: &f.name,
ActionName: &param.name,
Object: &param.object,
unit: unit(unitId),
Updated: frame.Date,
Value: obj,
@ -148,9 +158,10 @@ func (c *converter) CheckTimeouts(isOffline bool) ([]*Event, bool) {
}
event := &Event{
Field: fld.name,
ActionName: param.name,
Object: param.object,
Tag: &c.tag,
Field: &fld.name,
ActionName: &param.name,
Object: &param.object,
unit: unit(k.unitId),
Updated: &deadline,
Value: nil,
@ -169,7 +180,7 @@ func (c *converter) CheckTimeouts(isOffline bool) ([]*Event, bool) {
return events, events != nil
}
func getMaxTime(protocolMap *map[key]action) time.Time {
func getMaxTime(protocolMap *map[key]*action) time.Time {
now := time.Unix(0, 0)
for _, param := range *protocolMap {

@ -1,6 +1,10 @@
package yabl
import "fmt"
import (
"encoding/json"
"fmt"
"time"
)
func (t BooleanType) String() string {
switch t {
@ -211,3 +215,21 @@ func (t SignedAirTemp8BitType) String() string {
func (c ConnectedOut8bitType) String() string {
return fmt.Sprintf("%d", c)
}
func (u *Event) MarshalJSON() ([]byte, error) {
return json.Marshal(struct {
Host *string
Unit uint
ActionName *AName
Field *FName
Updated *time.Time
Value string
}{
Host: u.Tag,
Unit: u.GetUnitId(),
ActionName: u.ActionName,
Field: u.Field,
Updated: u.Updated,
Value: fmt.Sprintf("%v", u.Value),
})
}

@ -13,9 +13,10 @@ type Action interface {
type Event struct {
unit
ActionName AName
Field FName
Object Action
Tag *string
ActionName *AName
Field *FName
Object *Action //TODO Actually obj, or copy on event generation time?
Updated *time.Time
Value any
}

Loading…
Cancel
Save