From 671b2393dcf54f62cdf4a7adb6ca382eaeaf3547 Mon Sep 17 00:00:00 2001
From: quoije <mathieumoran1@gmail.com>
Date: Wed, 19 Oct 2022 16:47:21 -0400
Subject: [PATCH] fix HA sync issue, still no color lol

---
 HA-SS_Sync.py | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/HA-SS_Sync.py b/HA-SS_Sync.py
index f262169..ce9a889 100644
--- a/HA-SS_Sync.py
+++ b/HA-SS_Sync.py
@@ -1,9 +1,9 @@
-from logging import handlers
+from os import getenv
 from requests import get
 from requests import post
 from json import loads
+from json import load
 from time import sleep
-from requests import Session, post
 
 # https://github.com/slattery-mark/SteelSeries-CKL-App
 # author: slattery-mark
@@ -16,12 +16,11 @@ haHeaders = {
                 "Authorization": "Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiI0ZmQ4MzQxNTZjNjg0YThlYTFjY2NiYmNkNWEzYTI4OSIsImlhdCI6MTY2NjExMDcwMiwiZXhwIjoxOTgxNDcwNzAyfQ.5KVla7Y72yKFrWhF01EupQpSHX0Rbr0CQ-LMLW6v6VU",
                 "content-type": "application/json"
             }
-gsAddress = "http://127.0.0.1:50786"
+gsCorePropsPath = getenv('PROGRAMDATA') + "\SteelSeries\SteelSeries Engine 3\coreProps.json" 
+gsAddress = f'http://{load(open(gsCorePropsPath))["address"]}'
 gsGame = "HA_LIGHT_SYNC"
 gsEvent = "SYNC"
-redRGB = 0
-greenRGB = 0
-blueRGB = 0
+
 
 def checkLight():
         """ Check HA light color """
@@ -29,6 +28,10 @@ def checkLight():
         haData = loads(haResponse.text)
         return haData['attributes']['rgb_color']
 
+redRGB = checkLight()[0]
+greenRGB = checkLight()[1]
+blueRGB = checkLight()[2]
+
 def updateLight():
     global redRGB
     global greenRGB
@@ -97,26 +100,27 @@ def sendGameEvent(kill_switch):
             "game": gsGame,
             "event": gsEvent,
             "data" : {
+                "value" : 100,
                 "frame": {
                     "zone-all-color": {
-                        "color": {"red": redRGB,"green": greenRGB,"blue": blueRGB}
+                        "color": {"red": 0,"green": 0,"blue": 0}
                     }
                 }
             }
         }
 
-        with Session() as s:
-            while kill_switch == 0:
+        while kill_switch == 0:
 
                 """ DEBUG """
                 print("[+] loopyloop")
                 """ DEBUG """       
-                print("[+] sendGameEvent(kill_switch)")
+                
                 print("[+] update light RGB state")
                 updateLight()
-                r = s.post(endpoint, json=payload)
+                payload['data']['frame']['zone-all-color']['color'] = {"red": redRGB,"green": greenRGB,"blue": blueRGB}
+                print("[+] sendGameEvent(kill_switch)")
+                r = post(endpoint, json=payload)
                 print(r.text)
-
                 if kill_switch == 1: break
 
                 """ DEBUG """