Make code -Wall -Wextra -pedantic -Wmissing-prototypes -Wold-style-definition

This commit is contained in:
Pim van Pelt
2018-04-22 14:15:35 +02:00
parent 64fe69d3e3
commit 38c3cdf27e
8 changed files with 41 additions and 30 deletions

View File

@ -30,7 +30,7 @@
#define I2CBUSNR 5
void i2c_scanner(struct mgos_i2c *i2c) {
static void i2c_scanner(struct mgos_i2c *i2c) {
int i;
if (!i2c) {
@ -47,6 +47,7 @@ void i2c_scanner(struct mgos_i2c *i2c) {
}
}
bool i2c_dumpregs(struct mgos_i2c *i2c, uint8_t i2caddr);
bool i2c_dumpregs(struct mgos_i2c *i2c, uint8_t i2caddr) {
uint16_t reg;
int value;
@ -66,7 +67,7 @@ bool i2c_dumpregs(struct mgos_i2c *i2c, uint8_t i2caddr) {
return true;
}
bool do_ccs811(struct mgos_ccs811 *sensor) {
static bool do_ccs811(struct mgos_ccs811 *sensor) {
float eco2, tvoc;
if (!sensor) {
@ -80,7 +81,7 @@ bool do_ccs811(struct mgos_ccs811 *sensor) {
return true;
}
bool do_sht31(struct mgos_sht31 *sensor) {
static bool do_sht31(struct mgos_sht31 *sensor) {
float temp, humid;
if (!sensor) {
@ -94,7 +95,7 @@ bool do_sht31(struct mgos_sht31 *sensor) {
return true;
}
bool do_si7021(struct mgos_si7021 *sensor) {
static bool do_si7021(struct mgos_si7021 *sensor) {
float temp, humid;
if (!sensor) {
@ -108,7 +109,7 @@ bool do_si7021(struct mgos_si7021 *sensor) {
return true;
}
bool do_htu21df(struct mgos_htu21df *sensor) {
static bool do_htu21df(struct mgos_htu21df *sensor) {
float temp, humid;
if (!sensor) {
@ -122,7 +123,7 @@ bool do_htu21df(struct mgos_htu21df *sensor) {
return true;
}
bool do_mcp9808(struct mgos_mcp9808 *sensor) {
static bool do_mcp9808(struct mgos_mcp9808 *sensor) {
float temp;
if (!sensor) {
@ -135,7 +136,7 @@ bool do_mcp9808(struct mgos_mcp9808 *sensor) {
return true;
}
bool do_mpu9250(struct mgos_mpu9250 *sensor) {
static bool do_mpu9250(struct mgos_mpu9250 *sensor) {
float ax, ay, az;
float gx, gy, gz;
float mx, my, mz;
@ -156,7 +157,7 @@ bool do_mpu9250(struct mgos_mpu9250 *sensor) {
return true;
}
bool do_baro(struct mgos_barometer *sensor) {
static bool do_baro(struct mgos_barometer *sensor) {
float pressure, temperature;
if (!sensor)
@ -173,15 +174,15 @@ bool do_baro(struct mgos_barometer *sensor) {
return true;
}
int main() {
struct mgos_i2c * i2c;
struct mgos_si7021 * si7021;
struct mgos_sht31 * sht31;
struct mgos_htu21df *htu21df;
struct mgos_mcp9808 *mcp9808;
struct mgos_ccs811 * ccs811;
struct mgos_mpu9250 *mpu9250;
struct mgos_barometer *baro1, *baro2;
int main(int argc, char **argv, char **environ) {
struct mgos_i2c * i2c = NULL;
struct mgos_si7021 * si7021 = NULL;
struct mgos_sht31 * sht31 = NULL;
struct mgos_htu21df *htu21df = NULL;
struct mgos_mcp9808 *mcp9808 = NULL;
struct mgos_ccs811 * ccs811 = NULL;
struct mgos_mpu9250 *mpu9250 = NULL;
struct mgos_barometer *baro1 = NULL, *baro2 = NULL;
if (!mgos_i2c_open(I2CBUSNR)) {
LOG(LL_ERROR, ("Cannot open I2C bus %u", I2CBUSNR));
@ -230,14 +231,12 @@ int main() {
}
for (;;) {
/*
* do_sht31(sht31);
* do_si7021(si7021);
* do_htu21df(htu21df);
* do_mcp9808(mcp9808);
* do_ccs811(ccs811);
* do_mpu9250(mpu9250);
*/
do_sht31(sht31);
do_si7021(si7021);
do_htu21df(htu21df);
do_mcp9808(mcp9808);
do_ccs811(ccs811);
do_mpu9250(mpu9250);
do_baro(baro1);
do_baro(baro2);
sleep(1);
@ -253,4 +252,7 @@ int main() {
mgos_barometer_destroy(&baro2);
return 0;
(void)argc;
(void)argv;
(void)environ;
}