gryf/wmtemp
1
0
Fork 0
mirror of https://github.com/gryf/wmtemp.git synced 2026-02-14 12:55:47 +01:00
Code Issues Projects Releases Wiki Activity

Reverted code to nvidia-settings approach since nvclock stopped working with

Browse Source 
nvidia drivers 295.40. To conserve resources there is delay in running
nvidia-settings utility in contrast to CPU temp readings.
This commit is contained in:
gryf
2012-05-30 11:04:50 +02:00
parent 28d2a7fd2e
commit 0c442e8e90
55 changed files with 97 additions and 9074 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wmtempnv/Makefile
View File

@@ -1,4 +1,5 @@
system=Linux
# By RedSeb 1999, Liverbugg 2002
SRC = wmtempnv.c ../wmgeneral/wmgeneral.c ../wmgeneral/misc.c ../wmgeneral/list.c
@@ -8,7 +9,7 @@ OBJ = $(SRC:.c=.o)
CFLAGS = -Wall -O3
LIB = -L/usr/X11R6/lib -lXpm -lXext -lX11 -lsensors -lbackend -L../nvclock
LIB = -L/usr/X11R6/lib -lXpm -lXext -lX11 -lsensors
INSTALL = /usr/bin/install
@@ -16,7 +17,7 @@ CC = gcc
all: $(OBJ)
$(CC) -o $(EXE) $(OBJ) $(LIB)
#strip $(EXE)
strip $(EXE)
$(OBJ): %.o : %.c
$(CC) $(CFLAGS) -c -o $@ $<

163
wmtempnv/wmtempnv.c
View File

@@ -19,78 +19,87 @@
#include <string.h>
#include "../wmgeneral/wmgeneral.h"
#include "../wmgeneral/misc.h"
#include "../wmgeneral/misc.h"
#include "wmtempnv_master2.xpm"
#include "wmtempnv_mask.xbm"
#define MAXSTRLEN 8
#define TEMP 40
#define TEMP_OVER 47
#define GPU_T 70
#define GPU_T_OVER 85
#define MAXFNAME 50
void display_values(int, int, int);
int get_temp(int core_number);
int get_temp(int core_number, int skip);
int get_offset(int temp, int cpu);
int main(int argc, char **argv){
int temp1=0, temp2=0, temp3=0;
/* offset is one of 0 (normal), 7 (alert), 14 (warning) */
/* offset is one of 0 (normal), 7 (alert), 14 (warning) */
int offset1=0, offset2=0, offset3=0;
int counter = 0;
int counter = 0;
int skip = 3;
/* nvclock.dpy = NULL; */
/* if(!init_nvclock()) return 0; */
/* atexit(unload_nvclock); */
/* if(!set_card(0)) return 0; */
openXwindow(argc, argv, wmtempnv_master2_xpm, wmtempnv_mask_bits, wmtempnv_mask_width, wmtempnv_mask_height);
while(TRUE){
if(counter==0){
temp1 = get_temp(0);
offset1 = get_offset(temp1, 1);
temp2 = get_temp(1);
offset2 = get_offset(temp2, 1);
temp3 = get_temp(2);
offset3 = get_offset(temp3, 0);
counter = 200;
}
// core 1
copyXPMArea(0, 87 + offset1, 23, 7, 4, 7); // LCD: "CPU"
copyXPMArea(69, 87 + offset1, 5, 7, 22, 7); // LCD: number of cpu
copyXPMArea(66, 65 + offset1, 9, 7, 51, 7); // LCD: "°C"
display_values(temp1, 0, offset1);
while(TRUE){
if(counter==0){
skip--;
temp1 = get_temp(0, skip);
offset1 = get_offset(temp1, 1);
temp2 = get_temp(1, skip);
offset2 = get_offset(temp2, 1);
temp3 = get_temp(2, skip);
offset3 = get_offset(temp3, 0);
counter = 500;
if (skip == 0) skip = 3;
}
// core 2
copyXPMArea(0, 87 + offset2, 23, 7, 4, 21);
copyXPMArea(75, 87 + offset2, 5, 7, 22, 21);
copyXPMArea(66, 65 + offset2, 9, 7, 51, 21);
display_values(temp2, 14, offset2);
// core 1
copyXPMArea(0, 87 + offset1, 23, 7, 4, 7); // LCD: "CPU"
copyXPMArea(69, 87 + offset1, 5, 7, 22, 7); // LCD: number of cpu
copyXPMArea(66, 65 + offset1, 9, 7, 51, 7); // LCD: "°C"
display_values(temp1, 0, offset1);
// gpu
copyXPMArea(23, 87 + offset3, 23, 7, 4, 35);
copyXPMArea(66, 65 + offset3, 9, 7, 51, 35);
display_values(temp3, 28, offset3);
RedrawWindow();
counter--;
usleep(5000);
}
// core 2
copyXPMArea(0, 87 + offset2, 23, 7, 4, 21);
copyXPMArea(75, 87 + offset2, 5, 7, 22, 21);
copyXPMArea(66, 65 + offset2, 9, 7, 51, 21);
display_values(temp2, 14, offset2);
// gpu
copyXPMArea(23, 87 + offset3, 23, 7, 4, 35);
copyXPMArea(66, 65 + offset3, 9, 7, 51, 35);
display_values(temp3, 28, offset3);
RedrawWindow();
counter--;
usleep(2000);
}
}
int get_offset(int temp, int cpu){
int alt, wrn;
if(cpu == 1){
wrn = TEMP;
alt = TEMP_OVER;
}else{
wrn = GPU_T;
alt = GPU_T_OVER;
}
if(temp >= alt){
return 7; // Alert
}else if(temp >= wrn){
return 14; // Warning
}else{
return 0; // Normal
}
int alt, wrn;
if(cpu == 1){
wrn = TEMP;
alt = TEMP_OVER;
}else{
wrn = GPU_T;
alt = GPU_T_OVER;
}
if(temp >= alt){
return 7; // Alert
}else if(temp >= wrn){
return 14; // Warning
}else{
return 0; // Normal
}
}
void display_values(int temp, int offset, int offset2){
char text[5], num1, num2, num3, num4;
@@ -101,34 +110,46 @@ void display_values(int temp, int offset, int offset2){
num3 = (text[2] - '0');
num4 = (text[3] - '0');
if(num1)
copyXPMArea(5 * num1, 65 + offset2, 5, 7, 31, 7 + offset);
copyXPMArea(5 * num1, 65 + offset2, 5, 7, 31, 7 + offset);
else
copyXPMArea(60, 65 + offset2, 5, 7, 31, 7 + offset);
copyXPMArea(60, 65 + offset2, 5, 7, 31, 7 + offset);
copyXPMArea(5 * num2, 65 + offset2, 5, 7, 38, 7 + offset);
copyXPMArea(5 * num3, 65 + offset2, 5, 7, 45, 7 + offset);
copyXPMArea(5 * num4, 65 + offset2, 5, 7, 51, 7 + offset);
}
int get_temp(int core_number){
// Core temperature. argument is core number. core no.2 is GPU
FILE *file;
int core=0;
char cmd[] = " ";
if(core_number==2){
sprintf(cmd, "echo `nvidia-settings -q 'GPUCoreTemp'|grep Attribute|cut -d ':' -f 3|cut -d '.' -f 1`");
}else{
sprintf(cmd, "echo `sensors |grep 'Core %d'|cut -d ':' -f 2|cut -d '.' -f 1`", core_number);
}
file = popen(cmd, "r");
while (! feof(file)) {
char line[MAXSTRLEN + 1];
bzero(line, MAXSTRLEN + 1);
fgets(line, MAXSTRLEN, file);
if(line[0] != 0){
sscanf(line, "%d", &core);
int get_temp(int core_number, int skip){
// Core temperature. argument is core number. core no.2 is GPU
FILE *file;
char filename[MAXFNAME];
int core_temp = 0;
char gpu_cmd[] = "nvidia-settings -tq GPUCoreTemp";
/* if(core_number == 2 && skip > 0){ */
if(core_number == 2){
printf("%d\n", skip);
// GPU
file = popen(gpu_cmd, "r");
while (!feof(file)) {
char line[MAXSTRLEN + 1];
bzero(line, MAXSTRLEN + 1);
fgets(line, MAXSTRLEN, file);
if(line[0] != 0){
sscanf(line, "%d", &core_temp);
}
}
pclose(file);
}else{
snprintf(filename, MAXFNAME,
"/sys/bus/platform/devices/coretemp.0/temp%d_input",
core_number + 2);
if((file = fopen(filename, "r")) != NULL){
if(fscanf(file, "%d", &core_temp) != EOF){
core_temp = core_temp / 1000;
fclose(file);
}
}
}
pclose(file);
return core;
return core_temp;
}

2
wmtempnv/wmtempnv_mask.xbm
View File

@@ -1,6 +1,6 @@
#define wmtempnv_mask_width 64
#define wmtempnv_mask_height 64
static char wmtempnv_mask_bits[] = {
static unsigned char wmtempnv_mask_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,