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

… dev Conflicts: telemetry/telemetry.go Signed-off-by: Lucas Vieira <[email protected]>
lucasvmx · Aug 20, 2023 · 2fe4f62 · 2fe4f62
2 parents 563b077 + 2db79f4
commit 2fe4f62
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 8 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -0,0 +1,23 @@
+name: Release
+
+on:
+  push:
+    tags:
+      - "v*"
+
+jobs:
+  release:
+    runs-on: "ubuntu-latest"
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Get Date
+        id: date
+        run: echo "::set-output name=date::$(date +'%m-%d-%Y-%H-%M')"
+
+      - name: Make release
+        uses: "marvinpinto/action-automatic-releases@latest"
+        with:
+          repo_token: "${{ secrets.GITHUB_TOKEN }}"
+          prerelease: false
diff --git a/README.md b/README.md
@@ -8,6 +8,11 @@ A simple library to get WarThunder data provided by the localhost server
 
 # Usage
 
+## Installation
+```sh
+go get -u github.com/lucasvmx/WarTelemetry/telemetry
+```
+
 ## Example
 ```go
 package main
@@ -42,11 +47,6 @@ func main() {
 
 ```
 
-## Get Packages
-```sh
-go get -v
-```
-
 ## Build program
 ```sh
 go build

diff --git a/model/gamechat/gamechat.go b/model/gamechat/gamechat.go
@@ -26,7 +26,7 @@ func GetURL() string {
 		url = utils.GetBaseURL()
 		url = strings.ReplaceAll(url, "$hostname$", utils.GetHostname())
 		url = strings.ReplaceAll(url, "$path$", path)
-		//url += "?lastId=0"
+		url += "?lastId=0"
 	}
 
 	return url

diff --git a/model/hudmsg/hudmsg.go b/model/hudmsg/hudmsg.go
@@ -28,7 +28,7 @@ func GetURL() string {
 		url = utils.GetBaseURL()
 		url = strings.ReplaceAll(url, "$hostname$", utils.GetHostname())
 		url = strings.ReplaceAll(url, "$path$", path)
-		//url += "?lastEvt=0&lastDmg=0"
+		url += "?lastEvt=0&lastDmg=0"
 	}
 
 	return url

diff --git a/model/indicators/indicators.go b/model/indicators/indicators.go
@@ -34,8 +34,10 @@ type Indicators struct {
 	ClockSec         float32 `json:"clock_sec"`
 	RpmMin           float32 `json:"rpm_min"`
 	RpmMin1          float32 `json:"rpm1_min"`
-	AngleOfAttacl    float32 `json:"aoa"`
+	GAcceleration    float32 `json:"g_meter"`
+	AngleOfAttack    float32 `json:"aoa"`
 	SuperCharger     float32 `json:"supercharger"`
+	PropellerPitch   float32 `json:"prop_pitch"`
 }
 
 var path string = "indicators"

diff --git a/model/state/state.go b/model/state/state.go
@@ -36,6 +36,7 @@ type AircraftState struct {
 	Pitch1            float32 `json:"pitch1"`
 	Thrust1           float32 `json:"thrust1"`
 	Efficiency1       float32 `json:"efficiency1"`
+	CompressorStage1  float32 `json:"compressorstage1"`
 
 	// Engine 2
 	ThrottleEngine2   float32 `json:"throttle2"`
@@ -48,6 +49,7 @@ type AircraftState struct {
 	Pitch2            float32 `json:"pitch2"`
 	Thrust2           float32 `json:"thrust2"`
 	Efficiency2       float32 `json:"efficiency2"`
+	CompressorStage2  float32 `json:"compressorstage2"`
 
 	// Engine 3
 	ThrottleEngine3   float32 `json:"throttle3"`
@@ -60,6 +62,7 @@ type AircraftState struct {
 	Pitch3            float32 `json:"pitch3"`
 	Thrust3           float32 `json:"thrust3"`
 	Efficiency3       float32 `json:"efficiency3"`
+	CompressorStage3  float32 `json:"compressorstage3"`
 
 	// Engine 4
 	ThrottleEngine4   float32 `json:"throttle4"`
@@ -72,6 +75,7 @@ type AircraftState struct {
 	Pitch4            float32 `json:"pitch4"`
 	Thrust4           float32 `json:"thrust4"`
 	Efficiency4       float32 `json:"efficiency4"`
+	CompressorStage4  float32 `json:"compressorstage4"`
 }
 
 var path string = "state"