tschwery/reprapfirmware-dc42
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

JSON requests now working, but with strange requirements...

Browse source
This commit is contained in:
Adrian Bowyer 2013-05-04 18:55:18 +01:00
parent 522ca8a891
commit 07f72215b1
3 changed files with 30 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
SD-image/www/reprap.htm
View file

@ -50,7 +50,7 @@
<a href="http://reprappro.com" target="_blank"><img src="logo.png" alt="RepRapPro logo" align="right"></a>
<div style="font-size:20px">RepRap: <strong data-bind="text: machineName, click: $root.getName"></strong></div>
<div style="font-size:20px">RepRap: <strong data-bind="text: machineName"></strong></div>
<br clear = "all">
@ -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('<click here>');
//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)

27
SD-image/www/reprap.htm~
View file

@ -50,7 +50,7 @@
<a href="http://reprappro.com" target="_blank"><img src="logo.png" alt="RepRapPro logo" align="right"></a>
<div style="font-size:20px">RepRap: <strong data-bind="text: machineName, click: $root.getName"></strong></div>
<div style="font-size:20px">RepRap: <strong data-bind="text: machineName"></strong></div>
<br clear = "all">
@ -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('<click here>');
//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)

12
Webserver.ino
View file

@ -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, "<br>\n");
platform->Message(HOST_MESSAGE, "HTTP request: ");
platform->Message(HOST_MESSAGE, clientLine);
platform->Message(HOST_MESSAGE, "<br>\n");
int i = 5;
int j = 0;