From a40fc00df69f16b3ff0a91eeb6b5cf13c4f397c0 Mon Sep 17 00:00:00 2001
From: Peter Quiring <pquiring@gmail.com>
Date: Thu, 30 Mar 2017 10:50:07 -0400
Subject: [PATCH] 15.2.0

---
 build.xml                              | 2 +-
 projects/jfdatalogger/build.xml        | 2 +-
 projects/jfdatalogger/src/App.java     | 2 +-
 projects/jfdatalogger/whatsnew.txt     | 3 +++
 projects/jfdatalogger/wix32.xml        | 2 +-
 projects/jfdatalogger/wix64.xml        | 2 +-
 projects/jfdataloggerplus/build.xml    | 2 +-
 projects/jfdataloggerplus/whatsnew.txt | 3 +++
 projects/jfdataloggerplus/wix32.xml    | 2 +-
 projects/jfdataloggerplus/wix64.xml    | 2 +-
 readme.txt                             | 4 ++--
 src/javaforce/JF.java                  | 2 +-
 whatsnew.txt                           | 5 +++++
 13 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/build.xml b/build.xml
index 548fcbeb2..f012201c6 100755
--- 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
index 346677cf9..efd2b2400 100755
--- 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
index 0f96d1ec9..9b7268ca7 100755
--- 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
index 80fddb604..7f1e35af4 100755
--- 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
index 9ba1bab36..1541550b5 100755
--- 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
index a10ff13b0..6d4a1be8f 100755
--- 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
index 864d5d075..de28e2cc9 100755
--- 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
index 48fbdea62..2f04fc405 100755
--- 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
index c51354d67..7869de14d 100755
--- 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
index 2cdd6eacd..063ad9178 100755
--- 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
index 881100872..e1feafb2b 100755
--- 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
index c7fa163d8..a419704c5 100755
--- 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
index 9a158a357..21c7643bd 100755
--- 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