Implemented Aquacomputer Next Vision coolant temperature reading#487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
420coupe wants to merge 1 commit into
base:main
Choose a base branch
from
Open

Implemented Aquacomputer Next Vision coolant temperature reading #487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion extension.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -80,7 +80,7 @@ var VitalsMenuButton = GObject.registerClass({
this);

let settings = [ 'use-higher-precision', 'alphabetize', 'hide-zeros',
'fixed-widths', 'hide-icons', 'unit',
'fixed-widths', 'hide-icons', 'unit', 'coolant-unit',
'memory-measurement', 'include-public-ip', 'network-public-ip-interval',
'network-public-ip-show-flag', 'network-public-ip-provider', 'network-speed-format', 'network-speed-unit', 'storage-measurement',
'include-static-info', 'include-static-gpu-info' ];
Expand Down
36 changes: 28 additions & 8 deletions helpers/catalog.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
/* Shared sensor catalog for shell and preferences. */
export const sensorCatalog = {
'temperature' : { 'icon': 'temperature-symbolic.svg', colorFormats: ['temp'] },
'voltage' : { 'icon': 'voltage-symbolic.svg' },
'fan' : { 'icon': 'fan-symbolic.svg', colorFormats: ['fan'] },
'temperature' : { 'icon': 'temperature-symbolic.svg', colorFormats: ['temp'], aggregate: true },
'coolant' : { 'icon': 'water-droplet-symbolic.svg', colorFormats: ['temp'], aggregate: true,
unitSetting: 'coolant-unit' },
'voltage' : { 'icon': 'voltage-symbolic.svg', aggregate: true },
'fan' : { 'icon': 'fan-symbolic.svg', colorFormats: ['fan'], aggregate: true },
'pump' : { 'icon': 'pump-symbolic.svg', colorFormats: ['fan'], aggregate: true },
'memory' : { 'icon': 'memory-symbolic.svg', colorFormats: ['percent'] },
'processor' : { 'icon': 'cpu-symbolic.svg', colorFormats: ['percent'] },
'system' : { 'icon': 'system-symbolic.svg', colorFormats: ['load'] },
Expand DownExpand Up@@ -268,7 +271,14 @@ export function sensorGroupFromType(type) {
let group = (type || '').replace(/-group$/, '');
if (group.startsWith('gpu'))
return 'gpu';
return group.replace(/#\d+$/, '');
group = group.replace(/#\d+$/, '');

// types may carry a suffix, eg 'network-rx' or 'network-us'. Every catalog
// group is a single word, so fall back to the leading segment.
if (!(group in sensorCatalog))
group = group.split('-')[0];

return group;
}

export function colorSettingsKeys() {
Expand All@@ -279,19 +289,29 @@ export function colorSettingsKeys() {

// GSettings key for threshold colors for a live sensor (shared by values + prefs).
export function colorsKeyForSensor(type, format) {
// All temperatures share the temperature threshold UI, including GPU rows.
if (format === 'temp')
return 'temperature-colors';

const group = sensorGroupFromType(type);
const formats = sensorCatalog[group]?.colorFormats;
if (formats && formats.includes(format))
return `${group}-colors`;

// remaining temperatures share the temperature threshold UI, including GPU rows
if (format === 'temp')
return 'temperature-colors';

return null;
}

export function colorPageForSensor(type, format) {
let key = colorsKeyForSensor(type, format);
return key ? key.slice(0, -'-colors'.length) : null;
}

// groups discovered from hardware monitors and summarized by a group average
export function isAggregateGroup(group) {
return !!sensorCatalog[group]?.aggregate;
}

// a group may pick its own temperature unit, eg coolant reads coolant-unit
export function unitSettingForType(type) {
return sensorCatalog[sensorGroupFromType(type)]?.unitSetting ?? 'unit';
}
1 change: 1 addition & 0 deletions icons/gnome/pump-symbolic.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions icons/gnome/water-droplet-symbolic.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions icons/original/pump-symbolic.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions icons/original/water-droplet-symbolic.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 4 additions & 1 deletion prefs.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -216,8 +216,10 @@ class Settings {

this._sensorPageGates = {
'temperature': { toggle: 'show-temperature', widgets: ['unit'] },
'coolant': { toggle: 'show-coolant', widgets: ['coolant-unit'] },
'voltage': { toggle: 'show-voltage', widgets: [] },
'fan': { toggle: 'show-fan', widgets: [] },
'pump': { toggle: 'show-pump', widgets: [] },
'memory': { toggle: 'show-memory', widgets: ['memory-measurement'] },
'processor': { toggle: 'show-processor', widgets: ['include-static-info'] },
'system': { toggle: 'show-system', widgets: ['monitor-cmd'] },
Expand DownExpand Up@@ -303,6 +305,7 @@ class Settings {

// process sensor toggles
let sensors = [ 'show-temperature', 'show-voltage', 'show-fan',
'show-coolant', 'show-pump',
'show-memory', 'show-processor', 'show-system',
'show-network', 'show-storage', 'use-higher-precision',
'alphabetize', 'hide-zeros', 'include-public-ip',
Expand DownExpand Up@@ -330,7 +333,7 @@ class Settings {

// process individual drop down sensor preferences
sensors = [
'position-in-panel', 'unit', 'network-speed-format', 'network-speed-unit',
'position-in-panel', 'unit', 'coolant-unit', 'network-speed-format', 'network-speed-unit',
'memory-measurement', 'storage-measurement', 'battery-slot', 'icon-style',
'network-public-ip-provider'
];
Expand Down
119 changes: 119 additions & 0 deletions prefs.ui
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -108,6 +108,34 @@
</child>
</object>
</child>
<child>
<object class="GtkListBoxRow">
<property name="name">coolant</property>
<child>
<object class="GtkBox">
<property name="orientation">horizontal</property>
<property name="spacing">12</property>
<property name="margin-start">6</property>
<property name="margin-end">6</property>
<property name="margin-top">4</property>
<property name="margin-bottom">4</property>
<child>
<object class="GtkImage" id="sidebar-icon-coolant">
<property name="icon-name">water-droplet-symbolic</property>
<property name="pixel-size">16</property>
</object>
</child>
<child>
<object class="GtkLabel">
<property name="label" translatable="yes">Coolant</property>
<property name="xalign">0</property>
<property name="hexpand">True</property>
</object>
</child>
</object>
</child>
</object>
</child>
<child>
<object class="GtkListBoxRow">
<property name="name">voltage</property>
Expand DownExpand Up@@ -164,6 +192,34 @@
</child>
</object>
</child>
<child>
<object class="GtkListBoxRow">
<property name="name">pump</property>
<child>
<object class="GtkBox">
<property name="orientation">horizontal</property>
<property name="spacing">12</property>
<property name="margin-start">6</property>
<property name="margin-end">6</property>
<property name="margin-top">4</property>
<property name="margin-bottom">4</property>
<child>
<object class="GtkImage" id="sidebar-icon-pump">
<property name="icon-name">pump-symbolic</property>
<property name="pixel-size">16</property>
</object>
</child>
<child>
<object class="GtkLabel">
<property name="label" translatable="yes">Pump</property>
<property name="xalign">0</property>
<property name="hexpand">True</property>
</object>
</child>
</object>
</child>
</object>
</child>
<child>
<object class="GtkListBoxRow">
<property name="name">memory</property>
Expand DownExpand Up@@ -589,6 +645,45 @@
</child>
</object>

<!-- Coolant -->
<object class="AdwPreferencesPage" id="coolant-page">
<property name="name">coolant</property>
<property name="title" translatable="yes">Coolant</property>
<property name="icon-name">water-droplet-symbolic</property>
<child>
<object class="AdwPreferencesGroup">
<property name="margin-start">10</property>
<property name="margin-end">10</property>
<child>
<object class="AdwActionRow">
<property name="title" translatable="yes">Monitor coolant</property>
<property name="activatable-widget">show-coolant</property>
<child type="suffix">
<object class="GtkSwitch" id="show-coolant">
<property name="valign">center</property>
</object>
</child>
</object>
</child>
<child>
<object class="AdwActionRow">
<property name="title" translatable="yes">Unit</property>
<property name="activatable-widget">coolant-unit</property>
<child type="suffix">
<object class="GtkComboBoxText" id="coolant-unit">
<property name="valign">center</property>
<items>
<item translatable="yes">°C</item>
<item translatable="yes">°F</item>
</items>
</object>
</child>
</object>
</child>
</object>
</child>
</object>

<!-- Voltage -->
<object class="AdwPreferencesPage" id="voltage-page">
<property name="name">voltage</property>
Expand DownExpand Up@@ -637,6 +732,30 @@
</child>
</object>

<!-- Pump -->
<object class="AdwPreferencesPage" id="pump-page">
<property name="name">pump</property>
<property name="title" translatable="yes">Pump</property>
<property name="icon-name">pump-symbolic</property>
<child>
<object class="AdwPreferencesGroup">
<property name="margin-start">10</property>
<property name="margin-end">10</property>
<child>
<object class="AdwActionRow">
<property name="title" translatable="yes">Monitor pump</property>
<property name="activatable-widget">show-pump</property>
<child type="suffix">
<object class="GtkSwitch" id="show-pump">
<property name="valign">center</property>
</object>
</child>
</object>
</child>
</object>
</child>
</object>

<!-- Memory -->
<object class="AdwPreferencesPage" id="memory-page">
<property name="name">memory</property>
Expand Down
25 changes: 25 additions & 0 deletions schemas/org.gnome.shell.extensions.vitals.gschema.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,11 +41,26 @@
<summary>Temperature unit</summary>
<description>The unit ('centigrade' or 'fahrenheit') the extension should display the temperature in</description>
</key>
<key type="i" name="coolant-unit">
<default>0</default>
<summary>Coolant temperature unit</summary>
<description>The unit ('centigrade' or 'fahrenheit') the extension should display the coolant temperature in</description>
</key>
<key type="b" name="show-voltage">
<default>true</default>
<summary>Monitor voltage</summary>
<description>Display voltage of various components</description>
</key>
<key type="b" name="show-coolant">
<default>true</default>
<summary>Monitor coolant</summary>
<description>Display liquid cooling loop coolant temperature</description>
</key>
<key type="b" name="show-pump">
<default>true</default>
<summary>Monitor pump</summary>
<description>Display liquid cooling pump rotation per minute</description>
</key>
<key type="b" name="show-fan">
<default>true</default>
<summary>Monitor fan</summary>
Expand DownExpand Up@@ -179,6 +194,16 @@
<summary>Fan color thresholds</summary>
<description>Color rules matched against fan RPM. Entries are "threshold r g b" or "threshold r g b sensor:&lt;key&gt;" per sensor. Unknown sensor keys are ignored.</description>
</key>
<key name="coolant-colors" type="as">
<default>["35 0.9647058844566345 0.8274509906768799 0.1764705926179886", "40 1 0.47058823704719543 0", "45 0.8784313797950745 0.10588235408067703 0.1411764770746231"]</default>
<summary>Coolant color thresholds</summary>
<description>Color rules matched against the displayed coolant temperature. Entries are "threshold r g b".</description>
</key>
<key name="pump-colors" type="as">
<default>[]</default>
<summary>Pump color thresholds</summary>
<description>Color rules matched against pump RPM. Entries are "threshold r g b".</description>
</key>
<key name="memory-colors" type="as">
<default>[]</default>
<summary>Memory usage color thresholds</summary>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Implemented Aquacomputer Next Vision coolant temperature reading#487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

420coupe
wants to merge
1
commit into

base:main
Choose a base branch

from

 Open


Implemented Aquacomputer Next Vision coolant temperature reading
#487
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
extension.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,7 +80,7 @@ var VitalsMenuButton = GObject.registerClass({
 this);

 let settings = [ 'use-higher-precision', 'alphabetize', 'hide-zeros',
 'fixed-widths', 'hide-icons', 'unit',
 'fixed-widths', 'hide-icons', 'unit', 'coolant-unit',
 'memory-measurement', 'include-public-ip', 'network-public-ip-interval',
 'network-public-ip-show-flag', 'network-public-ip-provider', 'network-speed-format', 'network-speed-unit', 'storage-measurement',
 'include-static-info', 'include-static-gpu-info' ];
Expand Down

36 changes: 28 additions & 8 deletions
helpers/catalog.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
/* Shared sensor catalog for shell and preferences. */
export const sensorCatalog = {
 'temperature' : { 'icon': 'temperature-symbolic.svg', colorFormats: ['temp'] },
 'voltage' : { 'icon': 'voltage-symbolic.svg' },
 'fan' : { 'icon': 'fan-symbolic.svg', colorFormats: ['fan'] },
 'temperature' : { 'icon': 'temperature-symbolic.svg', colorFormats: ['temp'], aggregate: true },
 'coolant' : { 'icon': 'water-droplet-symbolic.svg', colorFormats: ['temp'], aggregate: true,
 unitSetting: 'coolant-unit' },
 'voltage' : { 'icon': 'voltage-symbolic.svg', aggregate: true },
 'fan' : { 'icon': 'fan-symbolic.svg', colorFormats: ['fan'], aggregate: true },
 'pump' : { 'icon': 'pump-symbolic.svg', colorFormats: ['fan'], aggregate: true },
 'memory' : { 'icon': 'memory-symbolic.svg', colorFormats: ['percent'] },
 'processor' : { 'icon': 'cpu-symbolic.svg', colorFormats: ['percent'] },
 'system' : { 'icon': 'system-symbolic.svg', colorFormats: ['load'] },
Expand DownExpand Up@@ -268,7 +271,14 @@ export function sensorGroupFromType(type) {
 let group = (type || '').replace(/-group$/, '');
 if (group.startsWith('gpu'))
 return 'gpu';
 return group.replace(/#\d+$/, '');
 group = group.replace(/#\d+$/, '');

 // types may carry a suffix, eg 'network-rx' or 'network-us'. Every catalog
 // group is a single word, so fall back to the leading segment.
 if (!(group in sensorCatalog))
 group = group.split('-')[0];

 return group;
}

export function colorSettingsKeys() {
Expand All@@ -279,19 +289,29 @@ export function colorSettingsKeys() {

// GSettings key for threshold colors for a live sensor (shared by values + prefs).
export function colorsKeyForSensor(type, format) {
 // All temperatures share the temperature threshold UI, including GPU rows.
 if (format === 'temp')
 return 'temperature-colors';

 const group = sensorGroupFromType(type);
 const formats = sensorCatalog[group]?.colorFormats;
 if (formats && formats.includes(format))
 return `${group}-colors`;

 // remaining temperatures share the temperature threshold UI, including GPU rows
 if (format === 'temp')
 return 'temperature-colors';

 return null;
}

export function colorPageForSensor(type, format) {
 let key = colorsKeyForSensor(type, format);
 return key ? key.slice(0, -'-colors'.length) : null;
}

// groups discovered from hardware monitors and summarized by a group average
export function isAggregateGroup(group) {
 return !!sensorCatalog[group]?.aggregate;
}

// a group may pick its own temperature unit, eg coolant reads coolant-unit
export function unitSettingForType(type) {
 return sensorCatalog[sensorGroupFromType(type)]?.unitSetting ?? 'unit';
}

1 change: 1 addition & 0 deletions
icons/gnome/pump-symbolic.svg

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

3 changes: 3 additions & 0 deletions
icons/gnome/water-droplet-symbolic.svg

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

1 change: 1 addition & 0 deletions
icons/original/pump-symbolic.svg

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

3 changes: 3 additions & 0 deletions
icons/original/water-droplet-symbolic.svg

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

5 changes: 4 additions & 1 deletion
prefs.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -216,8 +216,10 @@ class Settings {

 this._sensorPageGates = {
 'temperature': { toggle: 'show-temperature', widgets: ['unit'] },
 'coolant': { toggle: 'show-coolant', widgets: ['coolant-unit'] },
 'voltage': { toggle: 'show-voltage', widgets: [] },
 'fan': { toggle: 'show-fan', widgets: [] },
 'pump': { toggle: 'show-pump', widgets: [] },
 'memory': { toggle: 'show-memory', widgets: ['memory-measurement'] },
 'processor': { toggle: 'show-processor', widgets: ['include-static-info'] },
 'system': { toggle: 'show-system', widgets: ['monitor-cmd'] },
Expand DownExpand Up@@ -303,6 +305,7 @@ class Settings {

 // process sensor toggles
 let sensors = [ 'show-temperature', 'show-voltage', 'show-fan',
 'show-coolant', 'show-pump',
 'show-memory', 'show-processor', 'show-system',
 'show-network', 'show-storage', 'use-higher-precision',
 'alphabetize', 'hide-zeros', 'include-public-ip',
Expand DownExpand Up@@ -330,7 +333,7 @@ class Settings {

 // process individual drop down sensor preferences
 sensors = [
 'position-in-panel', 'unit', 'network-speed-format', 'network-speed-unit',
 'position-in-panel', 'unit', 'coolant-unit', 'network-speed-format', 'network-speed-unit',
 'memory-measurement', 'storage-measurement', 'battery-slot', 'icon-style',
 'network-public-ip-provider'
 ];
Expand Down

119 changes: 119 additions & 0 deletions
prefs.ui

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,6 +108,34 @@
 </child>
 </object>
 </child>
 <child>
 <object class="GtkListBoxRow">
 <property name="name">coolant</property>
 <child>
 <object class="GtkBox">
 <property name="orientation">horizontal</property>
 <property name="spacing">12</property>
 <property name="margin-start">6</property>
 <property name="margin-end">6</property>
 <property name="margin-top">4</property>
 <property name="margin-bottom">4</property>
 <child>
 <object class="GtkImage" id="sidebar-icon-coolant">
 <property name="icon-name">water-droplet-symbolic</property>
 <property name="pixel-size">16</property>
 </object>
 </child>
 <child>
 <object class="GtkLabel">
 <property name="label" translatable="yes">Coolant</property>
 <property name="xalign">0</property>
 <property name="hexpand">True</property>
 </object>
 </child>
 </object>
 </child>
 </object>
 </child>
 <child>
 <object class="GtkListBoxRow">
 <property name="name">voltage</property>
Expand DownExpand Up@@ -164,6 +192,34 @@
 </child>
 </object>
 </child>
 <child>
 <object class="GtkListBoxRow">
 <property name="name">pump</property>
 <child>
 <object class="GtkBox">
 <property name="orientation">horizontal</property>
 <property name="spacing">12</property>
 <property name="margin-start">6</property>
 <property name="margin-end">6</property>
 <property name="margin-top">4</property>
 <property name="margin-bottom">4</property>
 <child>
 <object class="GtkImage" id="sidebar-icon-pump">
 <property name="icon-name">pump-symbolic</property>
 <property name="pixel-size">16</property>
 </object>
 </child>
 <child>
 <object class="GtkLabel">
 <property name="label" translatable="yes">Pump</property>
 <property name="xalign">0</property>
 <property name="hexpand">True</property>
 </object>
 </child>
 </object>
 </child>
 </object>
 </child>
 <child>
 <object class="GtkListBoxRow">
 <property name="name">memory</property>
Expand DownExpand Up@@ -589,6 +645,45 @@
 </child>
 </object>

 <!-- Coolant -->
 <object class="AdwPreferencesPage" id="coolant-page">
 <property name="name">coolant</property>
 <property name="title" translatable="yes">Coolant</property>
 <property name="icon-name">water-droplet-symbolic</property>
 <child>
 <object class="AdwPreferencesGroup">
 <property name="margin-start">10</property>
 <property name="margin-end">10</property>
 <child>
 <object class="AdwActionRow">
 <property name="title" translatable="yes">Monitor coolant</property>
 <property name="activatable-widget">show-coolant</property>
 <child type="suffix">
 <object class="GtkSwitch" id="show-coolant">
 <property name="valign">center</property>
 </object>
 </child>
 </object>
 </child>
 <child>
 <object class="AdwActionRow">
 <property name="title" translatable="yes">Unit</property>
 <property name="activatable-widget">coolant-unit</property>
 <child type="suffix">
 <object class="GtkComboBoxText" id="coolant-unit">
 <property name="valign">center</property>
 <items>
 <item translatable="yes">°C</item>
 <item translatable="yes">°F</item>
 </items>
 </object>
 </child>
 </object>
 </child>
 </object>
 </child>
 </object>

 <!-- Voltage -->
 <object class="AdwPreferencesPage" id="voltage-page">
 <property name="name">voltage</property>
Expand DownExpand Up@@ -637,6 +732,30 @@
 </child>
 </object>

 <!-- Pump -->
 <object class="AdwPreferencesPage" id="pump-page">
 <property name="name">pump</property>
 <property name="title" translatable="yes">Pump</property>
 <property name="icon-name">pump-symbolic</property>
 <child>
 <object class="AdwPreferencesGroup">
 <property name="margin-start">10</property>
 <property name="margin-end">10</property>
 <child>
 <object class="AdwActionRow">
 <property name="title" translatable="yes">Monitor pump</property>
 <property name="activatable-widget">show-pump</property>
 <child type="suffix">
 <object class="GtkSwitch" id="show-pump">
 <property name="valign">center</property>
 </object>
 </child>
 </object>
 </child>
 </object>
 </child>
 </object>

 <!-- Memory -->
 <object class="AdwPreferencesPage" id="memory-page">
 <property name="name">memory</property>
Expand Down

25 changes: 25 additions & 0 deletions
schemas/org.gnome.shell.extensions.vitals.gschema.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,11 +41,26 @@
 <summary>Temperature unit</summary>
 <description>The unit ('centigrade' or 'fahrenheit') the extension should display the temperature in</description>
 </key>
 <key type="i" name="coolant-unit">
 <default>0</default>
 <summary>Coolant temperature unit</summary>
 <description>The unit ('centigrade' or 'fahrenheit') the extension should display the coolant temperature in</description>
 </key>
 <key type="b" name="show-voltage">
 <default>true</default>
 <summary>Monitor voltage</summary>
 <description>Display voltage of various components</description>
 </key>
 <key type="b" name="show-coolant">
 <default>true</default>
 <summary>Monitor coolant</summary>
 <description>Display liquid cooling loop coolant temperature</description>
 </key>
 <key type="b" name="show-pump">
 <default>true</default>
 <summary>Monitor pump</summary>
 <description>Display liquid cooling pump rotation per minute</description>
 </key>
 <key type="b" name="show-fan">
 <default>true</default>
 <summary>Monitor fan</summary>
Expand DownExpand Up@@ -179,6 +194,16 @@
 <summary>Fan color thresholds</summary>
 <description>Color rules matched against fan RPM. Entries are "threshold r g b" or "threshold r g b sensor:&lt;key&gt;" per sensor. Unknown sensor keys are ignored.</description>
 </key>
 <key name="coolant-colors" type="as">
 <default>["35 0.9647058844566345 0.8274509906768799 0.1764705926179886", "40 1 0.47058823704719543 0", "45 0.8784313797950745 0.10588235408067703 0.1411764770746231"]</default>
 <summary>Coolant color thresholds</summary>
 <description>Color rules matched against the displayed coolant temperature. Entries are "threshold r g b".</description>
 </key>
 <key name="pump-colors" type="as">
 <default>[]</default>
 <summary>Pump color thresholds</summary>
 <description>Color rules matched against pump RPM. Entries are "threshold r g b".</description>
 </key>
 <key name="memory-colors" type="as">
 <default>[]</default>
 <summary>Memory usage color thresholds</summary>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Implemented Aquacomputer Next Vision coolant temperature reading#487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

420coupe
wants to merge
1
commit into

base:main
Choose a base branch

from

 Open


Implemented Aquacomputer Next Vision coolant temperature reading
#487
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
extension.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,7 +80,7 @@ var VitalsMenuButton = GObject.registerClass({
 this);

 let settings = [ 'use-higher-precision', 'alphabetize', 'hide-zeros',
 'fixed-widths', 'hide-icons', 'unit',
 'fixed-widths', 'hide-icons', 'unit', 'coolant-unit',
 'memory-measurement', 'include-public-ip', 'network-public-ip-interval',
 'network-public-ip-show-flag', 'network-public-ip-provider', 'network-speed-format', 'network-speed-unit', 'storage-measurement',
 'include-static-info', 'include-static-gpu-info' ];
Expand Down

36 changes: 28 additions & 8 deletions
helpers/catalog.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
/* Shared sensor catalog for shell and preferences. */
export const sensorCatalog = {
 'temperature' : { 'icon': 'temperature-symbolic.svg', colorFormats: ['temp'] },
 'voltage' : { 'icon': 'voltage-symbolic.svg' },
 'fan' : { 'icon': 'fan-symbolic.svg', colorFormats: ['fan'] },
 'temperature' : { 'icon': 'temperature-symbolic.svg', colorFormats: ['temp'], aggregate: true },
 'coolant' : { 'icon': 'water-droplet-symbolic.svg', colorFormats: ['temp'], aggregate: true,
 unitSetting: 'coolant-unit' },
 'voltage' : { 'icon': 'voltage-symbolic.svg', aggregate: true },
 'fan' : { 'icon': 'fan-symbolic.svg', colorFormats: ['fan'], aggregate: true },
 'pump' : { 'icon': 'pump-symbolic.svg', colorFormats: ['fan'], aggregate: true },
 'memory' : { 'icon': 'memory-symbolic.svg', colorFormats: ['percent'] },
 'processor' : { 'icon': 'cpu-symbolic.svg', colorFormats: ['percent'] },
 'system' : { 'icon': 'system-symbolic.svg', colorFormats: ['load'] },
Expand DownExpand Up@@ -268,7 +271,14 @@ export function sensorGroupFromType(type) {
 let group = (type || '').replace(/-group$/, '');
 if (group.startsWith('gpu'))
 return 'gpu';
 return group.replace(/#\d+$/, '');
 group = group.replace(/#\d+$/, '');

 // types may carry a suffix, eg 'network-rx' or 'network-us'. Every catalog
 // group is a single word, so fall back to the leading segment.
 if (!(group in sensorCatalog))
 group = group.split('-')[0];

 return group;
}

export function colorSettingsKeys() {
Expand All@@ -279,19 +289,29 @@ export function colorSettingsKeys() {

// GSettings key for threshold colors for a live sensor (shared by values + prefs).
export function colorsKeyForSensor(type, format) {
 // All temperatures share the temperature threshold UI, including GPU rows.
 if (format === 'temp')
 return 'temperature-colors';

 const group = sensorGroupFromType(type);
 const formats = sensorCatalog[group]?.colorFormats;
 if (formats && formats.includes(format))
 return `${group}-colors`;

 // remaining temperatures share the temperature threshold UI, including GPU rows
 if (format === 'temp')
 return 'temperature-colors';

 return null;
}

export function colorPageForSensor(type, format) {
 let key = colorsKeyForSensor(type, format);
 return key ? key.slice(0, -'-colors'.length) : null;
}

// groups discovered from hardware monitors and summarized by a group average
export function isAggregateGroup(group) {
 return !!sensorCatalog[group]?.aggregate;
}

// a group may pick its own temperature unit, eg coolant reads coolant-unit
export function unitSettingForType(type) {
 return sensorCatalog[sensorGroupFromType(type)]?.unitSetting ?? 'unit';
}

1 change: 1 addition & 0 deletions
icons/gnome/pump-symbolic.svg

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

3 changes: 3 additions & 0 deletions
icons/gnome/water-droplet-symbolic.svg

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

1 change: 1 addition & 0 deletions
icons/original/pump-symbolic.svg

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

3 changes: 3 additions & 0 deletions
icons/original/water-droplet-symbolic.svg

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

5 changes: 4 additions & 1 deletion
prefs.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -216,8 +216,10 @@ class Settings {

 this._sensorPageGates = {
 'temperature': { toggle: 'show-temperature', widgets: ['unit'] },
 'coolant': { toggle: 'show-coolant', widgets: ['coolant-unit'] },
 'voltage': { toggle: 'show-voltage', widgets: [] },
 'fan': { toggle: 'show-fan', widgets: [] },
 'pump': { toggle: 'show-pump', widgets: [] },
 'memory': { toggle: 'show-memory', widgets: ['memory-measurement'] },
 'processor': { toggle: 'show-processor', widgets: ['include-static-info'] },
 'system': { toggle: 'show-system', widgets: ['monitor-cmd'] },
Expand DownExpand Up@@ -303,6 +305,7 @@ class Settings {

 // process sensor toggles
 let sensors = [ 'show-temperature', 'show-voltage', 'show-fan',
 'show-coolant', 'show-pump',
 'show-memory', 'show-processor', 'show-system',
 'show-network', 'show-storage', 'use-higher-precision',
 'alphabetize', 'hide-zeros', 'include-public-ip',
Expand DownExpand Up@@ -330,7 +333,7 @@ class Settings {

 // process individual drop down sensor preferences
 sensors = [
 'position-in-panel', 'unit', 'network-speed-format', 'network-speed-unit',
 'position-in-panel', 'unit', 'coolant-unit', 'network-speed-format', 'network-speed-unit',
 'memory-measurement', 'storage-measurement', 'battery-slot', 'icon-style',
 'network-public-ip-provider'
 ];
Expand Down

119 changes: 119 additions & 0 deletions
prefs.ui

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,6 +108,34 @@
 </child>
 </object>
 </child>
 <child>
 <object class="GtkListBoxRow">
 <property name="name">coolant</property>
 <child>
 <object class="GtkBox">
 <property name="orientation">horizontal</property>
 <property name="spacing">12</property>
 <property name="margin-start">6</property>
 <property name="margin-end">6</property>
 <property name="margin-top">4</property>
 <property name="margin-bottom">4</property>
 <child>
 <object class="GtkImage" id="sidebar-icon-coolant">
 <property name="icon-name">water-droplet-symbolic</property>
 <property name="pixel-size">16</property>
 </object>
 </child>
 <child>
 <object class="GtkLabel">
 <property name="label" translatable="yes">Coolant</property>
 <property name="xalign">0</property>
 <property name="hexpand">True</property>
 </object>
 </child>
 </object>
 </child>
 </object>
 </child>
 <child>
 <object class="GtkListBoxRow">
 <property name="name">voltage</property>
Expand DownExpand Up@@ -164,6 +192,34 @@
 </child>
 </object>
 </child>
 <child>
 <object class="GtkListBoxRow">
 <property name="name">pump</property>
 <child>
 <object class="GtkBox">
 <property name="orientation">horizontal</property>
 <property name="spacing">12</property>
 <property name="margin-start">6</property>
 <property name="margin-end">6</property>
 <property name="margin-top">4</property>
 <property name="margin-bottom">4</property>
 <child>
 <object class="GtkImage" id="sidebar-icon-pump">
 <property name="icon-name">pump-symbolic</property>
 <property name="pixel-size">16</property>
 </object>
 </child>
 <child>
 <object class="GtkLabel">
 <property name="label" translatable="yes">Pump</property>
 <property name="xalign">0</property>
 <property name="hexpand">True</property>
 </object>
 </child>
 </object>
 </child>
 </object>
 </child>
 <child>
 <object class="GtkListBoxRow">
 <property name="name">memory</property>
Expand DownExpand Up@@ -589,6 +645,45 @@
 </child>
 </object>

 <!-- Coolant -->
 <object class="AdwPreferencesPage" id="coolant-page">
 <property name="name">coolant</property>
 <property name="title" translatable="yes">Coolant</property>
 <property name="icon-name">water-droplet-symbolic</property>
 <child>
 <object class="AdwPreferencesGroup">
 <property name="margin-start">10</property>
 <property name="margin-end">10</property>
 <child>
 <object class="AdwActionRow">
 <property name="title" translatable="yes">Monitor coolant</property>
 <property name="activatable-widget">show-coolant</property>
 <child type="suffix">
 <object class="GtkSwitch" id="show-coolant">
 <property name="valign">center</property>
 </object>
 </child>
 </object>
 </child>
 <child>
 <object class="AdwActionRow">
 <property name="title" translatable="yes">Unit</property>
 <property name="activatable-widget">coolant-unit</property>
 <child type="suffix">
 <object class="GtkComboBoxText" id="coolant-unit">
 <property name="valign">center</property>
 <items>
 <item translatable="yes">°C</item>
 <item translatable="yes">°F</item>
 </items>
 </object>
 </child>
 </object>
 </child>
 </object>
 </child>
 </object>

 <!-- Voltage -->
 <object class="AdwPreferencesPage" id="voltage-page">
 <property name="name">voltage</property>
Expand DownExpand Up@@ -637,6 +732,30 @@
 </child>
 </object>

 <!-- Pump -->
 <object class="AdwPreferencesPage" id="pump-page">
 <property name="name">pump</property>
 <property name="title" translatable="yes">Pump</property>
 <property name="icon-name">pump-symbolic</property>
 <child>
 <object class="AdwPreferencesGroup">
 <property name="margin-start">10</property>
 <property name="margin-end">10</property>
 <child>
 <object class="AdwActionRow">
 <property name="title" translatable="yes">Monitor pump</property>
 <property name="activatable-widget">show-pump</property>
 <child type="suffix">
 <object class="GtkSwitch" id="show-pump">
 <property name="valign">center</property>
 </object>
 </child>
 </object>
 </child>
 </object>
 </child>
 </object>

 <!-- Memory -->
 <object class="AdwPreferencesPage" id="memory-page">
 <property name="name">memory</property>
Expand Down

25 changes: 25 additions & 0 deletions
schemas/org.gnome.shell.extensions.vitals.gschema.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,11 +41,26 @@
 <summary>Temperature unit</summary>
 <description>The unit ('centigrade' or 'fahrenheit') the extension should display the temperature in</description>
 </key>
 <key type="i" name="coolant-unit">
 <default>0</default>
 <summary>Coolant temperature unit</summary>
 <description>The unit ('centigrade' or 'fahrenheit') the extension should display the coolant temperature in</description>
 </key>
 <key type="b" name="show-voltage">
 <default>true</default>
 <summary>Monitor voltage</summary>
 <description>Display voltage of various components</description>
 </key>
 <key type="b" name="show-coolant">
 <default>true</default>
 <summary>Monitor coolant</summary>
 <description>Display liquid cooling loop coolant temperature</description>
 </key>
 <key type="b" name="show-pump">
 <default>true</default>
 <summary>Monitor pump</summary>
 <description>Display liquid cooling pump rotation per minute</description>
 </key>
 <key type="b" name="show-fan">
 <default>true</default>
 <summary>Monitor fan</summary>
Expand DownExpand Up@@ -179,6 +194,16 @@
 <summary>Fan color thresholds</summary>
 <description>Color rules matched against fan RPM. Entries are "threshold r g b" or "threshold r g b sensor:&lt;key&gt;" per sensor. Unknown sensor keys are ignored.</description>
 </key>
 <key name="coolant-colors" type="as">
 <default>["35 0.9647058844566345 0.8274509906768799 0.1764705926179886", "40 1 0.47058823704719543 0", "45 0.8784313797950745 0.10588235408067703 0.1411764770746231"]</default>
 <summary>Coolant color thresholds</summary>
 <description>Color rules matched against the displayed coolant temperature. Entries are "threshold r g b".</description>
 </key>
 <key name="pump-colors" type="as">
 <default>[]</default>
 <summary>Pump color thresholds</summary>
 <description>Color rules matched against pump RPM. Entries are "threshold r g b".</description>
 </key>
 <key name="memory-colors" type="as">
 <default>[]</default>
 <summary>Memory usage color thresholds</summary>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Implemented Aquacomputer Next Vision coolant temperature reading#487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

420coupe
wants to merge
1
commit into

base:main
Choose a base branch

from

 Open


Implemented Aquacomputer Next Vision coolant temperature reading
#487
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
extension.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,7 +80,7 @@ var VitalsMenuButton = GObject.registerClass({
 this);

 let settings = [ 'use-higher-precision', 'alphabetize', 'hide-zeros',
 'fixed-widths', 'hide-icons', 'unit',
 'fixed-widths', 'hide-icons', 'unit', 'coolant-unit',
 'memory-measurement', 'include-public-ip', 'network-public-ip-interval',
 'network-public-ip-show-flag', 'network-public-ip-provider', 'network-speed-format', 'network-speed-unit', 'storage-measurement',
 'include-static-info', 'include-static-gpu-info' ];
Expand Down

36 changes: 28 additions & 8 deletions
helpers/catalog.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
/* Shared sensor catalog for shell and preferences. */
export const sensorCatalog = {
 'temperature' : { 'icon': 'temperature-symbolic.svg', colorFormats: ['temp'] },
 'voltage' : { 'icon': 'voltage-symbolic.svg' },
 'fan' : { 'icon': 'fan-symbolic.svg', colorFormats: ['fan'] },
 'temperature' : { 'icon': 'temperature-symbolic.svg', colorFormats: ['temp'], aggregate: true },
 'coolant' : { 'icon': 'water-droplet-symbolic.svg', colorFormats: ['temp'], aggregate: true,
 unitSetting: 'coolant-unit' },
 'voltage' : { 'icon': 'voltage-symbolic.svg', aggregate: true },
 'fan' : { 'icon': 'fan-symbolic.svg', colorFormats: ['fan'], aggregate: true },
 'pump' : { 'icon': 'pump-symbolic.svg', colorFormats: ['fan'], aggregate: true },
 'memory' : { 'icon': 'memory-symbolic.svg', colorFormats: ['percent'] },
 'processor' : { 'icon': 'cpu-symbolic.svg', colorFormats: ['percent'] },
 'system' : { 'icon': 'system-symbolic.svg', colorFormats: ['load'] },
Expand DownExpand Up@@ -268,7 +271,14 @@ export function sensorGroupFromType(type) {
 let group = (type || '').replace(/-group$/, '');
 if (group.startsWith('gpu'))
 return 'gpu';
 return group.replace(/#\d+$/, '');
 group = group.replace(/#\d+$/, '');

 // types may carry a suffix, eg 'network-rx' or 'network-us'. Every catalog
 // group is a single word, so fall back to the leading segment.
 if (!(group in sensorCatalog))
 group = group.split('-')[0];

 return group;
}

export function colorSettingsKeys() {
Expand All@@ -279,19 +289,29 @@ export function colorSettingsKeys() {

// GSettings key for threshold colors for a live sensor (shared by values + prefs).
export function colorsKeyForSensor(type, format) {
 // All temperatures share the temperature threshold UI, including GPU rows.
 if (format === 'temp')
 return 'temperature-colors';

 const group = sensorGroupFromType(type);
 const formats = sensorCatalog[group]?.colorFormats;
 if (formats && formats.includes(format))
 return `${group}-colors`;

 // remaining temperatures share the temperature threshold UI, including GPU rows
 if (format === 'temp')
 return 'temperature-colors';

 return null;
}

export function colorPageForSensor(type, format) {
 let key = colorsKeyForSensor(type, format);
 return key ? key.slice(0, -'-colors'.length) : null;
}

// groups discovered from hardware monitors and summarized by a group average
export function isAggregateGroup(group) {
 return !!sensorCatalog[group]?.aggregate;
}

// a group may pick its own temperature unit, eg coolant reads coolant-unit
export function unitSettingForType(type) {
 return sensorCatalog[sensorGroupFromType(type)]?.unitSetting ?? 'unit';
}

1 change: 1 addition & 0 deletions
icons/gnome/pump-symbolic.svg

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

3 changes: 3 additions & 0 deletions
icons/gnome/water-droplet-symbolic.svg

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

1 change: 1 addition & 0 deletions
icons/original/pump-symbolic.svg

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

3 changes: 3 additions & 0 deletions
icons/original/water-droplet-symbolic.svg

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

5 changes: 4 additions & 1 deletion
prefs.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -216,8 +216,10 @@ class Settings {

 this._sensorPageGates = {
 'temperature': { toggle: 'show-temperature', widgets: ['unit'] },
 'coolant': { toggle: 'show-coolant', widgets: ['coolant-unit'] },
 'voltage': { toggle: 'show-voltage', widgets: [] },
 'fan': { toggle: 'show-fan', widgets: [] },
 'pump': { toggle: 'show-pump', widgets: [] },
 'memory': { toggle: 'show-memory', widgets: ['memory-measurement'] },
 'processor': { toggle: 'show-processor', widgets: ['include-static-info'] },
 'system': { toggle: 'show-system', widgets: ['monitor-cmd'] },
Expand DownExpand Up@@ -303,6 +305,7 @@ class Settings {

 // process sensor toggles
 let sensors = [ 'show-temperature', 'show-voltage', 'show-fan',
 'show-coolant', 'show-pump',
 'show-memory', 'show-processor', 'show-system',
 'show-network', 'show-storage', 'use-higher-precision',
 'alphabetize', 'hide-zeros', 'include-public-ip',
Expand DownExpand Up@@ -330,7 +333,7 @@ class Settings {

 // process individual drop down sensor preferences
 sensors = [
 'position-in-panel', 'unit', 'network-speed-format', 'network-speed-unit',
 'position-in-panel', 'unit', 'coolant-unit', 'network-speed-format', 'network-speed-unit',
 'memory-measurement', 'storage-measurement', 'battery-slot', 'icon-style',
 'network-public-ip-provider'
 ];
Expand Down

119 changes: 119 additions & 0 deletions
prefs.ui

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,6 +108,34 @@
 </child>
 </object>
 </child>
 <child>
 <object class="GtkListBoxRow">
 <property name="name">coolant</property>
 <child>
 <object class="GtkBox">
 <property name="orientation">horizontal</property>
 <property name="spacing">12</property>
 <property name="margin-start">6</property>
 <property name="margin-end">6</property>
 <property name="margin-top">4</property>
 <property name="margin-bottom">4</property>
 <child>
 <object class="GtkImage" id="sidebar-icon-coolant">
 <property name="icon-name">water-droplet-symbolic</property>
 <property name="pixel-size">16</property>
 </object>
 </child>
 <child>
 <object class="GtkLabel">
 <property name="label" translatable="yes">Coolant</property>
 <property name="xalign">0</property>
 <property name="hexpand">True</property>
 </object>
 </child>
 </object>
 </child>
 </object>
 </child>
 <child>
 <object class="GtkListBoxRow">
 <property name="name">voltage</property>
Expand DownExpand Up@@ -164,6 +192,34 @@
 </child>
 </object>
 </child>
 <child>
 <object class="GtkListBoxRow">
 <property name="name">pump</property>
 <child>
 <object class="GtkBox">
 <property name="orientation">horizontal</property>
 <property name="spacing">12</property>
 <property name="margin-start">6</property>
 <property name="margin-end">6</property>
 <property name="margin-top">4</property>
 <property name="margin-bottom">4</property>
 <child>
 <object class="GtkImage" id="sidebar-icon-pump">
 <property name="icon-name">pump-symbolic</property>
 <property name="pixel-size">16</property>
 </object>
 </child>
 <child>
 <object class="GtkLabel">
 <property name="label" translatable="yes">Pump</property>
 <property name="xalign">0</property>
 <property name="hexpand">True</property>
 </object>
 </child>
 </object>
 </child>
 </object>
 </child>
 <child>
 <object class="GtkListBoxRow">
 <property name="name">memory</property>
Expand DownExpand Up@@ -589,6 +645,45 @@
 </child>
 </object>

 <!-- Coolant -->
 <object class="AdwPreferencesPage" id="coolant-page">
 <property name="name">coolant</property>
 <property name="title" translatable="yes">Coolant</property>
 <property name="icon-name">water-droplet-symbolic</property>
 <child>
 <object class="AdwPreferencesGroup">
 <property name="margin-start">10</property>
 <property name="margin-end">10</property>
 <child>
 <object class="AdwActionRow">
 <property name="title" translatable="yes">Monitor coolant</property>
 <property name="activatable-widget">show-coolant</property>
 <child type="suffix">
 <object class="GtkSwitch" id="show-coolant">
 <property name="valign">center</property>
 </object>
 </child>
 </object>
 </child>
 <child>
 <object class="AdwActionRow">
 <property name="title" translatable="yes">Unit</property>
 <property name="activatable-widget">coolant-unit</property>
 <child type="suffix">
 <object class="GtkComboBoxText" id="coolant-unit">
 <property name="valign">center</property>
 <items>
 <item translatable="yes">°C</item>
 <item translatable="yes">°F</item>
 </items>
 </object>
 </child>
 </object>
 </child>
 </object>
 </child>
 </object>

 <!-- Voltage -->
 <object class="AdwPreferencesPage" id="voltage-page">
 <property name="name">voltage</property>
Expand DownExpand Up@@ -637,6 +732,30 @@
 </child>
 </object>

 <!-- Pump -->
 <object class="AdwPreferencesPage" id="pump-page">
 <property name="name">pump</property>
 <property name="title" translatable="yes">Pump</property>
 <property name="icon-name">pump-symbolic</property>
 <child>
 <object class="AdwPreferencesGroup">
 <property name="margin-start">10</property>
 <property name="margin-end">10</property>
 <child>
 <object class="AdwActionRow">
 <property name="title" translatable="yes">Monitor pump</property>
 <property name="activatable-widget">show-pump</property>
 <child type="suffix">
 <object class="GtkSwitch" id="show-pump">
 <property name="valign">center</property>
 </object>
 </child>
 </object>
 </child>
 </object>
 </child>
 </object>

 <!-- Memory -->
 <object class="AdwPreferencesPage" id="memory-page">
 <property name="name">memory</property>
Expand Down

25 changes: 25 additions & 0 deletions
schemas/org.gnome.shell.extensions.vitals.gschema.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,11 +41,26 @@
 <summary>Temperature unit</summary>
 <description>The unit ('centigrade' or 'fahrenheit') the extension should display the temperature in</description>
 </key>
 <key type="i" name="coolant-unit">
 <default>0</default>
 <summary>Coolant temperature unit</summary>
 <description>The unit ('centigrade' or 'fahrenheit') the extension should display the coolant temperature in</description>
 </key>
 <key type="b" name="show-voltage">
 <default>true</default>
 <summary>Monitor voltage</summary>
 <description>Display voltage of various components</description>
 </key>
 <key type="b" name="show-coolant">
 <default>true</default>
 <summary>Monitor coolant</summary>
 <description>Display liquid cooling loop coolant temperature</description>
 </key>
 <key type="b" name="show-pump">
 <default>true</default>
 <summary>Monitor pump</summary>
 <description>Display liquid cooling pump rotation per minute</description>
 </key>
 <key type="b" name="show-fan">
 <default>true</default>
 <summary>Monitor fan</summary>
Expand DownExpand Up@@ -179,6 +194,16 @@
 <summary>Fan color thresholds</summary>
 <description>Color rules matched against fan RPM. Entries are "threshold r g b" or "threshold r g b sensor:&lt;key&gt;" per sensor. Unknown sensor keys are ignored.</description>
 </key>
 <key name="coolant-colors" type="as">
 <default>["35 0.9647058844566345 0.8274509906768799 0.1764705926179886", "40 1 0.47058823704719543 0", "45 0.8784313797950745 0.10588235408067703 0.1411764770746231"]</default>
 <summary>Coolant color thresholds</summary>
 <description>Color rules matched against the displayed coolant temperature. Entries are "threshold r g b".</description>
 </key>
 <key name="pump-colors" type="as">
 <default>[]</default>
 <summary>Pump color thresholds</summary>
 <description>Color rules matched against pump RPM. Entries are "threshold r g b".</description>
 </key>
 <key name="memory-colors" type="as">
 <default>[]</default>
 <summary>Memory usage color thresholds</summary>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Implemented Aquacomputer Next Vision coolant temperature reading#487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

420coupe
wants to merge
1
commit into

base:main
Choose a base branch

from

 Open


Implemented Aquacomputer Next Vision coolant temperature reading
#487
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
extension.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,7 +80,7 @@ var VitalsMenuButton = GObject.registerClass({
 this);

 let settings = [ 'use-higher-precision', 'alphabetize', 'hide-zeros',
 'fixed-widths', 'hide-icons', 'unit',
 'fixed-widths', 'hide-icons', 'unit', 'coolant-unit',
 'memory-measurement', 'include-public-ip', 'network-public-ip-interval',
 'network-public-ip-show-flag', 'network-public-ip-provider', 'network-speed-format', 'network-speed-unit', 'storage-measurement',
 'include-static-info', 'include-static-gpu-info' ];
Expand Down

36 changes: 28 additions & 8 deletions
helpers/catalog.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
/* Shared sensor catalog for shell and preferences. */
export const sensorCatalog = {
 'temperature' : { 'icon': 'temperature-symbolic.svg', colorFormats: ['temp'] },
 'voltage' : { 'icon': 'voltage-symbolic.svg' },
 'fan' : { 'icon': 'fan-symbolic.svg', colorFormats: ['fan'] },
 'temperature' : { 'icon': 'temperature-symbolic.svg', colorFormats: ['temp'], aggregate: true },
 'coolant' : { 'icon': 'water-droplet-symbolic.svg', colorFormats: ['temp'], aggregate: true,
 unitSetting: 'coolant-unit' },
 'voltage' : { 'icon': 'voltage-symbolic.svg', aggregate: true },
 'fan' : { 'icon': 'fan-symbolic.svg', colorFormats: ['fan'], aggregate: true },
 'pump' : { 'icon': 'pump-symbolic.svg', colorFormats: ['fan'], aggregate: true },
 'memory' : { 'icon': 'memory-symbolic.svg', colorFormats: ['percent'] },
 'processor' : { 'icon': 'cpu-symbolic.svg', colorFormats: ['percent'] },
 'system' : { 'icon': 'system-symbolic.svg', colorFormats: ['load'] },
Expand DownExpand Up@@ -268,7 +271,14 @@ export function sensorGroupFromType(type) {
 let group = (type || '').replace(/-group$/, '');
 if (group.startsWith('gpu'))
 return 'gpu';
 return group.replace(/#\d+$/, '');
 group = group.replace(/#\d+$/, '');

 // types may carry a suffix, eg 'network-rx' or 'network-us'. Every catalog
 // group is a single word, so fall back to the leading segment.
 if (!(group in sensorCatalog))
 group = group.split('-')[0];

 return group;
}

export function colorSettingsKeys() {
Expand All@@ -279,19 +289,29 @@ export function colorSettingsKeys() {

// GSettings key for threshold colors for a live sensor (shared by values + prefs).
export function colorsKeyForSensor(type, format) {
 // All temperatures share the temperature threshold UI, including GPU rows.
 if (format === 'temp')
 return 'temperature-colors';

 const group = sensorGroupFromType(type);
 const formats = sensorCatalog[group]?.colorFormats;
 if (formats && formats.includes(format))
 return `${group}-colors`;

 // remaining temperatures share the temperature threshold UI, including GPU rows
 if (format === 'temp')
 return 'temperature-colors';

 return null;
}

export function colorPageForSensor(type, format) {
 let key = colorsKeyForSensor(type, format);
 return key ? key.slice(0, -'-colors'.length) : null;
}

// groups discovered from hardware monitors and summarized by a group average
export function isAggregateGroup(group) {
 return !!sensorCatalog[group]?.aggregate;
}

// a group may pick its own temperature unit, eg coolant reads coolant-unit
export function unitSettingForType(type) {
 return sensorCatalog[sensorGroupFromType(type)]?.unitSetting ?? 'unit';
}

1 change: 1 addition & 0 deletions
icons/gnome/pump-symbolic.svg

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

3 changes: 3 additions & 0 deletions
icons/gnome/water-droplet-symbolic.svg

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

1 change: 1 addition & 0 deletions
icons/original/pump-symbolic.svg

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

3 changes: 3 additions & 0 deletions
icons/original/water-droplet-symbolic.svg

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

5 changes: 4 additions & 1 deletion
prefs.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -216,8 +216,10 @@ class Settings {

 this._sensorPageGates = {
 'temperature': { toggle: 'show-temperature', widgets: ['unit'] },
 'coolant': { toggle: 'show-coolant', widgets: ['coolant-unit'] },
 'voltage': { toggle: 'show-voltage', widgets: [] },
 'fan': { toggle: 'show-fan', widgets: [] },
 'pump': { toggle: 'show-pump', widgets: [] },
 'memory': { toggle: 'show-memory', widgets: ['memory-measurement'] },
 'processor': { toggle: 'show-processor', widgets: ['include-static-info'] },
 'system': { toggle: 'show-system', widgets: ['monitor-cmd'] },
Expand DownExpand Up@@ -303,6 +305,7 @@ class Settings {

 // process sensor toggles
 let sensors = [ 'show-temperature', 'show-voltage', 'show-fan',
 'show-coolant', 'show-pump',
 'show-memory', 'show-processor', 'show-system',
 'show-network', 'show-storage', 'use-higher-precision',
 'alphabetize', 'hide-zeros', 'include-public-ip',
Expand DownExpand Up@@ -330,7 +333,7 @@ class Settings {

 // process individual drop down sensor preferences
 sensors = [
 'position-in-panel', 'unit', 'network-speed-format', 'network-speed-unit',
 'position-in-panel', 'unit', 'coolant-unit', 'network-speed-format', 'network-speed-unit',
 'memory-measurement', 'storage-measurement', 'battery-slot', 'icon-style',
 'network-public-ip-provider'
 ];
Expand Down

119 changes: 119 additions & 0 deletions
prefs.ui

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,6 +108,34 @@
 </child>
 </object>
 </child>
 <child>
 <object class="GtkListBoxRow">
 <property name="name">coolant</property>
 <child>
 <object class="GtkBox">
 <property name="orientation">horizontal</property>
 <property name="spacing">12</property>
 <property name="margin-start">6</property>
 <property name="margin-end">6</property>
 <property name="margin-top">4</property>
 <property name="margin-bottom">4</property>
 <child>
 <object class="GtkImage" id="sidebar-icon-coolant">
 <property name="icon-name">water-droplet-symbolic</property>
 <property name="pixel-size">16</property>
 </object>
 </child>
 <child>
 <object class="GtkLabel">
 <property name="label" translatable="yes">Coolant</property>
 <property name="xalign">0</property>
 <property name="hexpand">True</property>
 </object>
 </child>
 </object>
 </child>
 </object>
 </child>
 <child>
 <object class="GtkListBoxRow">
 <property name="name">voltage</property>
Expand DownExpand Up@@ -164,6 +192,34 @@
 </child>
 </object>
 </child>
 <child>
 <object class="GtkListBoxRow">
 <property name="name">pump</property>
 <child>
 <object class="GtkBox">
 <property name="orientation">horizontal</property>
 <property name="spacing">12</property>
 <property name="margin-start">6</property>
 <property name="margin-end">6</property>
 <property name="margin-top">4</property>
 <property name="margin-bottom">4</property>
 <child>
 <object class="GtkImage" id="sidebar-icon-pump">
 <property name="icon-name">pump-symbolic</property>
 <property name="pixel-size">16</property>
 </object>
 </child>
 <child>
 <object class="GtkLabel">
 <property name="label" translatable="yes">Pump</property>
 <property name="xalign">0</property>
 <property name="hexpand">True</property>
 </object>
 </child>
 </object>
 </child>
 </object>
 </child>
 <child>
 <object class="GtkListBoxRow">
 <property name="name">memory</property>
Expand DownExpand Up@@ -589,6 +645,45 @@
 </child>
 </object>

 <!-- Coolant -->
 <object class="AdwPreferencesPage" id="coolant-page">
 <property name="name">coolant</property>
 <property name="title" translatable="yes">Coolant</property>
 <property name="icon-name">water-droplet-symbolic</property>
 <child>
 <object class="AdwPreferencesGroup">
 <property name="margin-start">10</property>
 <property name="margin-end">10</property>
 <child>
 <object class="AdwActionRow">
 <property name="title" translatable="yes">Monitor coolant</property>
 <property name="activatable-widget">show-coolant</property>
 <child type="suffix">
 <object class="GtkSwitch" id="show-coolant">
 <property name="valign">center</property>
 </object>
 </child>
 </object>
 </child>
 <child>
 <object class="AdwActionRow">
 <property name="title" translatable="yes">Unit</property>
 <property name="activatable-widget">coolant-unit</property>
 <child type="suffix">
 <object class="GtkComboBoxText" id="coolant-unit">
 <property name="valign">center</property>
 <items>
 <item translatable="yes">°C</item>
 <item translatable="yes">°F</item>
 </items>
 </object>
 </child>
 </object>
 </child>
 </object>
 </child>
 </object>

 <!-- Voltage -->
 <object class="AdwPreferencesPage" id="voltage-page">
 <property name="name">voltage</property>
Expand DownExpand Up@@ -637,6 +732,30 @@
 </child>
 </object>

 <!-- Pump -->
 <object class="AdwPreferencesPage" id="pump-page">
 <property name="name">pump</property>
 <property name="title" translatable="yes">Pump</property>
 <property name="icon-name">pump-symbolic</property>
 <child>
 <object class="AdwPreferencesGroup">
 <property name="margin-start">10</property>
 <property name="margin-end">10</property>
 <child>
 <object class="AdwActionRow">
 <property name="title" translatable="yes">Monitor pump</property>
 <property name="activatable-widget">show-pump</property>
 <child type="suffix">
 <object class="GtkSwitch" id="show-pump">
 <property name="valign">center</property>
 </object>
 </child>
 </object>
 </child>
 </object>
 </child>
 </object>

 <!-- Memory -->
 <object class="AdwPreferencesPage" id="memory-page">
 <property name="name">memory</property>
Expand Down

25 changes: 25 additions & 0 deletions
schemas/org.gnome.shell.extensions.vitals.gschema.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,11 +41,26 @@
 <summary>Temperature unit</summary>
 <description>The unit ('centigrade' or 'fahrenheit') the extension should display the temperature in</description>
 </key>
 <key type="i" name="coolant-unit">
 <default>0</default>
 <summary>Coolant temperature unit</summary>
 <description>The unit ('centigrade' or 'fahrenheit') the extension should display the coolant temperature in</description>
 </key>
 <key type="b" name="show-voltage">
 <default>true</default>
 <summary>Monitor voltage</summary>
 <description>Display voltage of various components</description>
 </key>
 <key type="b" name="show-coolant">
 <default>true</default>
 <summary>Monitor coolant</summary>
 <description>Display liquid cooling loop coolant temperature</description>
 </key>
 <key type="b" name="show-pump">
 <default>true</default>
 <summary>Monitor pump</summary>
 <description>Display liquid cooling pump rotation per minute</description>
 </key>
 <key type="b" name="show-fan">
 <default>true</default>
 <summary>Monitor fan</summary>
Expand DownExpand Up@@ -179,6 +194,16 @@
 <summary>Fan color thresholds</summary>
 <description>Color rules matched against fan RPM. Entries are "threshold r g b" or "threshold r g b sensor:&lt;key&gt;" per sensor. Unknown sensor keys are ignored.</description>
 </key>
 <key name="coolant-colors" type="as">
 <default>["35 0.9647058844566345 0.8274509906768799 0.1764705926179886", "40 1 0.47058823704719543 0", "45 0.8784313797950745 0.10588235408067703 0.1411764770746231"]</default>
 <summary>Coolant color thresholds</summary>
 <description>Color rules matched against the displayed coolant temperature. Entries are "threshold r g b".</description>
 </key>
 <key name="pump-colors" type="as">
 <default>[]</default>
 <summary>Pump color thresholds</summary>
 <description>Color rules matched against pump RPM. Entries are "threshold r g b".</description>
 </key>
 <key name="memory-colors" type="as">
 <default>[]</default>
 <summary>Memory usage color thresholds</summary>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Implemented Aquacomputer Next Vision coolant temperature reading#487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

420coupe
wants to merge
1
commit into

base:main
Choose a base branch

from

 Open


Implemented Aquacomputer Next Vision coolant temperature reading
#487
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
extension.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,7 +80,7 @@ var VitalsMenuButton = GObject.registerClass({
 this);

 let settings = [ 'use-higher-precision', 'alphabetize', 'hide-zeros',
 'fixed-widths', 'hide-icons', 'unit',
 'fixed-widths', 'hide-icons', 'unit', 'coolant-unit',
 'memory-measurement', 'include-public-ip', 'network-public-ip-interval',
 'network-public-ip-show-flag', 'network-public-ip-provider', 'network-speed-format', 'network-speed-unit', 'storage-measurement',
 'include-static-info', 'include-static-gpu-info' ];
Expand Down

36 changes: 28 additions & 8 deletions
helpers/catalog.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
/* Shared sensor catalog for shell and preferences. */
export const sensorCatalog = {
 'temperature' : { 'icon': 'temperature-symbolic.svg', colorFormats: ['temp'] },
 'voltage' : { 'icon': 'voltage-symbolic.svg' },
 'fan' : { 'icon': 'fan-symbolic.svg', colorFormats: ['fan'] },
 'temperature' : { 'icon': 'temperature-symbolic.svg', colorFormats: ['temp'], aggregate: true },
 'coolant' : { 'icon': 'water-droplet-symbolic.svg', colorFormats: ['temp'], aggregate: true,
 unitSetting: 'coolant-unit' },
 'voltage' : { 'icon': 'voltage-symbolic.svg', aggregate: true },
 'fan' : { 'icon': 'fan-symbolic.svg', colorFormats: ['fan'], aggregate: true },
 'pump' : { 'icon': 'pump-symbolic.svg', colorFormats: ['fan'], aggregate: true },
 'memory' : { 'icon': 'memory-symbolic.svg', colorFormats: ['percent'] },
 'processor' : { 'icon': 'cpu-symbolic.svg', colorFormats: ['percent'] },
 'system' : { 'icon': 'system-symbolic.svg', colorFormats: ['load'] },
Expand DownExpand Up@@ -268,7 +271,14 @@ export function sensorGroupFromType(type) {
 let group = (type || '').replace(/-group$/, '');
 if (group.startsWith('gpu'))
 return 'gpu';
 return group.replace(/#\d+$/, '');
 group = group.replace(/#\d+$/, '');

 // types may carry a suffix, eg 'network-rx' or 'network-us'. Every catalog
 // group is a single word, so fall back to the leading segment.
 if (!(group in sensorCatalog))
 group = group.split('-')[0];

 return group;
}

export function colorSettingsKeys() {
Expand All@@ -279,19 +289,29 @@ export function colorSettingsKeys() {

// GSettings key for threshold colors for a live sensor (shared by values + prefs).
export function colorsKeyForSensor(type, format) {
 // All temperatures share the temperature threshold UI, including GPU rows.
 if (format === 'temp')
 return 'temperature-colors';

 const group = sensorGroupFromType(type);
 const formats = sensorCatalog[group]?.colorFormats;
 if (formats && formats.includes(format))
 return `${group}-colors`;

 // remaining temperatures share the temperature threshold UI, including GPU rows
 if (format === 'temp')
 return 'temperature-colors';

 return null;
}

export function colorPageForSensor(type, format) {
 let key = colorsKeyForSensor(type, format);
 return key ? key.slice(0, -'-colors'.length) : null;
}

// groups discovered from hardware monitors and summarized by a group average
export function isAggregateGroup(group) {
 return !!sensorCatalog[group]?.aggregate;
}

// a group may pick its own temperature unit, eg coolant reads coolant-unit
export function unitSettingForType(type) {
 return sensorCatalog[sensorGroupFromType(type)]?.unitSetting ?? 'unit';
}

1 change: 1 addition & 0 deletions
icons/gnome/pump-symbolic.svg

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

3 changes: 3 additions & 0 deletions
icons/gnome/water-droplet-symbolic.svg

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

1 change: 1 addition & 0 deletions
icons/original/pump-symbolic.svg

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

3 changes: 3 additions & 0 deletions
icons/original/water-droplet-symbolic.svg

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

5 changes: 4 additions & 1 deletion
prefs.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -216,8 +216,10 @@ class Settings {

 this._sensorPageGates = {
 'temperature': { toggle: 'show-temperature', widgets: ['unit'] },
 'coolant': { toggle: 'show-coolant', widgets: ['coolant-unit'] },
 'voltage': { toggle: 'show-voltage', widgets: [] },
 'fan': { toggle: 'show-fan', widgets: [] },
 'pump': { toggle: 'show-pump', widgets: [] },
 'memory': { toggle: 'show-memory', widgets: ['memory-measurement'] },
 'processor': { toggle: 'show-processor', widgets: ['include-static-info'] },
 'system': { toggle: 'show-system', widgets: ['monitor-cmd'] },
Expand DownExpand Up@@ -303,6 +305,7 @@ class Settings {

 // process sensor toggles
 let sensors = [ 'show-temperature', 'show-voltage', 'show-fan',
 'show-coolant', 'show-pump',
 'show-memory', 'show-processor', 'show-system',
 'show-network', 'show-storage', 'use-higher-precision',
 'alphabetize', 'hide-zeros', 'include-public-ip',
Expand DownExpand Up@@ -330,7 +333,7 @@ class Settings {

 // process individual drop down sensor preferences
 sensors = [
 'position-in-panel', 'unit', 'network-speed-format', 'network-speed-unit',
 'position-in-panel', 'unit', 'coolant-unit', 'network-speed-format', 'network-speed-unit',
 'memory-measurement', 'storage-measurement', 'battery-slot', 'icon-style',
 'network-public-ip-provider'
 ];
Expand Down

119 changes: 119 additions & 0 deletions
prefs.ui

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,6 +108,34 @@
 </child>
 </object>
 </child>
 <child>
 <object class="GtkListBoxRow">
 <property name="name">coolant</property>
 <child>
 <object class="GtkBox">
 <property name="orientation">horizontal</property>
 <property name="spacing">12</property>
 <property name="margin-start">6</property>
 <property name="margin-end">6</property>
 <property name="margin-top">4</property>
 <property name="margin-bottom">4</property>
 <child>
 <object class="GtkImage" id="sidebar-icon-coolant">
 <property name="icon-name">water-droplet-symbolic</property>
 <property name="pixel-size">16</property>
 </object>
 </child>
 <child>
 <object class="GtkLabel">
 <property name="label" translatable="yes">Coolant</property>
 <property name="xalign">0</property>
 <property name="hexpand">True</property>
 </object>
 </child>
 </object>
 </child>
 </object>
 </child>
 <child>
 <object class="GtkListBoxRow">
 <property name="name">voltage</property>
Expand DownExpand Up@@ -164,6 +192,34 @@
 </child>
 </object>
 </child>
 <child>
 <object class="GtkListBoxRow">
 <property name="name">pump</property>
 <child>
 <object class="GtkBox">
 <property name="orientation">horizontal</property>
 <property name="spacing">12</property>
 <property name="margin-start">6</property>
 <property name="margin-end">6</property>
 <property name="margin-top">4</property>
 <property name="margin-bottom">4</property>
 <child>
 <object class="GtkImage" id="sidebar-icon-pump">
 <property name="icon-name">pump-symbolic</property>
 <property name="pixel-size">16</property>
 </object>
 </child>
 <child>
 <object class="GtkLabel">
 <property name="label" translatable="yes">Pump</property>
 <property name="xalign">0</property>
 <property name="hexpand">True</property>
 </object>
 </child>
 </object>
 </child>
 </object>
 </child>
 <child>
 <object class="GtkListBoxRow">
 <property name="name">memory</property>
Expand DownExpand Up@@ -589,6 +645,45 @@
 </child>
 </object>

 <!-- Coolant -->
 <object class="AdwPreferencesPage" id="coolant-page">
 <property name="name">coolant</property>
 <property name="title" translatable="yes">Coolant</property>
 <property name="icon-name">water-droplet-symbolic</property>
 <child>
 <object class="AdwPreferencesGroup">
 <property name="margin-start">10</property>
 <property name="margin-end">10</property>
 <child>
 <object class="AdwActionRow">
 <property name="title" translatable="yes">Monitor coolant</property>
 <property name="activatable-widget">show-coolant</property>
 <child type="suffix">
 <object class="GtkSwitch" id="show-coolant">
 <property name="valign">center</property>
 </object>
 </child>
 </object>
 </child>
 <child>
 <object class="AdwActionRow">
 <property name="title" translatable="yes">Unit</property>
 <property name="activatable-widget">coolant-unit</property>
 <child type="suffix">
 <object class="GtkComboBoxText" id="coolant-unit">
 <property name="valign">center</property>
 <items>
 <item translatable="yes">°C</item>
 <item translatable="yes">°F</item>
 </items>
 </object>
 </child>
 </object>
 </child>
 </object>
 </child>
 </object>

 <!-- Voltage -->
 <object class="AdwPreferencesPage" id="voltage-page">
 <property name="name">voltage</property>
Expand DownExpand Up@@ -637,6 +732,30 @@
 </child>
 </object>

 <!-- Pump -->
 <object class="AdwPreferencesPage" id="pump-page">
 <property name="name">pump</property>
 <property name="title" translatable="yes">Pump</property>
 <property name="icon-name">pump-symbolic</property>
 <child>
 <object class="AdwPreferencesGroup">
 <property name="margin-start">10</property>
 <property name="margin-end">10</property>
 <child>
 <object class="AdwActionRow">
 <property name="title" translatable="yes">Monitor pump</property>
 <property name="activatable-widget">show-pump</property>
 <child type="suffix">
 <object class="GtkSwitch" id="show-pump">
 <property name="valign">center</property>
 </object>
 </child>
 </object>
 </child>
 </object>
 </child>
 </object>

 <!-- Memory -->
 <object class="AdwPreferencesPage" id="memory-page">
 <property name="name">memory</property>
Expand Down

25 changes: 25 additions & 0 deletions
schemas/org.gnome.shell.extensions.vitals.gschema.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,11 +41,26 @@
 <summary>Temperature unit</summary>
 <description>The unit ('centigrade' or 'fahrenheit') the extension should display the temperature in</description>
 </key>
 <key type="i" name="coolant-unit">
 <default>0</default>
 <summary>Coolant temperature unit</summary>
 <description>The unit ('centigrade' or 'fahrenheit') the extension should display the coolant temperature in</description>
 </key>
 <key type="b" name="show-voltage">
 <default>true</default>
 <summary>Monitor voltage</summary>
 <description>Display voltage of various components</description>
 </key>
 <key type="b" name="show-coolant">
 <default>true</default>
 <summary>Monitor coolant</summary>
 <description>Display liquid cooling loop coolant temperature</description>
 </key>
 <key type="b" name="show-pump">
 <default>true</default>
 <summary>Monitor pump</summary>
 <description>Display liquid cooling pump rotation per minute</description>
 </key>
 <key type="b" name="show-fan">
 <default>true</default>
 <summary>Monitor fan</summary>
Expand DownExpand Up@@ -179,6 +194,16 @@
 <summary>Fan color thresholds</summary>
 <description>Color rules matched against fan RPM. Entries are "threshold r g b" or "threshold r g b sensor:&lt;key&gt;" per sensor. Unknown sensor keys are ignored.</description>
 </key>
 <key name="coolant-colors" type="as">
 <default>["35 0.9647058844566345 0.8274509906768799 0.1764705926179886", "40 1 0.47058823704719543 0", "45 0.8784313797950745 0.10588235408067703 0.1411764770746231"]</default>
 <summary>Coolant color thresholds</summary>
 <description>Color rules matched against the displayed coolant temperature. Entries are "threshold r g b".</description>
 </key>
 <key name="pump-colors" type="as">
 <default>[]</default>
 <summary>Pump color thresholds</summary>
 <description>Color rules matched against pump RPM. Entries are "threshold r g b".</description>
 </key>
 <key name="memory-colors" type="as">
 <default>[]</default>
 <summary>Memory usage color thresholds</summary>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Implemented Aquacomputer Next Vision coolant temperature reading#487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

420coupe
wants to merge
1
commit into

base:main
Choose a base branch

from

 Open


Implemented Aquacomputer Next Vision coolant temperature reading
#487
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
extension.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,7 +80,7 @@ var VitalsMenuButton = GObject.registerClass({
 this);

 let settings = [ 'use-higher-precision', 'alphabetize', 'hide-zeros',
 'fixed-widths', 'hide-icons', 'unit',
 'fixed-widths', 'hide-icons', 'unit', 'coolant-unit',
 'memory-measurement', 'include-public-ip', 'network-public-ip-interval',
 'network-public-ip-show-flag', 'network-public-ip-provider', 'network-speed-format', 'network-speed-unit', 'storage-measurement',
 'include-static-info', 'include-static-gpu-info' ];
Expand Down

36 changes: 28 additions & 8 deletions
helpers/catalog.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
/* Shared sensor catalog for shell and preferences. */
export const sensorCatalog = {
 'temperature' : { 'icon': 'temperature-symbolic.svg', colorFormats: ['temp'] },
 'voltage' : { 'icon': 'voltage-symbolic.svg' },
 'fan' : { 'icon': 'fan-symbolic.svg', colorFormats: ['fan'] },
 'temperature' : { 'icon': 'temperature-symbolic.svg', colorFormats: ['temp'], aggregate: true },
 'coolant' : { 'icon': 'water-droplet-symbolic.svg', colorFormats: ['temp'], aggregate: true,
 unitSetting: 'coolant-unit' },
 'voltage' : { 'icon': 'voltage-symbolic.svg', aggregate: true },
 'fan' : { 'icon': 'fan-symbolic.svg', colorFormats: ['fan'], aggregate: true },
 'pump' : { 'icon': 'pump-symbolic.svg', colorFormats: ['fan'], aggregate: true },
 'memory' : { 'icon': 'memory-symbolic.svg', colorFormats: ['percent'] },
 'processor' : { 'icon': 'cpu-symbolic.svg', colorFormats: ['percent'] },
 'system' : { 'icon': 'system-symbolic.svg', colorFormats: ['load'] },
Expand DownExpand Up@@ -268,7 +271,14 @@ export function sensorGroupFromType(type) {
 let group = (type || '').replace(/-group$/, '');
 if (group.startsWith('gpu'))
 return 'gpu';
 return group.replace(/#\d+$/, '');
 group = group.replace(/#\d+$/, '');

 // types may carry a suffix, eg 'network-rx' or 'network-us'. Every catalog
 // group is a single word, so fall back to the leading segment.
 if (!(group in sensorCatalog))
 group = group.split('-')[0];

 return group;
}

export function colorSettingsKeys() {
Expand All@@ -279,19 +289,29 @@ export function colorSettingsKeys() {

// GSettings key for threshold colors for a live sensor (shared by values + prefs).
export function colorsKeyForSensor(type, format) {
 // All temperatures share the temperature threshold UI, including GPU rows.
 if (format === 'temp')
 return 'temperature-colors';

 const group = sensorGroupFromType(type);
 const formats = sensorCatalog[group]?.colorFormats;
 if (formats && formats.includes(format))
 return `${group}-colors`;

 // remaining temperatures share the temperature threshold UI, including GPU rows
 if (format === 'temp')
 return 'temperature-colors';

 return null;
}

export function colorPageForSensor(type, format) {
 let key = colorsKeyForSensor(type, format);
 return key ? key.slice(0, -'-colors'.length) : null;
}

// groups discovered from hardware monitors and summarized by a group average
export function isAggregateGroup(group) {
 return !!sensorCatalog[group]?.aggregate;
}

// a group may pick its own temperature unit, eg coolant reads coolant-unit
export function unitSettingForType(type) {
 return sensorCatalog[sensorGroupFromType(type)]?.unitSetting ?? 'unit';
}

1 change: 1 addition & 0 deletions
icons/gnome/pump-symbolic.svg

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

3 changes: 3 additions & 0 deletions
icons/gnome/water-droplet-symbolic.svg

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

1 change: 1 addition & 0 deletions
icons/original/pump-symbolic.svg

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

3 changes: 3 additions & 0 deletions
icons/original/water-droplet-symbolic.svg

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

5 changes: 4 additions & 1 deletion
prefs.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -216,8 +216,10 @@ class Settings {

 this._sensorPageGates = {
 'temperature': { toggle: 'show-temperature', widgets: ['unit'] },
 'coolant': { toggle: 'show-coolant', widgets: ['coolant-unit'] },
 'voltage': { toggle: 'show-voltage', widgets: [] },
 'fan': { toggle: 'show-fan', widgets: [] },
 'pump': { toggle: 'show-pump', widgets: [] },
 'memory': { toggle: 'show-memory', widgets: ['memory-measurement'] },
 'processor': { toggle: 'show-processor', widgets: ['include-static-info'] },
 'system': { toggle: 'show-system', widgets: ['monitor-cmd'] },
Expand DownExpand Up@@ -303,6 +305,7 @@ class Settings {

 // process sensor toggles
 let sensors = [ 'show-temperature', 'show-voltage', 'show-fan',
 'show-coolant', 'show-pump',
 'show-memory', 'show-processor', 'show-system',
 'show-network', 'show-storage', 'use-higher-precision',
 'alphabetize', 'hide-zeros', 'include-public-ip',
Expand DownExpand Up@@ -330,7 +333,7 @@ class Settings {

 // process individual drop down sensor preferences
 sensors = [
 'position-in-panel', 'unit', 'network-speed-format', 'network-speed-unit',
 'position-in-panel', 'unit', 'coolant-unit', 'network-speed-format', 'network-speed-unit',
 'memory-measurement', 'storage-measurement', 'battery-slot', 'icon-style',
 'network-public-ip-provider'
 ];
Expand Down

119 changes: 119 additions & 0 deletions
prefs.ui

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,6 +108,34 @@
 </child>
 </object>
 </child>
 <child>
 <object class="GtkListBoxRow">
 <property name="name">coolant</property>
 <child>
 <object class="GtkBox">
 <property name="orientation">horizontal</property>
 <property name="spacing">12</property>
 <property name="margin-start">6</property>
 <property name="margin-end">6</property>
 <property name="margin-top">4</property>
 <property name="margin-bottom">4</property>
 <child>
 <object class="GtkImage" id="sidebar-icon-coolant">
 <property name="icon-name">water-droplet-symbolic</property>
 <property name="pixel-size">16</property>
 </object>
 </child>
 <child>
 <object class="GtkLabel">
 <property name="label" translatable="yes">Coolant</property>
 <property name="xalign">0</property>
 <property name="hexpand">True</property>
 </object>
 </child>
 </object>
 </child>
 </object>
 </child>
 <child>
 <object class="GtkListBoxRow">
 <property name="name">voltage</property>
Expand DownExpand Up@@ -164,6 +192,34 @@
 </child>
 </object>
 </child>
 <child>
 <object class="GtkListBoxRow">
 <property name="name">pump</property>
 <child>
 <object class="GtkBox">
 <property name="orientation">horizontal</property>
 <property name="spacing">12</property>
 <property name="margin-start">6</property>
 <property name="margin-end">6</property>
 <property name="margin-top">4</property>
 <property name="margin-bottom">4</property>
 <child>
 <object class="GtkImage" id="sidebar-icon-pump">
 <property name="icon-name">pump-symbolic</property>
 <property name="pixel-size">16</property>
 </object>
 </child>
 <child>
 <object class="GtkLabel">
 <property name="label" translatable="yes">Pump</property>
 <property name="xalign">0</property>
 <property name="hexpand">True</property>
 </object>
 </child>
 </object>
 </child>
 </object>
 </child>
 <child>
 <object class="GtkListBoxRow">
 <property name="name">memory</property>
Expand DownExpand Up@@ -589,6 +645,45 @@
 </child>
 </object>

 <!-- Coolant -->
 <object class="AdwPreferencesPage" id="coolant-page">
 <property name="name">coolant</property>
 <property name="title" translatable="yes">Coolant</property>
 <property name="icon-name">water-droplet-symbolic</property>
 <child>
 <object class="AdwPreferencesGroup">
 <property name="margin-start">10</property>
 <property name="margin-end">10</property>
 <child>
 <object class="AdwActionRow">
 <property name="title" translatable="yes">Monitor coolant</property>
 <property name="activatable-widget">show-coolant</property>
 <child type="suffix">
 <object class="GtkSwitch" id="show-coolant">
 <property name="valign">center</property>
 </object>
 </child>
 </object>
 </child>
 <child>
 <object class="AdwActionRow">
 <property name="title" translatable="yes">Unit</property>
 <property name="activatable-widget">coolant-unit</property>
 <child type="suffix">
 <object class="GtkComboBoxText" id="coolant-unit">
 <property name="valign">center</property>
 <items>
 <item translatable="yes">°C</item>
 <item translatable="yes">°F</item>
 </items>
 </object>
 </child>
 </object>
 </child>
 </object>
 </child>
 </object>

 <!-- Voltage -->
 <object class="AdwPreferencesPage" id="voltage-page">
 <property name="name">voltage</property>
Expand DownExpand Up@@ -637,6 +732,30 @@
 </child>
 </object>

 <!-- Pump -->
 <object class="AdwPreferencesPage" id="pump-page">
 <property name="name">pump</property>
 <property name="title" translatable="yes">Pump</property>
 <property name="icon-name">pump-symbolic</property>
 <child>
 <object class="AdwPreferencesGroup">
 <property name="margin-start">10</property>
 <property name="margin-end">10</property>
 <child>
 <object class="AdwActionRow">
 <property name="title" translatable="yes">Monitor pump</property>
 <property name="activatable-widget">show-pump</property>
 <child type="suffix">
 <object class="GtkSwitch" id="show-pump">
 <property name="valign">center</property>
 </object>
 </child>
 </object>
 </child>
 </object>
 </child>
 </object>

 <!-- Memory -->
 <object class="AdwPreferencesPage" id="memory-page">
 <property name="name">memory</property>
Expand Down

25 changes: 25 additions & 0 deletions
schemas/org.gnome.shell.extensions.vitals.gschema.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,11 +41,26 @@
 <summary>Temperature unit</summary>
 <description>The unit ('centigrade' or 'fahrenheit') the extension should display the temperature in</description>
 </key>
 <key type="i" name="coolant-unit">
 <default>0</default>
 <summary>Coolant temperature unit</summary>
 <description>The unit ('centigrade' or 'fahrenheit') the extension should display the coolant temperature in</description>
 </key>
 <key type="b" name="show-voltage">
 <default>true</default>
 <summary>Monitor voltage</summary>
 <description>Display voltage of various components</description>
 </key>
 <key type="b" name="show-coolant">
 <default>true</default>
 <summary>Monitor coolant</summary>
 <description>Display liquid cooling loop coolant temperature</description>
 </key>
 <key type="b" name="show-pump">
 <default>true</default>
 <summary>Monitor pump</summary>
 <description>Display liquid cooling pump rotation per minute</description>
 </key>
 <key type="b" name="show-fan">
 <default>true</default>
 <summary>Monitor fan</summary>
Expand DownExpand Up@@ -179,6 +194,16 @@
 <summary>Fan color thresholds</summary>
 <description>Color rules matched against fan RPM. Entries are "threshold r g b" or "threshold r g b sensor:&lt;key&gt;" per sensor. Unknown sensor keys are ignored.</description>
 </key>
 <key name="coolant-colors" type="as">
 <default>["35 0.9647058844566345 0.8274509906768799 0.1764705926179886", "40 1 0.47058823704719543 0", "45 0.8784313797950745 0.10588235408067703 0.1411764770746231"]</default>
 <summary>Coolant color thresholds</summary>
 <description>Color rules matched against the displayed coolant temperature. Entries are "threshold r g b".</description>
 </key>
 <key name="pump-colors" type="as">
 <default>[]</default>
 <summary>Pump color thresholds</summary>
 <description>Color rules matched against pump RPM. Entries are "threshold r g b".</description>
 </key>
 <key name="memory-colors" type="as">
 <default>[]</default>
 <summary>Memory usage color thresholds</summary>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Implemented Aquacomputer Next Vision coolant temperature reading#487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

420coupe
wants to merge
1
commit into

base:main
Choose a base branch

from

 Open


Implemented Aquacomputer Next Vision coolant temperature reading
#487
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
extension.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,7 +80,7 @@ var VitalsMenuButton = GObject.registerClass({
 this);

 let settings = [ 'use-higher-precision', 'alphabetize', 'hide-zeros',
 'fixed-widths', 'hide-icons', 'unit',
 'fixed-widths', 'hide-icons', 'unit', 'coolant-unit',
 'memory-measurement', 'include-public-ip', 'network-public-ip-interval',
 'network-public-ip-show-flag', 'network-public-ip-provider', 'network-speed-format', 'network-speed-unit', 'storage-measurement',
 'include-static-info', 'include-static-gpu-info' ];
Expand Down

36 changes: 28 additions & 8 deletions
helpers/catalog.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
/* Shared sensor catalog for shell and preferences. */
export const sensorCatalog = {
 'temperature' : { 'icon': 'temperature-symbolic.svg', colorFormats: ['temp'] },
 'voltage' : { 'icon': 'voltage-symbolic.svg' },
 'fan' : { 'icon': 'fan-symbolic.svg', colorFormats: ['fan'] },
 'temperature' : { 'icon': 'temperature-symbolic.svg', colorFormats: ['temp'], aggregate: true },
 'coolant' : { 'icon': 'water-droplet-symbolic.svg', colorFormats: ['temp'], aggregate: true,
 unitSetting: 'coolant-unit' },
 'voltage' : { 'icon': 'voltage-symbolic.svg', aggregate: true },
 'fan' : { 'icon': 'fan-symbolic.svg', colorFormats: ['fan'], aggregate: true },
 'pump' : { 'icon': 'pump-symbolic.svg', colorFormats: ['fan'], aggregate: true },
 'memory' : { 'icon': 'memory-symbolic.svg', colorFormats: ['percent'] },
 'processor' : { 'icon': 'cpu-symbolic.svg', colorFormats: ['percent'] },
 'system' : { 'icon': 'system-symbolic.svg', colorFormats: ['load'] },
Expand DownExpand Up@@ -268,7 +271,14 @@ export function sensorGroupFromType(type) {
 let group = (type || '').replace(/-group$/, '');
 if (group.startsWith('gpu'))
 return 'gpu';
 return group.replace(/#\d+$/, '');
 group = group.replace(/#\d+$/, '');

 // types may carry a suffix, eg 'network-rx' or 'network-us'. Every catalog
 // group is a single word, so fall back to the leading segment.
 if (!(group in sensorCatalog))
 group = group.split('-')[0];

 return group;
}

export function colorSettingsKeys() {
Expand All@@ -279,19 +289,29 @@ export function colorSettingsKeys() {

// GSettings key for threshold colors for a live sensor (shared by values + prefs).
export function colorsKeyForSensor(type, format) {
 // All temperatures share the temperature threshold UI, including GPU rows.
 if (format === 'temp')
 return 'temperature-colors';

 const group = sensorGroupFromType(type);
 const formats = sensorCatalog[group]?.colorFormats;
 if (formats && formats.includes(format))
 return `${group}-colors`;

 // remaining temperatures share the temperature threshold UI, including GPU rows
 if (format === 'temp')
 return 'temperature-colors';

 return null;
}

export function colorPageForSensor(type, format) {
 let key = colorsKeyForSensor(type, format);
 return key ? key.slice(0, -'-colors'.length) : null;
}

// groups discovered from hardware monitors and summarized by a group average
export function isAggregateGroup(group) {
 return !!sensorCatalog[group]?.aggregate;
}

// a group may pick its own temperature unit, eg coolant reads coolant-unit
export function unitSettingForType(type) {
 return sensorCatalog[sensorGroupFromType(type)]?.unitSetting ?? 'unit';
}

1 change: 1 addition & 0 deletions
icons/gnome/pump-symbolic.svg

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

3 changes: 3 additions & 0 deletions
icons/gnome/water-droplet-symbolic.svg

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

1 change: 1 addition & 0 deletions
icons/original/pump-symbolic.svg

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

3 changes: 3 additions & 0 deletions
icons/original/water-droplet-symbolic.svg

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

5 changes: 4 additions & 1 deletion
prefs.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -216,8 +216,10 @@ class Settings {

 this._sensorPageGates = {
 'temperature': { toggle: 'show-temperature', widgets: ['unit'] },
 'coolant': { toggle: 'show-coolant', widgets: ['coolant-unit'] },
 'voltage': { toggle: 'show-voltage', widgets: [] },
 'fan': { toggle: 'show-fan', widgets: [] },
 'pump': { toggle: 'show-pump', widgets: [] },
 'memory': { toggle: 'show-memory', widgets: ['memory-measurement'] },
 'processor': { toggle: 'show-processor', widgets: ['include-static-info'] },
 'system': { toggle: 'show-system', widgets: ['monitor-cmd'] },
Expand DownExpand Up@@ -303,6 +305,7 @@ class Settings {

 // process sensor toggles
 let sensors = [ 'show-temperature', 'show-voltage', 'show-fan',
 'show-coolant', 'show-pump',
 'show-memory', 'show-processor', 'show-system',
 'show-network', 'show-storage', 'use-higher-precision',
 'alphabetize', 'hide-zeros', 'include-public-ip',
Expand DownExpand Up@@ -330,7 +333,7 @@ class Settings {

 // process individual drop down sensor preferences
 sensors = [
 'position-in-panel', 'unit', 'network-speed-format', 'network-speed-unit',
 'position-in-panel', 'unit', 'coolant-unit', 'network-speed-format', 'network-speed-unit',
 'memory-measurement', 'storage-measurement', 'battery-slot', 'icon-style',
 'network-public-ip-provider'
 ];
Expand Down

119 changes: 119 additions & 0 deletions
prefs.ui

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,6 +108,34 @@
 </child>
 </object>
 </child>
 <child>
 <object class="GtkListBoxRow">
 <property name="name">coolant</property>
 <child>
 <object class="GtkBox">
 <property name="orientation">horizontal</property>
 <property name="spacing">12</property>
 <property name="margin-start">6</property>
 <property name="margin-end">6</property>
 <property name="margin-top">4</property>
 <property name="margin-bottom">4</property>
 <child>
 <object class="GtkImage" id="sidebar-icon-coolant">
 <property name="icon-name">water-droplet-symbolic</property>
 <property name="pixel-size">16</property>
 </object>
 </child>
 <child>
 <object class="GtkLabel">
 <property name="label" translatable="yes">Coolant</property>
 <property name="xalign">0</property>
 <property name="hexpand">True</property>
 </object>
 </child>
 </object>
 </child>
 </object>
 </child>
 <child>
 <object class="GtkListBoxRow">
 <property name="name">voltage</property>
Expand DownExpand Up@@ -164,6 +192,34 @@
 </child>
 </object>
 </child>
 <child>
 <object class="GtkListBoxRow">
 <property name="name">pump</property>
 <child>
 <object class="GtkBox">
 <property name="orientation">horizontal</property>
 <property name="spacing">12</property>
 <property name="margin-start">6</property>
 <property name="margin-end">6</property>
 <property name="margin-top">4</property>
 <property name="margin-bottom">4</property>
 <child>
 <object class="GtkImage" id="sidebar-icon-pump">
 <property name="icon-name">pump-symbolic</property>
 <property name="pixel-size">16</property>
 </object>
 </child>
 <child>
 <object class="GtkLabel">
 <property name="label" translatable="yes">Pump</property>
 <property name="xalign">0</property>
 <property name="hexpand">True</property>
 </object>
 </child>
 </object>
 </child>
 </object>
 </child>
 <child>
 <object class="GtkListBoxRow">
 <property name="name">memory</property>
Expand DownExpand Up@@ -589,6 +645,45 @@
 </child>
 </object>

 <!-- Coolant -->
 <object class="AdwPreferencesPage" id="coolant-page">
 <property name="name">coolant</property>
 <property name="title" translatable="yes">Coolant</property>
 <property name="icon-name">water-droplet-symbolic</property>
 <child>
 <object class="AdwPreferencesGroup">
 <property name="margin-start">10</property>
 <property name="margin-end">10</property>
 <child>
 <object class="AdwActionRow">
 <property name="title" translatable="yes">Monitor coolant</property>
 <property name="activatable-widget">show-coolant</property>
 <child type="suffix">
 <object class="GtkSwitch" id="show-coolant">
 <property name="valign">center</property>
 </object>
 </child>
 </object>
 </child>
 <child>
 <object class="AdwActionRow">
 <property name="title" translatable="yes">Unit</property>
 <property name="activatable-widget">coolant-unit</property>
 <child type="suffix">
 <object class="GtkComboBoxText" id="coolant-unit">
 <property name="valign">center</property>
 <items>
 <item translatable="yes">°C</item>
 <item translatable="yes">°F</item>
 </items>
 </object>
 </child>
 </object>
 </child>
 </object>
 </child>
 </object>

 <!-- Voltage -->
 <object class="AdwPreferencesPage" id="voltage-page">
 <property name="name">voltage</property>
Expand DownExpand Up@@ -637,6 +732,30 @@
 </child>
 </object>

 <!-- Pump -->
 <object class="AdwPreferencesPage" id="pump-page">
 <property name="name">pump</property>
 <property name="title" translatable="yes">Pump</property>
 <property name="icon-name">pump-symbolic</property>
 <child>
 <object class="AdwPreferencesGroup">
 <property name="margin-start">10</property>
 <property name="margin-end">10</property>
 <child>
 <object class="AdwActionRow">
 <property name="title" translatable="yes">Monitor pump</property>
 <property name="activatable-widget">show-pump</property>
 <child type="suffix">
 <object class="GtkSwitch" id="show-pump">
 <property name="valign">center</property>
 </object>
 </child>
 </object>
 </child>
 </object>
 </child>
 </object>

 <!-- Memory -->
 <object class="AdwPreferencesPage" id="memory-page">
 <property name="name">memory</property>
Expand Down

25 changes: 25 additions & 0 deletions
schemas/org.gnome.shell.extensions.vitals.gschema.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,11 +41,26 @@
 <summary>Temperature unit</summary>
 <description>The unit ('centigrade' or 'fahrenheit') the extension should display the temperature in</description>
 </key>
 <key type="i" name="coolant-unit">
 <default>0</default>
 <summary>Coolant temperature unit</summary>
 <description>The unit ('centigrade' or 'fahrenheit') the extension should display the coolant temperature in</description>
 </key>
 <key type="b" name="show-voltage">
 <default>true</default>
 <summary>Monitor voltage</summary>
 <description>Display voltage of various components</description>
 </key>
 <key type="b" name="show-coolant">
 <default>true</default>
 <summary>Monitor coolant</summary>
 <description>Display liquid cooling loop coolant temperature</description>
 </key>
 <key type="b" name="show-pump">
 <default>true</default>
 <summary>Monitor pump</summary>
 <description>Display liquid cooling pump rotation per minute</description>
 </key>
 <key type="b" name="show-fan">
 <default>true</default>
 <summary>Monitor fan</summary>
Expand DownExpand Up@@ -179,6 +194,16 @@
 <summary>Fan color thresholds</summary>
 <description>Color rules matched against fan RPM. Entries are "threshold r g b" or "threshold r g b sensor:&lt;key&gt;" per sensor. Unknown sensor keys are ignored.</description>
 </key>
 <key name="coolant-colors" type="as">
 <default>["35 0.9647058844566345 0.8274509906768799 0.1764705926179886", "40 1 0.47058823704719543 0", "45 0.8784313797950745 0.10588235408067703 0.1411764770746231"]</default>
 <summary>Coolant color thresholds</summary>
 <description>Color rules matched against the displayed coolant temperature. Entries are "threshold r g b".</description>
 </key>
 <key name="pump-colors" type="as">
 <default>[]</default>
 <summary>Pump color thresholds</summary>
 <description>Color rules matched against pump RPM. Entries are "threshold r g b".</description>
 </key>
 <key name="memory-colors" type="as">
 <default>[]</default>
 <summary>Memory usage color thresholds</summary>
Expand Down
Loading