sensor v1 df220 adapt

SConscript

@@ -4,8 +4,10 @@ Import('rtconfig')
 src   = []
 cwd   = GetCurrentDir()
 
+if GetDepend('PKG_DF220_USING_SENSOR_V1'):
+   src += Glob('mira_df220_sensor_v1.c')
+
 # add df220 src files.
-src += Glob('sensor_mira_df220.c')
 src += Glob('libraries/df220.c')
 
 # add df220 include path.

sensor_mira_df220.c → mira_df220_sensor_v1.c

@@ -1,9 +1,9 @@
 
-#include "sensor_mira_df220.h"
+#include "mira_df220_sensor_v1.h"
 
 #define DBG_ENABLE
 #define DBG_LEVEL DBG_LOG
-#define DBG_SECTION_NAME  "sensor.mira.df220"
+#define DBG_SECTION_NAME "mira.df220.sensor.v1"
 #define DBG_COLOR
 #include <rtdbg.h>
 
@@ -31,7 +31,7 @@ static int8_t rt_i2c_write_reg(void *intf_ptr, uint8_t addr, uint8_t reg, uint8_
 
     if (rt_i2c_transfer(intf_ptr, msgs, 2) != 2)
     {
-        return -RT_ERROR;
+        return RT_ERROR;
     }
 
     return RT_EOK;
@@ -54,7 +54,7 @@ static int8_t rt_i2c_read_reg(void *intf_ptr, uint8_t addr, uint8_t reg, uint8_t
 
     if (rt_i2c_transfer(intf_ptr, msgs, 2) != 2)
     {
-        return -RT_ERROR;
+        return RT_ERROR;
     }
 
     return RT_EOK;
@@ -218,7 +218,7 @@ static rt_err_t _df220_set_power(rt_sensor_t sensor, rt_uint8_t power)
     return rslt;
 }
 
-static rt_size_t df220_fetch_data(struct rt_sensor_device *sensor, void *buf, rt_size_t len)
+static RT_SIZE_TYPE df220_fetch_data(struct rt_sensor_device *sensor, void *buf, rt_size_t len)
 {
     struct df220_dev *_df220_dev = sensor->parent.user_data;
     struct rt_sensor_data *data = buf;

mira_df220_sensor_v1.h

@@ -0,0 +1,22 @@
+
+
+#ifndef SENSOR_MIRA_DF220_H__
+#define SENSOR_MIRA_DF220_H__
+
+#include "rtthread.h"
+#include "rtdevice.h"
+#include "df220.h"
+
+#define DF220_ADDR_DEFAULT UINT8_C(0x27)
+
+#if defined(RT_VERSION_CHECK)
+    #if (RTTHREAD_VERSION >= RT_VERSION_CHECK(5, 0, 2))
+        #define RT_SIZE_TYPE rt_ssize_t
+    #else
+        #define RT_SIZE_TYPE rt_size_t
+    #endif
+#endif
+
+int rt_hw_df220_init(const char *name, struct rt_sensor_config *cfg);
+
+#endif

sensor_mira_df220.h

@@ -1,13 +0,0 @@
-
-
-#ifndef SENSOR_MIRA_DF220_H__
-#define SENSOR_MIRA_DF220_H__
-
-#include "sensor.h"
-#include "df220.h"
-
-#define DF220_ADDR_DEFAULT UINT8_C(0x27)
-
-int rt_hw_df220_init(const char *name, struct rt_sensor_config *cfg);
-
-#endif