/*
- * Copyright (C) 2010-2014 jeanfi@gmail.com
+ * Copyright (C) 2010-2017 jeanfi@gmail.com
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
#include <config.h>
#include <amd.h>
+#include <bcm2835.h>
#include <cfg.h>
#include <graph.h>
#include <hdd.h>
gtop2_psensor_list_update(sensors);
atasmart_psensor_list_update(sensors);
hddtemp_psensor_list_update(sensors);
+ bcm2835_psensor_list_update(sensors);
psensor_log_measures(sensors);
struct config *cfg;
gboolean ret;
struct ui_psensor *ui = (struct ui_psensor *)data;
- int use_celsius;
ret = TRUE;
cfg = ui->config;
pmutex_lock(&ui->sensors_mutex);
- graph_update(ui->sensors, ui->w_graph, ui->config, ui->main_window);
+ graph_update(ui->sensors, ui_get_graph(), ui->config, ui->main_window);
ui_sensorlist_update(ui, 0);
if (is_appindicator_supported() || is_status_supported())
indicators_update(ui);
- if (config_get_temperature_unit() == CELSIUS)
- use_celsius = 1;
- else
- use_celsius = 0;
- ui_unity_launcher_entry_update(ui->sensors,
- !cfg->unity_launcher_count_disabled,
- use_celsius);
+ ui_unity_launcher_entry_update(ui->sensors);
if (ui->graph_update_interval != cfg->graph_update_interval) {
ui->graph_update_interval = cfg->graph_update_interval;
{
bool ret;
struct psensor *s;
- double d, high_temp;
+ double high_temp, high_default, low_default;
high_temp = config_get_default_high_threshold_temperature();
s->cb_alarm_raised = cb_alarm_raised;
s->cb_alarm_raised_data = ui;
- ret = config_get_sensor_alarm_high_threshold
- (s->id, &s->alarm_high_threshold);
-
- if (!ret) {
- if (s->max == UNKNOWN_DBL_VALUE) {
- if (s->type & SENSOR_TYPE_TEMP)
- s->alarm_high_threshold = high_temp;
- } else {
- s->alarm_high_threshold = s->max;
- }
+ if (s->max == UNKNOWN_DBL_VALUE) {
+ if (s->type & SENSOR_TYPE_TEMP)
+ high_default = high_temp;
+ else
+ high_default = UNKNOWN_DBL_VALUE;
+ } else {
+ high_default = s->max;
}
+ ret = config_get_sensor_alarm_high_threshold
+ (s->id, &s->alarm_high_threshold, high_default);
+
+ if (!ret)
+ s->alarm_high_threshold = high_default;
+
+ if (s->min == UNKNOWN_DBL_VALUE)
+ low_default = 0;
+ else
+ low_default = s->min;
+
ret = config_get_sensor_alarm_low_threshold
- (s->id, &s->alarm_low_threshold);
+ (s->id, &s->alarm_low_threshold, low_default);
- if (!ret && s->min != UNKNOWN_DBL_VALUE)
- s->alarm_low_threshold = s->min;
+ if (!ret)
+ s->alarm_low_threshold = low_default;
sensors++;
}
if (config_is_udisks2_enabled())
udisks2_psensor_list_append(&sensors, 600);
+
+ bcm2835_psensor_list_append(&sensors, 600);
}
associate_preferences(sensors);
g_timeout_add(1000 * ui.graph_update_interval, ui_refresh_thread, &ui);
ui_appindicator_init(&ui);
+ ui_unity_init();
gdk_notify_startup_complete();