Change GroveTempHumiBaroBME280.Init()

Author: matsujirushi

src/Module/GroveTempHumiBaroBME280.cpp

@@ -74,8 +74,10 @@ uint32_t GroveTempHumiBaroBME280::ReadReg24(uint8_t reg)
 	return (uint32_t)data[0] << 16 | (uint32_t)data[1] << 8 | data[2];
 }
 
-void GroveTempHumiBaroBME280::Init()
+bool GroveTempHumiBaroBME280::Init()
 {
+	if (!_Device->IsExist()) return false;
+
 	if (ReadReg8(BME280_REG_CHIPID) != 0x60) HalSystem::Abort();
 
 	dig_T1 = ReadReg16LE(BME280_REG_DIG_T1);
@@ -101,10 +103,21 @@ void GroveTempHumiBaroBME280::Init()
 
 	_Device->WriteReg8(BME280_REG_CONTROLHUMID, 0x05);
 	_Device->WriteReg8(BME280_REG_CONTROL, 0xB7);
+
+	_IsExist = true;
+	return true;
 }
 
 void GroveTempHumiBaroBME280::Read()
 {
+	if (!_IsExist)
+	{
+		Temperature = NAN;
+		Humidity = NAN;
+		Pressure = NAN;
+		return;
+	}
+
 	// Temperature
 
 	int32_t t_fine;

src/Module/GroveTempHumiBaroBME280.h

@@ -4,10 +4,10 @@
 
 #pragma once
 
-#include "Abstract/GroveModule.h"
+#include "Abstract/GroveModule2.h"
 #include "../Connector/GroveConnectorI2C.h"
 
-class GroveTempHumiBaroBME280 : public GroveModule
+class GroveTempHumiBaroBME280 : public GroveModule2
 {
 private:
 	HalI2CDevice * _Device;
@@ -51,7 +51,7 @@ class GroveTempHumiBaroBME280 : public GroveModule
 		_Device = connector->NewDevice(0x76);	// I2C_ADDRESS
 	}
 
-	void Init();
+	bool Init();
 	void Read();
 
 };