chore: merges branch 'dev' of github.com:lucasvmx/WarTelemetry into dev

# Conflicts: # controller/gamechat.go # controller/hudmsg.go # controller/indicators.go # controller/mapinfo.go # controller/mapobjects.go # controller/state.go Signed-off-by: Lucas Vieira <[email protected]>
lucasvmx · Jul 29, 2023 · ef8f59b · ef8f59b
2 parents 611eff9 + 3db4e03
commit ef8f59b
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/controller/gamechat.go b/controller/gamechat.go
@@ -13,7 +13,7 @@ import (
 // GetGamechatData retrieves data about gamechat
 func GetGamechatData(wg *sync.WaitGroup) {
 
-	var gc []gamechat.GameChat
+	var gc []gamechat.GameChat = []gamechat.GameChat{}
 	defer wg.Done()
 
 	// Sends the GET request

diff --git a/controller/indicators.go b/controller/indicators.go
@@ -12,7 +12,7 @@ import (
 
 // GetIndicatorsData function retrieves data about aircraft indicators
 func GetIndicatorsData(wg *sync.WaitGroup) {
-	var id *indicators.Indicators
+	var id *indicators.Indicators = &indicators.Indicators{}
 	defer wg.Done()
 
 	data, err := network.GetDataFromURL(indicators.GetURL())

diff --git a/controller/mapinfo.go b/controller/mapinfo.go
@@ -12,7 +12,7 @@ import (
 
 // GetMapInfoData function retrieves information about current map
 func GetMapInfoData(wg *sync.WaitGroup) {
-	var mi *mapinfo.MapInformation
+	var mi *mapinfo.MapInformation = &mapinfo.MapInformation{}
 	defer wg.Done()
 
 	data, err := network.GetDataFromURL(mapinfo.GetURL())

diff --git a/controller/mapobjects.go b/controller/mapobjects.go
@@ -12,7 +12,7 @@ import (
 
 // GetMapObjsData function retrives data about all map objects
 func GetMapObjsData(wg *sync.WaitGroup) {
-	var mo []mapobjects.MapObjects
+	var mo []mapobjects.MapObjects = []mapobjects.MapObjects{}
 	defer wg.Done()
 
 	// Sends GET request

diff --git a/controller/state.go b/controller/state.go
@@ -13,7 +13,7 @@ import (
 
 // GetStateData function retrieves data about running missions
 func GetStateData(wg *sync.WaitGroup) {
-	var st *state.AircraftState
+	var st *state.AircraftState = &state.AircraftState{}
 	defer wg.Done()
 
 	// Sends a HTTP request

diff --git a/model/indicators/indicators.go b/model/indicators/indicators.go
@@ -35,6 +35,7 @@ type Indicators struct {
 	RpmMin           float32 `json:"rpm_min"`
 	RpmMin1          float32 `json:"rpm1_min"`
 	AngleOfAttacl    float32 `json:"aoa"`
+	SuperCharger     float32 `json:"supercharger"`
 }
 
 var path string = "indicators"