projects
/
psensor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hide sensors in the application indicator
[psensor.git]
/
src
/
lib
/
psensor.c
diff --git
a/src/lib/psensor.c
b/src/lib/psensor.c
index
ce44a56
..
abacd9f
100644
(file)
--- a/
src/lib/psensor.c
+++ b/
src/lib/psensor.c
@@
-50,8
+50,8
@@
struct psensor *psensor_create(char *id, char *name,
psensor->measures = measures_dbl_create(values_max_length);
psensor->alarm_enabled = 0;
psensor->measures = measures_dbl_create(values_max_length);
psensor->alarm_enabled = 0;
- psensor->alarm_high_thresold = 0;
- psensor->alarm_low_thresold = 0;
+ psensor->alarm_high_thres
h
old = 0;
+ psensor->alarm_low_thres
h
old = 0;
psensor->cb_alarm_raised = NULL;
psensor->cb_alarm_raised_data = NULL;
psensor->cb_alarm_raised = NULL;
psensor->cb_alarm_raised_data = NULL;
@@
-61,6
+61,8
@@
struct psensor *psensor_create(char *id, char *name,
psensor->color = NULL;
psensor->color = NULL;
+ psensor->appindicator_enabled = 0;
+
return psensor;
}
return psensor;
}
@@
-213,23
+215,16
@@
double fahrenheit_to_celcius(double f)
char *
psensor_value_to_str(unsigned int type, double value, int use_celcius)
{
char *
psensor_value_to_str(unsigned int type, double value, int use_celcius)
{
- /* should not be possible to exceed 20 characters with temp or
- rpm values the .x part is never displayed */
- char *str = malloc(20);
+ char *str;
+ const char *unit;
- char *unit;
+ /*
+ * should not be possible to exceed 20 characters with temp or
+ * rpm values the .x part is never displayed
+ */
+ str = malloc(20);
- if (is_temp_type(type))
- if (use_celcius) {
- unit = "°C";
- } else {
- unit = "°F";
- value = celcius_to_fahrenheit(value);
- }
- else if (type & SENSOR_TYPE_CPU_USAGE)
- unit = "%";
- else
- unit = "";
+ unit = psensor_type_to_unit_str(type, use_celcius);
sprintf(str, "%.0f%s", value, unit);
sprintf(str, "%.0f%s", value, unit);
@@
-272,7
+267,7
@@
psensor_set_current_measure(struct psensor *s,
s->max = v;
if (s->alarm_enabled) {
s->max = v;
if (s->alarm_enabled) {
- if (v > s->alarm_high_thres
old || v < s->alarm_low_thres
old) {
+ if (v > s->alarm_high_thres
hold || v < s->alarm_low_thresh
old) {
if (!s->alarm_raised && s->cb_alarm_raised)
s->cb_alarm_raised(s, s->cb_alarm_raised_data);
if (!s->alarm_raised && s->cb_alarm_raised)
s->cb_alarm_raised(s, s->cb_alarm_raised_data);
@@
-464,20
+459,18
@@
const char *psensor_type_to_str(unsigned int type)
const char *psensor_type_to_unit_str(unsigned int type, int use_celcius)
{
const char *psensor_type_to_unit_str(unsigned int type, int use_celcius)
{
- if (
type & SENSOR_TYPE_TEMP
) {
+ if (
is_temp_type(type)
) {
if (use_celcius)
return "\302\260C";
else
return "\302\260F";
if (use_celcius)
return "\302\260C";
else
return "\302\260F";
- }
-
- if (type & SENSOR_TYPE_FAN)
+ } else if (is_fan_type(type)) {
return _("RPM");
return _("RPM");
-
- if (type & SENSOR_TYPE_CPU_USAGE)
+ } else if (type & SENSOR_TYPE_CPU_USAGE) {
return _("%");
return _("%");
-
- return _("N/A");
+ } else {
+ return _("N/A");
+ }
}
void psensor_list_update_measures(struct psensor **sensors)
}
void psensor_list_update_measures(struct psensor **sensors)