RIG.PTT implemented

dispatcher.go

@@ -35,7 +35,6 @@ func dispatchStateChangeEvents(events <-chan model.Js8callEvent) (<-chan model.W
 		defer close(websocketEvents)
 		defer close(dbObjects)
 
-		//var f func(*model.Js8callEvent, chan<- model.WebsocketEvent, chan<- model.DbObj) error
 		f := defaultNotifier
 		for event := range events {
 			switch event.Type {
@@ -49,6 +48,8 @@ func dispatchStateChangeEvents(events <-chan model.Js8callEvent) (<-chan model.W
 				f = rigStatusNotifier
 			case model.EVENT_TYPE_STATION_CALLSIGN, model.EVENT_TYPE_STATION_GRID, model.EVENT_TYPE_STATION_INFO, model.EVENT_TYPE_STATION_STATUS:
 				f = stationInfoNotifier
+			case model.EVENT_TYPE_RIG_PTT:
+				f = rigPttNotifier
 			default:
 				f = defaultNotifier
 			}

model/js8callEvent.go

@@ -15,6 +15,7 @@ var (
 	EVENT_TYPE_STATION_GRID     = "STATION.GRID"
 
 	// event types as seen in Websocket communication
+	WS_EVENT_TYPE_RIG_PTT      = "RIG.PTT"
 	WS_EVENT_TYPE_RIG_STATUS   = "RIG.STATUS"
 	WS_EVENT_TYPE_STATION_INFO = "STATION.INFO"
 )
@@ -44,7 +45,7 @@ type Js8callEventParams struct {
 	Command   string      `json:"CMD"`
 	Extra     string      `json:"EXTRA"`
 	PTT       bool        `json:"PTT"`
-	Tones     []uint8     `json:"TONES"`
+	Tones     []int       `json:"TONES"`
 	UTC       int64       `json:"UTC"`
 	Selected  string      `json:"SELECTED"`
 	Band      string      `json:"BAND"`

model/rigPtt.go

@@ -0,0 +1,22 @@
+package model
+
+import (
+	"errors"
+)
+
+type RigPttWsEvent struct {
+	Enabled bool
+}
+
+func (o *RigPttWsEvent) Type() string {
+	return WS_EVENT_TYPE_RIG_PTT
+}
+
+func CreateRigPttWsEvent(event *Js8callEvent) (*RigPttWsEvent, error) {
+	if event.Type != EVENT_TYPE_RIG_PTT {
+		return nil, errors.New("wrong event type, cannot parse params")
+	}
+	o := new(RigPttWsEvent)
+	o.Enabled = event.Params.PTT
+	return o, nil
+}

model/rigStatus.go

@@ -14,7 +14,7 @@ type RigStatusWsEvent struct {
 }
 
 func (o *RigStatusWsEvent) Type() string {
-	return EVENT_TYPE_RIG_STATUS
+	return WS_EVENT_TYPE_RIG_STATUS
 }
 
 func CreateRigStatusWsEvent(event *Js8callEvent) (*RigStatusWsEvent, error) {

model/txPacket.go → model/txFrame.go

@@ -9,7 +9,7 @@ import (
 )
 
 var (
-	SQL_TX_FRAME_INSERT = "INSERT INTO `TX_FRAME` (`TIMESTAMP`, `CHANNEL`, `DIAL`, `FREQ`, `OFFSET`, `MODE`, `SPEED`, `SELECTED`, `TONES`) values(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"
+	SQL_TX_FRAME_INSERT = "INSERT INTO `TX_FRAME` (`TIMESTAMP`, `CHANNEL`, `DIAL`, `FREQ`, `OFFSET`, `MODE`, `SPEED`, `SELECTED`, `TONES`) values(?, ?, ?, ?, ?, ?, ?, ?, ?)"
 )
 
 type TxFrameObj struct {
@@ -22,7 +22,7 @@ type TxFrameObj struct {
 	Mode      string
 	Speed     string
 	Selected  string
-	Tones     string
+	Tones     []int
 }
 
 func CreateTxFrameObj(event *Js8callEvent) (*TxFrameObj, error) {
@@ -32,6 +32,7 @@ func CreateTxFrameObj(event *Js8callEvent) (*TxFrameObj, error) {
 
 	o := new(TxFrameObj)
 	o.Timestamp = time.Now().UTC()
+	o.Tones = event.Params.Tones
 	return o, nil
 }
 
@@ -55,6 +56,7 @@ func (obj *TxFrameObj) Insert(db *sql.DB) error {
 	if err != nil {
 		return fmt.Errorf("unable to marshall tones %w", err)
 	}
+	fmt.Print("Marshalled: ", string(marshalledTones))
 
 	res, err := stmt.Exec(
 		toSqlTime(obj.Timestamp),
@@ -65,7 +67,7 @@ func (obj *TxFrameObj) Insert(db *sql.DB) error {
 		&obj.Mode,
 		&obj.Speed,
 		&obj.Selected,
-		&marshalledTones,
+		string(marshalledTones),
 	)
 	if err != nil {
 		return fmt.Errorf("error executing SQL query inserting new TxFrame record, becouse of %w", err)

rigStatus.go

@@ -1,6 +1,10 @@
 package main
 
-import "github.com/PiotrTopa/js8web/model"
+import (
+	"errors"
+
+	"github.com/PiotrTopa/js8web/model"
+)
 
 var rigStatusCache model.RigStatusWsEvent = model.RigStatusWsEvent{}
 
@@ -21,3 +25,12 @@ func rigStatusNotifier(event *model.Js8callEvent, websocketEvents chan<- model.W
 	}
 	return nil
 }
+
+func rigPttNotifier(event *model.Js8callEvent, websocketEvents chan<- model.WebsocketEvent, databaseObjects chan<- model.DbObj) error {
+	wsEvent, err := model.CreateRigPttWsEvent(event)
+	if err != nil {
+		return errors.New("can not convert TxFrame event to db object")
+	}
+	websocketEvents <- wsEvent
+	return nil
+}