소스 검색

fix double default arg and support HDC1050

lady ada 5 년 전
부모
커밋
7db54c1fde
2개의 변경된 파일5개의 추가작업 그리고 3개의 파일을 삭제
  1. 4 2
      Adafruit_HDC1000.cpp
  2. 1 1
      Adafruit_HDC1000.h

+ 4 - 2
Adafruit_HDC1000.cpp

@@ -35,7 +35,7 @@ Adafruit_HDC1000::Adafruit_HDC1000() {}
  * param wire The TwoWire master, defaults to &Wire
  * @return Returns true if successful
  */
-bool Adafruit_HDC1000::begin(uint8_t addr, TwoWire *wire = &Wire) {
+bool Adafruit_HDC1000::begin(uint8_t addr, TwoWire *wire) {
   if (i2c_dev) {
     delete i2c_dev; // remove old interface
   }
@@ -49,8 +49,10 @@ bool Adafruit_HDC1000::begin(uint8_t addr, TwoWire *wire = &Wire) {
   reset();
   if (read16(HDC1000_MANUFID) != 0x5449)
     return false;
-  if (read16(HDC1000_DEVICEID) != 0x1000)
+  uint16_t device_id = read16(HDC1000_DEVICEID);
+  if ((device_id != 0x1000) && (device_id != 0x1050))
     return false;
+
   return true;
 }
 

+ 1 - 1
Adafruit_HDC1000.h

@@ -64,7 +64,7 @@ class Adafruit_HDC1000 {
 public:
   Adafruit_HDC1000();
 
-  bool begin(uint8_t a = HDC1000_I2CADDR, TwoWire *wire = &Wire);
+  bool begin(uint8_t addr = HDC1000_I2CADDR, TwoWire *wire = &Wire);
 
   float readTemperature(void);