Fixed boost switching.

Author: aredden

G14Control.pyw

@@ -31,7 +31,7 @@ showFlash = False
 config_loc: str
 current_boost_mode = 0
 current_windows_plan = "Balanced"
-active_plan_map: dict
+active_plan_map: dict = {}
 
 
 def readData(data):
@@ -51,12 +51,27 @@ def get_power_plans():
             app_GUID = i.split(' ')[3]
 
 def get_windows_plans():
-    global win_plans, config, active_plan_map
+    global win_plans, config, active_plan_map, current_windows_plan
     windows_power_options = re.findall(r"([0-9a-f\-]{36}) *\((.*)\) *\*?\n", os.popen("powercfg /l").read())
     active_plan_map = {x[1]:False for x in windows_power_options}
     active_plan_map[current_windows_plan] = True
     return windows_power_options
 
+"""
+Cannot be run before @get_windows_plans()
+"""
+def get_active_plan_map():
+    global windows_plans, active_plan_map
+    try:
+        active_plan_map["Balanced"]
+        return active_plan_map
+    except Exception: 
+        active_plan_map = {x[1]:False for x in windows_plans}
+        active_plan_map[current_windows_plan] = True
+        return active_plan_map
+
+
+
 def get_app_path():
     global G14dir
     G14Dir = ""
@@ -253,12 +268,12 @@ def get_current():
 def apply_plan(plan):
     global current_plan, main_cmds, icon_app
     current_plan = plan['name']
+    main_cmds.set_windows_and_active_plans(windows_plans,active_plan_map)
     main_cmds.set_atrofac(plan['plan'], plan['cpu_curve'], plan['gpu_curve'])
     main_cmds.set_boost(plan['boost'], False)
     main_cmds.set_dgpu(plan['dgpu_enabled'], False)
     main_cmds.set_screen(plan['screen_hz'], False)
     main_cmds.set_ryzenadj(plan['cpu_tdp'])
-
     notify("Applied plan " + plan['name'])
 
 
@@ -284,15 +299,18 @@ def quit_app():
 
 
 def apply_plan_deactivate_switching(plan):
-    apply_plan(plan)
+    global current_plan
+    main_cmds.apply_plan(plan)
     deactivate_powerswitching()
 
 
 def set_windows_plan(plan):
-    global active_plan_map, current_windows_plan
+    global active_plan_map, current_windows_plan, windows_plans
+    print(plan)
     active_plan_map[current_windows_plan]=False
     current_windows_plan = plan[1]
     active_plan_map[current_windows_plan]=True
+    main_cmds.set_windows_and_active_plans(windows_plans,active_plan_map)
     main_cmds.set_power_plan(plan[0])
 
 def power_options_menu():
@@ -409,6 +427,7 @@ def startup_checks():
 
 
 if __name__ == "__main__":
+
     device = None
     frame = []
     G14dir = None
@@ -430,8 +449,10 @@ if __name__ == "__main__":
         ac = psutil.sensors_battery().power_plugged  # Set AC/battery status on start
         resources.extract(config['temp_dir'])
         startup_checks()
+        
+        active_plan_map = get_active_plan_map()
         # A process in the background will check for AC, autoswitch plan if enabled and detected
-        main_cmds = RunCommands(config,G14dir,app_GUID,dpp_GUID,notify) #Instantiate command line tasks runners in G14RunCommands.py
+        main_cmds = RunCommands(config,G14dir,app_GUID,dpp_GUID,notify,windows_plans,active_plan_map) #Instantiate command line tasks runners in G14RunCommands.py
         power_thread = power_check_thread()
         power_thread.start()
 

G14RunCommands.py

@@ -6,13 +6,20 @@
 
 class RunCommands():
 
-    def __init__(self,config, G14dir, app_GUID, dpp_GUID, notify):
+    def __init__(self,config, G14dir, app_GUID, dpp_GUID, notify, windows_plans, active_plan_map):
         self.config = config
         self.G14dir = G14dir
         self.app_GUID = app_GUID
         self.dpp_GUID = dpp_GUID
         self.notify = notify
+        self.windows_plans = windows_plans
+        self.active_plan_map = active_plan_map
+        self.windows_plan_map = {name:guid for guid,name in iter(windows_plans)}
 
+    def set_windows_and_active_plans(self,winplns,activeplns):
+        self.active_plan_map = activeplns
+        self.windows_plans = winplns
+        
 
         # noinspection PyBroadException
     def parse_boolean(self, parse_string):  # Small utility to convert windows HEX format to a boolean.
@@ -25,7 +32,6 @@ def parse_boolean(self, parse_string):  # Small utility to convert windows HEX f
             return None  # Just in case™
 
 
-
     def get_boost(self):
         current_pwr = os.popen("powercfg /GETACTIVESCHEME")  # I know, it's ugly, but no other way to do that from py.
         pwr_guid = current_pwr.readlines()[0].rsplit(": ")[1].rsplit(" (")[0].lstrip("\n")  # Parse the GUID
@@ -54,10 +60,22 @@ def do_boost(self, state):
         print(SET_AC_VAL)
         print(SET_DC_VAL)
 
+
     def set_boost(self, state, notification=True):
         current_boost_mode = state
-        (dpp_GUID, app_GUID) = (self.app_GUID,self.dpp_GUID)
-        # self.set_power_plan(dpp_GUID)
+        win_plans = self.windows_plans
+        active_plans = self.active_plan_map
+        windows_plan_map = self.windows_plan_map
+        CURRENT_SCHEME = os.popen("powercfg /GETACTIVESCHEME") 
+        pwr_guid = CURRENT_SCHEME.readlines()[0].rsplit(": ")[1].rsplit(" (")[0].lstrip("\n").replace(" ","")  # Parse the GUID
+        switch_to = list({val for key,val in windows_plan_map.items() if val!=pwr_guid})[0]
+        switch_to_guid = win_plans
+        print(switch_to, "switch to guid")
+        print(pwr_guid, "power guid")
+        print(self.active_plan_map)
+        self.set_power_plan(switch_to)
+        time.sleep(.25)
+        self.set_power_plan(pwr_guid)
         if state is True:  # Activate boost
             self.do_boost(state)
             if notification is True:
@@ -78,9 +96,9 @@ def set_boost(self, state, notification=True):
             self.do_boost(state)
             if notification is True:
                 self.notify("Boost set to Aggressive")  # Inform the user
-        # self.set_power_plan(app_GUID)
+        self.set_power_plan(switch_to)
         time.sleep(0.25)
-        # self.set_power_plan(dpp_GUID)
+        self.set_power_plan(pwr_guid)
 
 
     def get_dgpu(self):
@@ -96,6 +114,7 @@ def get_dgpu(self):
         else:
             return True
 
+
     def set_dgpu(self, state, notification=True):
         config = self.config
         G14dir = self.G14dir

data/config.yml

@@ -48,23 +48,23 @@ plans:
     dgpu_enabled: true
     screen_hz: 120
   - name: Performance
-    plan: windows
+    plan: performance
     cpu_curve: "30c:0%,40c:5%,50c:8%,60c:10%,70c:31%,80c:49%,90c:56%,100c:56%"
     gpu_curve: "30c:0%,40c:5%,50c:8%,60c:10%,70c:34%,80c:51%,90c:61%,100c:61%"
     cpu_tdp: 38000
     boost: 4
     dgpu_enabled: true
     screen_hz: 120
   - name: Performance Plus
-    plan: windows
+    plan: performance
     cpu_curve: "30c:0%,40c:5%,50c:15%,60c:24%,70c:31%,80c:49%,90c:56%,100c:56%"
     gpu_curve: "30c:0%,40c:5%,50c:15%,60c:24%,70c:34%,80c:51%,90c:61%,100c:61%"
     cpu_tdp: 40000
     boost: 4
     dgpu_enabled: true
     screen_hz: 120
   - name: Extreme
-    plan: windows
+    plan: turbo
     cpu_curve: "30c:20%,40c:50%,50c:50%,60c:50%,70c:70%,80c:70%,90c:80%,100c:90%"
     gpu_curve: "30c:20%,40c:50%,50c:50%,60c:50%,70c:70%,80c:70%,90c:80%,100c:90%"
     cpu_tdp: 45000