SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Try a stepper for the serial port

Browse source
This commit is contained in:
Scott Lahteine 2015-02-05 11:44:43 -08:00
parent ac7a4358d6
commit 53f6bbdfe0
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Marlin/configurator/css/configurator.css
View file

@ -14,7 +14,7 @@ img { display: none; }
label, input, select, textarea { display: block; float: left; margin: 1px 0; } label, input, select, textarea { display: block; float: left; margin: 1px 0; }
label.newline, textarea { clear: both; } label.newline, textarea { clear: both; }
label { width: 130px; height: 1em; padding: 10px 480px 10px 1em; margin-right: -470px; text-align: right; } label { width: 130px; height: 1em; padding: 10px 480px 10px 1em; margin-right: -470px; text-align: right; }
input[type="text"], select, .jstepper { margin: 0.75em 0 0; } input[type="text"], select { margin: 0.75em 0 0; }
input[type="checkbox"], input[type="radio"], input[type="file"] { margin: 1em 0 0; } input[type="checkbox"], input[type="radio"], input[type="file"] { margin: 1em 0 0; }
#config_form { display: block; background: #DDD; padding: 20px; color: #000; } #config_form { display: block; background: #DDD; padding: 20px; color: #000; }
/*#config_text, #config_adv_text { font-family: "Andale mono", monospace; clear: both; }*/ /*#config_text, #config_adv_text { font-family: "Andale mono", monospace; clear: both; }*/
@ -24,4 +24,5 @@ input:disabled { color: #BBB; }
.clear { clear: both; } .clear { clear: both; }
h1, h2, h3, h4, h5, h6 { clear: both; } h1, h2, h3, h4, h5, h6 { clear: both; }
h2 { margin: 0; padding: 1em 0 0; } h2 { margin: 0; padding: 1em 0 0; }
.jstepper { display: block; } #serial_stepper { padding-top: 0.75em; display: block; float: left; }
#SERIAL_PORT { display: none; }

9
Marlin/configurator/js/configurator.js
View file

@ -247,10 +247,10 @@ var configuratorApp = (function(){
this.initField('TEMP_SENSOR_2'); this.initField('TEMP_SENSOR_2');
this.initField('TEMP_SENSOR_BED'); this.initField('TEMP_SENSOR_BED');
/*
$('#serial_stepper').jstepper({ $('#serial_stepper').jstepper({
min: 0, min: 0,
max: 3, max: 7,
val: $('#SERIAL_PORT').val(), val: $('#SERIAL_PORT').val(),
arrowWidth: '18px', arrowWidth: '18px',
arrowHeight: '15px', arrowHeight: '15px',
@ -258,11 +258,10 @@ var configuratorApp = (function(){
acolor: '#F70', acolor: '#F70',
hcolor: '#FF0', hcolor: '#FF0',
id: 'select-me', id: 'select-me',
stepperClass: 'inner',
textStyle: {width:'1.5em',fontSize:'120%',textAlign:'center'}, textStyle: {width:'1.5em',fontSize:'120%',textAlign:'center'},
// onChange: function(v) { }, onChange: function(v) { $('#SERIAL_PORT').val(v).trigger('change'); }
}); });
*/
// prettyPrint(); // prettyPrint();
}, },