diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ab8660..44979ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,10 +5,12 @@ Added Support for Wifi data source (initially to be used for ESP8266_SD) and Android Wear datasource + V2.5.3 - 10sep2017 - Added Pebble App V2.6 which provides better alarm reliability + - no changes to Android App other than first run dialog. + V2.5.2 - 09 May 2017 Added support for Pebble App V2.5 which includes a multi-ROI mode to improve sensitivity. - - + V2.5.1 - 07 May 2017 - Improved alarm annunciation for short duration seizures - setting Latch Alarms will result in alarms sounding for at least Latch Alarm diff --git a/app/app-release-2.5.2.apk b/app/app-release-2.5.2.apk new file mode 100644 index 0000000..b6a606c Binary files /dev/null and b/app/app-release-2.5.2.apk differ diff --git a/app/build.gradle b/app/build.gradle index 1f72f06..c697549 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,8 +7,8 @@ android { defaultConfig { applicationId "uk.org.openseizuredetector" - minSdkVersion 20 - targetSdkVersion 24 + minSdkVersion 14 + targetSdkVersion 14 } buildTypes { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4a4698b..99fdf93 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,8 +1,9 @@ + android:versionName="2.5.3"> diff --git a/app/src/main/assets/pebble_sd.pbw b/app/src/main/assets/pebble_sd.pbw index db097bf..2675b03 100644 Binary files a/app/src/main/assets/pebble_sd.pbw and b/app/src/main/assets/pebble_sd.pbw differ diff --git a/app/src/main/java/uk/org/openseizuredetector/MainActivity.java b/app/src/main/java/uk/org/openseizuredetector/MainActivity.java index 69c8bb6..ac0edff 100644 --- a/app/src/main/java/uk/org/openseizuredetector/MainActivity.java +++ b/app/src/main/java/uk/org/openseizuredetector/MainActivity.java @@ -275,7 +275,7 @@ public class MainActivity extends Activity { TextView tv; tv = (TextView) findViewById(R.id.versionTv); String versionName = mUtil.getAppVersionName(); - tv.setText("OpenSeizureDetector Server Version " + versionName); + tv.setText("OpenSeizureDetector Android App Version " + versionName); mUtil.writeToSysLogFile("MainActivity.onStart - Binding to Server"); mUtil.bindToServer(this, mConnection); diff --git a/app/src/main/java/uk/org/openseizuredetector/SdWebServer.java b/app/src/main/java/uk/org/openseizuredetector/SdWebServer.java index 43441d5..36b1ece 100644 --- a/app/src/main/java/uk/org/openseizuredetector/SdWebServer.java +++ b/app/src/main/java/uk/org/openseizuredetector/SdWebServer.java @@ -90,10 +90,10 @@ public class SdWebServer extends NanoHTTPD { Log.v(TAG, "WebServer.serve() - POST /data - receiving data from device: parameters=" + parameters.toString()); Log.v(TAG, " header=" + header.toString()); Log.v(TAG, " files=" + files.toString()); - String postData = files.get("postData"); - Log.v(TAG, " postData=" + postData); + //String postData = files.get("postData"); + //Log.v(TAG, " postData=" + postData); // Send the data to the SdDataSource so the app can pick it up. - mSdServer.mSdDataSource.updateFromJSON(postData); + mSdServer.mSdDataSource.updateFromJSON(parameters.toString()); break; default: Log.v(TAG, "WebServer.serve() - Unrecognised method - " + method);