Преглед изворни кода

Mass app fixes for new API

Thanks @Willy-JL for finding issues and fixing many of those apps
Other apps fixed by me
MX пре 2 година
родитељ
комит
b48d78fe25
4 измењених фајлова са 6 додато и 19 уклоњено
  1. 2 3
      sensors/BME680.h
  2. 2 2
      sensors/BMP180.c
  3. 0 6
      sensors/SCD30.c
  4. 2 8
      sensors/SCD40.c

+ 2 - 3
sensors/BME680.h

@@ -74,17 +74,16 @@ typedef struct {
     int32_t t_fine;
 } BME680_instance;
 
-extern const SensorType BMP280;
 extern const SensorType BME680;
 /**
- * @brief Выделение памяти и установка начальных значений датчика BMP280
+ * @brief Выделение памяти и установка начальных значений датчика BME680
  * @param sensor Указатель на создаваемый датчик
  * @return Истина при успехе
  */
 bool unitemp_BME680_alloc(Sensor* sensor, char* args);
 
 /**
- * @brief Инициализации датчика BMP280
+ * @brief Инициализации датчика BME680
  * @param sensor Указатель на датчик
  * @return Истина если инициализация упспешная
  */

+ 2 - 2
sensors/BMP180.c

@@ -56,8 +56,8 @@ bool unitemp_BMP180_I2C_alloc(Sensor* sensor, char* args) {
     i2c_sensor->minI2CAdr = 0x77 << 1;
     i2c_sensor->maxI2CAdr = 0x77 << 1;
 
-    BMP180_instance* bmx280_instance = malloc(sizeof(BMP180_instance));
-    i2c_sensor->sensorInstance = bmx280_instance;
+    BMP180_instance* bmx180_instance = malloc(sizeof(BMP180_instance));
+    i2c_sensor->sensorInstance = bmx180_instance;
     return true;
 }
 

+ 0 - 6
sensors/SCD30.c

@@ -30,12 +30,6 @@ typedef union {
     float value;
 } ByteToFl;
 
-bool unitemp_SCD30_alloc(Sensor* sensor, char* args);
-bool unitemp_SCD30_init(Sensor* sensor);
-bool unitemp_SCD30_deinit(Sensor* sensor);
-UnitempStatus unitemp_SCD30_update(Sensor* sensor);
-bool unitemp_SCD30_free(Sensor* sensor);
-
 const SensorType SCD30 = {
     .typename = "SCD30",
     .interface = &I2C,

+ 2 - 8
sensors/SCD40.c

@@ -19,17 +19,11 @@
 
 // Some information may be seen on https://github.com/sparkfun/SparkFun_SCD30_Arduino_Library
 
-#include "SCD30.h"
+#include "SCD40.h"
 #include "../interfaces/I2CSensor.h"
 #include "../interfaces/endianness.h"
 //#include <3rdparty/everest/include/everest/kremlin/c_endianness.h>
 
-bool unitemp_SCD40_alloc(Sensor* sensor, char* args);
-bool unitemp_SCD40_init(Sensor* sensor);
-bool unitemp_SCD40_deinit(Sensor* sensor);
-UnitempStatus unitemp_SCD40_update(Sensor* sensor);
-bool unitemp_SCD40_free(Sensor* sensor);
-
 const SensorType SCD40 = {
     .typename = "SCD40",
     .interface = &I2C,
@@ -185,7 +179,7 @@ static bool getSettingValue(Sensor* sensor, uint16_t registerAddress, uint16_t*
     return loadWord(bytes, val);
 }
 
-// Get 18 bytes from SCD30
+// Get 18 bytes from SCD40
 // Updates global variables with floats
 // Returns true if success
 static bool readMeasurement(Sensor* sensor) {