diff --git a/www/index.html b/www/index.html
index cd0b5d3..5aa8b24 100755
--- a/www/index.html
+++ b/www/index.html
@@ -131,6 +131,7 @@
+
@@ -143,7 +144,7 @@
-
+
diff --git a/www/js/message.js b/www/js/Message.js
similarity index 100%
rename from www/js/message.js
rename to www/js/Message.js
diff --git a/www/js/SettingsWindow.js b/www/js/SettingsWindow.js
index 846ca07..9eb7191 100644
--- a/www/js/SettingsWindow.js
+++ b/www/js/SettingsWindow.js
@@ -49,7 +49,7 @@ function SettingsWindow() {
this.clientModeState = SettingsWindow.NOT_CONNECTED;
this.currentAP;
this.apModeState = SettingsWindow.NO_AP;
-
+
// after switching wifi network or creating a access point we delay the status retrieval
// because the webserver needs time to switch
this.retrieveNetworkStatusDelay; // setTimout delay
@@ -68,7 +68,6 @@ function SettingsWindow() {
SettingsWindow.NO_AP = "no ap";
SettingsWindow.AP = "ap";
SettingsWindow.CREATING_AP = "creating ap";
-
SettingsWindow.API_CONNECTING_FAILED = -1
SettingsWindow.API_NOT_CONNECTED = 0
@@ -77,6 +76,15 @@ function SettingsWindow() {
SettingsWindow.API_CREATING = 3
SettingsWindow.API_CREATED = 4
+ // network mode
+ SettingsWindow.NETWORK_MODE_NEITHER = "neither";
+ SettingsWindow.NETWORK_MODE_CLIENT = "clientMode";
+ SettingsWindow.NETWORK_MODE_ACCESS_POINT = "accessPointMode";
+
+ this.networkMode = SettingsWindow.NETWORK_MODE_NEITHER;
+
+ this.updatePanel = new UpdatePanel();
+
var self = this;
this.init = function(wifiboxURL,wifiboxCGIBinURL) {
@@ -108,6 +116,10 @@ function SettingsWindow() {
btnConnect.on('touchstart mousedown',self.connectToNetwork);
btnCreate.on('touchstart mousedown',self.createAP);
networkSelector.change(self.networkSelectorChanged);
+
+ // update panel
+ var $updatePanelElement = self.form.find("#updatePanel");
+ self.updatePanel.init(wifiboxURL,$updatePanelElement);
});
}
this.submitwindow = function(e) {
@@ -360,6 +372,8 @@ function SettingsWindow() {
//console.log(" not connected & not a access point");
self.apFieldSet.show();
self.clientFieldSet.show();
+
+ self.networkMode = SettingsWindow.NETWORK_MODE_NEITHER;
break;
case SettingsWindow.API_CONNECTING_FAILED:
case SettingsWindow.API_CONNECTING:
@@ -380,7 +394,7 @@ function SettingsWindow() {
} else {
self.currentLocalIP = ""
}
-
+ self.networkMode = SettingsWindow.NETWORK_MODE_CLIENT;
break;
case SettingsWindow.API_CREATING:
case SettingsWindow.API_CREATED:
@@ -398,8 +412,10 @@ function SettingsWindow() {
if(data.ssid && data.status == SettingsWindow.API_CREATED) {
self.currentAP = data.ssid;
}
+ self.networkMode = SettingsWindow.NETWORK_MODE_ACCESS_POINT;
break;
}
+ self.updatePanel.setNetworkMode(self.networkMode);
// update status message
switch(data.status) {
@@ -456,6 +472,8 @@ function SettingsWindow() {
this.selectNetwork = function(ssid) {
console.log("select network: ",ssid);
+ if(ssid == "") return;
+ console.log(" checked");
this.selectedNetwork = ssid;
if(this.networks == undefined || ssid == SettingsWindow.NOT_CONNECTED) {
this.hideWiFiPassword();
diff --git a/www/js/UpdatePanel.js b/www/js/UpdatePanel.js
new file mode 100644
index 0000000..5c9558c
--- /dev/null
+++ b/www/js/UpdatePanel.js
@@ -0,0 +1,230 @@
+function UpdatePanel() {
+ this.wifiboxURL;
+ this.element;
+
+ this.statusCheckInterval = 1000;
+ this.statusCheckDelayer; // setTimout instance
+ this.installedDelay = 60*1000; // Since we can't retrieve status during installation we show the installed text after a fixed delay
+ this.installedDelayer; // setTimout instance
+ this.retryDelay = 1000;
+ this.retryDelayer; // setTimout instance
+ //this.timeoutTime = 3000;
+
+ this.canUpdate = false;
+ this.currentVersion = "";
+ this.newestVersion;
+ this.progress;
+ this.imageSize;
+
+ // states from api, see Doodle3D firmware src/script/d3d-updater.lua
+ UpdatePanel.NONE = 1; // default state
+ UpdatePanel.DOWNLOADING = 2;
+ UpdatePanel.DOWNLOAD_FAILED = 3;
+ UpdatePanel.IMAGE_READY = 4; // download successfull and checked
+ UpdatePanel.INSTALLING = 5;
+ UpdatePanel.INSTALLED = 6;
+ UpdatePanel.INSTALL_FAILED = 7;
+
+ this.state; // update state from api
+ this.stateText = ""; // update state text from api
+
+ this.networkMode; // network modes from SettingsWindow
+
+ var self = this;
+
+ this.init = function(wifiboxURL,updatePanelElement) {
+
+ this.wifiboxURL = wifiboxURL;
+
+ this.element = updatePanelElement;
+ this.btnUpdate = this.element.find("#update");
+ this.statusDisplay = this.element.find("#updateState");
+ this.infoDisplay = this.element.find("#updateInfo");
+
+ this.btnUpdate.click(this.update);
+
+ this.checkStatus(false);
+ }
+
+ this.update = function() {
+ console.log("UpdatePanel:update");
+ self.downloadUpdate();
+ }
+ this.downloadUpdate = function() {
+ console.log("UpdatePanel:downloadUpdate");
+ $.ajax({
+ url: self.wifiboxURL + "/update/download",
+ type: "POST",
+ dataType: 'json',
+ success: function(response){
+ console.log("UpdatePanel:downloadUpdate response: ",response);
+ }
+ }).fail(function() {
+ console.log("UpdatePanel:downloadUpdate: failed");
+ });
+ self.setState(UpdatePanel.DOWNLOADING);
+ self.startCheckingStatus();
+ }
+ this.installUpdate = function() {
+ console.log("UpdatePanel:installUpdate");
+ self.stopCheckingStatus();
+ $.ajax({
+ url: self.wifiboxURL + "/update/install",
+ type: "POST",
+ dataType: 'json',
+ success: function(response){
+ console.log("UpdatePanel:installUpdate response: ",response);
+ }
+ }).fail(function() {
+ console.log("UpdatePanel:installUpdate: no respons (there shouldn't be)");
+ });
+ self.setState(UpdatePanel.INSTALLING);
+
+ clearTimeout(self.installedDelayer);
+ self.installedDelayer = setTimeout(function() { self.setState(UpdatePanel.INSTALLED) },self.installedDelay);
+ }
+
+ this.startCheckingStatus = function() {
+ clearTimeout(self.statusCheckDelayer);
+ clearTimeout(self.retryDelayer);
+ self.statusCheckDelayer = setTimeout(function() { self.checkStatus(true) },self.statusCheckInterval);
+ }
+ this.stopCheckingStatus = function() {
+ clearTimeout(self.statusCheckDelayer);
+ clearTimeout(self.retryDelayer);
+ }
+ this.checkStatus = function(keepChecking) {
+ if (!communicateWithWifibox) return;
+ $.ajax({
+ url: self.wifiboxURL + "/update/status",
+ type: "GET",
+ dataType: 'json',
+ //timeout: self.timeoutTime,
+ success: function(response){
+ console.log("UpdatePanel:checkStatus response: ",response);
+
+ // Keep checking ?
+ if(keepChecking) {
+ switch(self.state){
+ case UpdatePanel.DOWNLOADING:
+ case UpdatePanel.INSTALLING:
+ clearTimeout(self.statusCheckDelayer);
+ self.statusCheckDelayer = setTimeout(function() { self.checkStatus(keepChecking) },self.statusCheckInterval);
+ break;
+ }
+ }
+
+ if(response.status != "error") {
+ var data = response.data;
+ self.handleStatusData(data);
+ }
+ }
+ }).fail(function() {
+ //console.log("UpdatePanel:checkStatus: failed");
+ if(keepChecking) {
+ clearTimeout(self.retryDelayer);
+ self.retryDelayer = setTimeout(function() { self.checkStatus(keepChecking) },self.retryDelay); // retry after delay
+ }
+ });
+ }
+
+ this.handleStatusData = function(data) {
+ //console.log("UpdatePanel:handleStatusData");
+ self.canUpdate = data.can_update;
+
+ if(self.currentVersion != data.current_version || self.newestVersion != data.newest_version) {
+ self.currentVersion = data.current_version;
+ self.newestVersion = data.newest_version;
+ self.updateInfoDisplay();
+ }
+
+ self.stateText = data.state_text;
+ self.progress = data.progress; // not always available
+ self.imageSize = data.image_size; // not always available
+
+ self.setState(data.state_code);
+
+ switch(this.state){
+ case UpdatePanel.IMAGE_READY:
+ self.installUpdate();
+ break;
+ }
+ }
+ this.setState = function(newState) {
+ if(this.state == newState) return;
+ console.log("UpdatePanel:setState: ",this.state," > ",newState,"(",this.stateText,") (networkMode: ",self.networkMode,") (newestVersion: ",self.newestVersion,")");
+ this.state = newState;
+
+ // download button
+ // if there isn't newestVersion data something went wrong,
+ // probably accessing the internet
+ if(self.newestVersion != undefined) {
+ switch(this.state){
+ case UpdatePanel.NONE:
+ case UpdatePanel.DOWNLOAD_FAILED:
+ case UpdatePanel.INSTALL_FAILED:
+ if(self.canUpdate) {
+ self.btnUpdate.removeAttr("disabled");
+ } else {
+ self.btnUpdate.attr("disabled", true);
+ }
+ break;
+ default:
+ self.btnUpdate.attr("disabled", true);
+ break;
+ }
+ } else {
+ self.btnUpdate.attr("disabled", true);
+ }
+ this.updateStatusDisplay();
+ }
+ this.updateStatusDisplay = function() {
+ var text = "";
+ if(self.newestVersion != undefined) {
+ switch(this.state){
+ case UpdatePanel.NONE:
+ if(self.canUpdate) {
+ text = "Update(s) available.";
+ } else {
+ text = "You're up to date.";
+ }
+ break;
+ case UpdatePanel.DOWNLOADING:
+ text = "Downloading update...";
+ break;
+ case UpdatePanel.DOWNLOAD_FAILED:
+ text = "Downloading update failed.";
+ break;
+ case UpdatePanel.IMAGE_READY:
+ text = "Update downloaded.";
+ break;
+ case UpdatePanel.INSTALLING:
+ text = "Installing update... (will take a minute)";
+ break;
+ case UpdatePanel.INSTALLED:
+ text = "Update complete, please