3370 Connect to server even if sensor is not detected.

jburhenn · jburhenn · commit 2eac22a04e0e · 2016-06-27T14:51:18.000-06:00
diff --git a/Sensors/BMP180/BMP180.ino b/Sensors/BMP180/BMP180.ino
@@ -36,6 +36,7 @@ Steps:
 #define TEMPERATURE_PIN V2
 
 Adafruit_BMP085_Unified bmp = Adafruit_BMP085_Unified(10180);
+bool bmpSensorDetected = true;
 
 // Cayenne authentication token. This should be obtained from the Cayenne Dashboard.
 char token[] = "AuthenticationToken";
@@ -47,7 +48,7 @@ void setup()
 	if (!bmp.begin())
 	{
 		CAYENNE_LOG("No BMP sensor detected");
-		while (1);
+		bmpSensorDetected = false;
 	}
 }
 
@@ -59,22 +60,36 @@ void loop()
 // This function is called when the Cayenne widget requests data for the barometer's Virtual Pin.
 CAYENNE_OUT(BAROMETER_PIN)
 {
-	// Send the command to get data.
-	sensors_event_t event;
-	bmp.getEvent(&event);
+	if (bmpSensorDetected)
+	{
+		// Send the command to get data.
+		sensors_event_t event;
+		bmp.getEvent(&event);
 
-	if (event.pressure)
+		if (event.pressure)
+		{
+			// Send the value to Cayenne in hectopascals.
+			Cayenne.hectoPascalWrite(BAROMETER_PIN, event.pressure);
+		}
+	}
+	else
 	{
-		// Send the value to Cayenne in hectopascals.
-		Cayenne.hectoPascalWrite(BAROMETER_PIN, event.pressure);
+		CAYENNE_LOG("No BMP sensor detected");
 	}
 }
 
 // This function is called when the Cayenne widget requests data for the temperature's Virtual Pin.
 CAYENNE_OUT(TEMPERATURE_PIN)
 {
-	float temperature;
-	bmp.getTemperature(&temperature);
-	// Send the value to Cayenne in Celsius.
-	Cayenne.celsiusWrite(TEMPERATURE_PIN, temperature);
+	if (bmpSensorDetected)
+	{
+		float temperature;
+		bmp.getTemperature(&temperature);
+		// Send the value to Cayenne in Celsius.
+		Cayenne.celsiusWrite(TEMPERATURE_PIN, temperature);
+	}
+	else
+	{
+		CAYENNE_LOG("No BMP sensor detected");
+	}
 }
diff --git a/Sensors/TSL2561/TSL2561.ino b/Sensors/TSL2561/TSL2561.ino
@@ -52,7 +52,6 @@ void setup()
 	if (!tsl.begin())
 	{
 		CAYENNE_LOG("No TSL2561 detected");
-		while (1);
 	}
 
 	tsl.enableAutoRange(true);
@@ -83,6 +82,6 @@ CAYENNE_OUT(VIRTUAL_PIN)
 	{
 		/* If event.light = 0 lux the sensor is probably saturated
 		and no reliable data could be generated! */
-		CAYENNE_LOG("Sensor overload");
+		CAYENNE_LOG("No sensor data");
 	}
 }
diff --git a/Sensors/VCNL4000/VCNL4000.ino b/Sensors/VCNL4000/VCNL4000.ino
@@ -32,6 +32,7 @@ Steps:
 #define LUMINOSITY_PIN V2
 
 VCNL4000 proximitySensor;
+bool sensorDetected = true;
 
 // Cayenne authentication token. This should be obtained from the Cayenne Dashboard.
 char token[] = "AuthenticationToken";
@@ -43,7 +44,7 @@ void setup()
 	if (!proximitySensor.begin())
 	{
 		CAYENNE_LOG("No sensor detected");
-		while (1);
+		sensorDetected = false;
 	}
 }
 
@@ -55,16 +56,30 @@ void loop()
 // This function is called when the Cayenne widget requests data for the distance Virtual Pin.
 CAYENNE_OUT(DISTANCE_PIN)
 {
-	//The getMillimeters() function only provides a rough estimate of distance. If greater accuracy is desired
-	//settings can be tweaked in CayenneVCNL400.h.
-	int distance = proximitySensor.getMillimeters();
-	if (distance != NO_PROXIMITY) {
-		Cayenne.virtualWrite(DISTANCE_PIN, distance, DISTANCE, MILLIMETERS);
+	if (sensorDetected)
+	{
+		//The getMillimeters() function only provides a rough estimate of distance. If greater accuracy is desired
+		//settings can be tweaked in CayenneVCNL400.h.
+		int distance = proximitySensor.getMillimeters();
+		if (distance != NO_PROXIMITY) {
+			Cayenne.virtualWrite(DISTANCE_PIN, distance, DISTANCE, MILLIMETERS);
+		}
+	}
+	else
+	{
+		CAYENNE_LOG("No sensor detected");
 	}
 }
 
 // This function is called when the Cayenne widget requests data for the luminosity Virtual Pin.
 CAYENNE_OUT(LUMINOSITY_PIN)
 {
-	Cayenne.luxWrite(LUMINOSITY_PIN, proximitySensor.getLux());
+	if (sensorDetected)
+	{
+		Cayenne.luxWrite(LUMINOSITY_PIN, proximitySensor.getLux());
+	}
+	else
+	{
+		CAYENNE_LOG("No sensor detected");
+	}
 }

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,6 @@ void setup()`
`52`	`52`	`if (!tsl.begin())`
`53`	`53`	`{`
`54`	`54`	`CAYENNE_LOG("No TSL2561 detected");`
`55`		`- while (1);`
`56`	`55`	`}`
`57`	`56`
`58`	`57`	`tsl.enableAutoRange(true);`
`@@ -83,6 +82,6 @@ CAYENNE_OUT(VIRTUAL_PIN)`
`83`	`82`	`{`
`84`	`83`	`/* If event.light = 0 lux the sensor is probably saturated`
`85`	`84`	`and no reliable data could be generated! */`
`86`		`- CAYENNE_LOG("Sensor overload");`
	`85`	`+ CAYENNE_LOG("No sensor data");`
`87`	`86`	`}`
`88`	`87`	`}`