Diff: SHT3x.cpp

Revision:

3:16d45bca7580

Parent:

2:e87793cb9185

Child:

4:9a5de0485008

--- a/SHT3x.cpp	Sun Nov 19 13:16:35 2017 +0000
+++ b/SHT3x.cpp	Wed May 02 18:16:26 2018 +0000
@@ -7,8 +7,8 @@
     i2c = &i2cBus;
     if(celect == AD0_HIGH) _addr = SLV_ADDR_HIGH;
     else _addr = SLV_ADDR_LOW;
-    SLV_WRITE = _addr;
-    SLV_READ  = _addr | 1;    
+    SLV_WRITE_SHT = _addr;
+    SLV_READ_SHT  = _addr | 1;    
     i2c->frequency(400000);
 }
 /**********
@@ -24,7 +24,7 @@
     cmd[0][0] = 0x30;cmd[0][1] = 0x66;
     cmd[1][0] = 0x30;cmd[1][1] = 0x6D;
     
-    i2c->write(SLV_WRITE, cmd[i], 3);
+    i2c->write(SLV_WRITE_SHT, cmd[i], 3);
 }
 /**************
 温度、湿度を取得する
@@ -38,9 +38,9 @@
     char buff[6];
     unsigned int val[4];
     
-    i2c->write(SLV_WRITE, cmd, 2);
+    i2c->write(SLV_WRITE_SHT, cmd, 2);
     wait_ms(30);
-    i2c->read(SLV_READ, buff, 6);
+    i2c->read(SLV_READ_SHT, buff, 6);
     
     val[0] = (unsigned int)buff[0]<<8;
     val[1] = (unsigned int)buff[1];
@@ -64,9 +64,9 @@
     unsigned int val[2];
     float temp;
     
-    i2c->write(SLV_WRITE, cmd, 2);
+    i2c->write(SLV_WRITE_SHT, cmd, 2);
     wait_ms(30);
-    i2c->read(SLV_READ, buff, 6);
+    i2c->read(SLV_READ_SHT, buff, 6);
 
     val[0] = (unsigned int)buff[0]<<8;
     val[1] = (unsigned int)buff[1];
@@ -87,9 +87,9 @@
     unsigned int val[2];
     float hum;
     
-    i2c->write(SLV_WRITE, cmd, 2);
+    i2c->write(SLV_WRITE_SHT, cmd, 2);
     wait_ms(30);
-    i2c->read(SLV_READ, buff, 6);
+    i2c->read(SLV_READ_SHT, buff, 6);
 
     val[0] = (unsigned int)buff[3]<<8;
     val[1] = (unsigned int)buff[4];
@@ -111,8 +111,8 @@
     unsigned int val[2];
     int state;
     
-    i2c->write(SLV_WRITE, cmd, 2);
-    i2c->read(SLV_READ, buff, 2);
+    i2c->write(SLV_WRITE_SHT, cmd, 2);
+    i2c->read(SLV_READ_SHT, buff, 2);
     
     val[0] = (unsigned int)buff[0]<<8;
     val[1] = (unsigned int)buff[1];