From 5d676828d479c84be77726d33e1b4b0ae51791bf Mon Sep 17 00:00:00 2001
From: Seth Samuel <sethsml@hotmail.com>
Date: Sun, 10 Nov 2024 16:30:00 +1300
Subject: [PATCH 1/2] added prep to read forza data

---
 FORZA_METHODS                 |  0
 GAME_METHODS/FORZA_METHODS.py |  1 +
 GAME_METHODS/__init__.py      |  2 +-
 OutGaugeInterpreter.py        | 25 +++++++++++++++++++++----
 4 files changed, 23 insertions(+), 5 deletions(-)
 delete mode 100644 FORZA_METHODS
 create mode 100644 GAME_METHODS/FORZA_METHODS.py

diff --git a/FORZA_METHODS b/FORZA_METHODS
deleted file mode 100644
index e69de29..0000000
diff --git a/GAME_METHODS/FORZA_METHODS.py b/GAME_METHODS/FORZA_METHODS.py
new file mode 100644
index 0000000..c89d0db
--- /dev/null
+++ b/GAME_METHODS/FORZA_METHODS.py
@@ -0,0 +1 @@
+FROZA_DATA_FORMAT = '<iIfffffffffffffffffffffffffffffffffffffffffffffffffffiiiiifffffffffffffffffHBBBBBBbbb'
\ No newline at end of file
diff --git a/GAME_METHODS/__init__.py b/GAME_METHODS/__init__.py
index 0d920bf..a8cdccf 100644
--- a/GAME_METHODS/__init__.py
+++ b/GAME_METHODS/__init__.py
@@ -1 +1 @@
-__all__= ["BEAMNG_METHODS"]
\ No newline at end of file
+__all__= ["BEAMNG_METHODS","FORZA_METHODS"]
\ No newline at end of file
diff --git a/OutGaugeInterpreter.py b/OutGaugeInterpreter.py
index 97dad3e..97b4679 100644
--- a/OutGaugeInterpreter.py
+++ b/OutGaugeInterpreter.py
@@ -7,18 +7,35 @@ from GAME_METHODS import *
 
 COM_PORT = 'COM5'
 UDP_IP = "127.0.0.1"
-UDP_PORT = 4444
+BEAMNG_UDP_PORT = 4444
+FORZA_UDP_PORT= 4843
 
 connectedArduino = False
 connectedWebSocket = False
+gameSelected = False
+portToConnect= 0
+dataFormat = ""
+
+while gameSelected == False:
+    gameNo = input("1:BEAMNG\n2:FORZA")
+    if gameNo == 1:
+        portToConnect = BEAMNG_UDP_PORT
+        dataFormat =BEAMNG_METHODS.BEAMNG_DATA_FORMAT
+        gameSelected = True
+    elif gameNo ==2:
+        portToConnect = FORZA_UDP_PORT
+        dataFormat = FORZA_METHODS.FROZA_DATA_FORMAT
+    else:
+        print("please select a number from the list")
+
 
 while connectedWebSocket == False:
     try:    
         sock = socket.socket(socket.AF_INET,socket.SOCK_DGRAM)
-        sock.bind((UDP_IP,UDP_PORT))
+        sock.bind((UDP_IP,portToConnect))
         connectedWebSocket = True
     except:
-        print("please check you are able to open the socket on this system")
+        print("please check you are able to open the socket on this system\ntired to open port: "+portToConnect)
         exit()
 
 while connectedArduino == False:
@@ -34,7 +51,7 @@ print("ready:\n")
 
 while True:
     data, addr = sock.recvfrom(1024)
-    unpackedData = struct.unpack(BEAMNG_METHODS.BEAMNG_DATA_FORMAT,data)
+    unpackedData = struct.unpack(dataFormat,data)
     carData = BEAMNG_METHODS.unpackData(unpackedData)
     kmh=carData["speed"]*3.6
     toPi.write(str(kmh).encode()+":".encode())

From 9ec76323d7a4b461b17944097809693dca142283 Mon Sep 17 00:00:00 2001
From: Seth Samuel <sethsml@hotmail.com>
Date: Sun, 10 Nov 2024 16:36:38 +1300
Subject: [PATCH 2/2] made UI a little more clear

---
 .../__pycache__/FORZA_METHODS.cpython-311.pyc   | Bin 0 -> 291 bytes
 .../__pycache__/__init__.cpython-311.pyc        | Bin 206 -> 225 bytes
 OutGaugeInterpreter.py                          |  10 ++++++----
 3 files changed, 6 insertions(+), 4 deletions(-)
 create mode 100644 GAME_METHODS/__pycache__/FORZA_METHODS.cpython-311.pyc

diff --git a/GAME_METHODS/__pycache__/FORZA_METHODS.cpython-311.pyc b/GAME_METHODS/__pycache__/FORZA_METHODS.cpython-311.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..af6d27738aa2c16277ef9cdb3c4121f98958392b
GIT binary patch
literal 291
zcmZ3^%ge<81P&?&={Z39F^B^Lj8MjBkdo;PDGX5zDU87knoLz;HkqDjq=QTlz|iL5
z1O`b-Nq(A)w*=jS{G%M>T^vIk<K6s&d>unpGJFO(<d;XXRZM7cYEf}aacW6MOhHk8
zR%&udag2XyiF;ycda7q$Nor9+Q7Vv(ad-4}jrVm8@$h#EjsY42G!e?vE2#X%VUwGm
kQks)$SHuQ1805`jK_KygnURt4hDgo@20;iaVgZT*0N0&XHUIzs

literal 0
HcmV?d00001

diff --git a/GAME_METHODS/__pycache__/__init__.cpython-311.pyc b/GAME_METHODS/__pycache__/__init__.cpython-311.pyc
index ce1cb9b55e377a1f29673ba643197ef41fc54aaa..21e6e8968bd3d29965822a5a4cf10547833e5656 100644
GIT binary patch
delta 127
zcmX@d_>eJhIWI340}zC&7^G_h>Bk@r3@||%pZS1{=?p0hDU9h%Q4A?e!3>(rxA>e~
z9ew@W<9%I2Jp5gPZ}GbM2SqtfbjVia04iq$;$mSS@qw9<k?{tX)C~IzoZ1cSAXvl(
G6bAsKM;I>v

delta 108
zcmaFJc#hFwIWI340}y<ZH%ONT(vLwL7+{1lKJx$>(-~42(ix)|QW%37G?{MkIk`Ie
m`ngXG%vNRx%7T;@3j&D`%#4hTH@KuOa7s6@gJ2OWP!s^;%o2wH

diff --git a/OutGaugeInterpreter.py b/OutGaugeInterpreter.py
index 97b4679..89f83a3 100644
--- a/OutGaugeInterpreter.py
+++ b/OutGaugeInterpreter.py
@@ -17,14 +17,17 @@ portToConnect= 0
 dataFormat = ""
 
 while gameSelected == False:
-    gameNo = input("1:BEAMNG\n2:FORZA")
-    if gameNo == 1:
+    gameNo = input("1:BEAMNG\n2:FORZA\n")
+    if gameNo == "1":
         portToConnect = BEAMNG_UDP_PORT
         dataFormat =BEAMNG_METHODS.BEAMNG_DATA_FORMAT
         gameSelected = True
-    elif gameNo ==2:
+        print("BeamNG Selected")
+    elif gameNo == "2":
         portToConnect = FORZA_UDP_PORT
         dataFormat = FORZA_METHODS.FROZA_DATA_FORMAT
+        print("Forza Selected")
+        gameSelected=True
     else:
         print("please select a number from the list")
 
@@ -48,7 +51,6 @@ while connectedArduino == False:
 
 print("ready:\n")
 
-
 while True:
     data, addr = sock.recvfrom(1024)
     unpackedData = struct.unpack(dataFormat,data)