feature/amqp-client #3

Merged
didinst merged 7 commits from feature/amqp-client into main 2 years ago
  1. 69
      can/can.go
  2. 7
      can/input.go
  3. 4
      can/input_test.go
  4. 51
      cli-mon.go
  5. 3
      go.mod
  6. 18
      go.sum
  7. 76
      ui/amqp.go
  8. 39
      ui/amqp_test.go
  9. 34
      ui/parameters.go
  10. 2
      ui/table.go
  11. 63
      ui/ui.go
  12. 43
      yabl/const.go
  13. 92
      yabl/init.go
  14. 61
      yabl/protocol.go
  15. 24
      yabl/strings.go
  16. 7
      yabl/types.go

@ -11,36 +11,11 @@ import (
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
) )
const CAN_ID_071 = 0x071
const CAN_ID_073 = 0x073
const CAN_ID_074 = 0x074
const CAN_ID_075 = 0x075
const CAN_ID_021 = 0x021
const CAN_ID_022 = 0x022
const CAN_ID_023 = 0x023
const CAN_ID_011 = 0x011
const CAN_ID_014 = 0x014
const CAN_ID_015 = 0x015
const CAN_ID_016 = 0x016
const CAN_ID_01A = 0x01A
const CAN_ID_02A = 0x02A
const CAN_ID_041 = 0x041
const CAN_ID_042 = 0x042
const CAN_ID_046 = 0x046
const CAN_ID_047 = 0x047
const CAN_ID_048 = 0x048
const CAN_ID_049 = 0x049
const CAN_ID_067 = 0x067
const CAN_ID_068 = 0x068
const CAN_ID_06C = 0x06C
const CAN_ID_061 = 0x061
const CAN_ID_062 = 0x062
const CAN_ID_065 = 0x065
const bufferSize = 100 const bufferSize = 100
type CanFrame struct { type CanFrame struct {
CanId uint32 CanId uint32
Payload []uint8 Payload *[]uint8
Date *time.Time Date *time.Time
} }
@ -83,9 +58,9 @@ func (sck *Socket) Bind(addr string, filter []unix.CanFilter) error {
return unix.Bind(sck.dev.fd, sck.addr) return unix.Bind(sck.dev.fd, sck.addr)
} }
// Recv receives data from the CAN socket. // Receive receives data from the CAN socket.
// id is the CAN_frame id the data was originated from. // id is the CAN_frame id the data was originated from.
func (sck *Socket) Recv() (id uint32, data []byte, err error) { func (sck *Socket) Receive() (id uint32, data *[]byte, err error) {
var buf [frameSize]byte var buf [frameSize]byte
n, err := io.ReadFull(sck.dev, buf[:]) n, err := io.ReadFull(sck.dev, buf[:])
if err != nil { if err != nil {
@ -99,9 +74,9 @@ func (sck *Socket) Recv() (id uint32, data []byte, err error) {
id = binary.LittleEndian.Uint32(buf[:4]) id = binary.LittleEndian.Uint32(buf[:4])
//TODO make correct switch betwin EFF and SFF //TODO make correct switch betwin EFF and SFF
id &= unix.CAN_EFF_MASK id &= unix.CAN_EFF_MASK
data = make([]byte, buf[4]) payload := make([]byte, buf[4])
copy(data, buf[8:]) copy(payload, buf[8:])
return id, data, nil return id, &payload, nil
} }
type device struct { type device struct {
@ -126,35 +101,7 @@ type canframe struct {
Data [8]byte Data [8]byte
} }
func StartCan(canbus string) (<-chan *CanFrame, error) { func StartCan(canbus string, filter []unix.CanFilter) (<-chan *CanFrame, error) {
var filter []unix.CanFilter = []unix.CanFilter{
{Id: CAN_ID_071, Mask: 0xFFF},
{Id: CAN_ID_073, Mask: 0xFFF},
{Id: CAN_ID_074, Mask: 0xFFF},
{Id: CAN_ID_075, Mask: 0xFFF},
{Id: CAN_ID_021, Mask: 0xFFF},
{Id: CAN_ID_022, Mask: 0xFFF},
{Id: CAN_ID_011, Mask: 0xFFF},
{Id: CAN_ID_014, Mask: 0xFFF},
{Id: CAN_ID_015, Mask: 0xFFF},
{Id: CAN_ID_016, Mask: 0xFFF},
{Id: CAN_ID_01A, Mask: 0xFFF},
{Id: CAN_ID_023, Mask: 0xFFF},
{Id: CAN_ID_02A, Mask: 0xFFF},
{Id: CAN_ID_041, Mask: 0xFFF},
{Id: CAN_ID_042, Mask: 0xFFF},
{Id: CAN_ID_046, Mask: 0xFFF},
{Id: CAN_ID_047, Mask: 0xFFF},
{Id: CAN_ID_048, Mask: 0xFFF},
{Id: CAN_ID_049, Mask: 0xFFF},
{Id: CAN_ID_067, Mask: 0xFFF},
{Id: CAN_ID_068, Mask: 0xFFF},
{Id: CAN_ID_06C, Mask: 0xFFF},
{Id: CAN_ID_061, Mask: 0xFFF},
{Id: CAN_ID_062, Mask: 0xFFF},
{Id: CAN_ID_065, Mask: 0xFFF},
}
if socket, err := NewCan(); err == nil { if socket, err := NewCan(); err == nil {
@ -167,7 +114,7 @@ func StartCan(canbus string) (<-chan *CanFrame, error) {
defer socket.Close() defer socket.Close()
for { //TODO implement stop for { //TODO implement stop
if id, data, serr := socket.Recv(); serr == nil { if id, data, serr := socket.Receive(); serr == nil {
var now = time.Now() var now = time.Now()
canevents <- &CanFrame{ canevents <- &CanFrame{
Date: &now, Date: &now,

@ -52,12 +52,13 @@ func process(scanner *bufio.Scanner, ch chan<- *CanFrame) {
} }
} }
func ReadStdin() <-chan *CanFrame { func ReadStdin(file *os.File) <-chan *CanFrame {
c := make(chan *CanFrame) c := make(chan *CanFrame)
go func() { go func() {
scanner := bufio.NewScanner(os.Stdin) scanner := bufio.NewScanner(file)
process(scanner, c) process(scanner, c)
close(c)
}() }()
return c return c
} }
@ -104,7 +105,7 @@ func fromString(text string) *CanFrame {
return &CanFrame{ return &CanFrame{
Date: &now, Date: &now,
CanId: uint32(canId), CanId: uint32(canId),
Payload: payload, Payload: &payload,
} }
} }

@ -36,7 +36,7 @@ func Test_fromString(t *testing.T) {
want: &CanFrame{ want: &CanFrame{
Date: &time_m, Date: &time_m,
CanId: 0x4021, 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{ want: &CanFrame{
Date: &time_p, Date: &time_p,
CanId: 0x100, CanId: 0x100,
Payload: []uint8{00, 00, 00, 00, 00, 00, 0x64, 00}, Payload: &[]uint8{00, 00, 00, 00, 00, 00, 0x64, 00},
}, },
}, },
} }

@ -4,29 +4,60 @@ import (
"cli-mon/can" "cli-mon/can"
"cli-mon/ui" "cli-mon/ui"
"cli-mon/yabl" "cli-mon/yabl"
"flag" flag "flag"
"fmt" "fmt"
"golang.org/x/sys/unix"
"os" "os"
"time" "time"
) )
func main() { func main() {
filename := flag.String("f", "", "Candump filename") 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") 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() flag.Parse()
var frames <-chan *can.CanFrame var frames <-chan *can.CanFrame
switch { switch {
case *stdin: case *stdin:
frames = can.ReadStdin() frames = can.ReadStdin(os.Stdin)
case len(*filename) > 0: case len(*filename) > 0:
frames = can.Readfile(filename) frames = can.Readfile(filename)
case len(*canbus) > 0: case len(*canbus) > 0:
filter := []unix.CanFilter{
{Id: yabl.CanIdContIntState, Mask: 0xFFF},
{Id: yabl.CanIdContIntErr, Mask: 0xFFF},
{Id: yabl.CanIdContIntForce, Mask: 0xFFF},
{Id: yabl.CanIdContIntDebug, Mask: 0xFFF},
{Id: yabl.CanIdPuPresentEnergy, Mask: 0xFFF},
{Id: yabl.CanIdPuPeriphery, Mask: 0xFFF},
{Id: yabl.CanIdCpuPresentEnergy, Mask: 0xFFF},
{Id: yabl.CanIdCpuPeriphery, Mask: 0xFFF},
{Id: yabl.CanIdCpuEnergySettings, Mask: 0xFFF},
{Id: yabl.CanIdCpuErrors, Mask: 0xFFF},
{Id: yabl.CanIdCpuDebug, Mask: 0xFFF},
{Id: yabl.CanIdPuErrors, Mask: 0xFFF},
{Id: yabl.CanIdPuDebug, Mask: 0xFFF},
{Id: yabl.CanIdSeccTargetEnergy, Mask: 0xFFF},
{Id: yabl.CanIdSeccErrors, Mask: 0xFFF},
{Id: yabl.CanIdLogicAuth, Mask: 0xFFF},
{Id: yabl.CanIdLogicEnergyMode, Mask: 0xFFF},
{Id: yabl.CanIdLogicErrors, Mask: 0xFFF},
{Id: yabl.CanIdLogicWorkingMode, Mask: 0xFFF},
{Id: yabl.CanIdPeripheryState, Mask: 0xFFF},
{Id: yabl.CanIdPeripheryInfo, Mask: 0xFFF},
{Id: yabl.CanIdPeripheryDebug, Mask: 0xFFF},
{Id: yabl.CanIdConverterPresentEnergy, Mask: 0xFFF},
{Id: yabl.CanIdConverterErrors, Mask: 0xFFF},
{Id: yabl.CanIdConverterDebug, Mask: 0xFFF},
}
var err error var err error
frames, err = can.StartCan(*canbus) frames, err = can.StartCan(*canbus, filter)
if err != nil { if err != nil {
fmt.Println(err) fmt.Println(err)
return return
@ -40,12 +71,14 @@ func main() {
os.Exit(0) os.Exit(0)
} }
converter := yabl.NewProtocolConverter() converter := yabl.NewProtocolConverter("")
var display ui.UI var display ui.UI
if *gui { if *gui {
display = ui.NewUI() display = ui.NewUI()
} else if len(*amqp) > 0 {
display = ui.NewAmqp(*amqp)
} else { } else {
display = ui.NewLog() display = ui.NewLog()
} }
@ -54,14 +87,16 @@ func main() {
updates := make(chan *yabl.Event, 1000) updates := make(chan *yabl.Event, 1000)
isOffline := len(*filename) > 0 || *stdin
var f func() var f func()
f = func() { f = func() {
if events, ok := converter.CheckTimeouts(); ok { if events, ok := converter.CheckTimeouts(isOffline); ok {
for _, event := range events { for _, event := range events {
updates <- event updates <- event
} }
} }
time.AfterFunc(50*time.Millisecond, f) time.AfterFunc(interval*time.Millisecond, f)
} }
time.AfterFunc(5*time.Second, f) time.AfterFunc(5*time.Second, f)

@ -3,13 +3,14 @@ module cli-mon
go 1.19 go 1.19
require ( 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 github.com/rivo/tview v0.0.0-20230621164836-6cc0565babaf
golang.org/x/sys v0.5.0 golang.org/x/sys v0.5.0
) )
require ( require (
github.com/gdamore/encoding v1.0.0 // indirect 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/lucasb-eyer/go-colorful v1.2.0 // indirect
github.com/mattn/go-runewidth v0.0.14 // indirect github.com/mattn/go-runewidth v0.0.14 // indirect
github.com/rivo/uniseg v0.4.3 // 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 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdko=
github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg= 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 h1:OKbluoP9VYmJwZwq/iLb4BxwKcwGthaa1YNBJIyCySg=
github.com/gdamore/tcell/v2 v2.6.0/go.mod h1:be9omFATkdr0D9qewWW3d+MEvl5dha+Etb5y65J2H8Y= 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 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= 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 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU=
github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= 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 h1:IchpMMtnfvzg7T3je672bP1nKWz1M4tW3kMZT6CbgoM=
github.com/rivo/tview v0.0.0-20230621164836-6cc0565babaf/go.mod h1:nVwGv4MP47T0jvlk7KuTTjjuSmrGO4JF0iaiNt4bufE= 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.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
github.com/rivo/uniseg v0.4.3 h1:utMvzDsuh3suAEnhH0RdHmoPbU648o6CvXxTx4SBMOw= github.com/rivo/uniseg v0.4.3 h1:utMvzDsuh3suAEnhH0RdHmoPbU648o6CvXxTx4SBMOw=
github.com/rivo/uniseg v0.4.3/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= 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= 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-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/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= 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.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/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= 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()
})
}

@ -8,23 +8,22 @@ var pu = []key{
{yabl.PCpuPresentEnergy, yabl.FPresentVoltage, 3}, {yabl.PCpuPresentEnergy, yabl.FPresentVoltage, 3},
{yabl.PPuPresentEnergy, yabl.FPresentCurrent, 4}, {yabl.PPuPresentEnergy, yabl.FPresentCurrent, 4},
{yabl.PCpuPresentEnergy, yabl.FPresentCurrent, 5}, {yabl.PCpuPresentEnergy, yabl.FPresentCurrent, 5},
{yabl.PPuPeriphery, yabl.FConnectorInsert, 6}, {yabl.PSeccTargetEnergy, yabl.FTargetCurrent, 6},
{yabl.PPuPeriphery, yabl.FContactorOn, 7}, {yabl.PPuPeriphery, yabl.FConnectorInsert, 7},
{yabl.PPuPeriphery, yabl.FConnectorLocked, 8}, {yabl.PPuPeriphery, yabl.FContactorOn, 8},
{yabl.PPuPeriphery, yabl.FCpLineLevel, 9}, {yabl.PPuPeriphery, yabl.FConnectorLocked, 9},
{yabl.PPuPeriphery, yabl.FIsolationState, 10}, {yabl.PPuPeriphery, yabl.FCpLineLevel, 10},
{yabl.PPuPeriphery, yabl.FChargingAllowed, 11}, {yabl.PPuPeriphery, yabl.FIsolationState, 11},
{yabl.PPuPeriphery, yabl.FPwmEnabled, 12}, {yabl.PPuPeriphery, yabl.FChargingAllowed, 12},
{yabl.PPuPeriphery, yabl.FCpLineVoltage, 13}, {yabl.PPuPeriphery, yabl.FPwmEnabled, 13},
{yabl.PCpuEnergySettings, yabl.FTargetBatteryVoltage, 14}, {yabl.PPuPeriphery, yabl.FCpLineVoltage, 14},
{yabl.PCpuEnergySettings, yabl.FTargetGoalVoltage, 15}, {yabl.PSeccTargetEnergy, yabl.FTargetBatteryVoltage, 15},
{yabl.PCpuEnergySettings, yabl.FPowerMax, 16}, {yabl.PSeccTargetEnergy, yabl.FTargetGoalVoltage, 16},
{yabl.PCpuEnergySettings, yabl.FCurrentMax, 17}, {yabl.PCpuEnergySettings, yabl.FPowerMax, 17},
{yabl.PCpuEnergySettings, yabl.FVoltageMax, 18}, {yabl.PCpuEnergySettings, yabl.FCurrentMax, 18},
{yabl.PPuDebug, yabl.FDebugModeOn, 19}, {yabl.PCpuEnergySettings, yabl.FVoltageMax, 19},
{yabl.PPuDebug, yabl.FDebugContactorOutputOn, 20}, {yabl.PPuDebug, yabl.FDebugModeOn, 20},
{yabl.PPuPeriphery, yabl.FDebugContactorOn, 21}, {yabl.PPuErrors, yabl.FBoardReady, 21},
{yabl.PPuErrors, yabl.FBoardReady, 22},
} }
var pu_errors = []key{ var pu_errors = []key{
@ -45,6 +44,7 @@ var pu_errors = []key{
{yabl.PPuErrors, yabl.FOutputCircuitBreakerEnabled, 15}, {yabl.PPuErrors, yabl.FOutputCircuitBreakerEnabled, 15},
{yabl.PPuDebug, yabl.FDebugModeOn, 16}, {yabl.PPuDebug, yabl.FDebugModeOn, 16},
{yabl.PPuDebug, yabl.FDebugContactorOutputOn, 17}, {yabl.PPuDebug, yabl.FDebugContactorOutputOn, 17},
{yabl.PPuPeriphery, yabl.FDebugContactorOn, 18},
} }
var contactors_errors = []key{ var contactors_errors = []key{

@ -21,7 +21,7 @@ type key struct {
} }
func (t *table) update(event *yabl.Event) { 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)) cell.SetText(fmt.Sprintf("%v", event.Value))
} }
} }

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

@ -1,14 +1,41 @@
package yabl package yabl
const ( const (
CONVERTERS_MAX = 18 + 1 CONVERTERS_MAX = 18 + 1
CONTACTOR_MAX = 18 + 1 CONTACTOR_MAX = 18 + 1
CONNECTOR_COUNT = 6 CONNECTOR_COUNT = 6
CONNECTOR_MAX = CONNECTOR_COUNT + 1 CONNECTOR_MAX = CONNECTOR_COUNT + 1
ALL_BITS = 0xFFFFFFFFFFFFFFFF ALL_BITS = 0xFFFFFFFFFFFFFFFF
UNIT_ID_OFFSET = 12 UNIT_ID_OFFSET = 12
UNIT_ID_MASK = 0b111111111111 << UNIT_ID_OFFSET UNIT_ID_MASK = 0b111111111111 << UNIT_ID_OFFSET
ACTION_ID_MASK = 0b111111111111 ACTION_ID_MASK = 0b111111111111
CanIdContIntState = 0x071
CanIdContIntErr = 0x073
CanIdContIntForce = 0x074
CanIdContIntDebug = 0x075
CanIdPuPresentEnergy = 0x021
CanIdPuPeriphery = 0x022
CanIdPuErrors = 0x023
CanIdCpuPresentEnergy = 0x011
CanIdCpuPeriphery = 0x014
CanIdCpuEnergySettings = 0x015
CanIdCpuErrors = 0x016
CanIdCpuDebug = 0x01A
CanIdPuDebug = 0x02A
CanIdSeccTargetEnergy = 0x041
CanIdSeccErrors = 0x042
CanIdLogicAuth = 0x046
CanIdLogicEnergyMode = 0x047
CanIdLogicErrors = 0x048
CanIdLogicWorkingMode = 0x049
CanIdPeripheryState = 0x067
CanIdPeripheryInfo = 0x068
CanIdPeripheryDebug = 0x06C
CanIdConverterPresentEnergy = 0x061
CanIdConverterErrors = 0x062
CanIdConverterDebug = 0x065
BOARD_READY_OK BoardReadyType = 0 BOARD_READY_OK BoardReadyType = 0
BOARD_READY_INFO BoardReadyType = 1 BOARD_READY_INFO BoardReadyType = 1
BOARD_READY_WARNING BoardReadyType = 2 BOARD_READY_WARNING BoardReadyType = 2

@ -1,12 +1,10 @@
package yabl package yabl
import "cli-mon/can"
func (c *converter) initialize() { func (c *converter) initialize() {
c.protocolMap = make(map[key]action) c.protocolMap = make(map[key]*action)
for i := uint(1); i <= CONNECTOR_COUNT; i++ { for i := uint(1); i <= CONNECTOR_COUNT; i++ {
key := key{can.CAN_ID_011, i} key := key{CanIdCpuPresentEnergy, i}
cpe := &CpuPresentEnergy{unit: 1} cpe := &CpuPresentEnergy{unit: 1}
c.cpuPresentEnergyArray[i] = cpe c.cpuPresentEnergyArray[i] = cpe
fields := []*field{ fields := []*field{
@ -14,7 +12,7 @@ func (c *converter) initialize() {
{length: 10, setter: cpe.setPresentCurrent, name: FPresentCurrent}, {length: 10, setter: cpe.setPresentCurrent, name: FPresentCurrent},
{length: 11, setter: cpe.setPresentVoltage, name: FPresentVoltage}, {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} c.cpuPeripheryInstance = &CpuPeriphery{unit: 0}
@ -23,7 +21,7 @@ func (c *converter) initialize() {
{length: 2, setter: c.cpuPeripheryInstance.setCircuitBreakerInput, name: FCircuitBreakerInput}, {length: 2, setter: c.cpuPeripheryInstance.setCircuitBreakerInput, name: FCircuitBreakerInput},
{length: 2, setter: c.cpuPeripheryInstance.setCircuitBreakerPowerCBInput, name: FCircuitBreakerPowerCBInput}, {length: 2, setter: c.cpuPeripheryInstance.setCircuitBreakerPowerCBInput, name: FCircuitBreakerPowerCBInput},
} }
c.protocolMap[key{can.CAN_ID_014, 0}] = action{ c.protocolMap[key{CanIdCpuPeriphery, 0}] = &action{
fields: fields, fields: fields,
interval: 1000, interval: 1000,
name: PCpuPeriphery, name: PCpuPeriphery,
@ -31,7 +29,7 @@ func (c *converter) initialize() {
} }
for i := uint(0); i <= CONNECTOR_COUNT; i++ { for i := uint(0); i <= CONNECTOR_COUNT; i++ {
key := key{can.CAN_ID_015, i} key := key{CanIdCpuEnergySettings, i}
ces := &CpuEnergySettings{unit: unit(i)} ces := &CpuEnergySettings{unit: unit(i)}
c.cpuEnergySettingsArray[i] = ces c.cpuEnergySettingsArray[i] = ces
fields := []*field{ fields := []*field{
@ -41,7 +39,7 @@ func (c *converter) initialize() {
{length: 11, setter: ces.setTargetBatteryVoltage, name: FTargetBatteryVoltage}, {length: 11, setter: ces.setTargetBatteryVoltage, name: FTargetBatteryVoltage},
{length: 11, setter: ces.setTargetGoalVoltage, name: FTargetGoalVoltage}, {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} c.cpuErrorsInstance = &CpuErrors{unit: 0}
@ -65,7 +63,7 @@ func (c *converter) initialize() {
{length: 2, setter: c.cpuErrorsInstance.setContactorInputError, name: FContactorInputError}, {length: 2, setter: c.cpuErrorsInstance.setContactorInputError, name: FContactorInputError},
{length: 2, setter: c.cpuErrorsInstance.setNotReadyPeriphery, name: FNotReadyPeriphery}, {length: 2, setter: c.cpuErrorsInstance.setNotReadyPeriphery, name: FNotReadyPeriphery},
} }
c.protocolMap[key{can.CAN_ID_016, 0}] = action{ c.protocolMap[key{CanIdCpuErrors, 0}] = &action{
fields: fields, fields: fields,
interval: 1000, interval: 1000,
name: PCpuErrors, name: PCpuErrors,
@ -79,7 +77,7 @@ func (c *converter) initialize() {
{length: 3, setter: c.cpuDebugInstance.setDebugCircuitBreakerOn, name: FDebugCircuitBreakerOn}, {length: 3, setter: c.cpuDebugInstance.setDebugCircuitBreakerOn, name: FDebugCircuitBreakerOn},
{length: 3, setter: c.cpuDebugInstance.setDebugRedButtonSoftware, name: FDebugRedButtonSoftware}, {length: 3, setter: c.cpuDebugInstance.setDebugRedButtonSoftware, name: FDebugRedButtonSoftware},
} }
c.protocolMap[key{can.CAN_ID_01A, 0}] = action{ c.protocolMap[key{CanIdCpuDebug, 0}] = &action{
fields: fields, fields: fields,
interval: 1000, interval: 1000,
name: PCpuDebug, name: PCpuDebug,
@ -87,7 +85,7 @@ func (c *converter) initialize() {
} }
for i := uint(1); i <= CONNECTOR_COUNT; i++ { for i := uint(1); i <= CONNECTOR_COUNT; i++ {
key := key{can.CAN_ID_021, i} key := key{CanIdPuPresentEnergy, i}
ppe := &PuPresentEnergy{unit: unit(i)} ppe := &PuPresentEnergy{unit: unit(i)}
c.puPresentEnergyArray[i] = ppe c.puPresentEnergyArray[i] = ppe
fields := []*field{ fields := []*field{
@ -96,11 +94,11 @@ func (c *converter) initialize() {
{length: 11, setter: ppe.setVoltageAfter, name: FVoltageAfter}, {length: 11, setter: ppe.setVoltageAfter, name: FVoltageAfter},
{length: 10, setter: ppe.setPresentCurrent, name: FPresentCurrent}, {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++ { for i := uint(1); i <= CONNECTOR_COUNT; i++ {
key := key{can.CAN_ID_022, i} key := key{CanIdPuPeriphery, i}
pp := &PuPeriphery{unit: unit(i)} pp := &PuPeriphery{unit: unit(i)}
c.puPeripheryArray[i] = pp c.puPeripheryArray[i] = pp
fields := []*field{ fields := []*field{
@ -113,11 +111,11 @@ func (c *converter) initialize() {
{length: 2, setter: pp.setPwmEnabled, name: FPwmEnabled}, {length: 2, setter: pp.setPwmEnabled, name: FPwmEnabled},
{length: 9, setter: pp.setCpLineVoltage, name: FCpLineVoltage}, {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++ { for i := uint(1); i <= CONNECTOR_COUNT; i++ {
key := key{can.CAN_ID_023, i} key := key{CanIdPuErrors, i}
pe := &PuErrors{unit: 1} pe := &PuErrors{unit: 1}
c.puErrorsArray[i] = pe c.puErrorsArray[i] = pe
fields := []*field{ fields := []*field{
@ -138,22 +136,22 @@ func (c *converter) initialize() {
{length: 2, setter: pe.setOutputCircuitBreakerEnabled, name: FOutputCircuitBreakerEnabled}, {length: 2, setter: pe.setOutputCircuitBreakerEnabled, name: FOutputCircuitBreakerEnabled},
{length: 12, setter: pe.setOutputCircuitBreakerEnabledValue, name: FOutputCircuitBreakerEnabledValue}, {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++ { for i := uint(0); i <= CONNECTOR_COUNT; i++ {
key := key{can.CAN_ID_02A, i} key := key{CanIdPuDebug, i}
pd := &PuDebug{unit: unit(i)} pd := &PuDebug{unit: unit(i)}
c.puDebugArray[i] = pd c.puDebugArray[i] = pd
fields = []*field{ fields = []*field{
{length: 2, setter: pd.setDebugModeOn, name: FDebugModeOn}, {length: 2, setter: pd.setDebugModeOn, name: FDebugModeOn},
{length: 3, setter: pd.setDebugContactorOutputOn, name: FDebugContactorOutputOn}, {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++ { for i := uint(1); i <= CONNECTOR_COUNT; i++ {
key := key{can.CAN_ID_041, i} key := key{CanIdSeccTargetEnergy, i}
ste := &SeccTargetEnergy{unit: unit(i)} ste := &SeccTargetEnergy{unit: unit(i)}
c.seccTargetEnergyArray[i] = ste c.seccTargetEnergyArray[i] = ste
fields = []*field{ fields = []*field{
@ -162,33 +160,33 @@ func (c *converter) initialize() {
{length: 11, setter: ste.setTargetGoalVoltage, name: FTargetGoalVoltage}, {length: 11, setter: ste.setTargetGoalVoltage, name: FTargetGoalVoltage},
{length: 10, setter: ste.setTargetCurrent, name: FTargetCurrent}, {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++ { for i := uint(1); i <= CONNECTOR_COUNT; i++ {
key := key{can.CAN_ID_042, i} key := key{CanIdSeccErrors, i}
se := &SeccErrors{unit: unit(i)} se := &SeccErrors{unit: unit(i)}
c.seccErrorsArray[i] = se c.seccErrorsArray[i] = se
fields = []*field{ fields = []*field{
{length: 3, setter: se.setBoardReady, name: FBoardReady}, {length: 3, setter: se.setBoardReady, name: FBoardReady},
{length: 2, setter: se.setNotReadyLogic, name: FNotReadyLogic}, {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++ { for i := uint(0); i <= CONNECTOR_COUNT; i++ {
key := key{can.CAN_ID_046, i} key := key{CanIdLogicAuth, i}
la := &LogicAuth{unit: unit(i)} la := &LogicAuth{unit: unit(i)}
c.logicAuthArray[i] = la c.logicAuthArray[i] = la
fields = []*field{ fields = []*field{
{length: 2, setter: la.setAuthMode, name: FAuthMode}, {length: 2, setter: la.setAuthMode, name: FAuthMode},
{length: 3, setter: la.setAuthState, name: FAuthState}, {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++ { for i := uint(0); i <= CONNECTOR_COUNT; i++ {
key := key{can.CAN_ID_047, i} key := key{CanIdLogicEnergyMode, i}
lem := &LogicEnergyMode{unit: unit(i)} lem := &LogicEnergyMode{unit: unit(i)}
c.logicEnergyMode[i] = lem c.logicEnergyMode[i] = lem
fields = []*field{ fields = []*field{
@ -197,7 +195,7 @@ func (c *converter) initialize() {
{length: 11, setter: lem.setVoltageMax, name: FVoltageMax}, {length: 11, setter: lem.setVoltageMax, name: FVoltageMax},
{length: 14, setter: lem.setPowerMax, name: FPowerMax}, {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} c.logicErrorsInstance = &LogicErrors{unit: 0}
@ -205,7 +203,7 @@ func (c *converter) initialize() {
{length: 3, setter: c.logicErrorsInstance.setBoardReady, name: FBoardReady}, {length: 3, setter: c.logicErrorsInstance.setBoardReady, name: FBoardReady},
{length: 2, setter: c.logicErrorsInstance.setNotReadySettings, name: FNotReadySettings}, {length: 2, setter: c.logicErrorsInstance.setNotReadySettings, name: FNotReadySettings},
} }
c.protocolMap[key{can.CAN_ID_048, 0}] = action{ c.protocolMap[key{CanIdLogicErrors, 0}] = &action{
fields: fields, fields: fields,
interval: 1000, interval: 1000,
name: PLogicErrors, name: PLogicErrors,
@ -213,14 +211,14 @@ func (c *converter) initialize() {
} }
for i := uint(0); i <= CONNECTOR_COUNT; i++ { for i := uint(0); i <= CONNECTOR_COUNT; i++ {
key := key{can.CAN_ID_049, i} key := key{CanIdLogicWorkingMode, i}
lwm := &LogicWorkingMode{unit: unit(i)} lwm := &LogicWorkingMode{unit: unit(i)}
c.logicWorkingMode[i] = lwm c.logicWorkingMode[i] = lwm
fields = []*field{ fields = []*field{
{length: 5, setter: lwm.setTargetContactorMode, name: FTargetContactorMode}, {length: 5, setter: lwm.setTargetContactorMode, name: FTargetContactorMode},
{length: 2, setter: lwm.setAvailability, name: FAvailability}, {length: 2, setter: lwm.setAvailability, name: FAvailability},
} }
c.protocolMap[key] = action{ c.protocolMap[key] = &action{
fields: fields, fields: fields,
interval: 1000, interval: 1000,
name: PLogicWorkingMode, name: PLogicWorkingMode,
@ -229,7 +227,7 @@ func (c *converter) initialize() {
} }
for i := uint(0); i < CONTACTOR_MAX; i++ { for i := uint(0); i < CONTACTOR_MAX; i++ {
key := key{can.CAN_ID_071, i} key := key{CanIdContIntState, i}
cis := &ContactorInternalState{unit: unit(i)} cis := &ContactorInternalState{unit: unit(i)}
c.contactorInternalStateArray[i] = cis c.contactorInternalStateArray[i] = cis
fields = []*field{ fields = []*field{
@ -239,7 +237,7 @@ func (c *converter) initialize() {
{length: 2, setter: cis.setIsolated, name: FIsolated}, {length: 2, setter: cis.setIsolated, name: FIsolated},
{length: 2, setter: cis.setDebugEnabled, name: FDebugEnabled}, {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} c.contactorInternalErrorsInstance = &ContactorInternalErrors{unit: 0}
@ -253,7 +251,7 @@ func (c *converter) initialize() {
{length: 2, setter: c.contactorInternalErrorsInstance.setDebug, name: FDebug}, {length: 2, setter: c.contactorInternalErrorsInstance.setDebug, name: FDebug},
{length: 5, setter: c.contactorInternalErrorsInstance.setPresentContactorMode, name: FPresentContactorMode}, {length: 5, setter: c.contactorInternalErrorsInstance.setPresentContactorMode, name: FPresentContactorMode},
} }
c.protocolMap[key{can.CAN_ID_073, 0}] = action{ c.protocolMap[key{CanIdContIntErr, 0}] = &action{
fields: fields, fields: fields,
interval: 1000, interval: 1000,
name: PContactorInternalErrors, name: PContactorInternalErrors,
@ -265,7 +263,7 @@ func (c *converter) initialize() {
{length: 2, setter: c.contactorsInternalForce.setForceModeEnabled, name: FForceModeEnabled}, {length: 2, setter: c.contactorsInternalForce.setForceModeEnabled, name: FForceModeEnabled},
{length: 4, setter: c.contactorsInternalForce.setForceModeValue, name: FForceModeValue}, {length: 4, setter: c.contactorsInternalForce.setForceModeValue, name: FForceModeValue},
} }
c.protocolMap[key{can.CAN_ID_074, 0}] = action{ c.protocolMap[key{CanIdContIntForce, 0}] = &action{
fields: fields, fields: fields,
interval: 1000, interval: 1000,
name: PContactorsInternalForce, name: PContactorsInternalForce,
@ -273,18 +271,18 @@ func (c *converter) initialize() {
} }
for i := uint(0); i < CONTACTOR_MAX; i++ { for i := uint(0); i < CONTACTOR_MAX; i++ {
key := key{can.CAN_ID_075, i} key := key{CanIdContIntDebug, i}
cid := &ContactorInternalDebug{unit: unit(i)} cid := &ContactorInternalDebug{unit: unit(i)}
c.contactorInternalDebugArray[i] = cid c.contactorInternalDebugArray[i] = cid
fields = []*field{ fields = []*field{
{length: 2, setter: cid.setDebugModeOn, name: FDebugModeOn}, {length: 2, setter: cid.setDebugModeOn, name: FDebugModeOn},
{length: 3, setter: cid.setDebugContactorOn, name: FDebugContactorOn}, {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++ { for i := uint(0); i <= CONNECTOR_COUNT; i++ {
key := key{can.CAN_ID_067, i} key := key{CanIdPeripheryState, i}
ps := &PeripheryState{unit: unit(i)} ps := &PeripheryState{unit: unit(i)}
c.peripheryStateArray[i] = ps c.peripheryStateArray[i] = ps
fields = []*field{ fields = []*field{
@ -311,11 +309,11 @@ func (c *converter) initialize() {
{length: 2, setter: ps.setErrorContactorsInternalCircuitBreaker, name: FErrorContactorsInternalCircuitBreaker}, {length: 2, setter: ps.setErrorContactorsInternalCircuitBreaker, name: FErrorContactorsInternalCircuitBreaker},
{length: 2, setter: ps.setErrorPlcCircuitBreaker, name: FErrorPlcCircuitBreaker}, {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++ { for i := uint(0); i <= CONNECTOR_COUNT; i++ {
key := key{can.CAN_ID_068, i} key := key{CanIdPeripheryInfo, i}
pi := &PeripheryInfo{unit: unit(i)} pi := &PeripheryInfo{unit: unit(i)}
c.peripheryInfoArray[i] = pi c.peripheryInfoArray[i] = pi
fields = []*field{ fields = []*field{
@ -325,11 +323,11 @@ func (c *converter) initialize() {
{length: 2, setter: pi.setStateShsnFan, name: FStateShsnFan}, {length: 2, setter: pi.setStateShsnFan, name: FStateShsnFan},
{length: 2, setter: pi.setStateShptFan, name: FStateShptFan}, {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++ { for i := uint(0); i <= CONNECTOR_COUNT; i++ {
key := key{can.CAN_ID_06C, i} key := key{CanIdPeripheryDebug, i}
pd := &PeripheryDebug{unit: unit(i)} pd := &PeripheryDebug{unit: unit(i)}
c.peripheryDebugArray[i] = pd c.peripheryDebugArray[i] = pd
fields = []*field{ fields = []*field{
@ -338,11 +336,11 @@ func (c *converter) initialize() {
{length: 3, setter: pd.setDebugShptFan, name: FDebugShptFan}, {length: 3, setter: pd.setDebugShptFan, name: FDebugShptFan},
{length: 3, setter: pd.setDebugIoBoardTestLamp, name: FDebugIoBoardTestLamp}, {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++ { for i := uint(1); i < CONVERTERS_MAX; i++ {
key := key{can.CAN_ID_061, i} key := key{CanIdConverterPresentEnergy, i}
cpe := &ConverterPresentEnergy{unit: unit(i)} cpe := &ConverterPresentEnergy{unit: unit(i)}
c.converterPresentEnergyArray[i] = cpe c.converterPresentEnergyArray[i] = cpe
fields = []*field{ fields = []*field{
@ -351,11 +349,11 @@ func (c *converter) initialize() {
{length: 10, setter: cpe.setPresentCurrent, name: FPresentCurrent}, {length: 10, setter: cpe.setPresentCurrent, name: FPresentCurrent},
{length: 8, setter: cpe.setConnectedOut, name: FConnectedOut}, {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++ { for i := uint(1); i < CONVERTERS_MAX; i++ {
key := key{can.CAN_ID_062, i} key := key{CanIdConverterErrors, i}
ce := &ConverterErrors{unit: unit(i)} ce := &ConverterErrors{unit: unit(i)}
c.converterErrorsArray[i] = ce c.converterErrorsArray[i] = ce
fields = []*field{ fields = []*field{
@ -377,11 +375,11 @@ func (c *converter) initialize() {
{length: 2, setter: ce.setDebugConvEnabled, name: FDebugConvEnabled}, {length: 2, setter: ce.setDebugConvEnabled, name: FDebugConvEnabled},
{length: 2, setter: ce.setDebugConvDisabled, name: FDebugConvDisabled}, {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++ { for i := uint(0); i < CONVERTERS_MAX; i++ {
key := key{can.CAN_ID_065, i} key := key{CanIdConverterDebug, i}
cd := &ConverterDebug{unit: unit(i)} cd := &ConverterDebug{unit: unit(i)}
c.converterDebugArray[i] = cd c.converterDebugArray[i] = cd
fields = []*field{ fields = []*field{
@ -390,7 +388,7 @@ func (c *converter) initialize() {
{length: 11, setter: cd.setDebugTargetVoltage, name: FDebugTargetVoltage}, {length: 11, setter: cd.setDebugTargetVoltage, name: FDebugTargetVoltage},
{length: 10, setter: cd.setDebugTargetCurrent, name: FDebugTargetCurrent}, {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 // set "null" values

@ -3,6 +3,7 @@ package yabl
import ( import (
can "cli-mon/can" can "cli-mon/can"
"encoding/binary" "encoding/binary"
"os"
time "time" time "time"
) )
@ -27,7 +28,8 @@ type key struct {
} }
type converter struct { type converter struct {
protocolMap map[key]action tag string
protocolMap map[key]*action
cpuPresentEnergyArray [CONNECTOR_MAX]*CpuPresentEnergy cpuPresentEnergyArray [CONNECTOR_MAX]*CpuPresentEnergy
cpuPeripheryInstance *CpuPeriphery cpuPeripheryInstance *CpuPeriphery
cpuEnergySettingsArray [CONNECTOR_MAX]*CpuEnergySettings cpuEnergySettingsArray [CONNECTOR_MAX]*CpuEnergySettings
@ -57,11 +59,18 @@ type converter struct {
type Converter interface { type Converter interface {
EventsFromFrame(*can.CanFrame) ([]*Event, bool) EventsFromFrame(*can.CanFrame) ([]*Event, bool)
CheckTimeouts() ([]*Event, bool) CheckTimeouts(isOffline bool) ([]*Event, bool)
} }
func NewProtocolConverter() Converter { func NewProtocolConverter(tag string) Converter {
c := &converter{} if len(tag) == 0 {
tag = os.Getenv("HOSTNAME")
if len(tag) == 0 {
tag, _ = os.Hostname()
}
}
c := &converter{tag: tag}
c.initialize() c.initialize()
return c return c
} }
@ -86,9 +95,10 @@ func (c *converter) EventsFromFrame(frame *can.CanFrame) ([]*Event, bool) {
obj := f.setter(val) obj := f.setter(val)
event := &Event{ event := &Event{
Field: f.name, Tag: &c.tag,
ActionName: param.name, Field: &f.name,
Object: param.object, ActionName: &param.name,
Object: &param.object,
unit: unit(unitId), unit: unit(unitId),
Updated: frame.Date, Updated: frame.Date,
Value: obj, Value: obj,
@ -104,8 +114,8 @@ func (c *converter) EventsFromFrame(frame *can.CanFrame) ([]*Event, bool) {
return nil, false return nil, false
} }
func get(from uint8, size uint8, buffer []byte) (uint64, bool) { func get(from uint8, size uint8, buffer *[]byte) (uint64, bool) {
value := binary.LittleEndian.Uint64(buffer) value := binary.LittleEndian.Uint64(*buffer)
var mask uint64 = ^(ALL_BITS << size) var mask uint64 = ^(ALL_BITS << size)
mask = mask << from mask = mask << from
@ -122,12 +132,19 @@ func (u unit) GetUnitId() uint {
return uint(u) return uint(u)
} }
func (c *converter) CheckTimeouts() ([]*Event, bool) { func (c *converter) CheckTimeouts(isOffline bool) ([]*Event, bool) {
var multipler uint = 2 var multipler uint = 2
var events []*Event var events []*Event
for k, param := range c.protocolMap { for k, param := range c.protocolMap {
now := time.Now()
var now time.Time
if isOffline {
now = getMaxTime(&c.protocolMap)
} else {
now = time.Now()
}
deadline := now.Add(-time.Duration(param.interval*multipler) * time.Millisecond) deadline := now.Add(-time.Duration(param.interval*multipler) * time.Millisecond)
var from uint8 = 0 var from uint8 = 0
@ -141,11 +158,12 @@ func (c *converter) CheckTimeouts() ([]*Event, bool) {
} }
event := &Event{ event := &Event{
Field: fld.name, Tag: &c.tag,
ActionName: param.name, Field: &fld.name,
Object: param.object, ActionName: &param.name,
Object: &param.object,
unit: unit(k.unitId), unit: unit(k.unitId),
Updated: &now, Updated: &deadline,
Value: nil, Value: nil,
} }
@ -161,3 +179,16 @@ func (c *converter) CheckTimeouts() ([]*Event, bool) {
} }
return events, events != nil return events, events != nil
} }
func getMaxTime(protocolMap *map[key]*action) time.Time {
now := time.Unix(0, 0)
for _, param := range *protocolMap {
for _, fld := range param.fields {
if fld.last != nil && fld.last.After(now) {
now = *fld.last
}
}
}
return now
}

@ -1,6 +1,10 @@
package yabl package yabl
import "fmt" import (
"encoding/json"
"fmt"
"time"
)
func (t BooleanType) String() string { func (t BooleanType) String() string {
switch t { switch t {
@ -211,3 +215,21 @@ func (t SignedAirTemp8BitType) String() string {
func (c ConnectedOut8bitType) String() string { func (c ConnectedOut8bitType) String() string {
return fmt.Sprintf("%d", c) 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 { type Event struct {
unit unit
ActionName AName Tag *string
Field FName ActionName *AName
Object Action Field *FName
Object *Action //TODO Actually obj, or copy on event generation time?
Updated *time.Time Updated *time.Time
Value any Value any
} }

Loading…
Cancel
Save