From e1f8d2cbf6c09da9cbcb0bdf04d495b3d3666178 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Orsini Date: Sun, 29 Apr 2012 12:37:47 +0000 Subject: [PATCH] alert when temp < low thresold --- src/cfg.c | 24 ++++++++++++- src/cfg.h | 3 ++ src/lib/psensor.c | 6 ++-- src/lib/psensor.h | 1 + src/main.c | 7 ++-- src/ui_sensorpref.c | 98 ++++++++++++++++++++++++++++++++++++++++------------- 6 files changed, 109 insertions(+), 30 deletions(-) diff --git a/src/cfg.c b/src/cfg.c index a82883c..1bd5fac 100644 --- a/src/cfg.c +++ b/src/cfg.c @@ -29,7 +29,7 @@ static const char *KEY_SENSORS = "/apps/psensor/sensors"; static const char *ATT_SENSOR_ALARM_ENABLED = "alarm/enabled"; static const char *ATT_SENSOR_ALARM_HIGH_THRESOLD = "alarm/high_thresold"; -/*static const char *ATT_SENSOR_ALARM_LOW_THRESOLD = "alarm/low_thresold";*/ +static const char *ATT_SENSOR_ALARM_LOW_THRESOLD = "alarm/low_thresold"; static const char *ATT_SENSOR_COLOR = "color"; static const char *ATT_SENSOR_ENABLED = "enabled"; static const char *ATT_SENSOR_NAME = "name"; @@ -283,6 +283,28 @@ config_set_sensor_alarm_high_thresold(const char *sid, int thresold) free(key); } +int config_get_sensor_alarm_low_thresold(const char *sid) +{ + int res; + char *key; + + key = get_sensor_att_key(sid, ATT_SENSOR_ALARM_LOW_THRESOLD); + res = gconf_client_get_int(client, key, NULL); + free(key); + + return res; +} + +void +config_set_sensor_alarm_low_thresold(const char *sid, int thresold) +{ + char *key; + + key = get_sensor_att_key(sid, ATT_SENSOR_ALARM_LOW_THRESOLD); + gconf_client_set_int(client, key, thresold, NULL); + free(key); +} + int config_get_sensor_alarm_enabled(const char *sid) { gboolean b; diff --git a/src/cfg.h b/src/cfg.h index e076d02..fe90b96 100644 --- a/src/cfg.h +++ b/src/cfg.h @@ -88,6 +88,9 @@ void config_set_sensor_color(const char *sid, const struct color *); int config_get_sensor_alarm_high_thresold(const char *); void config_set_sensor_alarm_high_thresold(const char *, int); +int config_get_sensor_alarm_low_thresold(const char *); +void config_set_sensor_alarm_low_thresold(const char *, int); + int config_get_sensor_alarm_enabled(const char *); void config_set_sensor_alarm_enabled(const char *, int); diff --git a/src/lib/psensor.c b/src/lib/psensor.c index 76a250d..ce44a56 100644 --- a/src/lib/psensor.c +++ b/src/lib/psensor.c @@ -51,6 +51,7 @@ struct psensor *psensor_create(char *id, char *name, psensor->alarm_enabled = 0; psensor->alarm_high_thresold = 0; + psensor->alarm_low_thresold = 0; psensor->cb_alarm_raised = NULL; psensor->cb_alarm_raised_data = NULL; @@ -271,10 +272,9 @@ psensor_set_current_measure(struct psensor *s, s->max = v; if (s->alarm_enabled) { - if (v > s->alarm_high_thresold) { + if (v > s->alarm_high_thresold || v < s->alarm_low_thresold) { if (!s->alarm_raised && s->cb_alarm_raised) - s->cb_alarm_raised(s, - s->cb_alarm_raised_data); + s->cb_alarm_raised(s, s->cb_alarm_raised_data); s->alarm_raised = 1; } else { diff --git a/src/lib/psensor.h b/src/lib/psensor.h index 8d798e5..b04ca41 100644 --- a/src/lib/psensor.h +++ b/src/lib/psensor.h @@ -88,6 +88,7 @@ struct psensor { unsigned int alarm_enabled; int alarm_high_thresold; + int alarm_low_thresold; /* Whether the current value is bigger than 'alarm_high_thresold'. */ int alarm_raised; diff --git a/src/main.c b/src/main.c index 0698dd3..559400b 100644 --- a/src/main.c +++ b/src/main.c @@ -291,9 +291,12 @@ associate_cb_alarm_raised(struct psensor **sensors, struct ui_psensor *ui) s->cb_alarm_raised = cb_alarm_raised; s->cb_alarm_raised_data = ui; + s->alarm_high_thresold + = config_get_sensor_alarm_high_thresold(s->id); + s->alarm_low_thresold + = config_get_sensor_alarm_low_thresold(s->id); + if (is_temp_type(s->type)) { - s->alarm_high_thresold - = config_get_sensor_alarm_high_thresold(s->id); s->alarm_enabled = config_get_sensor_alarm_enabled(s->id); } else { diff --git a/src/ui_sensorpref.c b/src/ui_sensorpref.c index 286b25f..58382de 100644 --- a/src/ui_sensorpref.c +++ b/src/ui_sensorpref.c @@ -33,6 +33,7 @@ struct sensor_pref { struct color *color; int alarm_enabled; int alarm_high_thresold; + int alarm_low_thresold; }; struct cb_data { @@ -44,20 +45,25 @@ struct cb_data { static struct sensor_pref *sensor_pref_new(struct psensor *s, struct config *cfg) { - struct sensor_pref *p = malloc(sizeof(struct sensor_pref)); + struct sensor_pref *p; - p->sensor = s; + p = malloc(sizeof(struct sensor_pref)); + p->sensor = s; p->name = strdup(s->name); p->enabled = s->enabled; p->alarm_enabled = s->alarm_enabled; p->color = color_dup(s->color); - if (cfg->temperature_unit == CELCIUS) + if (cfg->temperature_unit == CELCIUS) { p->alarm_high_thresold = s->alarm_high_thresold; - else + p->alarm_low_thresold = s->alarm_low_thresold; + } else { p->alarm_high_thresold = celcius_to_fahrenheit(s->alarm_high_thresold); + p->alarm_low_thresold + = celcius_to_fahrenheit(s->alarm_low_thresold); + } return p; } @@ -201,17 +207,32 @@ static void on_color_set(GtkColorButton *widget, gpointer data) } } -static void on_temp_limit_changed(GtkSpinButton *btn, gpointer data) +static void on_alarm_high_thresold_changed(GtkSpinButton *btn, gpointer data) { - struct cb_data *cbdata = data; + struct cb_data *cbdata; struct sensor_pref *p; + cbdata = data; + p = get_selected_sensor_pref(cbdata->builder, cbdata->prefs); if (p) p->alarm_high_thresold = gtk_spin_button_get_value(btn); } +static void on_alarm_low_thresold_changed(GtkSpinButton *btn, gpointer data) +{ + struct cb_data *cbdata; + struct sensor_pref *p; + + cbdata = data; + + p = get_selected_sensor_pref(cbdata->builder, cbdata->prefs); + + if (p) + p->alarm_low_thresold = gtk_spin_button_get_value(btn); +} + static void connect_signals(GtkBuilder *builder, struct cb_data *cbdata) { g_signal_connect(gtk_builder_get_object(builder, "sensor_name"), @@ -226,8 +247,16 @@ static void connect_signals(GtkBuilder *builder, struct cb_data *cbdata) g_signal_connect(gtk_builder_get_object(builder, "sensor_alarm"), "toggled", G_CALLBACK(on_alarm_toggled), cbdata); - g_signal_connect(gtk_builder_get_object(builder, "sensor_temp_limit"), - "value-changed", G_CALLBACK(on_temp_limit_changed), + g_signal_connect(gtk_builder_get_object(builder, + "sensor_alarm_high_thresold"), + "value-changed", + G_CALLBACK(on_alarm_high_thresold_changed), + cbdata); + + g_signal_connect(gtk_builder_get_object(builder, + "sensor_alarm_low_thresold"), + "value-changed", + G_CALLBACK(on_alarm_low_thresold_changed), cbdata); } @@ -237,11 +266,11 @@ update_pref(struct psensor *s, struct config *cfg, GtkBuilder *builder) { - GtkLabel *w_id, *w_type, *w_temp_unit; + GtkLabel *w_id, *w_type, *w_high_thresold_unit, *w_low_thresold_unit; GtkEntry *w_name; GtkToggleButton *w_draw, *w_alarm; GtkColorButton *w_color; - GtkSpinButton *w_temp_limit; + GtkSpinButton *w_high_thresold, *w_low_thresold; GdkColor *color; struct sensor_pref *p = sensor_pref_get(prefs, s); int use_celcius; @@ -266,29 +295,44 @@ update_pref(struct psensor *s, w_alarm = GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "sensor_alarm")); - w_temp_limit - = GTK_SPIN_BUTTON(gtk_builder_get_object(builder, - "sensor_temp_limit")); - - w_temp_unit - = GTK_LABEL(gtk_builder_get_object(builder, - "sensor_temp_unit")); + w_high_thresold = GTK_SPIN_BUTTON(gtk_builder_get_object + (builder, + "sensor_alarm_high_thresold")); + w_low_thresold = GTK_SPIN_BUTTON(gtk_builder_get_object + (builder, + "sensor_alarm_low_thresold")); + + w_high_thresold_unit = GTK_LABEL(gtk_builder_get_object + (builder, + "sensor_alarm_high_thresold_unit")); + w_low_thresold_unit = GTK_LABEL(gtk_builder_get_object + (builder, + "sensor_alarm_low_thresold_unit")); use_celcius = cfg->temperature_unit == CELCIUS ? 1 : 0; - gtk_label_set_text(w_temp_unit, + gtk_label_set_text(w_high_thresold_unit, + psensor_type_to_unit_str(s->type, + use_celcius)); + gtk_label_set_text(w_low_thresold_unit, psensor_type_to_unit_str(s->type, use_celcius)); if (is_temp_type(s->type)) { gtk_toggle_button_set_active(w_alarm, p->alarm_enabled); - gtk_spin_button_set_value(w_temp_limit, p->alarm_high_thresold); + gtk_spin_button_set_value(w_high_thresold, + p->alarm_high_thresold); + gtk_spin_button_set_value(w_low_thresold, + p->alarm_low_thresold); gtk_widget_set_sensitive(GTK_WIDGET(w_alarm), TRUE); - gtk_widget_set_sensitive(GTK_WIDGET(w_temp_limit), TRUE); + gtk_widget_set_sensitive(GTK_WIDGET(w_high_thresold), TRUE); + gtk_widget_set_sensitive(GTK_WIDGET(w_low_thresold), TRUE); } else { gtk_toggle_button_set_active(w_alarm, 0); - gtk_spin_button_set_value(w_temp_limit, 0); + gtk_spin_button_set_value(w_high_thresold, 0); + gtk_spin_button_set_value(w_low_thresold, 0); gtk_widget_set_sensitive(GTK_WIDGET(w_alarm), FALSE); - gtk_widget_set_sensitive(GTK_WIDGET(w_temp_limit), FALSE); + gtk_widget_set_sensitive(GTK_WIDGET(w_high_thresold), FALSE); + gtk_widget_set_sensitive(GTK_WIDGET(w_low_thresold), FALSE); } } @@ -361,14 +405,20 @@ apply_prefs(struct sensor_pref **prefs, config_set_sensor_enabled(s->id, s->enabled); } - if (cfg->temperature_unit == CELCIUS) + if (is_temp_type(s->type) && cfg->temperature_unit == CELCIUS) { s->alarm_high_thresold = p->alarm_high_thresold; - else + s->alarm_low_thresold = p->alarm_low_thresold; + } else { s->alarm_high_thresold = fahrenheit_to_celcius (p->alarm_high_thresold); + s->alarm_low_thresold = fahrenheit_to_celcius + (p->alarm_low_thresold); + } config_set_sensor_alarm_high_thresold(s->id, s->alarm_high_thresold); + config_set_sensor_alarm_low_thresold(s->id, + s->alarm_low_thresold); if (s->alarm_enabled != p->alarm_enabled) { s->alarm_enabled = p->alarm_enabled; -- 2.7.4