saji/gotelem
1
0
Fork 0
Code Issues 7 Actions Packages Releases 2 Activity

add packet name to busevent

Browse source
This commit is contained in:
saji 2023-05-28 20:13:33 -05:00
parent b68055d028
commit c50d3774b7
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
skylab/skylab.go
View file

@ -38,6 +38,7 @@ type Packet interface {
UnmarshalPacket(p []byte) error UnmarshalPacket(p []byte) error
CANId() (uint32, error) CANId() (uint32, error)
Size() uint Size() uint
String() string
} }
// Marshaler is a packet that can be marshalled into bytes. // Marshaler is a packet that can be marshalled into bytes.
@ -81,7 +82,7 @@ type jsonRawEvent struct {
Data json.RawMessage Data json.RawMessage
} }
// BusEvent is a timestamped Skylab packet designed to be serialized. // BusEvent is a timestamped Skylab packet
type BusEvent struct { type BusEvent struct {
Timestamp float64 `json:"ts"` Timestamp float64 `json:"ts"`
Id uint64 `json:"id"` Id uint64 `json:"id"`
@ -95,6 +96,7 @@ func (e *BusEvent) MarshalJSON() (b []byte, err error) {
j := &jsonRawEvent{ j := &jsonRawEvent{
Timestamp: e.Timestamp, Timestamp: e.Timestamp,
Id: uint32(e.Id), Id: uint32(e.Id),
Name: e.Data.String(),
} }
// now we use the magic Packet -> map[string]interface{} function // now we use the magic Packet -> map[string]interface{} function
j.Data, err = json.Marshal(e.Data) j.Data, err = json.Marshal(e.Data)
@ -118,6 +120,7 @@ func (e *BusEvent) UnmarshalJSON(b []byte) error {
e.Timestamp = jRaw.Timestamp e.Timestamp = jRaw.Timestamp
e.Id = uint64(jRaw.Id) e.Id = uint64(jRaw.Id)
e.Data, err = FromJson(jRaw.Id, jRaw.Data) e.Data, err = FromJson(jRaw.Id, jRaw.Data)
e.Name = e.Data.String()
return err return err
} }
@ -149,6 +152,7 @@ func (e *BusEvent) UnmarshalMsg(b []byte) ([]byte, error) {
e.Timestamp = rawEv.Timestamp e.Timestamp = rawEv.Timestamp
e.Id = uint64(rawEv.Id) e.Id = uint64(rawEv.Id)
e.Data, err = FromCanFrame(rawEv.Id, rawEv.Data) e.Data, err = FromCanFrame(rawEv.Id, rawEv.Data)
e.Name = e.Data.String()
return remain, err return remain, err
} }