Diff: BME280.cpp

Revision:

2:42725d11023b

Parent:

1:0dbf59c6e564

Child:

3:df1107ddf502

--- a/BME280.cpp	Tue Jul 10 07:53:16 2018 +0000
+++ b/BME280.cpp	Tue Jul 10 07:59:58 2018 +0000
@@ -33,8 +33,8 @@
 
         //読み込み
         set_force_mode();                   //測定開始
-        while(STATUS_IS_MEASURING);       //測定待ち
-        sensor.read_reg(BME280_add, PRESS_MSB, sensor_raw_data, 8); //PRESS_MSBレジスタから8バイト読み込み
+        while(BMP280_STATUS_IS_MEASURING);       //測定待ち
+        sensor.read_reg(BME280_add, BMP280_PRESS_MSB, sensor_raw_data, 8); //PRESS_MSBレジスタから8バイト読み込み
         T = sensor_raw_data[3] << 12 | sensor_raw_data[4] << 4 | sensor_raw_data[5] >> 4 ;
         P = sensor_raw_data[0] << 12 | sensor_raw_data[1] << 4 | sensor_raw_data[2] >> 4 ;
         H = sensor_raw_data[6] <<  8 | sensor_raw_data[7];
@@ -50,19 +50,19 @@
 }
 
 bool BME280::data_is_ready(void){
-    return !STATUS_IS_MEASURING;
+    return !BMP280_STATUS_IS_MEASURING;
 }
 
 void BME280::set_sleep_mode(void){
-    sensor.write_reg(BME280_add, CTRL_MEAS, (meas_reg_value&0xFC) | SLEEP_MODE );
+    sensor.write_reg(BME280_add, BMP280_CTRL_MEAS, (meas_reg_value&0xFC) | BMP280_SLEEP_MODE );
 }
 
 void BME280::set_force_mode(void){
-    sensor.write_reg(BME280_add, CTRL_MEAS, (meas_reg_value&0xFC) | FORCE_MODE );
+    sensor.write_reg(BME280_add, BMP280_CTRL_MEAS, (meas_reg_value&0xFC) | BMP280_FORCE_MODE );
 }
 
 void BME280::set_normal_mode(void){
-    sensor.write_reg(BME280_add, CTRL_MEAS, (meas_reg_value&0xFC) | NORMAL_MODE );
+    sensor.write_reg(BME280_add, BMP280_CTRL_MEAS, (meas_reg_value&0xFC) | BMP280_NORMAL_MODE );
 }
 
 
@@ -119,19 +119,19 @@
 void BME280::init(void){
     char calib[32] = {0};
     char reg_data;
-    sensor.write_reg(BME280_add, RESET_REG, RESET_VALUE);
+    sensor.write_reg(BME280_add, BMP280_RESET_REG, BMP280_RESET_VALUE);
 
-    reg_data = sensor.read_reg(BME280_add,ID);  //ID読み込み
-    if(reg_data != ID_VALUE){               //ID不一致エラー
+    reg_data = sensor.read_reg(BME280_add,BMP280_ID);  //ID読み込み
+    if(reg_data != BMP280_ID_VALUE){               //ID不一致エラー
         printf("error\n");
         while(1);
     }
-    while(STATUS_IS_COPYING);       //不揮発メモリのデータのレジスタコピー待ち
+    while(BMP280_STATUS_IS_COPYING);       //不揮発メモリのデータのレジスタコピー待ち
 
     //ADC補償式用定数読み込み
-    sensor.read_reg(BME280_add, CALIB00, &(calib[0]), 24);
-    sensor.read_reg(BME280_add, CALIB25, &(calib[24]), 1);
-    sensor.read_reg(BME280_add, CALIB26, &(calib[25]), 7);
+    sensor.read_reg(BME280_add, BMP280_CALIB00, &(calib[0]), 24);
+    sensor.read_reg(BME280_add, BMP280_CALIB25, &(calib[24]), 1);
+    sensor.read_reg(BME280_add, BMP280_CALIB26, &(calib[25]), 7);
 
     dig_T1 = calib[ 0] | (calib[ 1] << 8);
     dig_T2 = calib[ 2] | (calib[ 3] << 8);
@@ -156,9 +156,9 @@
     //ADC補償式用定数読み込みEND
 
     //センサ設定
-    sensor.write_reg(BME280_add, CTRL_HUM , hum_reg_value);
-    sensor.write_reg(BME280_add, CTRL_MEAS, meas_reg_value);
-    sensor.write_reg(BME280_add, CONFIG   , config_reg_value);
+    sensor.write_reg(BME280_add, BMP280_CTRL_HUM , hum_reg_value);
+    sensor.write_reg(BME280_add, BMP280_CTRL_MEAS, meas_reg_value);
+    sensor.write_reg(BME280_add, BMP280_CONFIG   , config_reg_value);
 
 }