Merge pull request #76 from MURPHYENGINEERING/[email protected]

Disambiguate TwoWire::begin for [email protected]

Author: Heltec-Aaron-Lee

src/BMP180.cpp

@@ -9,7 +9,7 @@ boolean BMP085::begin(uint8_t mode) {
     mode = BMP085_ULTRAHIGHRES;
   oversampling = mode;
 //begin(int sdaPin, int sclPin, uint32_t frequency)
-  Wire.begin(13, 12, 100000);
+  Wire.begin(13, 12, 100000U);
 
   if (read8(0xD0) != 0x55) return false;
 

src/oled/SSD1306Wire.h

@@ -55,16 +55,16 @@ class SSD1306Wire : public OLEDDisplay {
 
 
     bool connect() {
-    		pinMode(_rst,OUTPUT);
-    		digitalWrite(_rst, LOW);
-    		delay(50);
-    		digitalWrite(_rst, HIGH);
-
-		Wire.begin(this->_sda, this->_scl);
-		// Let's use ~700khz if ESP8266 is in 160Mhz mode
-		// this will be limited to ~400khz if the ESP8266 in 80Mhz mode.
-		Wire.setClock(700000);
-		return true;
+			pinMode(_rst,OUTPUT);
+			digitalWrite(_rst, LOW);
+			delay(50);
+			digitalWrite(_rst, HIGH);
+
+			// Let's use ~700khz if ESP8266 is in 160Mhz mode
+			// this will be limited to ~400khz if the ESP8266 in 80Mhz mode.
+			Wire.begin(int(this->_sda), this->_scl, 700000U);
+		
+			return true;
     }
 
     void display(void) {