diff --git a/.gitignore b/.gitignore index 8268f95..8ba3b6e 100644 --- a/.gitignore +++ b/.gitignore @@ -36,4 +36,4 @@ fp-info-cache # fw/Debug -fw/.settings +fw/.settings/language.settings.xml diff --git a/fw/Core/Inc/main.h b/fw/Core/Inc/main.h index b1f733c..f42443b 100644 --- a/fw/Core/Inc/main.h +++ b/fw/Core/Inc/main.h @@ -50,6 +50,7 @@ extern "C" { /* USER CODE BEGIN Includes */ #include "i2c.h" #include "scd4x.h" +#include "sht4x.h" /* USER CODE END Includes */ /* Exported types ------------------------------------------------------------*/ diff --git a/fw/Core/Inc/scd4x.h b/fw/Core/Inc/scd4x.h index 5f86669..5b6726b 100644 --- a/fw/Core/Inc/scd4x.h +++ b/fw/Core/Inc/scd4x.h @@ -5,8 +5,8 @@ * Author: user */ -#ifndef INC_SHT4X_H_ -#define INC_SHT4X_H_ +#ifndef INC_SCD4X_H_ +#define INC_SCD4X_H_ #include "stdint.h" #include "stm32l0xx_ll_i2c.h" @@ -54,4 +54,4 @@ int8_t scd4x_perform_factory_reset( void ); int8_t scd4x_read_measurement(int * co2, int *temperature, int *relative_humidity); -#endif /* INC_SHT4X_H_ */ +#endif /* INC_SCD4X_H_ */ diff --git a/fw/Core/Src/scd4x.c b/fw/Core/Src/scd4x.c index 470006b..b146763 100644 --- a/fw/Core/Src/scd4x.c +++ b/fw/Core/Src/scd4x.c @@ -25,7 +25,7 @@ int8_t scd4x_send_cmd(scd4x_cmd_t cmd) int8_t scd4x_read_data(uint8_t *buffer, int len) { - + return SCD4X_OK; } int8_t scd4x_start_periodic_measurement( void ) diff --git a/fw/Core/Src/sht4x.c b/fw/Core/Src/sht4x.c index 31923f9..305083a 100644 --- a/fw/Core/Src/sht4x.c +++ b/fw/Core/Src/sht4x.c @@ -9,12 +9,12 @@ int8_t sht4x_send_cmd(sht4x_cmd_t cmd) { - + return SHT4X_OK; } int8_t sht4x_read_data(uint8_t *buffer, int len) { - + return SHT4X_OK; } int8_t sht4x_measure(int *temperature, int *relative_humidity)