Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-26 12:27:52 +00:00
Code Issues Releases Activity

Add nvidia driverversion variable (#889)

Browse Source
This commit is contained in:
Thomas Ingvarsson 2019-09-19 07:50:20 +02:00 committed by lasers
parent 1b55249a21
commit 9517ab1e6c
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/variables.xml
View File

@ -2923,6 +2923,10 @@
<command>modelname</command> <command>modelname</command>
<option>name of the GPU card</option> <option>name of the GPU card</option>
</member> </member>
<member>
<command>driverversion</command>
<option>Driver version</option>
</member>
</simplelist></para></listitem> </simplelist></para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>

18
src/nvidia.cc
View File

@ -54,9 +54,10 @@
* ambienttemp [gpu_id]}°C FAN ${nvidia fanspeed [gpu_id]} RPM (${nvidia * ambienttemp [gpu_id]}°C FAN ${nvidia fanspeed [gpu_id]} RPM (${nvidia
* fanlevel [gpu_id]}%) * fanlevel [gpu_id]}%)
* *
* miscelaneas: * Miscellaneous:
* OPENGL ${nvidia imagequality [gpu_id]} * OPENGL ${nvidia imagequality [gpu_id]}
* GPU ${nvidia modelname [gpu_id]} * GPU ${nvidia modelname [gpu_id]}
* DRIVER ${nvidia driverversion [gpu_id]}
* *
* --==| NVIDIA Bars |==-- * --==| NVIDIA Bars |==--
* LOAD ${nvidiabar [height][,width] gpuutil [gpu_id]} * LOAD ${nvidiabar [height][,width] gpuutil [gpu_id]}
@ -135,7 +136,7 @@ const char *translate_module_argument[] = {
"fanlevel", "fanlevel",
"imagequality", // Miscellaneous "imagequality", // Miscellaneous
"modelname"}; "modelname", "driverversion"};
// Enum for module arguments // Enum for module arguments
typedef enum _ARG_ID { typedef enum _ARG_ID {
@ -185,8 +186,8 @@ typedef enum _ARG_ID {
ARG_FAN_LEVEL, ARG_FAN_LEVEL,
ARG_IMAGEQUALITY, ARG_IMAGEQUALITY,
ARG_MODEL_NAME, ARG_MODEL_NAME,
ARG_DRIVER_VERSION,
ARG_UNKNOWN ARG_UNKNOWN
} ARG_ID; } ARG_ID;
@ -243,6 +244,9 @@ const int translate_nvidia_attribute[] = {
NV_CTRL_GPU_CURRENT_PERFORMANCE_LEVEL, NV_CTRL_GPU_CURRENT_PERFORMANCE_LEVEL,
NV_CTRL_IMAGE_SETTINGS, NV_CTRL_IMAGE_SETTINGS,
NV_CTRL_STRING_PRODUCT_NAME,
NV_CTRL_STRING_NVIDIA_DRIVER_VERSION,
}; };
// Enum for nvidia query attributes // Enum for nvidia query attributes
@ -271,7 +275,7 @@ typedef enum _ATTR_ID {
ATTR_IMAGE_QUALITY, ATTR_IMAGE_QUALITY,
ATTR_MODEL_NAME, ATTR_MODEL_NAME,
ATTR_DRIVER_VERSION,
} ATTR_ID; } ATTR_ID;
// Enum for query type // Enum for query type
@ -655,6 +659,12 @@ int set_nvidia_query(struct text_object *obj, const char *arg,
nvs->attribute = ATTR_MODEL_NAME; nvs->attribute = ATTR_MODEL_NAME;
break; break;
case ARG_DRIVER_VERSION:
nvs->query = QUERY_STRING;
nvs->target = TARGET_GPU;
nvs->attribute = ATTR_DRIVER_VERSION;
break;
default: // Unknown/invalid argument default: // Unknown/invalid argument
// Error printed by core.cc // Error printed by core.cc
return 1; return 1;