diff --git a/SD-image/www/reprap.htm b/SD-image/www/reprap.htm
index 0196bc6..dba499f 100644
--- a/SD-image/www/reprap.htm
+++ b/SD-image/www/reprap.htm
@@ -50,7 +50,7 @@
-
RepRap:
+RepRap:
@@ -93,23 +93,20 @@ function RepRap()
self.pages = ['Control', 'Print', 'Help', 'Settings', 'Messages', 'Logout'];
self.chosenPageId = ko.observable();
self.chosenPageData = ko.observable();
- self.machineName = ko.observable('');
- //var nameData = '{"myName":"RRR 5"}';
- //var parsed;
+ self.machineName = ko.computed(
+ function()
+ {
+ var n = ko.observable('r');
+ $.get('/rr_name', {}, n);
+ alert(n()); // Without this line it does not work...
+ return n().myName;
+ }
+ );
+
// Behaviours
self.getName = function()
{
- //alert(nameData);
- //parsed = JSON.parse(nameData);
- //alert(parsed.myName);
- //$.getJSON('/rr_name', function(nameData) {
- // alert(nameData);
- // parsed = JSON.parse(nameData);
- // self.machineName(parsed.myName);
- // });
-
- $.get('/rr_name', { qual: 'null' }, self.machineName);
- //alert(parsed.myName);
+ $.get('/rr_name', {}, self.machineName);
};
self.goToPage = function(page)
diff --git a/SD-image/www/reprap.htm~ b/SD-image/www/reprap.htm~
index 0196bc6..d2c5818 100644
--- a/SD-image/www/reprap.htm~
+++ b/SD-image/www/reprap.htm~
@@ -50,7 +50,7 @@
-RepRap:
+RepRap:
@@ -93,23 +93,20 @@ function RepRap()
self.pages = ['Control', 'Print', 'Help', 'Settings', 'Messages', 'Logout'];
self.chosenPageId = ko.observable();
self.chosenPageData = ko.observable();
- self.machineName = ko.observable('');
- //var nameData = '{"myName":"RRR 5"}';
- //var parsed;
+ self.machineName = ko.computed(
+ function()
+ {
+ var n = ko.observable('r');
+ $.get('/rr_name', {}, n);
+ alert(n());
+ return n().myName;
+ }
+ );
+
// Behaviours
self.getName = function()
{
- //alert(nameData);
- //parsed = JSON.parse(nameData);
- //alert(parsed.myName);
- //$.getJSON('/rr_name', function(nameData) {
- // alert(nameData);
- // parsed = JSON.parse(nameData);
- // self.machineName(parsed.myName);
- // });
-
- $.get('/rr_name', { qual: 'null' }, self.machineName);
- //alert(parsed.myName);
+ $.get('/rr_name', {}, self.machineName);
};
self.goToPage = function(page)
diff --git a/Webserver.ino b/Webserver.ino
index c733e34..a11a5f0 100644
--- a/Webserver.ino
+++ b/Webserver.ino
@@ -207,9 +207,9 @@ void Webserver::SendFile(char* nameOfFileToSend)
writing = true;
}
- if(jsonPointer >=0)
- platform->SendToClient("HTTP/1.1 201 OK\n");
- else
+ //if(jsonPointer >=0)
+ // platform->SendToClient("HTTP/1.1 201 OK\n");
+ //else
platform->SendToClient("HTTP/1.1 200 OK\n");
platform->SendToClient("Content-Type: ");
@@ -347,9 +347,9 @@ void Webserver::ParseGetPost()
// Serial.print("HTTP request: ");
// Serial.println(clientLine);
- //platform->Message(HOST_MESSAGE, "HTTP request: ");
- //platform->Message(HOST_MESSAGE, clientLine);
- //platform->Message(HOST_MESSAGE, "
\n");
+ platform->Message(HOST_MESSAGE, "HTTP request: ");
+ platform->Message(HOST_MESSAGE, clientLine);
+ platform->Message(HOST_MESSAGE, "
\n");
int i = 5;
int j = 0;