Fixing ryzenadj error & Removing registry startup option.

Author: aredden

G14Control.pyw

@@ -223,21 +223,6 @@ def quit_app():
 
     data.run_power_thread = False
     data.run_gaming_thread = False
-    # if data.power_thread is not None and data.power_thread.is_alive():
-    #     data.power_thread.kill()
-    #     while data.power_thread.isAlive():
-    #         if data.config["debug"]:
-    #             print("Waiting for power thread to die...")
-    #         time.sleep(0.25)
-    #     print("Power thread was alive, and now is dead.")
-
-    # if data.gaming_thread is not None and data.gaming_thread.is_alive():
-    #     data.gaming_thread.kill()
-    #     while data.gaming_thread.isAlive():
-    #         if data.config["debug"]:
-    #             print("Waiting for gaming thread to die...")
-    #         time.sleep(0.25)
-    #     print("Gaming thread was alive, and now is dead.")
     if device is not None:
         device.close()
     try:
@@ -540,7 +525,7 @@ if __name__ == "__main__":
     # Initialize the icon app and set its name
     icon_app: Icon = pystray.Icon(config["app_name"])
     # If running as admin or in debug mode, launch program
-    if is_admin() or config["debug"]:
+    if is_admin():
         startup(config, icon_app)
     else:  # Re-run the program with admin rights
         ctypes.windll.shell32.ShellExecuteW(

G14RunCommands.py

@@ -99,12 +99,8 @@ def set_boost(self, state, notification=True):
             self.do_boost(state)
             if notification is True:
                 self.notify("Boost ENABLED")  # Inform the user
-        elif state is False:  # Deactivate boost
-            self.do_boost(state)
-            if notification is True:
-                self.notify("Boost DISABLED")  # Inform the user
-        elif state == 0:
-            self.do_boost(state)
+        elif state is False or state == 0:  # Deactivate boost
+            self.do_boost(False)
             if notification is True:
                 self.notify("Boost DISABLED")  # Inform the user
         elif state == 4:
@@ -239,24 +235,39 @@ def set_atrofac(self, asus_plan, cpu_curve=None, gpu_curve=None):
             cmdargs = atrofac + " fan --gpu " + gpu_curve + " --plan " + asus_plan
         else:
             cmdargs = atrofac + " --plan " + asus_plan
-        result = sp.check_output(cmdargs, shell=True, creationflags=sp.CREATE_NO_WINDOW)
-        if self.config["debug"]:
-            print(result)
+        try:
+            result = sp.check_output(
+                cmdargs, shell=True, creationflags=sp.CREATE_NO_WINDOW
+            )
+            if self.config["debug"]:
+                print(result)
+        except Exception:
+            if self.config["debug"]:
+                print("Error setting fan speeds.")
 
-    def set_ryzenadj(self, tdp):
+    def set_ryzenadj(self, tdp, attempts=3):
         config = self.config
         ryzenadj = str(os.path.join(config["temp_dir"] + "ryzenadj.exe"))
         if tdp is None:
             pass
         else:
-            result = sp.check_output(
-                ryzenadj + " -a " + str(tdp) + " -b " + str(tdp),
-                shell=True,
-                creationflags=sp.CREATE_NO_WINDOW,
-                stderr=STDOUT,
-            )
-            if self.config["debug"]:
-                print(result.decode("utf-8"))
+            try:
+                result = sp.check_output(
+                    ryzenadj + " -a " + str(tdp) + " -b " + str(tdp),
+                    shell=True,
+                    creationflags=sp.CREATE_NO_WINDOW,
+                )
+                if self.config["debug"]:
+                    print(result.decode("utf-8"))
+            except Exception:
+                print("There was an error applying ryzenadj\n Attempt #" + attempts)
+                if attempts == 0:
+                    self.notify(
+                        "There was an error apply ryzenadj TDP power settings...\n"
+                        + "This is relatively normal."
+                    )
+                else:
+                    self.set_ryzenadj(tdp, attempts - 1)
 
     def set_power_plan(self, GUID, do_notify=False):
         print("setting power plan GUID to: ", GUID)

G14Utils.py

@@ -9,24 +9,26 @@
 import subprocess as sp
 
 
-# Adds G14Control.exe to the windows registry to start on boot/login
-def registry_add(registry_key_loc, G14dir):
-    G14exe = "G14Control.exe"
-    G14dir = str(G14dir)
-    G14fileloc = os.path.join(G14dir, G14exe)
-    G14Key = winreg.OpenKey(
-        winreg.HKEY_CURRENT_USER, registry_key_loc, 0, winreg.KEY_SET_VALUE
-    )
-    winreg.SetValueEx(G14Key, "G14Control", 1, winreg.REG_SZ, G14fileloc)
-
-
-# Removes G14Control.exe from the windows registry
-def registry_remove(registry_key_loc, G14dir):
-    G14dir = str(G14dir)
-    G14Key = winreg.OpenKey(
-        winreg.HKEY_CURRENT_USER, registry_key_loc, 0, winreg.KEY_ALL_ACCESS
-    )
-    winreg.DeleteValue(G14Key, "G14Control")
+# # Adds G14Control.exe to the windows registry to start on boot/login
+# def registry_add(registry_key_loc, G14dir):
+#     G14exe = "G14Control.exe"
+#     G14dir = str(G14dir)
+#     G14fileloc = os.path.join(G14dir, G14exe)
+#     G14Key = winreg.OpenKey(
+#         winreg.HKEY_CURRENT_USER, registry_key_loc, 0, winreg.KEY_SET_VALUE
+#     )
+#     winreg.SetValueEx(G14Key, "G14Control", 1, winreg.REG_SZ, G14fileloc)
+#     winreg.CloseKey(G14Key)
+
+
+# # Removes G14Control.exe from the windows registry
+# def registry_remove(registry_key_loc, G14dir):
+#     G14dir = str(G14dir)
+#     G14Key = winreg.OpenKey(
+#         winreg.HKEY_CURRENT_USER, registry_key_loc, 0, winreg.KEY_ALL_ACCESS
+#     )
+#     winreg.DeleteValue(G14Key, "G14Control")
+#     winreg.CloseKey(G14Key)
 
 
 # Checks if G14Control registry entry exists already
@@ -70,20 +72,20 @@ def startup_checks(data):
     # Adds registry entry if enabled in config, but not when in debug mode.
     # if not registry entry is already existing,
     # removes registry entry if registry exists but setting is disabled:
-    reg_run_enabled = registry_check(data.registry_key_loc, G14dir)
-
-    if (
-        data.config["start_on_boot"]
-        and not data.config["debug"]
-        and not reg_run_enabled
-    ):
-        registry_add(data.registry_key_loc, G14dir)
-    if (
-        not data.config["start_on_boot"]
-        and not data.config["debug"]
-        and reg_run_enabled
-    ):
-        registry_remove(data.registry_key_loc, data.G14dir)
+    # reg_run_enabled = registry_check(data.registry_key_loc, G14dir)
+
+    # if (
+    #     data.config["start_on_boot"]
+    #     and not data.config["debug"]
+    #     and not reg_run_enabled
+    # ):
+    #     registry_add(data.registry_key_loc, G14dir)
+    # if (
+    #     not data.config["start_on_boot"]
+    #     and not data.config["debug"]
+    #     and reg_run_enabled
+    # ):
+    #     registry_remove(data.registry_key_loc, data.G14dir)
     return data.auto_power_switch
 
 
@@ -165,8 +167,10 @@ def get_windows_plan_map(windows_plans):
 def is_admin():
     try:
         # Returns true if the user launched the app as admin
+        val = ctypes.windll.shell32.IsUserAnAdmin()
+        print("is admin?:" + val)
         return ctypes.windll.shell32.IsUserAnAdmin()
-    except OSError or WindowsError:
+    except Exception:
         return False
 
 
@@ -179,6 +183,7 @@ def get_windows_theme():
     )
     # Taskbar (where icon is displayed) uses the 'System' light theme key. Index 0 is the value, index 1 is the type of key
     value = winreg.QueryValueEx(sub_key, "SystemUsesLightTheme")[0]
+    sub_key.Close()
     return value  # 1 for light theme, 0 for dark theme