Improve support for NRF5 boards (#431)

Author: kainhofer

nodemanager/Constants.h

@@ -89,7 +89,7 @@ Chip type
 #if defined(ESP32) || defined(MY_GATEWAY_ESP32)
 #define CHIP_ESP32
 #endif
-#if defined (MYBOARDNRF5)
+#if defined (MYBOARDNRF5) || defined(NRF51) || defined(NRF52)
 #define CHIP_NRF5
 #endif
 #if !defined(CHIP_ESP8266) && !defined(CHIP_ESP32) && !defined(CHIP_STM32) && !defined(CHIP_NRF5)
@@ -187,4 +187,4 @@ Default configuration settings
 #define debug_verbose(x,...)
 #endif
 
-#endif
+#endif

sensors/DisplaySSD1306.h

@@ -24,13 +24,21 @@
 */
 
 #include <SSD1306Ascii.h>
-#include <SSD1306AsciiAvrI2c.h>
+#ifdef CHIP_AVR
+  #include <SSD1306AsciiAvrI2c.h>
+#else
+  #include <SSD1306AsciiWire.h>
+#endif
 
 #include "Display.h"
 
 class DisplaySSD1306: public Display {
 protected:
+#ifdef CHIP_AVR
 	SSD1306AsciiAvrI2c* _oled;
+#else
+	SSD1306AsciiWire* _oled;
+#endif
 	const DevType* _dev = &Adafruit128x64;
 	uint8_t _i2caddress = 0x3c;
 	int _fontsize = 1;
@@ -125,7 +133,11 @@ class DisplaySSD1306: public Display {
 
 	// define what to do during setup
 	void onSetup() {
+#ifdef CHIP_AVR
 		_oled = new SSD1306AsciiAvrI2c();
+#else
+		_oled = new SSD1306AsciiWire();
+#endif
 		_oled->begin(_dev, _i2caddress);
 		_oled->setFont(_font);
 		if (_contrast > -1) _oled->setContrast(_contrast);
@@ -146,4 +158,4 @@ class DisplaySSD1306: public Display {
 	};
 #endif
 };
-#endif
+#endif

sensors/SensorConfiguration.h

@@ -19,6 +19,7 @@
 #ifndef SensorConfiguration_h
 #define SensorConfiguration_h
 
+#if NODEMANAGER_OTA_CONFIGURATION == ON
 /*
 SensorConfiguration: allow remote configuration of the board and any configured sensor
 */
@@ -126,4 +127,9 @@ class SensorConfiguration: public Sensor {
 		nodeManager.sendMessage(children.get(1)->getChildId(),V_CUSTOM,function);
 	};
 };
-#endif
+
+#else
+#warning "SensorConfiguration.h included, but NODEMANAGER_OTA_CONFIGURATION configured to off..."
+#endif
+
+#endif

sensors/SensorVL53L0X.h

@@ -40,7 +40,16 @@ class SensorVL53L0X: public Sensor {
 	// define what to do during setup
 	void onSetup() {
 		if (_pin > 0) {
-			pinMode(_pin, OUTPUT); // Put sensor in deep sleep until the loop
+#ifdef CHIP_NRF5
+			// The NRF5 chip has hwPinMode S0D1, i.e. standard LOW, but disconnected
+			// HIGH, which is exactly what we need for the power pin of the VL53L0X
+			// (the sensort board has a pull-up, so disconnected means sensor's
+			// VCC, not the arduino/NRF5's potentially higher VCC!)
+			hwPinMode(_pin, OUTPUT_S0D1);
+#else
+			pinMode(_pin, OUTPUT);
+#endif
+			// Put sensor in deep sleep until the loop
 			digitalWrite(_pin, LOW);
 		}
 		_lox = new VL53L0X();
@@ -59,12 +68,20 @@ class SensorVL53L0X: public Sensor {
 	int _getDistance() {
 		int distance = -1;
 		if (_lox) {
-			// The XSHUT pin puts the sensor into deep sleep when pulled to LOW;
-			// To wake up, do NOT write HIGH (=3.3V or 5V) to the pin, as the sensor
-			// uses only 2.8V and is not 5V-tolerant. Instead, set the pin to INPUT.
 			if (_pin >= 0) {
+#ifdef CHIP_NRF5
+				// The nrf5 chips have disconnected high, so the pullup will
+				// cause the XSHUT pin to go to the sensor's VCC, which will
+				// not fry the chip. The arduino/nrf5's VCC (3.3V or 5V) is
+				// too high for the sensor's 2.8V VCC...
+				digitalWrite(_pin, HIGH);
+#else
+				// The XSHUT pin puts the sensor into deep sleep when pulled to LOW;
+				// To wake up, do NOT write HIGH (=3.3V or 5V) to the pin, as the sensor
+				// uses only 2.8V and is not 5V-tolerant. Instead, set the pin to INPUT.
 				pinMode(_pin, INPUT);
-				sleep(5); // Transition from HW standby to SW standby might take up to 1.5 ms => use 5ms to be on the safe side
+#endif
+				sleep(3); // Transition from HW standby to SW standby might take up to 1.5 ms => use 3ms to be on the safe side
 			}
 			_lox->init();
 			_lox->setTimeout(500);
@@ -73,12 +90,11 @@ class SensorVL53L0X: public Sensor {
 				digitalWrite(_pin, LOW);
 				pinMode(_pin, OUTPUT);
 			}
-		}
-		//  if (measure.RangeStatus == 0) {  // only 0  data
-		if (_lox->timeoutOccurred()) {
-			distance = -1;
+			if (_lox->timeoutOccurred()) {
+				distance = -1;
+			}
 		}
 		return distance;
 	};
 };
-#endif
+#endif