From fd1866bb9a2fb8724a325a2252ff5006e525e138 Mon Sep 17 00:00:00 2001 From: Adrian Bowyer Date: Wed, 8 May 2013 13:10:49 +0100 Subject: [PATCH] Repeated table contents now generated by javascript function. --- SD-image/www/reprap.htm | 77 ++++++++++++++++++++++++---------------- SD-image/www/reprap.htm~ | 77 ++++++++++++++++++++++++---------------- Webserver.ino | 9 ++--- 3 files changed, 97 insertions(+), 66 deletions(-) diff --git a/SD-image/www/reprap.htm b/SD-image/www/reprap.htm index cf5d5ab..4b69f48 100644 --- a/SD-image/www/reprap.htm +++ b/SD-image/www/reprap.htm @@ -48,6 +48,37 @@ td { text-align: center; } + RepRapPro logo @@ -96,42 +127,27 @@ td { text-align: center; } - - - - - - - - - - + + - - - - - - - - - - + + - - - - - - - - - - + + @@ -193,7 +209,6 @@ function viewModel() self.sendPassword = function() { $.get('/rr_password', {pwd: self.pwd()}, self.gotPassword); - //self.chosenPageId(self.pages[0]); }; self.sendHome = function(axis, data, event) diff --git a/SD-image/www/reprap.htm~ b/SD-image/www/reprap.htm~ index f1e9369..4b69f48 100644 --- a/SD-image/www/reprap.htm~ +++ b/SD-image/www/reprap.htm~ @@ -48,6 +48,37 @@ td { text-align: center; } + RepRapPro logo @@ -96,42 +127,27 @@ td { text-align: center; } - - - - - - - - - - + + - - - - - - - - - - + + - - - - - - - - - - + + @@ -193,7 +209,6 @@ function viewModel() self.sendPassword = function() { $.get('/rr_password', {pwd: self.pwd()}, self.gotPassword); - //self.chosenPageId(self.pages[0]); }; self.sendHome = function(axis, data, event) diff --git a/Webserver.ino b/Webserver.ino index 1347b05..8dec7cf 100644 --- a/Webserver.ino +++ b/Webserver.ino @@ -282,8 +282,6 @@ void Webserver::WriteByte() void Webserver::CheckPassword() { gotPassword = StringEndsWith(clientQualifier, password); - - //strcpy(clientRequest, INDEX_PAGE); } @@ -326,7 +324,8 @@ void Webserver::GetKOString(char* request) if(StringStartsWith(request, "gcode")) { - // TODO interpret GCode here, not in parse qual. + if(!LoadGcodeBuffer(&clientQualifier[6], true)) + platform->Message(HOST_MESSAGE, "Webserver: buffer not free!
\n"); strcpy(jsonResponse, "{}"); ok = true; } @@ -482,12 +481,14 @@ void Webserver::ParseQualifier() if(!gotPassword) //Doan work fur nuffink return; - if(StringStartsWith(clientQualifier, "gcode=")) +/* +if(StringStartsWith(clientQualifier, "gcode=")) { if(!LoadGcodeBuffer(&clientQualifier[6], true)) platform->Message(HOST_MESSAGE, "Webserver: buffer not free!
\n"); //strcpy(clientRequest, INDEX_PAGE); } + */ } // if you've gotten to the end of the line (received a newline