Merge branch 'release/1.13'

darmbrust · Jan 18, 2021 · 4e87af4 · 4e87af4
2 parents c08e19a + 75c2645
commit 4e87af4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git 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/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>net.sagebits.weatherlink</groupId>
 	<artifactId>weatherlink</artifactId>
-	<version>1.12</version>
+	<version>1.13</version>
 	<packaging>jar</packaging>
 
 	<name>WeatherLink Logger and GUI</name>

diff --git 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),
 

diff --git 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