From 3b34bad28a5a9100199cd113e617a71c3eabae0f Mon Sep 17 00:00:00 2001 From: "NGnius (Graham)" Date: Sat, 7 Jan 2023 18:45:12 -0500 Subject: [PATCH] Refactor UI so not *everything* updates when one thing changes... I hate React --- src/components/debug.tsx | 83 +++++++++++ src/components/gpu.tsx | 195 ++++++++++++++++++++++++++ src/consts.ts | 29 ++++ src/index.tsx | 287 ++++++--------------------------------- 4 files changed, 345 insertions(+), 249 deletions(-) create mode 100644 src/components/debug.tsx create mode 100644 src/components/gpu.tsx create mode 100644 src/consts.ts diff --git a/src/components/debug.tsx b/src/components/debug.tsx new file mode 100644 index 0000000..05b254c --- /dev/null +++ b/src/components/debug.tsx @@ -0,0 +1,83 @@ +import { Fragment } from "react"; +import {Component} from "react"; +import { + ButtonItem, + Field, + PanelSectionRow, + staticClasses, + Router, +} from "decky-frontend-lib"; +import * as backend from "../backend"; +import { + BACKEND_INFO, + DRIVER_INFO, +} from "../consts"; +import { get_value, target_usdpl, version_usdpl} from "usdpl-front"; + +let eggCount = 0; + +export class Debug extends Component<{}> { + render() { + return buildDebug(); + } +} + +function buildDebug() { + return ({/* Version Info */} +
+ {eggCount % 10 == 9 ? "Ha! Nerd" : "Debug"} +
+ + { + if (eggCount % 10 == 9) { + // you know you're bored and/or conceited when you spend time adding an easter egg + // that just sends people to your own project's repo + Router.NavigateToExternalWeb("https://github.com/NGnius/PowerTools"); + } + eggCount++; + }}> + {eggCount % 10 == 9 ? "by NGnius" : get_value(BACKEND_INFO)} + + + + eggCount++}> + {eggCount % 10 == 9 ? "<3 <3 <3" : target_usdpl()} + + + + eggCount++}> + {eggCount % 10 == 9 ? "Tracy Chapman" : get_value(DRIVER_INFO)} + + + + { + if (eggCount % 10 == 9) { + // you know you're bored and/or conceited when you spend time adding an easter egg + // that just sends people to your own project's repo + Router.NavigateToExternalWeb("https://github.com/NGnius/usdpl-rs"); + } + eggCount++; + }}> + v{version_usdpl()} + + + {eggCount % 10 == 9 && + { + backend.idk(); + }} + > + ??? + + } + ); +} diff --git a/src/components/gpu.tsx b/src/components/gpu.tsx new file mode 100644 index 0000000..0dd41d3 --- /dev/null +++ b/src/components/gpu.tsx @@ -0,0 +1,195 @@ +import { Fragment } from "react"; +import {Component} from "react"; +import { + ToggleField, + SliderField, + PanelSectionRow, + staticClasses, +} from "decky-frontend-lib"; +import * as backend from "../backend"; +import { + LIMITS_INFO, + SLOW_PPT_GPU, + FAST_PPT_GPU, + CLOCK_MIN_GPU, + CLOCK_MAX_GPU, + SLOW_MEMORY_GPU, +} from "../consts"; +import { set_value, get_value} from "usdpl-front"; + +export class Gpu extends Component<{}> { + constructor(props: {}) { + super(props); + this.state = { + reloadThingy: "/shrug", + }; + } + + render() { + const reloadGUI = (x: string) => this.setState({reloadThingy: x}); + return ( + {/* GPU */} +
+ GPU +
+ { ((get_value(LIMITS_INFO) as backend.SettingsLimits).gpu.fast_ppt_limits != null ||(get_value(LIMITS_INFO) as backend.SettingsLimits).gpu.slow_ppt_limits != null) && + { + if (value) { + if ((get_value(LIMITS_INFO) as backend.SettingsLimits).gpu.slow_ppt_limits != null) { + set_value(SLOW_PPT_GPU, (get_value(LIMITS_INFO) as backend.SettingsLimits).gpu.slow_ppt_limits!.max); + } + + if ((get_value(LIMITS_INFO) as backend.SettingsLimits).gpu.fast_ppt_limits != null) { + set_value(FAST_PPT_GPU, (get_value(LIMITS_INFO) as backend.SettingsLimits).gpu.fast_ppt_limits!.max); + } + reloadGUI("GPUPPTToggle"); + } else { + set_value(SLOW_PPT_GPU, null); + set_value(FAST_PPT_GPU, null); + backend.resolve(backend.unsetGpuPpt(), (_: any[]) => { + reloadGUI("GPUUnsetPPT"); + }); + } + }} + /> + } + + { get_value(SLOW_PPT_GPU) != null && { + backend.log(backend.LogLevel.Debug, "SlowPPT is now " + ppt.toString()); + const pptNow = get_value(SLOW_PPT_GPU); + const realPpt = ppt; + if (realPpt != pptNow) { + backend.resolve(backend.setGpuPpt(get_value(FAST_PPT_GPU), realPpt), + (limits: number[]) => { + set_value(FAST_PPT_GPU, limits[0]); + set_value(SLOW_PPT_GPU, limits[1]); + reloadGUI("GPUSlowPPT"); + }); + } + }} + />} + + + {get_value(FAST_PPT_GPU) != null && { + backend.log(backend.LogLevel.Debug, "FastPPT is now " + ppt.toString()); + const pptNow = get_value(FAST_PPT_GPU); + const realPpt = ppt; + if (realPpt != pptNow) { + backend.resolve(backend.setGpuPpt(realPpt, get_value(SLOW_PPT_GPU)), + (limits: number[]) => { + set_value(FAST_PPT_GPU, limits[0]); + set_value(SLOW_PPT_GPU, limits[1]); + reloadGUI("GPUFastPPT"); + }); + } + }} + />} + + {((get_value(LIMITS_INFO) as backend.SettingsLimits).gpu.clock_min_limits != null || (get_value(LIMITS_INFO) as backend.SettingsLimits).gpu.clock_max_limits != null) && + { + if (value) { + let clock_min_limits = (get_value(LIMITS_INFO) as backend.SettingsLimits).gpu.clock_min_limits; + let clock_max_limits = (get_value(LIMITS_INFO) as backend.SettingsLimits).gpu.clock_max_limits; + if (clock_min_limits != null) { + set_value(CLOCK_MIN_GPU, clock_min_limits.min); + } + if (clock_max_limits != null) { + set_value(CLOCK_MAX_GPU, clock_max_limits.max); + } + reloadGUI("GPUFreqToggle"); + } else { + set_value(CLOCK_MIN_GPU, null); + set_value(CLOCK_MAX_GPU, null); + backend.resolve(backend.unsetGpuClockLimits(), (_: any[]) => { + reloadGUI("GPUUnsetFreq"); + }); + } + }} + /> + } + + { get_value(CLOCK_MIN_GPU) != null && { + backend.log(backend.LogLevel.Debug, "GPU Clock Min is now " + val.toString()); + const valNow = get_value(CLOCK_MIN_GPU); + if (val != valNow) { + backend.resolve(backend.setGpuClockLimits(val, get_value(CLOCK_MAX_GPU)), + (limits: number[]) => { + set_value(CLOCK_MIN_GPU, limits[0]); + set_value(CLOCK_MAX_GPU, limits[1]); + reloadGUI("GPUMinClock"); + }); + } + }} + />} + + + {get_value(CLOCK_MAX_GPU) != null && { + backend.log(backend.LogLevel.Debug, "GPU Clock Max is now " + val.toString()); + const valNow = get_value(CLOCK_MAX_GPU); + if (val != valNow) { + backend.resolve(backend.setGpuClockLimits(get_value(CLOCK_MIN_GPU), val), + (limits: number[]) => { + set_value(CLOCK_MIN_GPU, limits[0]); + set_value(CLOCK_MAX_GPU, limits[1]); + reloadGUI("GPUMaxClock"); + }); + } + }} + />} + + {(get_value(LIMITS_INFO) as backend.SettingsLimits).gpu.memory_control_capable && + { + backend.resolve(backend.setGpuSlowMemory(value), (val: boolean) => { + set_value(SLOW_MEMORY_GPU, val); + reloadGUI("GPUSlowMemory"); + }) + }} + /> + } + ); + } +} diff --git a/src/consts.ts b/src/consts.ts new file mode 100644 index 0000000..0efe070 --- /dev/null +++ b/src/consts.ts @@ -0,0 +1,29 @@ +export const BACKEND_INFO = "VINFO"; +export const DRIVER_INFO = "GENERAL_provider"; + +export const LIMITS_INFO = "LIMITS_all"; + +export const CURRENT_BATT = "BATTERY_current_now"; +export const CHARGE_RATE_BATT = "BATTERY_charge_rate"; +export const CHARGE_MODE_BATT = "BATTERY_charge_mode"; +export const CHARGE_NOW_BATT = "BATTERY_charge_now"; +export const CHARGE_FULL_BATT = "BATTERY_charge_full"; +export const CHARGE_DESIGN_BATT = "BATTERY_charge_design"; + +//export const TOTAL_CPUS = "CPUs_total"; +export const ONLINE_CPUS = "CPUs_online"; +export const ONLINE_STATUS_CPUS = "CPUs_status_online"; +export const SMT_CPU = "CPUs_SMT"; +export const CLOCK_MIN_CPU = "CPUs_min_clock"; +export const CLOCK_MAX_CPU = "CPUs_max_clock"; +export const CLOCK_MIN_MAX_CPU = "CPUs_minmax_clocks"; +export const GOVERNOR_CPU = "CPUs_governor"; + +export const FAST_PPT_GPU = "GPU_fastPPT"; +export const SLOW_PPT_GPU = "GPU_slowPPT"; +export const CLOCK_MIN_GPU = "GPU_min_clock"; +export const CLOCK_MAX_GPU = "GPU_max_clock"; +export const SLOW_MEMORY_GPU = "GPU_slow_memory"; + +export const PERSISTENT_GEN = "GENERAL_persistent"; +export const NAME_GEN = "GENERAL_name"; diff --git a/src/index.tsx b/src/index.tsx index 4de4a06..f24413b 100755 --- a/src/index.tsx +++ b/src/index.tsx @@ -6,7 +6,6 @@ import { //MenuItem, PanelSection, PanelSectionRow, - Router, ServerAPI, //showContextMenu, staticClasses, @@ -25,7 +24,39 @@ import { GiDrill } from "react-icons/gi"; //import * as python from "./python"; import * as backend from "./backend"; -import {set_value, get_value, target_usdpl, version_usdpl} from "usdpl-front"; +import { + BACKEND_INFO, + DRIVER_INFO, + + LIMITS_INFO, + + CURRENT_BATT, + CHARGE_RATE_BATT, + CHARGE_MODE_BATT, + CHARGE_NOW_BATT, + CHARGE_FULL_BATT, + CHARGE_DESIGN_BATT, + + ONLINE_CPUS, + ONLINE_STATUS_CPUS, + SMT_CPU, + CLOCK_MIN_CPU, + CLOCK_MAX_CPU, + CLOCK_MIN_MAX_CPU, + GOVERNOR_CPU, + + FAST_PPT_GPU, + SLOW_PPT_GPU, + CLOCK_MIN_GPU, + CLOCK_MAX_GPU, + SLOW_MEMORY_GPU, + + PERSISTENT_GEN, + NAME_GEN, +} from "./consts"; +import {set_value, get_value} from "usdpl-front"; +import {Debug} from "./components/debug"; +import {Gpu} from "./components/gpu"; var periodicHook: NodeJS.Timer | null = null; var lifetimeHook: any = null; @@ -45,36 +76,6 @@ type MinMax = { // usdpl persistent store keys -const BACKEND_INFO = "VINFO"; -const DRIVER_INFO = "GENERAL_provider"; - -const LIMITS_INFO = "LIMITS_all"; - -const CURRENT_BATT = "BATTERY_current_now"; -const CHARGE_RATE_BATT = "BATTERY_charge_rate"; -const CHARGE_MODE_BATT = "BATTERY_charge_mode"; -const CHARGE_NOW_BATT = "BATTERY_charge_now"; -const CHARGE_FULL_BATT = "BATTERY_charge_full"; -const CHARGE_DESIGN_BATT = "BATTERY_charge_design" - -//const TOTAL_CPUS = "CPUs_total"; -const ONLINE_CPUS = "CPUs_online"; -const ONLINE_STATUS_CPUS = "CPUs_status_online"; -const SMT_CPU = "CPUs_SMT"; -const CLOCK_MIN_CPU = "CPUs_min_clock"; -const CLOCK_MAX_CPU = "CPUs_max_clock"; -const CLOCK_MIN_MAX_CPU = "CPUs_minmax_clocks"; -const GOVERNOR_CPU = "CPUs_governor"; - -const FAST_PPT_GPU = "GPU_fastPPT"; -const SLOW_PPT_GPU = "GPU_slowPPT"; -const CLOCK_MIN_GPU = "GPU_min_clock"; -const CLOCK_MAX_GPU = "GPU_max_clock"; -const SLOW_MEMORY_GPU = "GPU_slow_memory"; - -const PERSISTENT_GEN = "GENERAL_persistent"; -const NAME_GEN = "GENERAL_name"; - function countCpus(statii: boolean[]): number { let count = 0; for (let i = 0; i < statii.length; i++) { @@ -520,168 +521,9 @@ const Content: VFC<{ serverAPI: ServerAPI }> = ({}) => { /> } - {/* GPU */} -
- GPU -
- { ((get_value(LIMITS_INFO) as backend.SettingsLimits).gpu.fast_ppt_limits != null ||(get_value(LIMITS_INFO) as backend.SettingsLimits).gpu.slow_ppt_limits != null) && - { - if (value) { - if ((get_value(LIMITS_INFO) as backend.SettingsLimits).gpu.slow_ppt_limits != null) { - set_value(SLOW_PPT_GPU, (get_value(LIMITS_INFO) as backend.SettingsLimits).gpu.slow_ppt_limits!.max); - } - if ((get_value(LIMITS_INFO) as backend.SettingsLimits).gpu.fast_ppt_limits != null) { - set_value(FAST_PPT_GPU, (get_value(LIMITS_INFO) as backend.SettingsLimits).gpu.fast_ppt_limits!.max); - } - reloadGUI("GPUPPTToggle"); - } else { - set_value(SLOW_PPT_GPU, null); - set_value(FAST_PPT_GPU, null); - backend.resolve(backend.unsetGpuPpt(), (_: any[]) => { - reloadGUI("GPUUnsetPPT"); - }); - } - }} - /> - } - - { get_value(SLOW_PPT_GPU) != null && { - backend.log(backend.LogLevel.Debug, "SlowPPT is now " + ppt.toString()); - const pptNow = get_value(SLOW_PPT_GPU); - const realPpt = ppt; - if (realPpt != pptNow) { - backend.resolve(backend.setGpuPpt(get_value(FAST_PPT_GPU), realPpt), - (limits: number[]) => { - set_value(FAST_PPT_GPU, limits[0]); - set_value(SLOW_PPT_GPU, limits[1]); - reloadGUI("GPUSlowPPT"); - }); - } - }} - />} - - - {get_value(FAST_PPT_GPU) != null && { - backend.log(backend.LogLevel.Debug, "FastPPT is now " + ppt.toString()); - const pptNow = get_value(FAST_PPT_GPU); - const realPpt = ppt; - if (realPpt != pptNow) { - backend.resolve(backend.setGpuPpt(realPpt, get_value(SLOW_PPT_GPU)), - (limits: number[]) => { - set_value(FAST_PPT_GPU, limits[0]); - set_value(SLOW_PPT_GPU, limits[1]); - reloadGUI("GPUFastPPT"); - }); - } - }} - />} - - {((get_value(LIMITS_INFO) as backend.SettingsLimits).gpu.clock_min_limits != null || (get_value(LIMITS_INFO) as backend.SettingsLimits).gpu.clock_max_limits != null) && - { - if (value) { - let clock_min_limits = (get_value(LIMITS_INFO) as backend.SettingsLimits).gpu.clock_min_limits; - let clock_max_limits = (get_value(LIMITS_INFO) as backend.SettingsLimits).gpu.clock_max_limits; - if (clock_min_limits != null) { - set_value(CLOCK_MIN_GPU, clock_min_limits.min); - } - if (clock_max_limits != null) { - set_value(CLOCK_MAX_GPU, clock_max_limits.max); - } - reloadGUI("GPUFreqToggle"); - } else { - set_value(CLOCK_MIN_GPU, null); - set_value(CLOCK_MAX_GPU, null); - backend.resolve(backend.unsetGpuClockLimits(), (_: any[]) => { - reloadGUI("GPUUnsetFreq"); - }); - } - }} - /> - } - - { get_value(CLOCK_MIN_GPU) != null && { - backend.log(backend.LogLevel.Debug, "GPU Clock Min is now " + val.toString()); - const valNow = get_value(CLOCK_MIN_GPU); - if (val != valNow) { - backend.resolve(backend.setGpuClockLimits(val, get_value(CLOCK_MAX_GPU)), - (limits: number[]) => { - set_value(CLOCK_MIN_GPU, limits[0]); - set_value(CLOCK_MAX_GPU, limits[1]); - reloadGUI("GPUMinClock"); - }); - } - }} - />} - - - {get_value(CLOCK_MAX_GPU) != null && { - backend.log(backend.LogLevel.Debug, "GPU Clock Max is now " + val.toString()); - const valNow = get_value(CLOCK_MAX_GPU); - if (val != valNow) { - backend.resolve(backend.setGpuClockLimits(get_value(CLOCK_MIN_GPU), val), - (limits: number[]) => { - set_value(CLOCK_MIN_GPU, limits[0]); - set_value(CLOCK_MAX_GPU, limits[1]); - reloadGUI("GPUMaxClock"); - }); - } - }} - />} - - {(get_value(LIMITS_INFO) as backend.SettingsLimits).gpu.memory_control_capable && - { - backend.resolve(backend.setGpuSlowMemory(value), (val: boolean) => { - set_value(SLOW_MEMORY_GPU, val); - reloadGUI("GPUSlowMemory"); - }) - }} - /> - } + + {/* Battery */}
Battery @@ -811,62 +653,9 @@ const Content: VFC<{ serverAPI: ServerAPI }> = ({}) => { {get_value(NAME_GEN)} - {/* Version Info */} -
- {eggCount % 10 == 9 ? "Ha! Nerd" : "Debug"} -
- - { - if (eggCount % 10 == 9) { - // you know you're bored and/or conceited when you spend time adding an easter egg - // that just sends people to your own project's repo - Router.NavigateToExternalWeb("https://github.com/NGnius/PowerTools"); - } - eggCount++; - }}> - {eggCount % 10 == 9 ? "by NGnius" : get_value(BACKEND_INFO)} - - - - eggCount++}> - {eggCount % 10 == 9 ? "<3 <3 <3" : target_usdpl()} - - - - eggCount++}> - {eggCount % 10 == 9 ? "Tracy Chapman" : get_value(DRIVER_INFO)} - - - - { - if (eggCount % 10 == 9) { - // you know you're bored and/or conceited when you spend time adding an easter egg - // that just sends people to your own project's repo - Router.NavigateToExternalWeb("https://github.com/NGnius/usdpl-rs"); - } - eggCount++; - }}> - v{version_usdpl()} - - - {eggCount % 10 == 9 && - { - backend.idk(); - }} - > - ??? - - } + + +