15.2.0

pquiring · Mar 30, 2017 · a40fc00 · a40fc00
1 parent d399110
commit a40fc00
Show file tree

Hide file tree

Showing 13 changed files with 22 additions and 11 deletions.
diff --git a/build.xml b/build.xml
@@ -5,7 +5,7 @@
   <property name="src" location="src"/>
   <property name="build" location="classes"/>
   <property name="home" value="."/>
-  <property name="version" value="15.1.0"/>
+  <property name="version" value="15.2.0"/>
   <property name="noelf" value="true"/>
 
   <property name="ubuntu.depends" value="openjdk-8-jre, libjsch-java, libjzlib-java, libjcifs-java, fuse, libfuse2, fuseiso, libcdio13, mate-icon-theme, libv4l-dev"/>

diff --git a/projects/jfdatalogger/build.xml b/projects/jfdatalogger/build.xml
@@ -7,7 +7,7 @@
   <property name="src" location="src"/>
   <property name="build" location="classes"/>
   <property name="classpath" location="javaforce.jar"/>
-  <property name="version" value="0.9"/>
+  <property name="version" value="0.10"/>
 
   <import file="../../base.xml"/>
 

diff --git a/projects/jfdatalogger/src/App.java b/projects/jfdatalogger/src/App.java
@@ -14,7 +14,7 @@
 
 public class App extends javax.swing.JFrame {
 
-  public static String version = "0.9";
+  public static String version = "0.10";
 
   public static int delays[] = new int[] {
     25, 50, 100, 500, 1000, 3000, 5000, 10000, 30000, 60000, 300000

diff --git a/projects/jfdatalogger/whatsnew.txt b/projects/jfdatalogger/whatsnew.txt
@@ -1,3 +1,6 @@
+Mar 30/2017 : v0.10 released
+  - fix : NI connection issue
+
 Mar 10/2017 : v0.9 released
   - fix : NI is big endian
 

diff --git a/projects/jfdatalogger/wix32.xml b/projects/jfdatalogger/wix32.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <Product Id="*" UpgradeCode="{429E2AD1-232C-4C24-9C78-8D06E506505A}" Version="0.9" Language="1033" Name="jfDataLogger" Manufacturer="Peter Quiring">
+  <Product Id="*" UpgradeCode="{429E2AD1-232C-4C24-9C78-8D06E506505A}" Version="0.10" Language="1033" Name="jfDataLogger" Manufacturer="Peter Quiring">
     <Package InstallerVersion="300" Compressed="yes" InstallScope="perMachine"/>
     <Media Id="1" Cabinet="files.cab" EmbedCab="yes" />
     <UIRef Id="WixUI_Minimal" />

diff --git a/projects/jfdatalogger/wix64.xml b/projects/jfdatalogger/wix64.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <Product Id="*" UpgradeCode="{741FCC9E-8DEC-415E-A05E-1115FEA9FA31}" Version="0.9" Language="1033" Name="jfDataLogger" Manufacturer="Peter Quiring">
+  <Product Id="*" UpgradeCode="{741FCC9E-8DEC-415E-A05E-1115FEA9FA31}" Version="0.10" Language="1033" Name="jfDataLogger" Manufacturer="Peter Quiring">
     <Package InstallerVersion="300" Compressed="yes" InstallScope="perMachine" Platform="x64"/>
     <Media Id="1" Cabinet="files.cab" EmbedCab="yes" />
     <UIRef Id="WixUI_Minimal" />

diff --git a/projects/jfdataloggerplus/build.xml b/projects/jfdataloggerplus/build.xml
@@ -8,7 +8,7 @@
   <property name="src" location="src"/>
   <property name="build" location="classes"/>
   <property name="classpath" location="javaforce.jar"/>
-  <property name="version" value="0.5"/>
+  <property name="version" value="0.6"/>
 
   <import file="../../base.xml"/>
 

diff --git a/projects/jfdataloggerplus/whatsnew.txt b/projects/jfdataloggerplus/whatsnew.txt
@@ -1,3 +1,6 @@
+Mar 30/2017 : v0.6 released
+  - fix : NI connection issue
+
 Mar 10/2017 : v0.5 released
   - fix : NI is big endian
 

diff --git a/projects/jfdataloggerplus/wix32.xml b/projects/jfdataloggerplus/wix32.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-  <Product Id="*" UpgradeCode="{429E2AD1-232C-4C24-9C78-8D06E506505B}" Version="0.5" Language="1033" Name="jfDataLoggerPlus" Manufacturer="Peter Quiring">
+  <Product Id="*" UpgradeCode="{429E2AD1-232C-4C24-9C78-8D06E506505B}" Version="0.6" Language="1033" Name="jfDataLoggerPlus" Manufacturer="Peter Quiring">
     <Package InstallerVersion="300" Compressed="yes" InstallScope="perMachine"/>
     <Media Id="1" Cabinet="files.cab" EmbedCab="yes" />
     <UIRef Id="WixUI_Minimal" />

diff --git a/projects/jfdataloggerplus/wix64.xml b/projects/jfdataloggerplus/wix64.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-  <Product Id="*" UpgradeCode="{741FCC9E-8DEC-415E-A05E-1115FEA9FA32}" Version="0.5" Language="1033" Name="jfDataLoggerPlus" Manufacturer="Peter Quiring">
+  <Product Id="*" UpgradeCode="{741FCC9E-8DEC-415E-A05E-1115FEA9FA32}" Version="0.6" Language="1033" Name="jfDataLoggerPlus" Manufacturer="Peter Quiring">
     <Package InstallerVersion="300" Compressed="yes" InstallScope="perMachine" Platform="x64"/>
     <Media Id="1" Cabinet="files.cab" EmbedCab="yes" />
     <UIRef Id="WixUI_Minimal" />

diff --git a/readme.txt b/readme.txt
@@ -1,7 +1,7 @@
 JavaForce SDK
 =============
 
-Version 15.1.0
+Version 15.2.0
 
 What is it?
 ===========
@@ -98,4 +98,4 @@ Web : pquiring.github.io/javaforce
 
 Git : github.com/pquiring/javaforce
 
-Released : Mar 10, 2017
+Released : Mar 30, 2017
diff --git a/src/javaforce/JF.java b/src/javaforce/JF.java
@@ -23,7 +23,7 @@
 public class JF {
 
   public static String getVersion() {
-    return "15.1.0";
+    return "15.2.0";
   }
 
   public static void sleep(int milli) {

diff --git a/whatsnew.txt b/whatsnew.txt
@@ -1,5 +1,10 @@
 What's new...
 
+Mar 30/2017 : JF 15.2.0 released!
+  - fix : javaforce.controls.Controller.isConnected() was always returning false for NI devices
+    - jfDataLogger/0.10
+    - jfDataLoggerPlus/0.6
+
 Mar 10/2017 : JF 15.1.0 released!
   - fix : javaforce.controls.Tag : NI is big endian
     - jfDataLogger/0.9