projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Properly cleanup dropped MySQL connections.
[collectd.git]
/
src
/
barometer.c
diff --git
a/src/barometer.c
b/src/barometer.c
index
8729cdf
..
6c6347c
100644
(file)
--- a/
src/barometer.c
+++ b/
src/barometer.c
@@
-412,16
+412,16
@@
static int get_reference_temperature(double *result) {
continue;
}
continue;
}
- DEBUG(
-
"barometer: get_reference_temperature - initialize \"%s\", %zu
vals",
- list->sensor_name, values_num);
+ DEBUG(
"barometer: get_reference_temperature - initialize \"%s\", %" PRIsz
+
"
vals",
+
list->sensor_name, values_num);
list->initialized = 1;
list->num_values = values_num;
for (size_t i = 0; i < values_num; ++i) {
list->initialized = 1;
list->num_values = values_num;
for (size_t i = 0; i < values_num; ++i) {
- DEBUG("barometer: get_reference_temperature - rate %
zu: %lf **", i
,
- values[i]);
+ DEBUG("barometer: get_reference_temperature - rate %
" PRIsz ": %lf **"
,
+
i,
values[i]);
if (!isnan(values[i])) {
avg_sum += values[i];
++avg_num;
if (!isnan(values[i])) {
avg_sum += values[i];
++avg_num;
@@
-444,7
+444,7
@@
static int get_reference_temperature(double *result) {
}
for (size_t i = 0; i < REF_TEMP_AVG_NUM * list->num_values; ++i) {
}
for (size_t i = 0; i < REF_TEMP_AVG_NUM * list->num_values; ++i) {
- DEBUG("barometer: get_reference_temperature - history %
zu
: %lf", i,
+ DEBUG("barometer: get_reference_temperature - history %
" PRIsz "
: %lf", i,
values_history[i]);
if (!isnan(values_history[i])) {
avg_sum += values_history[i];
values_history[i]);
if (!isnan(values_history[i])) {
avg_sum += values_history[i];
@@
-464,8
+464,9
@@
static int get_reference_temperature(double *result) {
}
for (size_t i = 0; i < values_num; ++i) {
}
for (size_t i = 0; i < values_num; ++i) {
- DEBUG("barometer: get_reference_temperature - rate last %zu: %lf **", i,
- values[i]);
+ DEBUG("barometer: get_reference_temperature - rate last %" PRIsz
+ ": %lf **",
+ i, values[i]);
if (!isnan(values[i])) {
avg_sum += values[i];
++avg_num;
if (!isnan(values[i])) {
avg_sum += values[i];
++avg_num;
@@
-547,7
+548,6
@@
static int MPL115_read_coeffs(void) {
int8_t sic12MSB, sic12LSB, sic11MSB, sic11LSB, sic22MSB, sic22LSB;
int16_t sia0, sib1, sib2, sic12, sic11, sic22;
int8_t sic12MSB, sic12LSB, sic11MSB, sic11LSB, sic22MSB, sic22LSB;
int16_t sia0, sib1, sib2, sic12, sic11, sic22;
-
res = i2c_smbus_read_i2c_block_data(i2c_bus_fd, MPL115_ADDR_COEFFS,
STATIC_ARRAY_SIZE(mpl115_coeffs),
mpl115_coeffs);
res = i2c_smbus_read_i2c_block_data(i2c_bus_fd, MPL115_ADDR_COEFFS,
STATIC_ARRAY_SIZE(mpl115_coeffs),
mpl115_coeffs);
@@
-1127,7
+1127,6
@@
static int BMP085_read(double *pressure, double *temperature) {
long adc_pressure;
long adc_temperature;
long adc_pressure;
long adc_temperature;
-
/* start conversion of temperature */
res = i2c_smbus_write_byte_data(i2c_bus_fd, BMP085_ADDR_CTRL_REG,
BMP085_CMD_CONVERT_TEMP);
/* start conversion of temperature */
res = i2c_smbus_write_byte_data(i2c_bus_fd, BMP085_ADDR_CTRL_REG,
BMP085_CMD_CONVERT_TEMP);