From a3410921a0edf0341b330cdbc2a5e01cd4ac0448 Mon Sep 17 00:00:00 2001 From: darmbrust Date: Thu, 14 Jan 2021 15:16:34 -0600 Subject: [PATCH 1/3] [gitflow]Update for next development version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d13d09e..eeb7f93 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ net.sagebits.weatherlink weatherlink - 1.12 + 1.13 jar WeatherLink Logger and GUI From 5e380e3c7a4684a80b3b8e6a8faac8bca4159888 Mon Sep 17 00:00:00 2001 From: darmbrust Date: Thu, 14 Jan 2021 15:17:48 -0600 Subject: [PATCH 2/3] bump versions for dev --- README.md | 2 +- .../java/net/sagebits/weatherlink/gui/WeatherLinkLiveGUI.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 02e1b42..f816834 100644 --- a/README.md +++ b/README.md @@ -85,6 +85,6 @@ There are lots of TODOs.... useful things I may add (pull requests welcome) Change version in WeatherLinkLiveGUI.java too ``` -mvn -B gitflow:release-start gitflow:release-finish -DreleaseVersion=1.12 -DdevelopmentVersion=1.13 +mvn -B gitflow:release-start gitflow:release-finish -DreleaseVersion=1.13 -DdevelopmentVersion=1.14 ``` diff --git a/src/main/java/net/sagebits/weatherlink/gui/WeatherLinkLiveGUI.java b/src/main/java/net/sagebits/weatherlink/gui/WeatherLinkLiveGUI.java index 6be8b3c..3c30bed 100644 --- a/src/main/java/net/sagebits/weatherlink/gui/WeatherLinkLiveGUI.java +++ b/src/main/java/net/sagebits/weatherlink/gui/WeatherLinkLiveGUI.java @@ -21,7 +21,7 @@ public class WeatherLinkLiveGUI extends Application private WeatherLinkLiveGUIController wllc_; public static Logger logger = LogManager.getLogger(WeatherLinkLiveGUI.class); - public static final String version = "1.12"; + public static final String version = "1.13"; @Override public void start(Stage primaryStage) throws Exception From 75c264587e18975668af373eaf54ca7aa6acf01f Mon Sep 17 00:00:00 2001 From: darmbrust Date: Sun, 17 Jan 2021 23:02:45 -0600 Subject: [PATCH 3/3] fix a typo in the soil moisture table creation which caused data read failures on systems with soil moisture sensors --- .../net/sagebits/weatherlink/data/StoredDataTypes.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/sagebits/weatherlink/data/StoredDataTypes.java b/src/main/java/net/sagebits/weatherlink/data/StoredDataTypes.java index 8ce35de..2cb499c 100644 --- a/src/main/java/net/sagebits/weatherlink/data/StoredDataTypes.java +++ b/src/main/java/net/sagebits/weatherlink/data/StoredDataTypes.java @@ -63,10 +63,10 @@ public enum StoredDataTypes temp_2("temp 2", "REAL", "most recent valid soil temp slot 2 (°F)", StoredDataTables.SOIL), temp_3("temp 3", "REAL", "most recent valid soil temp slot 3 (°F)", StoredDataTables.SOIL), temp_4("temp 4", "REAL", "most recent valid soil temp slot 4 (°F)", StoredDataTables.SOIL), - most_soil_1("soil moisture 1", "REAL", "most recent valid soil moisture slot 1 (cb)", StoredDataTables.SOIL), - most_soil_2("soil moisture 2", "REAL", "most recent valid soil moisture slot 2 (cb)", StoredDataTables.SOIL), - most_soil_3("soil moisture 3", "REAL", "most recent valid soil moisture slot 3 (cb)", StoredDataTables.SOIL), - most_soil_4("soil moisture 4", "REAL", "most recent valid soil moisture slot 4 (cb)", StoredDataTables.SOIL), + moist_soil_1("soil moisture 1", "REAL", "most recent valid soil moisture slot 1 (cb)", StoredDataTables.SOIL), + moist_soil_2("soil moisture 2", "REAL", "most recent valid soil moisture slot 2 (cb)", StoredDataTables.SOIL), + moist_soil_3("soil moisture 3", "REAL", "most recent valid soil moisture slot 3 (cb)", StoredDataTables.SOIL), + moist_soil_4("soil moisture 4", "REAL", "most recent valid soil moisture slot 4 (cb)", StoredDataTables.SOIL), wet_leaf_1("leaf wetness 1", "TINYINT", "most recent valid leaf wetness slot 1", StoredDataTables.SOIL), wet_leaf_2("leaf wetness 2", "TINYINT", "most recent valid leaf wetness slot 2", StoredDataTables.SOIL),