diff --git a/app/src/main/assets/www/index.html b/app/src/main/assets/www/index.html
index 0ce2ad3..e6f2b13 100644
--- a/app/src/main/assets/www/index.html
+++ b/app/src/main/assets/www/index.html
@@ -59,8 +59,9 @@
-
Seizure Detector Settings
-
+
Seizure Detector Settings
+
+
SD Settings
diff --git a/app/src/main/assets/www/js/osd_main.js b/app/src/main/assets/www/js/osd_main.js
index 0117ebe..815b209 100644
--- a/app/src/main/assets/www/js/osd_main.js
+++ b/app/src/main/assets/www/js/osd_main.js
@@ -162,7 +162,11 @@ toggleMute = function() {
sd_muted = 1;
$("#muteButton").text("Un-mute Audible Alarm");
}
-}
+};
+
+acceptAlarm = function() {
+ $.ajax({url:"/acceptalarm"});
+};
$(document).ready(function() {
sd_muted = 0;
@@ -173,4 +177,5 @@ $(document).ready(function() {
setInterval("get_settings();",10000);
setInterval("get_spectrum();",5000);
$("#muteButton").click(toggleMute);
+ $("#acceptButton").click(acceptAlarm);
});
diff --git a/app/src/main/java/uk/org/openseizuredetector/SdServer.java b/app/src/main/java/uk/org/openseizuredetector/SdServer.java
index 24ed0f5..8cca4a5 100644
--- a/app/src/main/java/uk/org/openseizuredetector/SdServer.java
+++ b/app/src/main/java/uk/org/openseizuredetector/SdServer.java
@@ -755,7 +755,7 @@ public class SdServer extends Service implements SdDataReceiver, SdLocationRecei
Log.v(TAG, "startWebServer()");
mUtil.writeToSysLogFile("SdServer.Start Web Server.");
if (webServer == null) {
- webServer = new SdWebServer(getApplicationContext(), mUtil.getDataStorageDir(), mSdData);
+ webServer = new SdWebServer(getApplicationContext(), mUtil.getDataStorageDir(), mSdData, this);
try {
webServer.start();
} catch (IOException ioe) {
diff --git a/app/src/main/java/uk/org/openseizuredetector/SdWebServer.java b/app/src/main/java/uk/org/openseizuredetector/SdWebServer.java
index 9206594..cdc2572 100644
--- a/app/src/main/java/uk/org/openseizuredetector/SdWebServer.java
+++ b/app/src/main/java/uk/org/openseizuredetector/SdWebServer.java
@@ -25,14 +25,16 @@ import fi.iki.elonen.NanoHTTPD;
public class SdWebServer extends NanoHTTPD {
private String TAG = "WebServer";
private SdData mSdData;
+ private SdServer mSdServer;
private Context mContext;
private File mDataStorageDir = null;
- public SdWebServer(Context context, File storageDir, SdData sdData) {
+ public SdWebServer(Context context, File storageDir, SdData sdData, SdServer sdServer) {
// Set the port to listen on (8080)
super(8080);
mSdData = sdData;
mContext = context;
+ mSdServer = sdServer;
mDataStorageDir = storageDir;
}
@@ -110,6 +112,12 @@ public class SdWebServer extends NanoHTTPD {
}
break;
+ case "/acceptalarm":
+ Log.v(TAG, "WebServer.serve() - Accepting alarm");
+ mSdServer.acceptAlarm();
+ answer = "Alarm Accepted";
+ break;
+
default:
if (uri.startsWith("/index.html") ||
uri.startsWith("/logfiles.html") ||