mirror of
https://gitlab.com/ryzen-controller-team/ryzen-controller.git
synced 2024-12-23 02:23:31 +07:00
Fix #2 Added presets capabilities.
This commit is contained in:
parent
9b30f18c4d
commit
2e61b1caa0
17
index.html
17
index.html
@ -66,7 +66,10 @@
|
|||||||
<input class="uk-range" type="range" min="20" max="100" value="30" repeat="vrm_current_m_a" id="vrm_current_m_a_range">
|
<input class="uk-range" type="range" min="20" max="100" value="30" repeat="vrm_current_m_a" id="vrm_current_m_a_range">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<p class="uk-margin">
|
||||||
<button class="uk-button uk-button-primary" onClick="applyRyzenSettings()">Apply</button>
|
<button class="uk-button uk-button-primary" onClick="applyRyzenSettings()">Apply</button>
|
||||||
|
<button class="uk-button uk-button-secondary" uk-toggle="target: #modal-new-preset">Save to preset</button>
|
||||||
|
</p>
|
||||||
</li>
|
</li>
|
||||||
|
|
||||||
<li class="uk-container uk-animation-fade" id="presetTab"></li>
|
<li class="uk-container uk-animation-fade" id="presetTab"></li>
|
||||||
@ -106,6 +109,20 @@
|
|||||||
</li>
|
</li>
|
||||||
|
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
|
<!-- Add a preset modal -->
|
||||||
|
<div id="modal-new-preset" uk-modal>
|
||||||
|
<div class="uk-modal-dialog uk-modal-body">
|
||||||
|
<h2 class="uk-modal-title">Save current settings to preset</h2>
|
||||||
|
<p>The current settings will be saved to a new preset. Give it a name then you'll be able to reapply it fastly from the preset tab.</p>
|
||||||
|
<div class="uk-margin">
|
||||||
|
<input class="uk-input" type="text" id="new_preset_name" placeholder="Preset name: performance, low energy, unicorn power, ...">
|
||||||
|
</div>
|
||||||
|
<button class="uk-button uk-button-primary uk-modal-close" type="button" onClick="saveToNewPreset()">Save</button>
|
||||||
|
<button class="uk-button uk-button-secondary uk-modal-close" type="button">Close</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<script type="text/javascript" src="./js/methods.js"></script>
|
<script type="text/javascript" src="./js/methods.js"></script>
|
||||||
<script type="text/javascript" src="./js/app.js"></script>
|
<script type="text/javascript" src="./js/app.js"></script>
|
||||||
</body>
|
</body>
|
||||||
|
@ -10,6 +10,7 @@ ready(function(){
|
|||||||
reApplyPeriodically(require('electron-settings').get('settings.reapply_periodically'));
|
reApplyPeriodically(require('electron-settings').get('settings.reapply_periodically'));
|
||||||
displayOptionDescription();
|
displayOptionDescription();
|
||||||
recreateShortcut();
|
recreateShortcut();
|
||||||
|
updatePresetList();
|
||||||
document.isStarting = false;
|
document.isStarting = false;
|
||||||
settings.set('settings', {
|
settings.set('settings', {
|
||||||
...settings.get('settings'),
|
...settings.get('settings'),
|
||||||
@ -21,13 +22,7 @@ ready(function(){
|
|||||||
* Will create and handle ryzenadj.exe execution.
|
* Will create and handle ryzenadj.exe execution.
|
||||||
*/
|
*/
|
||||||
function applyRyzenSettings() {
|
function applyRyzenSettings() {
|
||||||
const settings = {
|
const settings = getCurrentSettings("ryzenadjArgs");
|
||||||
"--stapm-limit=": document.getElementById('stapm_limit_w').value,
|
|
||||||
"--fast-limit=": document.getElementById('ppt_fast_limit_w').value,
|
|
||||||
"--slow-limit=": document.getElementById('ppt_slow_limit_w').value,
|
|
||||||
"--tctl-temp=": document.getElementById('temperature_limit_c').value,
|
|
||||||
"--vrmmax-current=": document.getElementById('vrm_current_m_a').value,
|
|
||||||
};
|
|
||||||
|
|
||||||
const child = require('child_process').execFile;
|
const child = require('child_process').execFile;
|
||||||
const executablePath = getRyzenAdjExecutablePath();
|
const executablePath = getRyzenAdjExecutablePath();
|
||||||
|
140
js/methods.js
140
js/methods.js
@ -311,3 +311,143 @@ function recreateShortcut() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Will return an object completed with the current settings from inputs.
|
||||||
|
* @param {string} keyType "inputId" or "ryzenadjArgs"
|
||||||
|
*/
|
||||||
|
function getCurrentSettings(keyType) {
|
||||||
|
if (keyType === "ryzenadjArgs") {
|
||||||
|
return {
|
||||||
|
"--stapm-limit=": document.getElementById('stapm_limit_w').value,
|
||||||
|
"--fast-limit=": document.getElementById('ppt_fast_limit_w').value,
|
||||||
|
"--slow-limit=": document.getElementById('ppt_slow_limit_w').value,
|
||||||
|
"--tctl-temp=": document.getElementById('temperature_limit_c').value,
|
||||||
|
"--vrmmax-current=": document.getElementById('vrm_current_m_a').value,
|
||||||
|
};
|
||||||
|
} else {
|
||||||
|
var inputs = document.querySelectorAll('#controller-tab input');
|
||||||
|
var currentSettings = {};
|
||||||
|
inputs.forEach(element => {
|
||||||
|
let id = element.id;
|
||||||
|
let value = element.value;
|
||||||
|
currentSettings[id] = value;
|
||||||
|
});
|
||||||
|
return currentSettings;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Will save the current settings to a new preset.
|
||||||
|
*/
|
||||||
|
function saveToNewPreset() {
|
||||||
|
const settingsToBeSaved = getCurrentSettings("inputId");
|
||||||
|
const currentPresets = require('electron-settings').get('presets') || {};
|
||||||
|
var newPresetName = document.getElementById('new_preset_name').value;
|
||||||
|
|
||||||
|
if (!newPresetName) {
|
||||||
|
notification('danger', 'You must provide a preset name.');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (typeof currentPresets[newPresetName] !== "undefined") {
|
||||||
|
newPresetName = findUnusedNewPresetName(newPresetName);
|
||||||
|
notification('warning', `This preset name already exist, your preset has been saved with the name "${newPresetName}".`);
|
||||||
|
}
|
||||||
|
|
||||||
|
const newPresetList = {
|
||||||
|
...currentPresets,
|
||||||
|
[newPresetName]: settingsToBeSaved,
|
||||||
|
};
|
||||||
|
require('electron-settings').set('presets', newPresetList);
|
||||||
|
appendLog(`saveToNewPreset(): Saved preset ${newPresetName}, ${JSON.stringify(newPresetList)}`);
|
||||||
|
updatePresetList();
|
||||||
|
if (newPresetName === document.getElementById('new_preset_name').value) {
|
||||||
|
notification('success', `The preset ${newPresetName} has been saved.`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This recursive function will return an available preset name to be used to save a preset.
|
||||||
|
*
|
||||||
|
* @param {string} newPresetName The preset name to be edited.
|
||||||
|
* @param {number} suffix The preset name suffix
|
||||||
|
*/
|
||||||
|
function findUnusedNewPresetName(newPresetName, suffix = 1) {
|
||||||
|
const currentPresets = require('electron-settings').get('presets') || {};
|
||||||
|
if (typeof currentPresets[`${newPresetName}${suffix}`] !== "undefined") {
|
||||||
|
suffix++;
|
||||||
|
return findUnusedNewPresetName(newPresetName, suffix);
|
||||||
|
}
|
||||||
|
return `${newPresetName}${suffix}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This will update the preset tab based on saved presets.
|
||||||
|
*/
|
||||||
|
function updatePresetList() {
|
||||||
|
var presetTab = document.getElementById('presetTab');
|
||||||
|
const currentPresets = require('electron-settings').get('presets') || {};
|
||||||
|
|
||||||
|
var content = '';
|
||||||
|
content += '<ul class="uk-list">';
|
||||||
|
|
||||||
|
if (Object.keys(currentPresets).length === 0) {
|
||||||
|
content += `<li>No preset has been created yet, use "Save to preset" button on Controller tab to create one.</li>`;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (const presetName in currentPresets) {
|
||||||
|
if (currentPresets.hasOwnProperty(presetName)) {
|
||||||
|
const preset = currentPresets[presetName];
|
||||||
|
|
||||||
|
let valueSummary = [];
|
||||||
|
for (const key in preset) {
|
||||||
|
if (preset.hasOwnProperty(key) && key.indexOf('_range') !== -1) {
|
||||||
|
const value = preset[key];
|
||||||
|
valueSummary.push(value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
valueSummary.join(', ');
|
||||||
|
|
||||||
|
content += `
|
||||||
|
<li class="uk-margin">
|
||||||
|
<span class="uk-text-lead">${presetName}</span>
|
||||||
|
<i class="uk-text-small">${valueSummary}</i>
|
||||||
|
<button class="uk-button uk-button-danger uk-align-right" type="button" onClick="presetDeletion('${presetName}')">
|
||||||
|
Delete
|
||||||
|
</button>
|
||||||
|
<button class="uk-button uk-button-primary uk-align-right" type="button" onClick="applyPreset('${presetName}')">
|
||||||
|
Apply
|
||||||
|
</button>
|
||||||
|
</li>
|
||||||
|
`;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
content += '</ul>';
|
||||||
|
presetTab.innerHTML = content;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This will apply the preset you asked for.
|
||||||
|
* @param {string} presetName The preset name to be applied.
|
||||||
|
*/
|
||||||
|
function applyPreset(presetName) {
|
||||||
|
const presets = require('electron-settings').get(`presets.${presetName}`);
|
||||||
|
appendLog(`applyPreset(): preset ${presetName}: ${JSON.stringify(presets)}`);
|
||||||
|
var ret = require('electron-settings').set("latest_controller_tabs_settings", presets);
|
||||||
|
appendLog(`applyPreset(): saved preset: ${JSON.stringify(ret)}`);
|
||||||
|
loadLatestUsedSettings();
|
||||||
|
applyRyzenSettings();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This will delete the preset you asked for.
|
||||||
|
* @param {string} presetName The preset name to be deleted.
|
||||||
|
*/
|
||||||
|
function presetDeletion(presetName) {
|
||||||
|
var presets = require('electron-settings').get(`presets`);
|
||||||
|
delete presets[presetName];
|
||||||
|
require('electron-settings').set(`presets`, presets);
|
||||||
|
notification('success', `The preset ${presetName} has been deleted.`);
|
||||||
|
updatePresetList();
|
||||||
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user