diff --git a/electron/package.json b/electron/package.json index 996fa12..7600bcc 100644 --- a/electron/package.json +++ b/electron/package.json @@ -1,7 +1,7 @@ { "name": "g14controlv2-main", "productName": "G14ControlV2-Main", - "version": "0.1.35", + "version": "0.1.36", "description": "", "main": "./build/electron.js", "scripts": { diff --git a/electron/src/IPCEvents/HID/HIDDevice.ts b/electron/src/IPCEvents/HID/HIDDevice.ts index 1d4e7bb..a0fdcdb 100644 --- a/electron/src/IPCEvents/HID/HIDDevice.ts +++ b/electron/src/IPCEvents/HID/HIDDevice.ts @@ -228,18 +228,25 @@ export const setUpNewG14ControlKey = ( export const killROGKey = async () => { let thing1 = await checkRemoveAndRename(ARMCRATE_INTERFACE, ASUSACCI_PATH); + LOGGER.info('Did thing 1'); let thing2 = await checkRemoveAndRename(ARMCRATE_KEY_CTRL, ASUSACCI_PATH); + LOGGER.info('Did thing 2'); let thing3 = await checkRemoveAndRename( ARMORY_SW_AGENT, ARMORY_SW_AGENT_PATH ); + LOGGER.info('Did thing 3'); let thing4 = await checkRemoveAndRename( ARMCRATE_SESS_HELPER, ARMCRATE_SVC_PATH ); + LOGGER.info('Did thing 4'); let thing5 = await checkRemoveAndRename(ARMCRATE_SVC, ARMCRATE_SVC_PATH); + LOGGER.info('Did thing 5'); let thing6 = await checkRemoveAndRename(ARMSOCK_SERV, ARMSOCK_SERV_PATH); + LOGGER.info('Did thing 6'); let thing7 = await checkRemoveAndRename(ARMCRATE_MANAGER); + LOGGER.info('Did thing 7'); let thing8 = await checkRemoveAndRename(ARMCRATE_MANAGER_AGENT); return true; }; diff --git a/electron/src/config/config.dev.json b/electron/src/config/config.dev.json index f51cfd5..28b7eaf 100644 --- a/electron/src/config/config.dev.json +++ b/electron/src/config/config.dev.json @@ -1,511 +1 @@ -{ - "special": true, - "current": { - "ryzenadj": "Performance", - "fanCurve": { "type": "Custom", "name": "Gaming" }, - "rogKey": { "enabled": true, "func": "minmax", "armouryCrate": false }, - "batteryLimit": 70, - "shortcuts": { - "minmax": { "enabled": false, "accelerator": "Control+Space" } - } - }, - "startup": { - "checkBoostVisibility": true, - "autoLaunchEnabled": true, - "startMinimized": true - }, - "plans": [ - { - "name": "SaverSaver", - "windowsPlan": { - "name": "Power saver", - "guid": "64a64f24-65b9-4b56-befd-5ec1eaced9b3" - }, - "ryzenadj": "Power saver", - "armouryCrate": "Silent", - "boost": 0, - "graphics": 0 - }, - { - "name": "Hot Plan", - "windowsPlan": { - "name": "High performance", - "guid": "6fecc5ae-f350-48a5-b669-b472cb895ccf" - }, - "ryzenadj": "Performance", - "armouryCrate": "Turbo", - "boost": 2, - "graphics": 2 - }, - { - "name": "Medium Saver", - "windowsPlan": { - "name": "Balanced", - "guid": "381b4222-f694-41f0-9685-ff5bb260df2e" - }, - "ryzenadj": "Power saver", - "armouryCrate": "Performance", - "boost": 0, - "graphics": 0 - } - ], - "ryzenadj": { - "defaults": { - "fastLimit": 65, - "slowLimit": 54, - "stapmLimit": 35, - "stapmTime": 275, - "slowTime": 5, - "tctlTemp": 97 - }, - "options": [ - { - "name": "Default", - "fastLimit": 65, - "slowLimit": 54, - "stapmLimit": 35, - "stapmTime": 200, - "slowTime": 5, - "tctlTemp": 97 - }, - { - "name": "Performance", - "fastLimit": 68, - "slowLimit": 58, - "stapmLimit": 40, - "stapmTime": 300, - "slowTime": 10, - "tctlTemp": 100 - }, - { - "name": "Power saver", - "fastLimit": 40, - "slowLimit": 35, - "stapmLimit": 25, - "stapmTime": 275, - "slowTime": 2, - "tctlTemp": 85 - } - ] - }, - "fanCurves": [ - { - "name": "Performance", - "plan": "performance", - "cpu": [21, 25, 28, 30, 31, 57, 58, 61], - "gpu": [20, 23, 28, 34, 51, 61, 61, 69] - }, - { - "name": "Gaming", - "plan": "turbo", - "cpu": [24, 27, 31, 38, 51, 61, 62, 63], - "gpu": [20, 23, 35, 39, 51, 63, 65, 69] - }, - { - "name": "Slow Fan", - "plan": "silent", - "cpu": [0, 0, 0, 0, 17, 23, 35, 40, 56], - "gpu": [0, 0, 0, 0, 17, 23, 35, 44, 60] - }, - { - "name": "Medium Fan Performance", - "cpu": [28, 30, 32, 36, 42, 49, 60, 62], - "gpu": [21, 23, 24, 28, 34, 51, 61, 61], - "plan": "performance" - }, - { - "name": "Performance Programming", - "cpu": [33, 38, 43, 46, 51, 61, 62, 63], - "gpu": [28, 32, 35, 39, 51, 63, 65, 69], - "plan": "performance" - }, - { - "name": "Benchmarking", - "cpu": [44, 46, 49, 54, 61, 64, 76, 79], - "gpu": [20, 23, 35, 39, 51, 63, 65, 69], - "plan": "turbo" - }, - { - "name": "Super Benchmarking", - "cpu": [45, 51, 63, 69, 76, 80, 85, 86], - "gpu": [20, 23, 35, 39, 51, 63, 65, 69], - "plan": "turbo" - }, - { - "name": "Faster - Performance", - "cpu": [33, 41, 43, 46, 51, 61, 62, 63], - "gpu": [35, 38, 44, 47, 51, 63, 65, 69], - "plan": "performance" - }, - { - "name": "Performance", - "cpu": [21, 25, 28, 30, 46, 57, 58, 61], - "plan": "performance", - "gpu": [20, 23, 28, 34, 51, 61, 61, 69] - } - ], - "displayOptions": [ - { - "resolution": { "width": 640, "height": 480 }, - "bits": 32, - "refresh": 60, - "format": "default" - }, - { - "resolution": { "width": 640, "height": 480 }, - "bits": 32, - "refresh": 60, - "format": "stretched" - }, - { - "resolution": { "width": 640, "height": 480 }, - "bits": 32, - "refresh": 60, - "format": "centered" - }, - { - "resolution": { "width": 640, "height": 480 }, - "bits": 32, - "refresh": 120, - "format": "default" - }, - { - "resolution": { "width": 640, "height": 480 }, - "bits": 32, - "refresh": 120, - "format": "stretched" - }, - { - "resolution": { "width": 640, "height": 480 }, - "bits": 32, - "refresh": 120, - "format": "centered" - }, - { - "resolution": { "width": 800, "height": 600 }, - "bits": 32, - "refresh": 60, - "format": "default" - }, - { - "resolution": { "width": 800, "height": 600 }, - "bits": 32, - "refresh": 60, - "format": "stretched" - }, - { - "resolution": { "width": 800, "height": 600 }, - "bits": 32, - "refresh": 60, - "format": "centered" - }, - { - "resolution": { "width": 800, "height": 600 }, - "bits": 32, - "refresh": 120, - "format": "default" - }, - { - "resolution": { "width": 800, "height": 600 }, - "bits": 32, - "refresh": 120, - "format": "stretched" - }, - { - "resolution": { "width": 800, "height": 600 }, - "bits": 32, - "refresh": 120, - "format": "centered" - }, - { - "resolution": { "width": 1024, "height": 768 }, - "bits": 32, - "refresh": 60, - "format": "default" - }, - { - "resolution": { "width": 1024, "height": 768 }, - "bits": 32, - "refresh": 60, - "format": "stretched" - }, - { - "resolution": { "width": 1024, "height": 768 }, - "bits": 32, - "refresh": 60, - "format": "centered" - }, - { - "resolution": { "width": 1024, "height": 768 }, - "bits": 32, - "refresh": 120, - "format": "default" - }, - { - "resolution": { "width": 1024, "height": 768 }, - "bits": 32, - "refresh": 120, - "format": "stretched" - }, - { - "resolution": { "width": 1024, "height": 768 }, - "bits": 32, - "refresh": 120, - "format": "centered" - }, - { - "resolution": { "width": 1280, "height": 720 }, - "bits": 32, - "refresh": 60, - "format": "default" - }, - { - "resolution": { "width": 1280, "height": 720 }, - "bits": 32, - "refresh": 60, - "format": "stretched" - }, - { - "resolution": { "width": 1280, "height": 720 }, - "bits": 32, - "refresh": 60, - "format": "centered" - }, - { - "resolution": { "width": 1280, "height": 720 }, - "bits": 32, - "refresh": 120, - "format": "default" - }, - { - "resolution": { "width": 1280, "height": 720 }, - "bits": 32, - "refresh": 120, - "format": "stretched" - }, - { - "resolution": { "width": 1280, "height": 720 }, - "bits": 32, - "refresh": 120, - "format": "centered" - }, - { - "resolution": { "width": 1280, "height": 1024 }, - "bits": 32, - "refresh": 60, - "format": "default" - }, - { - "resolution": { "width": 1280, "height": 1024 }, - "bits": 32, - "refresh": 60, - "format": "stretched" - }, - { - "resolution": { "width": 1280, "height": 1024 }, - "bits": 32, - "refresh": 60, - "format": "centered" - }, - { - "resolution": { "width": 1280, "height": 1024 }, - "bits": 32, - "refresh": 120, - "format": "default" - }, - { - "resolution": { "width": 1280, "height": 1024 }, - "bits": 32, - "refresh": 120, - "format": "stretched" - }, - { - "resolution": { "width": 1280, "height": 1024 }, - "bits": 32, - "refresh": 120, - "format": "centered" - }, - { - "resolution": { "width": 1360, "height": 768 }, - "bits": 32, - "refresh": 60, - "format": "default" - }, - { - "resolution": { "width": 1360, "height": 768 }, - "bits": 32, - "refresh": 60, - "format": "stretched" - }, - { - "resolution": { "width": 1360, "height": 768 }, - "bits": 32, - "refresh": 60, - "format": "centered" - }, - { - "resolution": { "width": 1360, "height": 768 }, - "bits": 32, - "refresh": 120, - "format": "default" - }, - { - "resolution": { "width": 1360, "height": 768 }, - "bits": 32, - "refresh": 120, - "format": "stretched" - }, - { - "resolution": { "width": 1360, "height": 768 }, - "bits": 32, - "refresh": 120, - "format": "centered" - }, - { - "resolution": { "width": 1366, "height": 768 }, - "bits": 32, - "refresh": 60, - "format": "default" - }, - { - "resolution": { "width": 1366, "height": 768 }, - "bits": 32, - "refresh": 60, - "format": "stretched" - }, - { - "resolution": { "width": 1366, "height": 768 }, - "bits": 32, - "refresh": 60, - "format": "centered" - }, - { - "resolution": { "width": 1366, "height": 768 }, - "bits": 32, - "refresh": 120, - "format": "default" - }, - { - "resolution": { "width": 1366, "height": 768 }, - "bits": 32, - "refresh": 120, - "format": "stretched" - }, - { - "resolution": { "width": 1366, "height": 768 }, - "bits": 32, - "refresh": 120, - "format": "centered" - }, - { - "resolution": { "width": 1600, "height": 900 }, - "bits": 32, - "refresh": 60, - "format": "default" - }, - { - "resolution": { "width": 1600, "height": 900 }, - "bits": 32, - "refresh": 60, - "format": "stretched" - }, - { - "resolution": { "width": 1600, "height": 900 }, - "bits": 32, - "refresh": 60, - "format": "centered" - }, - { - "resolution": { "width": 1600, "height": 900 }, - "bits": 32, - "refresh": 120, - "format": "default" - }, - { - "resolution": { "width": 1600, "height": 900 }, - "bits": 32, - "refresh": 120, - "format": "stretched" - }, - { - "resolution": { "width": 1600, "height": 900 }, - "bits": 32, - "refresh": 120, - "format": "centered" - }, - { - "resolution": { "width": 1680, "height": 1050 }, - "bits": 32, - "refresh": 60, - "format": "default" - }, - { - "resolution": { "width": 1680, "height": 1050 }, - "bits": 32, - "refresh": 60, - "format": "stretched" - }, - { - "resolution": { "width": 1680, "height": 1050 }, - "bits": 32, - "refresh": 60, - "format": "centered" - }, - { - "resolution": { "width": 1680, "height": 1050 }, - "bits": 32, - "refresh": 120, - "format": "default" - }, - { - "resolution": { "width": 1680, "height": 1050 }, - "bits": 32, - "refresh": 120, - "format": "stretched" - }, - { - "resolution": { "width": 1680, "height": 1050 }, - "bits": 32, - "refresh": 120, - "format": "centered" - }, - { - "resolution": { "width": 1920, "height": 1080 }, - "bits": 32, - "refresh": 60, - "format": "default" - }, - { - "resolution": { "width": 1920, "height": 1080 }, - "bits": 32, - "refresh": 120, - "format": "default" - } - ], - "armouryPlan": "turbo", - "autoSwitch": { - "enabled": true, - "acPlan": { - "name": "Hot Plan", - "windowsPlan": { - "name": "High performance", - "guid": "6fecc5ae-f350-48a5-b669-b472cb895ccf" - }, - "ryzenadj": "Performance", - "armouryCrate": "Turbo", - "boost": 2, - "graphics": 2 - }, - "dcPlan": { - "name": "SaverSaver", - "windowsPlan": { - "name": "Power saver", - "guid": "64a64f24-65b9-4b56-befd-5ec1eaced9b3" - }, - "ryzenadj": "Power saver", - "armouryCrate": "Silent", - "boost": 0, - "graphics": 0 - } - } -} +{"special":true,"current":{"ryzenadj":"Performance","fanCurve":{"type":"Custom","name":"Slow Fan"},"rogKey":{"enabled":true,"func":"minmax","armouryCrate":true},"batteryLimit":70,"shortcuts":{"minmax":{"enabled":false,"accelerator":"Control+Space"}},"minToTray":true},"startup":{"checkBoostVisibility":true,"autoLaunchEnabled":true,"startMinimized":true},"plans":[{"name":"SaverSaver","windowsPlan":{"name":"Power saver","guid":"64a64f24-65b9-4b56-befd-5ec1eaced9b3"},"ryzenadj":"Power saver","armouryCrate":"Silent","boost":0,"graphics":0},{"name":"Hot Plan","windowsPlan":{"name":"High performance","guid":"6fecc5ae-f350-48a5-b669-b472cb895ccf"},"ryzenadj":"Performance","armouryCrate":"Turbo","boost":2,"graphics":2},{"name":"Medium Saver","windowsPlan":{"name":"Balanced","guid":"381b4222-f694-41f0-9685-ff5bb260df2e"},"ryzenadj":"Power saver","armouryCrate":"Performance","boost":0,"graphics":0}],"ryzenadj":{"defaults":{"fastLimit":65,"slowLimit":54,"stapmLimit":35,"stapmTime":275,"slowTime":5,"tctlTemp":97},"options":[{"name":"Default","fastLimit":65,"slowLimit":54,"stapmLimit":35,"stapmTime":200,"slowTime":5,"tctlTemp":97},{"name":"Performance","fastLimit":68,"slowLimit":58,"stapmLimit":40,"stapmTime":300,"slowTime":10,"tctlTemp":100},{"name":"Power saver","fastLimit":40,"slowLimit":35,"stapmLimit":25,"stapmTime":275,"slowTime":2,"tctlTemp":85}]},"fanCurves":[{"name":"Performance","plan":"performance","cpu":[21,25,28,30,31,57,58,61],"gpu":[20,23,28,34,51,61,61,69]},{"name":"Gaming","plan":"turbo","cpu":[24,27,31,38,51,61,62,63],"gpu":[20,23,35,39,51,63,65,69]},{"name":"Slow Fan","plan":"silent","cpu":[0,0,0,0,17,23,35,40,56],"gpu":[0,0,0,0,17,23,35,44,60]},{"name":"Medium Fan Performance","cpu":[28,30,32,36,42,49,60,62],"gpu":[21,23,24,28,34,51,61,61],"plan":"performance"},{"name":"Performance Programming","cpu":[33,38,43,46,51,61,62,63],"gpu":[28,32,35,39,51,63,65,69],"plan":"performance"},{"name":"Benchmarking","cpu":[44,46,49,54,61,64,76,79],"gpu":[20,23,35,39,51,63,65,69],"plan":"turbo"},{"name":"Super Benchmarking","cpu":[45,51,63,69,76,80,85,86],"gpu":[20,23,35,39,51,63,65,69],"plan":"turbo"},{"name":"Faster - Performance","cpu":[33,41,43,46,51,61,62,63],"gpu":[35,38,44,47,51,63,65,69],"plan":"performance"},{"name":"Performance","cpu":[21,25,28,30,46,57,58,61],"plan":"performance","gpu":[20,23,28,34,51,61,61,69]},{"name":"Testy Plan","cpu":[16,21,26,32,36,44,49,60],"plan":"turbo","gpu":[20,23,35,39,51,63,65,69]},{"name":"Test 2","cpu":[28,30,36,38,42,49,55,58,56],"plan":"silent","gpu":[21,25,32,34,35,37,43,44,60]}],"displayOptions":[{"resolution":{"width":640,"height":480},"bits":32,"refresh":60,"format":"default"},{"resolution":{"width":640,"height":480},"bits":32,"refresh":60,"format":"stretched"},{"resolution":{"width":640,"height":480},"bits":32,"refresh":60,"format":"centered"},{"resolution":{"width":640,"height":480},"bits":32,"refresh":120,"format":"default"},{"resolution":{"width":640,"height":480},"bits":32,"refresh":120,"format":"stretched"},{"resolution":{"width":640,"height":480},"bits":32,"refresh":120,"format":"centered"},{"resolution":{"width":800,"height":600},"bits":32,"refresh":60,"format":"default"},{"resolution":{"width":800,"height":600},"bits":32,"refresh":60,"format":"stretched"},{"resolution":{"width":800,"height":600},"bits":32,"refresh":60,"format":"centered"},{"resolution":{"width":800,"height":600},"bits":32,"refresh":120,"format":"default"},{"resolution":{"width":800,"height":600},"bits":32,"refresh":120,"format":"stretched"},{"resolution":{"width":800,"height":600},"bits":32,"refresh":120,"format":"centered"},{"resolution":{"width":1024,"height":768},"bits":32,"refresh":60,"format":"default"},{"resolution":{"width":1024,"height":768},"bits":32,"refresh":60,"format":"stretched"},{"resolution":{"width":1024,"height":768},"bits":32,"refresh":60,"format":"centered"},{"resolution":{"width":1024,"height":768},"bits":32,"refresh":120,"format":"default"},{"resolution":{"width":1024,"height":768},"bits":32,"refresh":120,"format":"stretched"},{"resolution":{"width":1024,"height":768},"bits":32,"refresh":120,"format":"centered"},{"resolution":{"width":1280,"height":720},"bits":32,"refresh":60,"format":"default"},{"resolution":{"width":1280,"height":720},"bits":32,"refresh":60,"format":"stretched"},{"resolution":{"width":1280,"height":720},"bits":32,"refresh":60,"format":"centered"},{"resolution":{"width":1280,"height":720},"bits":32,"refresh":120,"format":"default"},{"resolution":{"width":1280,"height":720},"bits":32,"refresh":120,"format":"stretched"},{"resolution":{"width":1280,"height":720},"bits":32,"refresh":120,"format":"centered"},{"resolution":{"width":1280,"height":1024},"bits":32,"refresh":60,"format":"default"},{"resolution":{"width":1280,"height":1024},"bits":32,"refresh":60,"format":"stretched"},{"resolution":{"width":1280,"height":1024},"bits":32,"refresh":60,"format":"centered"},{"resolution":{"width":1280,"height":1024},"bits":32,"refresh":120,"format":"default"},{"resolution":{"width":1280,"height":1024},"bits":32,"refresh":120,"format":"stretched"},{"resolution":{"width":1280,"height":1024},"bits":32,"refresh":120,"format":"centered"},{"resolution":{"width":1360,"height":768},"bits":32,"refresh":60,"format":"default"},{"resolution":{"width":1360,"height":768},"bits":32,"refresh":60,"format":"stretched"},{"resolution":{"width":1360,"height":768},"bits":32,"refresh":60,"format":"centered"},{"resolution":{"width":1360,"height":768},"bits":32,"refresh":120,"format":"default"},{"resolution":{"width":1360,"height":768},"bits":32,"refresh":120,"format":"stretched"},{"resolution":{"width":1360,"height":768},"bits":32,"refresh":120,"format":"centered"},{"resolution":{"width":1366,"height":768},"bits":32,"refresh":60,"format":"default"},{"resolution":{"width":1366,"height":768},"bits":32,"refresh":60,"format":"stretched"},{"resolution":{"width":1366,"height":768},"bits":32,"refresh":60,"format":"centered"},{"resolution":{"width":1366,"height":768},"bits":32,"refresh":120,"format":"default"},{"resolution":{"width":1366,"height":768},"bits":32,"refresh":120,"format":"stretched"},{"resolution":{"width":1366,"height":768},"bits":32,"refresh":120,"format":"centered"},{"resolution":{"width":1600,"height":900},"bits":32,"refresh":60,"format":"default"},{"resolution":{"width":1600,"height":900},"bits":32,"refresh":60,"format":"stretched"},{"resolution":{"width":1600,"height":900},"bits":32,"refresh":60,"format":"centered"},{"resolution":{"width":1600,"height":900},"bits":32,"refresh":120,"format":"default"},{"resolution":{"width":1600,"height":900},"bits":32,"refresh":120,"format":"stretched"},{"resolution":{"width":1600,"height":900},"bits":32,"refresh":120,"format":"centered"},{"resolution":{"width":1680,"height":1050},"bits":32,"refresh":60,"format":"default"},{"resolution":{"width":1680,"height":1050},"bits":32,"refresh":60,"format":"stretched"},{"resolution":{"width":1680,"height":1050},"bits":32,"refresh":60,"format":"centered"},{"resolution":{"width":1680,"height":1050},"bits":32,"refresh":120,"format":"default"},{"resolution":{"width":1680,"height":1050},"bits":32,"refresh":120,"format":"stretched"},{"resolution":{"width":1680,"height":1050},"bits":32,"refresh":120,"format":"centered"},{"resolution":{"width":1920,"height":1080},"bits":32,"refresh":60,"format":"default"},{"resolution":{"width":1920,"height":1080},"bits":32,"refresh":120,"format":"default"}],"armouryPlan":"turbo","autoSwitch":{"enabled":true,"acPlan":{"name":"Hot Plan","windowsPlan":{"name":"High performance","guid":"6fecc5ae-f350-48a5-b669-b472cb895ccf"},"ryzenadj":"Performance","armouryCrate":"Turbo","boost":2,"graphics":2},"dcPlan":{"name":"SaverSaver","windowsPlan":{"name":"Power saver","guid":"64a64f24-65b9-4b56-befd-5ec1eaced9b3"},"ryzenadj":"Power saver","armouryCrate":"Silent","boost":0,"graphics":0}}} \ No newline at end of file diff --git a/package.json b/package.json index 00f38a9..61da209 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "g14controlv2", "productName": "G14ControlV2", - "version": "v0.1.35", + "version": "v0.1.36", "description": "Management Tools for the Zephyrus G14", "author": { "name": "Alex Redden",