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

Updated web interface to 1.06

Browse source
This commit is contained in:
David Crocker 2015-04-18 10:51:23 +01:00
parent 808710e61b
commit e8cf1d3aea
3 changed files with 60 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SD-image/gcodes-MiniKossel/octagon-test-delta.gcode
View file

@ -1,5 +1,5 @@
G90 G90
G1 X0 Y0 Z100 F5000 G1 X0 Y0 Z50 F5000
G1 X-20 Y-48 F15000 G1 X-20 Y-48 F15000
G1 X20 Y-48 G1 X20 Y-48
G1 X48 Y-20 G1 X48 Y-20

78
SD-image/www/js/reprap.js
View file

@ -1,6 +1,6 @@
/*! Reprap Ormerod Web Control | by Matt Burnett <matt@burny.co.uk>. | open license /*! Reprap Ormerod Web Control | by Matt Burnett <matt@burny.co.uk>. | open license
*/ */
var ver = 1.04; //App version var ver = 1.06; //App version
var polling = false; var polling = false;
var printing = false; var printing = false;
var paused = false; var paused = false;
@ -168,19 +168,19 @@ $('div#bedActiveTemperature').on('click', 'a#bedActiveTempLink', function() {
}); });
$('div#head1ActiveTemperature').on('click', 'a#head1ActiveTempLink', function() { $('div#head1ActiveTemperature').on('click', 'a#head1ActiveTempLink', function() {
$('input#head1ActiveTempInput').val($(this).text()); $('input#head1ActiveTempInput').val($(this).text());
$.askElle('gcode', "G10 P1 S" + $(this).text()); $.askElle('gcode', "G10 P0 S" + $(this).text());
}); });
$('div#head1StandbyTemperature').on('click', 'a#head1StandbyTempLink', function() { $('div#head1StandbyTemperature').on('click', 'a#head1StandbyTempLink', function() {
$('input#head1StandbyTempInput').val($(this).text()); $('input#head1StandbyTempInput').val($(this).text());
$.askElle('gcode', "G10 P1 R" + $(this).text()); $.askElle('gcode', "G10 P0 R" + $(this).text());
}); });
$('div#head2ActiveTemperature').on('click', 'a#head2ActiveTempLink', function() { $('div#head2ActiveTemperature').on('click', 'a#head2ActiveTempLink', function() {
$('input#head2ActiveTempInput').val($(this).text()); $('input#head2ActiveTempInput').val($(this).text());
$.askElle('gcode', "G10 P2 S" + $(this).text()); $.askElle('gcode', "G10 P1 S" + $(this).text());
}); });
$('div#head2StandbyTemperature').on('click', 'a#head2StandbyTempLink', function() { $('div#head2StandbyTemperature').on('click', 'a#head2StandbyTempLink', function() {
$('input#head2StandbyTempInput').val($(this).text()); $('input#head2StandbyTempInput').val($(this).text());
$.askElle('gcode', "G10 P2 R" + $(this).text()); $.askElle('gcode', "G10 P1 R" + $(this).text());
}); });
$('input#bedActiveTempInput').keydown(function(event) { $('input#bedActiveTempInput').keydown(function(event) {
if (event.which === 13) { if (event.which === 13) {
@ -192,28 +192,28 @@ $('input#bedActiveTempInput').keydown(function(event) {
$('input#head1ActiveTempInput').keydown(function(event) { $('input#head1ActiveTempInput').keydown(function(event) {
if (event.which === 13) { if (event.which === 13) {
event.preventDefault(); event.preventDefault();
$.askElle('gcode', "G10 P1 S" + $(this).val()); $.askElle('gcode', "G10 P0 S" + $(this).val());
$('input#head1ActiveTempInput').blur(); $('input#head1ActiveTempInput').blur();
} }
}); });
$('input#head1StandbyTempInput').keydown(function(event) { $('input#head1StandbyTempInput').keydown(function(event) {
if (event.which === 13) { if (event.which === 13) {
event.preventDefault(); event.preventDefault();
$.askElle('gcode', "G10 P1 R" + $(this).val()); $.askElle('gcode', "G10 P0 R" + $(this).val());
$('input#head1StandbyTempInput').blur() $('input#head1StandbyTempInput').blur()
} }
}); });
$('input#head2ActiveTempInput').keydown(function(event) { $('input#head2ActiveTempInput').keydown(function(event) {
if (event.which === 13) { if (event.which === 13) {
event.preventDefault(); event.preventDefault();
$.askElle('gcode', "G10 P2 S" + $(this).val()); $.askElle('gcode', "G10 P1 S" + $(this).val());
$('input#head2ActiveTempInput').blur(); $('input#head2ActiveTempInput').blur();
} }
}); });
$('input#head2StandbyTempInput').keydown(function(event) { $('input#head2StandbyTempInput').keydown(function(event) {
if (event.which === 13) { if (event.which === 13) {
event.preventDefault(); event.preventDefault();
$.askElle('gcode', "G10 P2 R" + $(this).val()); $.askElle('gcode', "G10 P1 R" + $(this).val());
$('input#head2StandbyTempInput').blur(); $('input#head2StandbyTempInput').blur();
} }
}); });
@ -233,10 +233,10 @@ $('div#head2StandbyTemperature ul').on('click', 'a#addHead2StandbyTemp', functio
addTemp($('input#head2StandbyTempInput').val(), 'standby'); addTemp($('input#head2StandbyTempInput').val(), 'standby');
}); });
$('a#head1Click').on('click', function() { $('a#head1Click').on('click', function() {
$.askElle('gcode', (currentTool == 1) ? "T0" : "T1"); $.askElle('gcode', (currentTool == 1) ? "T-1" : "T0");
}); });
$('a#head2Click').on('click', function() { $('a#head2Click').on('click', function() {
$.askElle('gcode', (currentTool == 2) ? "T0" : "T2"); $.askElle('gcode', (currentTool == 2) ? "T-1" : "T1");
}); });
//feed controls //feed controls
@ -1032,15 +1032,17 @@ function updatePage() {
if (status.hasOwnProperty('fanRPM')) { if (status.hasOwnProperty('fanRPM')) {
$('#fanRPM').text(status.fanRPM.toString()); $('#fanRPM').text(status.fanRPM.toString());
} }
if (status.status == "S") { switch (status.status) {
//stopped case "S":
//halted
printing = false; printing = false;
$('button#printing').removeClass('btn-danger').removeClass('btn-success').addClass('btn-warning').text("Halted"); $('button#printing').removeClass('btn-danger').removeClass('btn-success').addClass('btn-warning').text("Halted");
disableButtons('panic'); disableButtons('panic');
disableButtons("head"); disableButtons("head");
disableButtons("temp"); disableButtons("temp");
disableButtons("gfilelist"); disableButtons("gfilelist");
} else if (status.status === "P") { break;
case "P":
//printing //printing
printing = true; printing = true;
objHeight = $('input#objheight').val(); objHeight = $('input#objheight').val();
@ -1048,7 +1050,7 @@ function updatePage() {
objHeight = status.height; objHeight = status.height;
$('input#objheight').val(objHeight.toString()); $('input#objheight').val(objHeight.toString());
} }
$('button#printing').removeClass('btn-danger').removeClass('btn-warning').addClass('btn-success').text("Active"); $('button#printing').removeClass('btn-danger').removeClass('btn-warning').addClass('btn-success').text("Printing");
enableButtons('panic'); enableButtons('panic');
enableButtons('temp'); enableButtons('temp');
disableButtons("print"); disableButtons("print");
@ -1067,26 +1069,62 @@ function updatePage() {
setProgress(0, 'print', 0, 0); setProgress(0, 'print', 0, 0);
} }
layers(currentLayer); layers(currentLayer);
} else if (status.status === "I" && !paused ) { break;
case "I":
//inactive, not printing //inactive, not printing
printing = false; printing = false;
$('button#printing').removeClass('btn-danger').removeClass('btn-success').addClass('btn-warning').text("Ready :)"); $('button#printing').removeClass('btn-danger').removeClass('btn-success').addClass('btn-warning').text("Idle");
disableButtons("panic"); disableButtons("panic");
enableButtons('head'); enableButtons('head');
enableButtons('temp'); enableButtons('temp');
enableButtons("gfilelist"); enableButtons("gfilelist");
} else if (status.status === "I" && paused) { break;
case "C":
//starting up
printing = false;
$('button#printing').removeClass('btn-danger').removeClass('btn-success').addClass('btn-warning').text("Starting");
disableButtons('panic');
disableButtons('head');
disableButtons('temp');
break;
case "A":
//paused //paused
printing = true; printing = true;
$('button#printing').removeClass('btn-danger').removeClass('btn-success').addClass('btn-warning').text("Paused"); $('button#printing').removeClass('btn-danger').removeClass('btn-success').addClass('btn-warning').text("Paused");
enableButtons('panic'); enableButtons('panic');
enableButtons('head'); enableButtons('head');
enableButtons('temp'); enableButtons('temp');
} else { break;
case "B":
//busy, running a macro
printing = false;
$('button#printing').removeClass('btn-danger').removeClass('btn-success').addClass('btn-warning').text("Busy");
enableButtons('panic');
disableButtons('head');
disableButtons('temp');
break;
case "D":
//pausing
printing = true;
$('button#printing').removeClass('btn-danger').removeClass('btn-success').addClass('btn-warning').text("Pausing");
enableButtons('panic');
enableButtons('head');
enableButtons('temp');
break;
case "R":
//resuming
printing = true;
$('button#printing').removeClass('btn-danger').removeClass('btn-success').addClass('btn-warning').text("Resuming");
enableButtons('panic');
enableButtons('head');
enableButtons('temp');
break;
default:
//unknown state //unknown state
printing = paused = false; printing = paused = false;
$('button#printing').removeClass('btn-warning').removeClass('btn-success').addClass('btn-danger').text("Error!"); $('button#printing').removeClass('btn-warning').removeClass('btn-success').addClass('btn-danger').text("Unknown");
message('danger', 'Unknown Poll State : ' + status.status); message('danger', 'Unknown Poll State : ' + status.status);
break;
} }
// Update the current and selected active/standby temperatures // Update the current and selected active/standby temperatures

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

@ -1,7 +1,7 @@
<!DOCTYPE HTML> <!DOCTYPE HTML>
<html> <html>
<head> <head>
<title>Ormerod Control v1.04</title> <title>Ormerod Control v1.06</title>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<!-- Bootstrap --> <!-- Bootstrap -->