Merge branch 'release/1.06'

darmbrust · Apr 22, 2020 · ff40b69 · ff40b69
2 parents 7d40974 + 2acd25b
commit ff40b69
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -44,6 +44,6 @@ There are lots of TODOs.... useful things I may add (pull requests welcome)
 
 # Release Notes
 ```
-mvn -B gitflow:release-start gitflow:release-finish -DreleaseVersion=1.05 -DdevelopmentVersion=1.06
+mvn -B gitflow:release-start gitflow:release-finish -DreleaseVersion=1.06 -DdevelopmentVersion=1.07
 
 ```
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>net.sagebits.weatherlink</groupId>
 	<artifactId>weatherlink</artifactId>
-	<version>1.05</version>
+	<version>1.06</version>
 	<packaging>jar</packaging>
 
 	<name>WeatherLink Logger and GUI</name>

diff --git a/src/main/java/net/sagebits/weatherlink/gui/WeatherLinkLiveGUIController.java b/src/main/java/net/sagebits/weatherlink/gui/WeatherLinkLiveGUIController.java
@@ -552,7 +552,7 @@ private Gauge buildQuarterWindGauge(String wllDeviceId, String sensorOutdoorId)
 		final Consumer<Void> updateTooltip = input -> 
 		{
 			//This will give us a pulse, every read attempt.  Don't actually care about the value.
-			if (currentWind.getTimeStamp() < (System.currentTimeMillis() - 6000))
+			if (currentWind.getTimeStamp() < (currentWind.getLocalTimeStamp() - 6000))
 			{
 				//More than 6 seconds out of date, missed at least 2 live data pulses.
 				gauge.setKnobColor(Color.BLACK);