Pass car by reference

tma · May 13, 2022 · 4b71e38 · 4b71e38
1 parent 2f1d751
commit 4b71e38
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/cmd/main.go b/cmd/main.go
@@ -40,6 +40,6 @@ func main() {
 		os.Getenv("ABRP_API_KEY"),
 	)
 
-	app.MessagesSubscribe(mqttAddress, car)
-	app.WebStart(port, car)
+	app.MessagesSubscribe(mqttAddress, &car)
+	app.WebStart(port, &car)
 }
diff --git a/internal/app/abrp.go b/internal/app/abrp.go
@@ -10,7 +10,7 @@ import (
 
 var abrpSendQuit = make(chan bool)
 
-func abrpSendActivate(car Car, endTime time.Time) {
+func abrpSendActivate(car *Car, endTime time.Time) {
 	car.abrpSendActive = true
 	car.abrpUpdatesEndTime = endTime
 
@@ -23,7 +23,7 @@ func abrpSendDeactivate() {
 
 const abrpSendInterval = 1 * time.Second
 
-func abrpSendLoop(car Car, endTime time.Time) {
+func abrpSendLoop(car *Car, endTime time.Time) {
 	log.Println("Start sending to ABRP...")
 
 	timer := -1
@@ -78,14 +78,14 @@ func abrpSendLoop(car Car, endTime time.Time) {
 	}
 }
 
-func abrpSendLoopStop(car Car) {
+func abrpSendLoopStop(car *Car) {
 	car.abrpSendActive = false
 	car.abrpUpdatesEndTime = time.Time{}
 }
 
 const abrpUrl = "https://api.iternio.com/1/tlm/send"
 
-func abrpSend(car Car) {
+func abrpSend(car *Car) {
 	log.Println("Sending to ABRP...")
 
 	data, error := json.Marshal(map[string]interface{}{"tlm": car.abrpData})

diff --git a/internal/app/car.go b/internal/app/car.go
@@ -49,11 +49,11 @@ func NewCar(number string, carModel string, abrpToken string, abrpApiKey string)
 	}
 }
 
-func updateCarTmData(car Car, topic string, payload string) {
+func updateCarTmData(car *Car, topic string, payload string) {
 	car.tmData[topic] = payload
 }
 
-func updateCarAbrpData(car Car, topic string, payload string) {
+func updateCarAbrpData(car *Car, topic string, payload string) {
 	switch topic {
 	case "latitude":
 		car.abrpData["lat"] = payload

diff --git a/internal/app/http.go b/internal/app/http.go
@@ -13,7 +13,7 @@ import (
 
 var indexTemplate = template.Must(template.ParseFiles("web/templates/index.html"))
 
-func indexHandler(car Car) http.HandlerFunc {
+func indexHandler(car *Car) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		carTmData, _ := json.MarshalIndent(car.tmData, "", "  ")
 		carAbrpData, _ := json.MarshalIndent(car.abrpData, "", "  ")
@@ -44,7 +44,7 @@ func indexHandler(car Car) http.HandlerFunc {
 	}
 }
 
-func abrpSendContinuousHandler(car Car) http.HandlerFunc {
+func abrpSendContinuousHandler(car *Car) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		if car.abrpSendActive {
 			abrpSendDeactivate()
@@ -64,7 +64,7 @@ func abrpSendContinuousHandler(car Car) http.HandlerFunc {
 	}
 }
 
-func abrpSendNowHandler(car Car) http.HandlerFunc {
+func abrpSendNowHandler(car *Car) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		abrpSend(car)
 
@@ -74,7 +74,7 @@ func abrpSendNowHandler(car Car) http.HandlerFunc {
 
 var rootPath string
 
-func WebStart(port string, car Car) {
+func WebStart(port string, car *Car) {
 	log.Println("Starting HTTP server on port " + port)
 
 	router := mux.NewRouter()

diff --git a/internal/app/messages.go b/internal/app/messages.go
@@ -7,7 +7,7 @@ import (
 	mqtt "github.com/eclipse/paho.mqtt.golang"
 )
 
-func MessagesSubscribe(mqttAddress string, car Car) {
+func MessagesSubscribe(mqttAddress string, car *Car) {
 	log.Println("Connecting to MQTT server on " + mqttAddress)
 
 	opts := mqtt.NewClientOptions().AddBroker(mqttAddress).SetClientID("tm-to-abrp-car" + car.number)