Skip to content

Commit 5269017

Browse files
committed
Merge pull request #5240 from basilfx/feature/si70xx_improvements
drivers: si70xx: result bugfixes
2 parents df574d6 + cf5e4c8 commit 5269017

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

drivers/si70xx/si70xx.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ int si70xx_init(si70xx_t *dev, i2c_t i2c_dev, uint8_t address)
8484
uint16_t si70xx_get_relative_humidity(si70xx_t *dev)
8585
{
8686
uint32_t raw;
87-
uint16_t humidity;
87+
int32_t humidity;
8888

8989
/* perform measurement */
9090
raw = si70xx_measure(dev, SI70XX_MEASURE_RH_HOLD);
@@ -99,7 +99,7 @@ uint16_t si70xx_get_relative_humidity(si70xx_t *dev)
9999
return 10000;
100100
}
101101
else {
102-
return humidity;
102+
return (uint16_t) humidity;
103103
}
104104
}
105105

@@ -129,8 +129,8 @@ void si70xx_get_both(si70xx_t *dev, uint16_t *humidity, int16_t *temperature)
129129
uint64_t si70xx_get_serial(si70xx_t *dev)
130130
{
131131
uint8_t out[2];
132-
uint8_t in_first[8];
133-
uint8_t in_second[8];
132+
uint8_t in_first[8] = { 0 };
133+
uint8_t in_second[8] = { 0 };
134134

135135
/* read the lower bytes */
136136
out[0] = SI70XX_READ_ID_FIRST_A;
@@ -165,7 +165,7 @@ uint8_t si70xx_get_id(si70xx_t *dev)
165165
uint8_t si70xx_get_revision(si70xx_t *dev)
166166
{
167167
uint8_t out[2];
168-
uint8_t in;
168+
uint8_t in = 0;
169169

170170
/* read the revision number */
171171
out[0] = SI70XX_READ_REVISION_A;

tests/driver_si70xx/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ USEMODULE += xtimer
99

1010
# set default device parameters in case they are undefined
1111
TEST_I2C ?= 0
12-
TEST_I2C_ADDR ?= 128
13-
TEST_PIN_EN ?= 57
12+
TEST_I2C_ADDR ?= 0x80
13+
TEST_PIN_EN ?= GPIO_PIN\(0,0\)
1414

1515
# export parameters
1616
CFLAGS += -DTEST_I2C=$(TEST_I2C)

tests/driver_si70xx/main.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ int main(void)
103103
both = !both;
104104

105105
/* display results */
106-
printf("relative humidity: %d.%d\n", humidity / 100, humidity % 100);
107-
printf("temperature: %d.%d C\n", temperature / 100, temperature % 100);
106+
printf("relative humidity: %d.%02d\n", humidity / 100, humidity % 100);
107+
printf("temperature: %d.%02d C\n", temperature / 100, temperature % 100);
108108

109109
/* sleep between measurements */
110110
xtimer_usleep(1000 * MS_IN_USEC);

0 commit comments

Comments
 (0)