diff --git a/build.xml b/build.xml index c26f49060..cbbd68769 100755 --- a/build.xml +++ b/build.xml @@ -5,7 +5,7 @@ - + diff --git a/projects/jfcontrols/build.xml b/projects/jfcontrols/build.xml index a93e0e235..a4a7bf015 100755 --- a/projects/jfcontrols/build.xml +++ b/projects/jfcontrols/build.xml @@ -7,7 +7,7 @@ - + @@ -58,18 +58,22 @@ + + + - + + - + @@ -78,8 +82,9 @@ - - + + + @@ -88,6 +93,7 @@ + diff --git a/projects/jfcontrols/readme.txt b/projects/jfcontrols/readme.txt index 00c778c94..1809ea8d6 100755 --- a/projects/jfcontrols/readme.txt +++ b/projects/jfcontrols/readme.txt @@ -1,4 +1,14 @@ -jfControls is a work in progress. +jfControls +========== -Not usable yet. +jfControls is a Controls Automation System. +It's like a software PLC with ladder logic and panels. + +Can communicate with other remote PLCs such as Siemens, Allen Bradley, Modbus and National Instruments. + +Requires Java 8 JRE and JDK (both MUST be installed) (Recommend 64bit version). + +WebSite : jfcontrols.sourceforge.net + +Git : github.com/pquiring/javaforce (under projects/jfcontrols) diff --git a/projects/jfcontrols/src/jfcontrols/app/Main.java b/projects/jfcontrols/src/jfcontrols/app/Main.java index e191e2770..c56e3c35d 100755 --- a/projects/jfcontrols/src/jfcontrols/app/Main.java +++ b/projects/jfcontrols/src/jfcontrols/app/Main.java @@ -16,7 +16,7 @@ public class Main implements WebUIHandler { - public static String version = "0.1B"; + public static String version = "0.1"; public static ClassLoader loader; public static boolean debug = false; public static String msgs = ""; diff --git a/projects/jfcontrols/src/jfcontrols/sql/SQLService.java b/projects/jfcontrols/src/jfcontrols/sql/SQLService.java index 90664a583..a1075e1f6 100755 --- a/projects/jfcontrols/src/jfcontrols/sql/SQLService.java +++ b/projects/jfcontrols/src/jfcontrols/sql/SQLService.java @@ -17,7 +17,7 @@ public class SQLService { public static String derbyURI; public static String databaseName = "database"; - public static String dbVersion = "0.0.1"; + public static String dbVersion = "0.1"; public static boolean running; public static SQL getSQL() { diff --git a/projects/jfcontrols/whatsnew.txt b/projects/jfcontrols/whatsnew.txt new file mode 100755 index 000000000..6d347238d --- /dev/null +++ b/projects/jfcontrols/whatsnew.txt @@ -0,0 +1,5 @@ +ChangeLog +========= + +Jul 7,2017 : version 0.1 released! + - init version released to the public diff --git a/projects/jfcontrols/wix32.xml b/projects/jfcontrols/wix32.xml index 27ce3a57d..9cc1f2b4f 100755 --- a/projects/jfcontrols/wix32.xml +++ b/projects/jfcontrols/wix32.xml @@ -1,6 +1,6 @@ - + diff --git a/projects/jfcontrols/wix64.xml b/projects/jfcontrols/wix64.xml index ce86db995..6c75a38ec 100755 --- a/projects/jfcontrols/wix64.xml +++ b/projects/jfcontrols/wix64.xml @@ -1,6 +1,6 @@ - + diff --git a/readme.txt b/readme.txt index 1d1903f9e..fb9ba64a7 100755 --- a/readme.txt +++ b/readme.txt @@ -1,7 +1,7 @@ JavaForce SDK ============= -Version 15.7.0 +Version 16.0.0 What is it? =========== @@ -135,4 +135,4 @@ Web : pquiring.github.io/javaforce Git : github.com/pquiring/javaforce -Released : July 4, 2017 +Released : July 7, 2017 diff --git a/src/javaforce/JF.java b/src/javaforce/JF.java index c9b865858..cf0c0a663 100755 --- a/src/javaforce/JF.java +++ b/src/javaforce/JF.java @@ -23,7 +23,7 @@ public class JF { public static String getVersion() { - return "15.7.0"; + return "16.0.0"; } public static void sleep(int milli) { diff --git a/src/javaforce/linux/Linux.java b/src/javaforce/linux/Linux.java index 4752febdd..a8aef9257 100755 --- a/src/javaforce/linux/Linux.java +++ b/src/javaforce/linux/Linux.java @@ -20,7 +20,7 @@ public class Linux { /** Returns jfLinux ISO version. */ public static String getVersion() { - return "15"; + return "16"; } public static enum DistroTypes { diff --git a/whatsnew.txt b/whatsnew.txt index 8b1e8c2db..888cbaec2 100755 --- a/whatsnew.txt +++ b/whatsnew.txt @@ -1,5 +1,9 @@ What's new... +Jul 7/2017 : JF 16.0.0 released + - new : jfControls + - a software PLC with ladder logic and panels + Jul 4/2017 : JF 15.7.0 released - jPhoneLite/1.12 - fixed help button