ppd42ns-driver was changed from 0.1.6 to 0.1.7.

s5uishida · Oct 26, 2019 · 71c5468 · 71c5468
1 parent 4333363
commit 71c5468
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 24 deletions.
diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: rainy - a tiny tool for iot data collection and monitoring
 Bundle-SymbolicName: rainy
-Bundle-Version: 0.1.17
+Bundle-Version: 0.1.18
 Automatic-Module-Name: rainy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: Shigeru Ishida (s5uishida)
@@ -28,19 +28,19 @@ Import-Package: com.fasterxml.jackson.core;version="[2.9.9,3.0.0)",
  org.influxdb;version="[2.15.0,3.0.0)",
  org.influxdb.dto;version="[2.15.0,3.0.0)",
  org.slf4j;version="[1.7.25,1.8.0)"
-Export-Package: io.github.s5uishida.iot.rainy.data;version="0.1.17",
- io.github.s5uishida.iot.rainy.device;version="0.1.17",
- io.github.s5uishida.iot.rainy.device.cc2650;version="0.1.17",
- io.github.s5uishida.iot.rainy.device.cc2650.data;version="0.1.17",
- io.github.s5uishida.iot.rainy.device.hcsr501;version="0.1.17",
- io.github.s5uishida.iot.rainy.device.hcsr501.data;version="0.1.17",
- io.github.s5uishida.iot.rainy.device.mhz19b;version="0.1.17",
- io.github.s5uishida.iot.rainy.device.mhz19b.data;version="0.1.17",
- io.github.s5uishida.iot.rainy.device.ppd42ns;version="0.1.17",
- io.github.s5uishida.iot.rainy.device.ppd42ns.data;version="0.1.17",
- io.github.s5uishida.iot.rainy.device.rcwl0516;version="0.1.17",
- io.github.s5uishida.iot.rainy.device.rcwl0516.data;version="0.1.17",
- io.github.s5uishida.iot.rainy.sender;version="0.1.17",
- io.github.s5uishida.iot.rainy.sender.influxdb;version="0.1.17",
- io.github.s5uishida.iot.rainy.sender.mqtt;version="0.1.17",
- io.github.s5uishida.iot.rainy.util;version="0.1.17"
+Export-Package: io.github.s5uishida.iot.rainy.data;version="0.1.18",
+ io.github.s5uishida.iot.rainy.device;version="0.1.18",
+ io.github.s5uishida.iot.rainy.device.cc2650;version="0.1.18",
+ io.github.s5uishida.iot.rainy.device.cc2650.data;version="0.1.18",
+ io.github.s5uishida.iot.rainy.device.hcsr501;version="0.1.18",
+ io.github.s5uishida.iot.rainy.device.hcsr501.data;version="0.1.18",
+ io.github.s5uishida.iot.rainy.device.mhz19b;version="0.1.18",
+ io.github.s5uishida.iot.rainy.device.mhz19b.data;version="0.1.18",
+ io.github.s5uishida.iot.rainy.device.ppd42ns;version="0.1.18",
+ io.github.s5uishida.iot.rainy.device.ppd42ns.data;version="0.1.18",
+ io.github.s5uishida.iot.rainy.device.rcwl0516;version="0.1.18",
+ io.github.s5uishida.iot.rainy.device.rcwl0516.data;version="0.1.18",
+ io.github.s5uishida.iot.rainy.sender;version="0.1.18",
+ io.github.s5uishida.iot.rainy.sender.influxdb;version="0.1.18",
+ io.github.s5uishida.iot.rainy.sender.mqtt;version="0.1.18",
+ io.github.s5uishida.iot.rainy.util;version="0.1.18"
diff --git a/src/io/github/s5uishida/iot/rainy/device/ppd42ns/PPD42NS.java b/src/io/github/s5uishida/iot/rainy/device/ppd42ns/PPD42NS.java
@@ -119,19 +119,21 @@ public void run() {
 		Date date = new Date();
 		String dateString = sdf.format(date);
 
+		PPD42NSObservationData data;
+		try {
+			data = ppd42ns.read();
+		} catch (IOException e) {
+			LOG.warn("caught - {}", e.toString());
+			return;
+		}
+
 		PPD42NSData ppd42nsData = new PPD42NSData();
 
 		ppd42nsData.clientID = clientID;
 		ppd42nsData.deviceID = ppd42ns.getName();
 		ppd42nsData.samplingDate = dateString;
 		ppd42nsData.samplingTimeMillis = date.getTime();
 
-		PPD42NSObservationData data = ppd42ns.read();
-		if (data == null) {
-			LOG.info(ppd42ns.getLogPrefix() + "read timeout.");
-			return;
-		}
-
 		ppd42nsData.pcs = new Pcs();
 		ppd42nsData.pcs.value = data.getPcs();
 

diff --git a/src/io/github/s5uishida/iot/rainy/util/ConfigParams.java b/src/io/github/s5uishida/iot/rainy/util/ConfigParams.java
@@ -6,7 +6,7 @@
  */
 public class ConfigParams {
 	public static final String NAME						= "rainy - a tiny tool for iot data collection and monitoring";
-	public static final String VERSION					= "0.1.17";
+	public static final String VERSION					= "0.1.18";
 
 	public static final String CONFIG_DIR_PARAM			= "config.dir";
 	public static final String CONFIG_FILE				= "rainy.properties";