diff --git a/.config/FanControl/userConfig.json b/.config/FanControl/userConfig.json deleted file mode 100644 index 7a5b675..0000000 --- a/.config/FanControl/userConfig.json +++ /dev/null @@ -1,604 +0,0 @@ -{ - "__VERSION__": "205", - "Main": { - "Controls": [ - { - "Calibration": [], - "Enable": false, - "ForceApply": false, - "Identifier": "/lpc/nct6797d/control/0", - "IsHidden": true, - "ManualControl": false, - "ManualControlValue": 50, - "MinimumPercent": 0, - "Name": "Fan #1", - "NickName": "Fan #1", - "PairedFanSensor": null, - "SelectedCommandStepDown": 8.0, - "SelectedCommandStepUp": 8.0, - "SelectedFanCurve": null, - "SelectedOffset": 0, - "SelectedStart": 0, - "SelectedStop": 0 - }, - { - "Calibration": [ - [ - 10, - 326 - ], - [ - 20, - 509 - ], - [ - 30, - 725 - ], - [ - 40, - 899 - ], - [ - 50, - 1044 - ], - [ - 60, - 1183 - ], - [ - 70, - 1304 - ], - [ - 80, - 1411 - ], - [ - 90, - 1481 - ], - [ - 100, - 1581 - ] - ], - "Enable": true, - "ForceApply": false, - "Identifier": "/lpc/nct6797d/control/1", - "IsHidden": false, - "ManualControl": false, - "ManualControlValue": 50, - "MinimumPercent": 0, - "Name": "Fan #2", - "NickName": "CPU", - "PairedFanSensor": { - "Identifier": "/lpc/nct6797d/fan/1", - "IsHidden": false, - "Name": "Fan #2", - "NickName": "CPU" - }, - "SelectedCommandStepDown": 8.0, - "SelectedCommandStepUp": 8.0, - "SelectedFanCurve": { - "CommandMode": 0, - "IgnoreHysteresisAtLimits": true, - "IsHidden": false, - "MaximumCommand": 100, - "MaximumTemperature": 120.0, - "MinimumTemperature": 20.0, - "Name": "CPU", - "OneWayHysteresis": false, - "Points": [ - "35,40", - "60,100" - ], - "SelectedHysteresis": 2.0, - "SelectedResponseTime": 1, - "SelectedTempSource": { - "Identifier": "/amdcpu/0/temperature/2", - "IsHidden": false, - "Name": "Core (Tctl/Tdie)", - "NickName": "Core (Tctl/Tdie)" - } - }, - "SelectedOffset": 0, - "SelectedStart": 0, - "SelectedStop": 0 - }, - { - "Calibration": [ - [ - 20, - 0 - ], - [ - 30, - 631 - ], - [ - 40, - 851 - ], - [ - 50, - 1023 - ], - [ - 60, - 1187 - ], - [ - 70, - 1336 - ], - [ - 80, - 1477 - ], - [ - 90, - 1604 - ], - [ - 100, - 1690 - ] - ], - "Enable": true, - "ForceApply": false, - "Identifier": "/lpc/nct6797d/control/2", - "IsHidden": false, - "ManualControl": false, - "ManualControlValue": 50, - "MinimumPercent": 0, - "Name": "Fan #3", - "NickName": "BACK", - "PairedFanSensor": { - "Identifier": "/lpc/nct6797d/fan/2", - "IsHidden": false, - "Name": "Fan #3", - "NickName": "BACK" - }, - "SelectedCommandStepDown": 8.0, - "SelectedCommandStepUp": 8.0, - "SelectedFanCurve": { - "CommandMode": 0, - "IgnoreHysteresisAtLimits": true, - "IsHidden": false, - "MaximumCommand": 100, - "MaximumTemperature": 120.0, - "MinimumTemperature": 20.0, - "Name": "CPU", - "OneWayHysteresis": false, - "Points": [ - "35,40", - "60,100" - ], - "SelectedHysteresis": 2.0, - "SelectedResponseTime": 1, - "SelectedTempSource": { - "Identifier": "/amdcpu/0/temperature/2", - "IsHidden": false, - "Name": "Core (Tctl/Tdie)", - "NickName": "Core (Tctl/Tdie)" - } - }, - "SelectedOffset": 0, - "SelectedStart": 35, - "SelectedStop": 26 - }, - { - "Calibration": [ - [ - 20, - 0 - ], - [ - 30, - 364 - ], - [ - 40, - 520 - ], - [ - 50, - 650 - ], - [ - 60, - 765 - ], - [ - 70, - 865 - ], - [ - 80, - 964 - ], - [ - 90, - 1051 - ], - [ - 100, - 1106 - ] - ], - "Enable": true, - "ForceApply": false, - "Identifier": "/lpc/nct6797d/control/3", - "IsHidden": false, - "ManualControl": false, - "ManualControlValue": 50, - "MinimumPercent": 0, - "Name": "Fan #4", - "NickName": "FRONT BAS", - "PairedFanSensor": { - "Identifier": "/lpc/nct6797d/fan/3", - "IsHidden": false, - "Name": "Fan #4", - "NickName": "FRONT BAS" - }, - "SelectedCommandStepDown": 8.0, - "SelectedCommandStepUp": 8.0, - "SelectedFanCurve": { - "CommandMode": 0, - "IgnoreHysteresisAtLimits": true, - "IsHidden": false, - "MaximumCommand": 100, - "MaximumTemperature": 120.0, - "MinimumTemperature": 20.0, - "Name": "GPU", - "OneWayHysteresis": false, - "Points": [ - "40,50", - "60,100" - ], - "SelectedHysteresis": 2.0, - "SelectedResponseTime": 1, - "SelectedTempSource": { - "Identifier": "NVApiWrapper/0-TU106-A/sensor/0", - "IsHidden": false, - "Name": "GPU", - "NickName": "GPU" - } - }, - "SelectedOffset": 0, - "SelectedStart": 47, - "SelectedStop": 26 - }, - { - "Calibration": [ - [ - 10, - 0 - ], - [ - 20, - 465 - ], - [ - 30, - 641 - ], - [ - 40, - 785 - ], - [ - 50, - 918 - ], - [ - 60, - 1041 - ], - [ - 70, - 1140 - ], - [ - 80, - 1254 - ], - [ - 90, - 1353 - ], - [ - 100, - 1409 - ] - ], - "Enable": true, - "ForceApply": false, - "Identifier": "/lpc/nct6797d/control/4", - "IsHidden": false, - "ManualControl": false, - "ManualControlValue": 50, - "MinimumPercent": 0, - "Name": "Fan #5", - "NickName": "FRONT TOP", - "PairedFanSensor": { - "Identifier": "/lpc/nct6797d/fan/4", - "IsHidden": false, - "Name": "Fan #5", - "NickName": "FRONT TOP" - }, - "SelectedCommandStepDown": 8.0, - "SelectedCommandStepUp": 8.0, - "SelectedFanCurve": { - "CommandMode": 0, - "IgnoreHysteresisAtLimits": true, - "IsHidden": false, - "MaximumCommand": 100, - "MaximumTemperature": 120.0, - "MinimumTemperature": 20.0, - "Name": "CPU", - "OneWayHysteresis": false, - "Points": [ - "35,40", - "60,100" - ], - "SelectedHysteresis": 2.0, - "SelectedResponseTime": 1, - "SelectedTempSource": { - "Identifier": "/amdcpu/0/temperature/2", - "IsHidden": false, - "Name": "Core (Tctl/Tdie)", - "NickName": "Core (Tctl/Tdie)" - } - }, - "SelectedOffset": 0, - "SelectedStart": 22, - "SelectedStop": 16 - }, - { - "Calibration": [], - "Enable": false, - "ForceApply": false, - "Identifier": "/lpc/nct6797d/control/5", - "IsHidden": true, - "ManualControl": false, - "ManualControlValue": 50, - "MinimumPercent": 0, - "Name": "Fan #6", - "NickName": "Fan #6", - "PairedFanSensor": null, - "SelectedCommandStepDown": 8.0, - "SelectedCommandStepUp": 8.0, - "SelectedFanCurve": null, - "SelectedOffset": 0, - "SelectedStart": 0, - "SelectedStop": 0 - }, - { - "Calibration": [], - "Enable": false, - "ForceApply": false, - "Identifier": "/lpc/nct6797d/control/6", - "IsHidden": true, - "ManualControl": false, - "ManualControlValue": 50, - "MinimumPercent": 0, - "Name": "Fan #7", - "NickName": "Fan #7", - "PairedFanSensor": null, - "SelectedCommandStepDown": 8.0, - "SelectedCommandStepUp": 8.0, - "SelectedFanCurve": null, - "SelectedOffset": 0, - "SelectedStart": 0, - "SelectedStop": 0 - }, - { - "Calibration": [ - [ - 40, - 1491 - ], - [ - 50, - 1643 - ], - [ - 60, - 1796 - ], - [ - 70, - 1800 - ], - [ - 80, - 1802 - ], - [ - 100, - 1806 - ] - ], - "Enable": true, - "ForceApply": false, - "Identifier": "NVApiWrapper/0-TU106-A/control/0", - "IsHidden": false, - "ManualControl": false, - "ManualControlValue": 50, - "MinimumPercent": 0, - "Name": "Control 1 - NVIDIA GeForce RTX 2060 SUPER", - "NickName": "Control 1 - NVIDIA GeForce RTX 2060 SUPER", - "PairedFanSensor": { - "Identifier": "NVApiWrapper/0-TU106-A/fan/0", - "IsHidden": false, - "Name": "Fan 1 - NVIDIA GeForce RTX 2060 SUPER", - "NickName": "Control 1 - NVIDIA GeForce RTX 2060 SUPER" - }, - "SelectedCommandStepDown": 8.0, - "SelectedCommandStepUp": 8.0, - "SelectedFanCurve": { - "CommandMode": 0, - "IgnoreHysteresisAtLimits": true, - "IsHidden": false, - "MaximumCommand": 100, - "MaximumTemperature": 120.0, - "MinimumTemperature": 20.0, - "Name": "GPU", - "OneWayHysteresis": false, - "Points": [ - "40,50", - "60,100" - ], - "SelectedHysteresis": 2.0, - "SelectedResponseTime": 1, - "SelectedTempSource": { - "Identifier": "NVApiWrapper/0-TU106-A/sensor/0", - "IsHidden": false, - "Name": "GPU", - "NickName": "GPU" - } - }, - "SelectedOffset": 0, - "SelectedStart": 0, - "SelectedStop": 0 - } - ], - "CustomSensors": [], - "Fahrenheit": false, - "FanCurves": [ - { - "CommandMode": 0, - "IgnoreHysteresisAtLimits": true, - "IsHidden": false, - "MaximumCommand": 100, - "MaximumTemperature": 120.0, - "MinimumTemperature": 20.0, - "Name": "CPU", - "OneWayHysteresis": false, - "Points": [ - "35,40", - "60,100" - ], - "SelectedHysteresis": 2.0, - "SelectedResponseTime": 1, - "SelectedTempSource": { - "Identifier": "/amdcpu/0/temperature/2", - "IsHidden": false, - "Name": "Core (Tctl/Tdie)", - "NickName": "Core (Tctl/Tdie)" - } - }, - { - "CommandMode": 0, - "IgnoreHysteresisAtLimits": true, - "IsHidden": false, - "MaximumCommand": 100, - "MaximumTemperature": 120.0, - "MinimumTemperature": 20.0, - "Name": "GPU", - "OneWayHysteresis": false, - "Points": [ - "40,50", - "60,100" - ], - "SelectedHysteresis": 2.0, - "SelectedResponseTime": 1, - "SelectedTempSource": { - "Identifier": "NVApiWrapper/0-TU106-A/sensor/0", - "IsHidden": false, - "Name": "GPU", - "NickName": "GPU" - } - } - ], - "FanSensors": [ - { - "Identifier": "/lpc/nct6797d/fan/0", - "IsHidden": false, - "Name": "Fan #1", - "NickName": "Fan #1" - }, - { - "Identifier": "/lpc/nct6797d/fan/1", - "IsHidden": false, - "Name": "Fan #2", - "NickName": "CPU" - }, - { - "Identifier": "/lpc/nct6797d/fan/2", - "IsHidden": false, - "Name": "Fan #3", - "NickName": "BACK" - }, - { - "Identifier": "/lpc/nct6797d/fan/3", - "IsHidden": false, - "Name": "Fan #4", - "NickName": "FRONT BAS" - }, - { - "Identifier": "/lpc/nct6797d/fan/4", - "IsHidden": false, - "Name": "Fan #5", - "NickName": "FRONT TOP" - }, - { - "Identifier": "/lpc/nct6797d/fan/5", - "IsHidden": false, - "Name": "Fan #6", - "NickName": "Fan #6" - }, - { - "Identifier": "/lpc/nct6797d/fan/6", - "IsHidden": false, - "Name": "Fan #7", - "NickName": "Fan #7" - }, - { - "Identifier": "NVApiWrapper/0-TU106-A/fan/0", - "IsHidden": false, - "Name": "Fan 1 - NVIDIA GeForce RTX 2060 SUPER", - "NickName": "Control 1 - NVIDIA GeForce RTX 2060 SUPER" - } - ], - "HideCalibration": false, - "HideFanSpeedCards": true, - "HorizontalUIOrientation": false, - "PrimaryColor": "#FF607D8B", - "SecondaryColor": "#FFC6FF00", - "SelectedTheme": "", - "ShowHiddenCards": false, - "SyncThemeWithWindows": true, - "SyncTrayIconColorWithWindows": true, - "TemperatureSensors": [], - "TrayIconColor": null, - "TrayIcons": [] - }, - "Sensors": { - "AdlxWrapperSettings": { - "Enabled": true - }, - "DisabledPlugins": [], - "DisableStorageSensors": true, - "LibreHardwareMonitorSettings": { - "Controller": false, - "CPU": true, - "EmbeddedEC": true, - "GPU": true, - "InpOut": false, - "Memory": false, - "Motherboard": true, - "PSU": false, - "Storage": false, - "ZeroRPMOverride": false - }, - "NvAPIWrapperSettings": { - "Enabled": true, - "ZeroRPMOverride": false - }, - "SensorCount": 23 - } -} \ No newline at end of file diff --git a/Makefile b/Makefile index 6cd4628..fc43923 100644 --- a/Makefile +++ b/Makefile @@ -262,16 +262,6 @@ else @echo endif -# FanControl -ifeq ($(ADMIN_WIN),1) - @echo "$(WIN) Can't update FanControl configuration, use elevated terminal to do so" - @echo -else - @$(MKDIR) $(PFx86)/FanControl/Configurations/ - @$(WGET) $(REPO_SRC)/.config/FanControl/userConfig.json -O $(PFx86)/FanControl/Configurations/userConfig.json - @echo "$(WIN) FanControl configuration synced!" - @echo -endif # Termux distro specific sync-termux: