X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fpsensor.c;h=58731d50416afaab938b9c839e532fad49953240;hb=837c8ac28740acafd262a7c30818d53b9940cbfa;hp=0e0479b58954ae89caf0c2a5ea51a470d33e9112;hpb=60f6135a421095b240b984898e555df284f3b77f;p=psensor.git diff --git a/src/lib/psensor.c b/src/lib/psensor.c index 0e0479b..58731d5 100644 --- a/src/lib/psensor.c +++ b/src/lib/psensor.c @@ -50,7 +50,6 @@ struct psensor *psensor_create(char *id, psensor->values_max_length = values_max_length; psensor->measures = measures_dbl_create(values_max_length); - psensor->alarm_enabled = 0; psensor->alarm_high_threshold = 0; psensor->alarm_low_threshold = 0; @@ -63,7 +62,6 @@ struct psensor *psensor_create(char *id, psensor->color = NULL; psensor->graph_enabled = 1; - psensor->appindicator_enabled = 0; psensor->provider_data = NULL; psensor->provider_data_free_fct = &free; @@ -266,15 +264,13 @@ void psensor_set_current_measure(struct psensor *s, double v, struct timeval tv) if (s->max == UNKNOWN_DBL_VALUE || v > s->max) s->max = v; - if (s->alarm_enabled) { - if (v > s->alarm_high_threshold || v < s->alarm_low_threshold) { - if (!s->alarm_raised && s->cb_alarm_raised) - s->cb_alarm_raised(s, s->cb_alarm_raised_data); - - s->alarm_raised = 1; - } else { - s->alarm_raised = 0; + if (v > s->alarm_high_threshold || v < s->alarm_low_threshold) { + if (!s->alarm_raised && s->cb_alarm_raised) { + s->alarm_raised = true; + s->cb_alarm_raised(s, s->cb_alarm_raised_data); } + } else { + s->alarm_raised = false; } }