From ef18bfdd3f328b30590fc6d64c14557a0b2b5c2a Mon Sep 17 00:00:00 2001 From: Scott Lahteine <sourcetree@thinkyhead.com> Date: Thu, 5 Feb 2015 07:05:29 -0800 Subject: [PATCH 01/41] An in-place browser-based configurator utility - A web form with fields for configuration values - Reads and parses standard config files - Modifies configurations dynamically in-place --- Marlin/configurator/css/configurator.css | 27 ++ Marlin/configurator/index.html | 52 +++ Marlin/configurator/js/configurator.js | 293 +++++++++++++ Marlin/configurator/js/jcanvas.js | 524 +++++++++++++++++++++++ Marlin/configurator/js/jstepper.js | 220 ++++++++++ 5 files changed, 1116 insertions(+) create mode 100644 Marlin/configurator/css/configurator.css create mode 100644 Marlin/configurator/index.html create mode 100644 Marlin/configurator/js/configurator.js create mode 100644 Marlin/configurator/js/jcanvas.js create mode 100644 Marlin/configurator/js/jstepper.js diff --git a/Marlin/configurator/css/configurator.css b/Marlin/configurator/css/configurator.css new file mode 100644 index 0000000000..9c7b1be0a8 --- /dev/null +++ b/Marlin/configurator/css/configurator.css @@ -0,0 +1,27 @@ +/* configurator.css */ +/* Styles for Marlin Configurator */ + +body { margin: 0; padding: 0; background: #458; color: #FFC; font-family: sans-serif; } +#main { float: left; width: 100%; margin-right: -100%; } +#main { padding: 0 4%; width: 92%; } +#main { font-family: monospace; } +.info { color: #AAF; } +.info span { color: #FFF; } +.info span span { color: #000; font-weight: bold; } +p { width: 80%; color: #FF0; } +#help strong { color: #0DD; } +img { display: none; } +label, input, select, textarea { display: block; float: left; margin: 1px 0; } +label.newline, textarea { clear: both; } +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="checkbox"], input[type="radio"] { margin: 1em 0 0; } +#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 { height: 25em; overflow: auto; background-color: #FFF; color: #888; padding: 10px; } +input[type="checkbox"], input[type="radio"].enabler { margin-left: 1em; } +input:disabled { color: #BBB; } +.clear { clear: both; } +h1, h2, h3, h4, h5, h6 { clear: both; } +h2 { margin: 0; padding: 1em 0 0; } +.jstepper { display: block; } diff --git a/Marlin/configurator/index.html b/Marlin/configurator/index.html new file mode 100644 index 0000000000..ea613d0177 --- /dev/null +++ b/Marlin/configurator/index.html @@ -0,0 +1,52 @@ +<html> + <head> + <title>Marlin Configurator</title> + <meta charset="UTF-8"> + <script type="text/javascript" src="https://code.jquery.com/jquery-2.1.3.min.js"></script> + <script src="js/configurator.js"></script> + <script src="js/jcanvas.js"></script> + <script src="js/jstepper.js"></script> + <link rel="stylesheet" href="css/configurator.css" type="text/css" media="all" /> + </head> + <body> + <div id="main"> + <h1>Marlin Configurator 0.1a</h1> + <p>Enter values in the form, get a Marlin configuration.<br/>Will include a drop-down of known configurations.</p> + <ul id="help"> + <li><strong>HELP</strong> - This is the help region</li> + </ul> + + <form id="config_form"> + + <!-- label>Serial Port:</label><input name="SERIAL_PORT" type="text" size="4" maxlength="2" value="99" / --> + + <label>Serial Port:</label><select name="SERIAL_PORT"></select><div id="serial_stepper"></div> + + <label>Baud Rate:</label><select name="BAUDRATE"></select> + + <label>AT90USB BT IF:</label> + <input name="BTENABLED" type="checkbox" value="1" checked /> + + <label class="newline">Motherboard:</label><select name="MOTHERBOARD"></select> + + <label class="newline">Custom Name:</label><input name="CUSTOM_MENDEL_NAME" class="switchable" type="text" size="14" maxlength="12" value="" /> + + <label class="newline">Machine UUID:</label><input name="MACHINE_UUID" class="switchable" type="text" size="38" maxlength="36" value="" /> + + <label class="newline">Extruders:</label><select name="EXTRUDERS"></select> + + <label class="newline">Power Supply:</label><select name="POWER_SUPPLY"></select> + + <label>PS Default Off:</label> + <input name="PS_DEFAULT_OFF" type="checkbox" value="1" checked /> + + <h2>Marlin/Configuration.h</h2> + <pre id="config_text" class="prettyprint linenums"></pre> + <h2>Marlin/Configuration_adv.h</h2> + <pre id="config_adv_text" class="prettyprint linenums"></pre> + + <br class="clear" /> + </form> + </div> + </body> +</html> diff --git a/Marlin/configurator/js/configurator.js b/Marlin/configurator/js/configurator.js new file mode 100644 index 0000000000..8189b24fa8 --- /dev/null +++ b/Marlin/configurator/js/configurator.js @@ -0,0 +1,293 @@ +/** + * configurator.js + * + * Marlin Configuration Utility + * - Web form for entering configuration options + * - A reprap calculator to calculate movement values + * - Uses HTML5 to generate downloadables in Javascript + * - Reads and parses standard configuration files from local folders + * + * Supporting functions + * - Parser to read Marlin Configuration.h and Configuration_adv.h files + * - Utilities to replace values in configuration files + */ +$(function(){ + +var marlin_config = '..'; + +// Extend String +String.prototype.lpad = function(len, chr) { + if (chr === undefined) { chr = ' '; } + var s = this+'', need = len - s.length; + if (need > 0) { s = new Array(need+1).join(chr) + s; } + return s; +}; + +String.prototype.prePad = function(len, chr) { + return len ? this.lpad(len, chr) : this; +}; + +String.prototype.zeroPad = function(len) { + return len ? this.prePad(len, '0') : this; +}; + +/** + * selectField.addOptions takes an array or keyed object + */ +$.fn.extend({ + addOptions: function(arrObj) { + return this.each(function() { + var sel = $(this); + var isArr = Object.prototype.toString.call(arrObj) == "[object Array]"; + $.each(arrObj, function(k, v) { + sel.append( $('<option>',{value:isArr?v:k}).text(v) ); + }); + }); + } +}); + +// The app is a singleton +var configuratorApp = (function(){ + + // private variables and functions go here + var self, + pi2 = Math.PI * 2, + $config = $('#config_text'), + $config_adv = $('#config_adv_text'), + boards_list = {}, + therms_list = {}; + + // Return this anonymous object as configuratorApp + return { + my_public_var: 4, + + init: function() { + self = this; // a 'this' for use when 'this' is something else + + // Read boards.h + boards_list = {}; + $.get(marlin_config + "/boards.h", function(txt) { + // Get all the boards and save them into an object + var r, findDef = new RegExp('[ \\t]*#define[ \\t]+(BOARD_[^ \\t]+)[ \\t]+(\\d+)[ \\t]*(//[ \\t]*)?(.+)?', 'mg'); + while((r = findDef.exec(txt)) !== null) { + boards_list[r[1]] = r[2].prePad(r[2] < 100 ? (r[2] < 10 ? 5 : 4) : 0, ' ') + " — " + r[4].replace(/\).*/, ')'); + } + }); + + // Read Configuration.h + $.get(marlin_config+"/Configuration.h", function(txt) { + $config.text(txt); + }); + + // Read Configuration.h + $.get(marlin_config+"/Configuration_adv.h", function(txt) { + $config_adv.text(txt); + self.setupConfigForm(); + }); + + }, + + setupConfigForm: function() { + // Modify form fields and make the form responsive. + // As values change on the form, we could update the + // contents of text areas containing the configs, for + // example. + + // while(!$config_adv.text() == null) {} + // while(!$config.text() == null) {} + + // Go through all form items with names + $('#config_form').find('[name]').each(function() { + // Set its id to its name + var name = $(this).attr('name'); + $(this).attr({id: name}); + // Attach its label sibling + var $label = $(this).prev(); + if ($label[0].tagName == 'LABEL') { + $label.attr('for',name); + } + }); + + // Get all 'switchable' class items and add a checkbox + $('#config_form .switchable').each(function(){ + $(this).after( + $('<input>',{type:'checkbox',value:'1',class:'enabler'}).prop('checked',true) + .attr('id',this.id + '-switch') + .change(self.handleSwitch) + ); + }); + + /** + * For now I'm manually creating these references + * but I should be able to parse Configuration.h + * and iterate the #defines. + * + * For any #ifdef blocks I can create field groups + * which can be dimmed together when the option + * is disabled. + * + * Then we only need to specify exceptions to + * standard behavior, (which is to add a text field) + */ + $('#SERIAL_PORT').addOptions([0,1,2,3,4,5,6,7]); + this.initField('SERIAL_PORT'); + + $('#BAUDRATE').addOptions([2400,9600,19200,38400,57600,115200,250000]); + this.initField('BAUDRATE'); + + this.initField('BTENABLED'); + + $('#MOTHERBOARD').addOptions(boards_list); + this.initField('MOTHERBOARD'); + + this.initField('CUSTOM_MENDEL_NAME'); + + this.initField('MACHINE_UUID'); + + $('#EXTRUDERS').addOptions([1,2,3,4]); + this.initField('EXTRUDERS'); + + $('#POWER_SUPPLY').addOptions({'1':'ATX','2':'Xbox 360'}); + this.initField('POWER_SUPPLY'); + + this.initField('PS_DEFAULT_OFF'); + +/* + $('#serial_stepper').jstepper({ + min: 0, + max: 3, + val: $('#SERIAL_PORT').val(), + arrowWidth: '18px', + arrowHeight: '15px', + color: '#FFF', + acolor: '#F70', + hcolor: '#FF0', + id: 'select-me', + stepperClass: 'inner', + textStyle: {width:'1.5em',fontSize:'120%',textAlign:'center'}, + // onChange: function(v) { }, + }); +*/ + + // prettyPrint(); + }, + + initField: function(name) { + var $elm = $('#'+name), isText = $elm.attr('type') == 'text'; + this.setFieldFromDefine(name); + isText ? $elm.bind('input', this.handleChange) : $elm.change(this.handleChange) + }, + + handleChange: function(e) { + self.updateDefineForField(e.target); + }, + + handleSwitch: function(e) { + var $elm = $(e.target), $prev = $elm.prev(); + var on = $elm.prop('checked') || false; + $prev.attr('disabled', !on); + self.setDefineEnabled($prev[0], on); + }, + + setDefineEnabled: function(elm, val) { + var $elm = $(elm); + + // console.log("Enable: " + elm.id + " = " + val); + + var txt = $config.text(); + + var findDef = new RegExp('^[ \\t]*(//[ \\t]*)?(#define[ \\t]+' + elm.id + '([ \\t].*)?)$', 'm'); + txt = txt.replace(findDef, val ? '$2': '//$2'); + + // Now set the text in the field + $config.text(txt); + }, + + updateDefineForField: function(elm) { + var $elm = $(elm), + isCheck = $elm.attr('type') == 'checkbox', + val = isCheck ? $elm.prop('checked') : $elm.val(); + + // console.log("Set: " + elm.id + " = " + val); + + var txt = $config.text(); + + if (isCheck) { + var findDef = new RegExp('^([ \\t]*)(//[ \\t]*)?(#define[ \\t]+' + elm.id + '([ \\t].*)?)$', 'm'); + txt = txt.replace(findDef, val ? '$1$3': '$1//$3'); + } + else { + // Match the define name, 1 = "#define name ", 3=value, 4=comment + var findDef = new RegExp('^([ \\t]*(//)?[ \\t]*#define[ \\t]+' + elm.id + '[ \\t]+)(.*)([ \\t]*(//)?.*)$', 'm'); + if ($elm.hasClass('quote')) val = '"' + val + '"' + txt = txt.replace(findDef, '$1!!REGEXP!!$4').replace('!!REGEXP!!', val); + } + // Now set the text in the field + $config.text(txt); + + // $config.scrollTo(500); + }, + + setFieldFromDefine: function(name, adv) { + var $elm = $('#'+name), elm = $elm[0]; + var isCheck = $elm.attr('type') == 'checkbox'; + var val = this.defineValue(name, adv); + + isCheck ? $elm.prop('checked', val) : $elm.val("" + val); + + // If the item has a checkbox then set enabled state too + var $cb = $('#'+name+'-switch'); + if ($cb.length) { + var on = self.defineIsEnabled(name,adv); + $elm.attr('disabled', !on); + $cb.prop('checked', on); + } + }, + + defineValue: function(name, adv) { + var $elm = $('#'+name), elm = $elm[0]; + var $c = adv ? $config_adv : $config; + if ($elm.attr('type') == 'checkbox') { + // maybe spaces, maybe comment, #define, spaces, name, maybe a comment + var findDef = new RegExp('^[ \\t]*(//[ \\t]*)?(#define[ \\t]+' + elm.id + '([ \\t]*(//)?.*)?)$', 'm'); + var result = findDef.exec($c.text()); + return (result ? result[1] == undefined || result[1].trim() != '//' : false); + } + else { + // maybe spaces, maybe comment, #define, spaces, name, one or more spaces, value, maybe a comment + var findDef = new RegExp('^([ \\t]*(//[ \\t]*)?#define[ \\t]+' + elm.id + '[ \\t]+)(.*)([ \\t]*(//)?.*)$', 'm'); + var result = findDef.exec($c.text()); + if (result !== null) { + var val = result[3]; + if (val.search(/^".*"$/) >= 0) $elm.addClass('quote'); + if ($elm.hasClass('quote')) val = val.replace(/^"(.*)"$/, '$1'); + return val; + } + return 'fail'; + } + }, + + defineIsEnabled: function(name, adv) { + var $elm = $('#'+name); + var $c = adv ? $config_adv : $config; + var findDef = new RegExp('^[ \\t]*(//[ \\t]*)?(#define[ \\t]+' + name + '([ \\t]*(//)?.*)?)$', 'm'); + var result = findDef.exec($c.text()); + return (result ? result[1].trim() != '//' : false); + }, + + logOnce: function(o) { + if (typeof o.didLogThisObject === 'undefined') { + console.log(o); + o.didLogThisObject = true; + } + }, + + EOF: null + }; + +})(); + +// Typically the app would be in its own file, but this would be here +configuratorApp.init(); + +}); diff --git a/Marlin/configurator/js/jcanvas.js b/Marlin/configurator/js/jcanvas.js new file mode 100644 index 0000000000..254d2acfbd --- /dev/null +++ b/Marlin/configurator/js/jcanvas.js @@ -0,0 +1,524 @@ +/*! + jCanvas v2.2.1 + Caleb Evans + 2.2.1 revisions by Thinkyhead +*/ + +(function($, document, Math, Number, undefined) { + +// jC global object +var jC = {}; +jC.originals = { + width: 20, + height: 20, + cornerRadius: 0, + fillStyle: 'transparent', + strokeStyle: 'transparent', + strokeWidth: 5, + strokeCap: 'butt', + strokeJoin: 'miter', + shadowX: 0, + shadowY: 0, + shadowBlur: 10, + shadowColor: 'transparent', + x: 0, y: 0, + x1: 0, y1: 0, + radius: 10, + start: 0, + end: 360, + ccw: false, + inDegrees: true, + fromCenter: true, + closed: false, + sides: 3, + angle: 0, + text: '', + font: 'normal 12pt sans-serif', + align: 'center', + baseline: 'middle', + source: '', + repeat: 'repeat' +}; +// Duplicate original defaults +jC.defaults = $.extend({}, jC.originals); + +// Set global properties +function setGlobals(context, map) { + context.fillStyle = map.fillStyle; + context.strokeStyle = map.strokeStyle; + context.lineWidth = map.strokeWidth; + context.lineCap = map.strokeCap; + context.lineJoin = map.strokeJoin; + context.shadowOffsetX = map.shadowX; + context.shadowOffsetY = map.shadowY; + context.shadowBlur = map.shadowBlur; + context.shadowColor = map.shadowColor; +} + +// Close path if chosen +function closePath(context, map) { + if (map.closed === true) { + context.closePath(); + context.fill(); + context.stroke(); + } else { + context.fill(); + context.stroke(); + context.closePath(); + } +} + +// Measure angles in degrees if chosen +function checkUnits(map) { + if (map.inDegrees === true) { + return Math.PI / 180; + } else { + return 1; + } +} + +// Set canvas defaults +$.fn.canvas = function(args) { + // Reset defaults if no value is passed + if (typeof args === 'undefined') { + jC.defaults = jC.originals; + } else { + jC.defaults = $.extend({}, jC.defaults, args); + } + return this; +}; + +// Load canvas +$.fn.loadCanvas = function(context) { + if (typeof context === 'undefined') {context = '2d';} + return this[0].getContext(context); +}; + +// Create gradient +$.fn.gradient = function(args) { + var ctx = this.loadCanvas(), + // Specify custom defaults + gDefaults = { + x1: 0, y1: 0, + x2: 0, y2: 0, + r1: 10, r2: 100 + }, + params = $.extend({}, gDefaults, args), + gradient, stops = 0, percent, i; + + // Create radial gradient if chosen + if (typeof args.r1 === 'undefined' && typeof args.r2 === 'undefined') { + gradient = ctx.createLinearGradient(params.x1, params.y1, params.x2, params.y2); + } else { + gradient = ctx.createRadialGradient(params.x1, params.y1, params.r1, params.x2, params.y2, params.r2); + } + + // Count number of color stops + for (i=1; i<=Number.MAX_VALUE; i+=1) { + if (params['c' + i]) { + stops += 1; + } else { + break; + } + } + + // Calculate color stop percentages if absent + for (i=1; i<=stops; i+=1) { + percent = Math.round((100 / (stops-1)) * (i-1)) / 100; + if (typeof params['s' + i] === 'undefined') { + params['s' + i] = percent; + } + gradient.addColorStop(params['s' + i], params['c' + i]); + } + return gradient; +}; + +// Create pattern +$.fn.pattern = function(args) { + var ctx = this.loadCanvas(), + params = $.extend({}, jC.defaults, args), + pattern, + img = document.createElement('img'); + img.src = params.source; + + // Create pattern + function create() { + if (img.complete === true) { + // Create pattern + pattern = ctx.createPattern(img, params.repeat); + } else { + throw "The pattern has not loaded yet"; + } + } + try { + create(); + } catch(error) { + img.onload = create; + } + return pattern; +}; + +// Clear canvas +$.fn.clearCanvas = function(args) { + var ctx = this.loadCanvas(), + params = $.extend({}, jC.defaults, args); + + // Draw from center if chosen + if (params.fromCenter === true) { + params.x -= params.width / 2; + params.y -= params.height / 2; + } + + // Clear entire canvas if chosen + ctx.beginPath(); + if (typeof args === 'undefined') { + ctx.clearRect(0, 0, this.width(), this.height()); + } else { + ctx.clearRect(params.x, params.y, params.width, params.height); + } + ctx.closePath(); + return this; +}; + +// Save canvas +$.fn.saveCanvas = function() { + var ctx = this.loadCanvas(); + ctx.save(); + return this; +}; + +// Restore canvas +$.fn.restoreCanvas = function() { + var ctx = this.loadCanvas(); + ctx.restore(); + return this; +}; + +// Scale canvas +$.fn.scaleCanvas = function(args) { + var ctx = this.loadCanvas(), + params = $.extend({}, jC.defaults, args); + ctx.save(); + ctx.translate(params.x, params.y); + ctx.scale(params.width, params.height); + ctx.translate(-params.x, -params.y) + return this; +}; + +// Translate canvas +$.fn.translateCanvas = function(args) { + var ctx = this.loadCanvas(), + params = $.extend({}, jC.defaults, args); + ctx.save(); + ctx.translate(params.x, params.y); + return this; +}; + +// Rotate canvas +$.fn.rotateCanvas = function(args) { + var ctx = this.loadCanvas(), + params = $.extend({}, jC.defaults, args), + toRad = checkUnits(params); + + ctx.save(); + ctx.translate(params.x, params.y); + ctx.rotate(params.angle * toRad); + ctx.translate(-params.x, -params.y); + return this; +}; + +// Draw rectangle +$.fn.drawRect = function(args) { + var ctx = this.loadCanvas(), + params = $.extend({}, jC.defaults, args), + toRad = checkUnits(params), + x1, y1, x2, y2, r; + setGlobals(ctx, params); + + // Draw from center if chosen + if (params.fromCenter === true) { + params.x -= params.width / 2; + params.y -= params.height / 2; + } + + // Draw rounded rectangle if chosen + if (params.cornerRadius > 0) { + x1 = params.x; + y1 = params.y; + x2 = params.x + params.width; + y2 = params.y + params.height; + r = params.cornerRadius; + if ((x2 - x1) - (2 * r) < 0) { + r = (x2 - x1) / 2; + } + if ((y2 - y1) - (2 * r) < 0) { + r = (y2 - y1) / 2; + } + ctx.beginPath(); + ctx.moveTo(x1+r,y1); + ctx.lineTo(x2-r,y1); + ctx.arc(x2-r, y1+r, r, 270*toRad, 360*toRad, false); + ctx.lineTo(x2,y2-r); + ctx.arc(x2-r, y2-r, r, 0, 90*toRad, false); + ctx.lineTo(x1+r,y2); + ctx.arc(x1+r, y2-r, r, 90*toRad, 180*toRad, false); + ctx.lineTo(x1,y1+r); + ctx.arc(x1+r, y1+r, r, 180*toRad, 270*toRad, false); + ctx.fill(); + ctx.stroke(); + ctx.closePath(); + } else { + ctx.fillRect(params.x, params.y, params.width, params.height); + ctx.strokeRect(params.x, params.y, params.width, params.height); + } + return this; +}; + +// Draw arc +$.fn.drawArc = function(args) { + var ctx = this.loadCanvas(), + params = $.extend({}, jC.defaults, args), + toRad = checkUnits(params); + setGlobals(ctx, params); + + // Draw from center if chosen + if (params.fromCenter === false) { + params.x += params.radius; + params.y += params.radius; + } + + ctx.beginPath(); + ctx.arc(params.x, params.y, params.radius, (params.start*toRad)-(Math.PI/2), (params.end*toRad)-(Math.PI/2), params.ccw); + // Close path if chosen + closePath(ctx, params); + return this; +}; + +// Draw ellipse +$.fn.drawEllipse = function(args) { + var ctx = this.loadCanvas(), + params = $.extend({}, jC.defaults, args), + controlW = params.width * (4/3); + setGlobals(ctx, params); + + // Draw from center if chosen + if (params.fromCenter === false) { + params.x += params.width / 2; + params.y += params.height / 2; + } + + // Increment coordinates to prevent negative values + params.x += 1e-10; + params.y += 1e-10; + + // Create ellipse + ctx.beginPath(); + ctx.moveTo(params.x, params.y-params.height/2); + ctx.bezierCurveTo(params.x-controlW/2,params.y-params.height/2, + params.x-controlW/2,params.y+params.height/2, + params.x,params.y+params.height/2); + ctx.bezierCurveTo(params.x+controlW/2,params.y+params.height/2, + params.x+controlW/2,params.y-params.height/2, + params.x,params.y-params.height/2); + ctx.closePath(); + ctx.fill(); + ctx.stroke(); + return this; +}; + +// Draw line +$.fn.drawLine = function(args) { + var ctx = this.loadCanvas(), + params = $.extend({}, jC.defaults, args), + max = Number.MAX_VALUE, l, + lx, ly; + setGlobals(ctx, params); + + // Draw each point + ctx.beginPath(); + ctx.moveTo(params.x1, params.y1); + for (l=2; l<max; l+=1) { + lx = params['x' + l]; + ly = params['y' + l]; + // Stop loop when all points are drawn + if (typeof lx === 'undefined' || typeof ly === 'undefined') { + break; + } + ctx.lineTo(lx, ly); + } + // Close path if chosen + closePath(ctx, params); + return this; +}; + +// Draw quadratic curve +$.fn.drawQuad = function(args) { + var ctx = this.loadCanvas(), + params = $.extend({}, jC.defaults, args), + max = Number.MAX_VALUE, l, + lx, ly, lcx, lcy; + setGlobals(ctx, params); + + // Draw each point + ctx.beginPath(); + ctx.moveTo(params.x1, params.y1); + for (l=2; l<max; l+=1) { + lx = params['x' + l]; + if (typeof lx === 'undefined') break; + ly = params['y' + l]; + if (typeof ly === 'undefined') break; + lcx = params['cx' + (l-1)]; + if (typeof lcx === 'undefined') break; + lcy = params['cy' + (l-1)]; + if (typeof lcy === 'undefined') break; + ctx.quadraticCurveTo(lcx, lcy, lx, ly); + } + // Close path if chosen + closePath(ctx, params); + return this; +}; + +// Draw Bezier curve +$.fn.drawBezier = function(args) { + var ctx = this.loadCanvas(), + params = $.extend({}, jC.defaults, args), + max = Number.MAX_VALUE, + l=2, lc=1, lx, ly, lcx1, lcy1, lcx2, lcy2, i; + setGlobals(ctx, params); + + // Draw each point + ctx.beginPath(); + ctx.moveTo(params.x1, params.y1); + for (i=2; i<max; i+=1) { + lx = params['x' + l]; + if (typeof lx === 'undefined') break; + ly = params['y' + l]; + if (typeof ly === 'undefined') break; + lcx1 = params['cx' + lc]; + if (typeof lcx1 === 'undefined') break; + lcy1 = params['cy' + lc]; + if (typeof lcy1 === 'undefined') break; + lcx2 = params['cx' + (lc+1)]; + if (typeof lcx2 === 'undefined') break; + lcy2 = params['cy' + (lc+1)]; + if (typeof lcy2 === 'undefined') break; + ctx.bezierCurveTo(lcx1, lcy1, lcx2, lcy2, lx, ly); + l += 1; + lc += 2; + } + // Close path if chosen + closePath(ctx, params); + return this; +}; + +// Draw text +$.fn.drawText = function(args) { + var ctx = this.loadCanvas(), + params = $.extend({}, jC.defaults, args); + setGlobals(ctx, params); + + // Set text-specific properties + ctx.textBaseline = params.baseline; + ctx.textAlign = params.align; + ctx.font = params.font; + + ctx.strokeText(params.text, params.x, params.y); + ctx.fillText(params.text, params.x, params.y); + return this; +}; + +// Draw image +$.fn.drawImage = function(args) { + var ctx = this.loadCanvas(), + params = $.extend({}, jC.defaults, args), + // Define image source + img = document.createElement('img'); + img.src = params.source; + setGlobals(ctx, params); + + // Draw image function + function draw() { + if (img.complete) { + + var scaleFac = img.width / img.height; + + // If width/height are specified + if (typeof args.width !== 'undefined' && typeof args.height !== 'undefined') { + img.width = args.width; + img.height = args.height; + // If width is specified + } else if (typeof args.width !== 'undefined' && typeof args.height === 'undefined') { + img.width = args.width; + img.height = img.width / scaleFac; + // If height is specified + } else if (typeof args.width === 'undefined' && typeof args.height !== 'undefined') { + img.height = args.height; + img.width = img.height * scaleFac; + } + + // Draw from center if chosen + if (params.fromCenter === true) { + params.x -= img.width / 2; + params.y -= img.height / 2; + } + + // Draw image + ctx.drawImage(img, params.x, params.y, img.width, img.height); + } else { + throw "The image has not loaded yet."; + } + } + + function dodraw() { + // console.log("dodraw..."); + try { + // console.log("dodraw...try..."); + draw(); + } + catch(error) { + // console.log("dodraw...catch: " + error); + } + } + + // Draw image if already loaded + // console.log("--------------------"); + // console.log("drawImage " + img.src); + try { + // console.log("try..."); + draw(); + } catch(error) { + // console.log("catch: " + error); + img.onload = dodraw; + } + return this; +}; + +// Draw polygon +$.fn.drawPolygon = function(args) { + var ctx = this.loadCanvas(), + params = $.extend({}, jC.defaults, args), + theta, dtheta, x, y, + toRad = checkUnits(params), i; + setGlobals(ctx, params); + + if (params.sides >= 3) { + // Calculate points and draw + theta = (Math.PI/2) + (Math.PI/params.sides) + (params.angle*toRad); + dtheta = (Math.PI*2) / params.sides; + for (i=0; i<params.sides; i+=1) { + x = params.x + (params.radius * Math.cos(theta)) + 1e-10; + y = params.y + (params.radius * Math.sin(theta)) + 1e-10; + if (params.fromCenter === false) { + x += params.radius; + y += params.radius; + } + ctx.lineTo(x, y); + theta += dtheta; + } + closePath(ctx, params); + } + return this; +}; + +return window.jCanvas = jC; +}(jQuery, document, Math, Number)); \ No newline at end of file diff --git a/Marlin/configurator/js/jstepper.js b/Marlin/configurator/js/jstepper.js new file mode 100644 index 0000000000..c26f5ff4b9 --- /dev/null +++ b/Marlin/configurator/js/jstepper.js @@ -0,0 +1,220 @@ +/*! + * jQuery "stepper" Plugin + * version 0.0.1 + * @requires jQuery v1.3.2 or later + * @requires jCanvas + * + * Authored 2011-06-11 Scott Lahteine (thinkyhead.com) + * + * A very simple numerical stepper. + * TODO: place arrows based on div size, make 50/50 width + * + * Usage example: + * + * $('#mydiv').jstepper({ + * min: 1, + * max: 4, + * val: 1, + * arrowWidth: 15, + * arrowHeight: '22px', + * color: '#FFF', + * acolor: '#F70', + * hcolor: '#FF0', + * id: 'select-me', + * stepperClass: 'inner', + * textStyle: {width:'1.5em',fontSize:'20px',textAlign:'center'}, + * onChange: function(v) { }, + * }); + * + */ +;(function($) { + var un = 'undefined'; + + $.jstepperArrows = [ + { name:'prev', poly:[[1.0,0],[0,0.5],[1.0,1.0]] }, + { name:'next', poly:[[0,0],[1.0,0.5],[0,1.0]] } + ]; + + $.fn.jstepper = function(args) { + + return this.each(function() { + + var defaults = { + min: 1, + max: null, + val: null, + active: true, + placeholder: null, + arrowWidth: 0, + arrowHeight: 0, + color: '#FFF', + hcolor: '#FF0', + acolor: '#F80', + id: '', + stepperClass: '', + textStyle: '', + onChange: (function(v){ if (typeof console.log !== 'undefined') console.log("val="+v); }) + }; + + args = $.extend(defaults, args || {}); + + var min = args.min * 1, + max = (args.max !== null) ? args.max * 1 : min, + span = max - min + 1, + val = (args.val !== null) ? args.val * 1 : min, + active = !args.disabled, + placeholder = args.placeholder, + arrowWidth = 1 * args.arrowWidth.toString().replace(/px/,''), + arrowHeight = 1 * args.arrowHeight.toString().replace(/px/,''), + color = args.color, + hcolor = args.hcolor, + acolor = args.acolor, + $prev = $('<a href="#prev" style="cursor:w-resize;"><canvas/></a>'), + $marq = $('<div class="number"/>').css({float:'left',textAlign:'center'}), + $next = $('<a href="#next" style="cursor:e-resize;"><canvas/></a>'), + arrow = [ $prev.find('canvas')[0], $next.find('canvas')[0] ], + $stepper = $('<span class="jstepper"/>').append($prev).append($marq).append($next).append('<div style="clear:both;"/>'), + onChange = args.onChange; + + if (args.id) $stepper[0].id = args.id; + if (args.stepperClass) $stepper.addClass(args.stepperClass); + if (args.textStyle) $marq.css(args.textStyle); + + // replace a span, but embed elsewhere + if (this.tagName == 'SPAN') { + var previd = this.id; + $(this).replaceWith($stepper); + if (previd) $stepper.attr('id',previd); + } + else { + $(this).append($stepper); + } + + // hook to call functions on this object + $stepper[0].ui = { + + refresh: function() { + this.updateNumber(); + this._drawArrow(0, 1); + this._drawArrow(1, 1); + return this; + }, + + _drawArrow: function(i,state) { + var $elm = $(arrow[i]), + desc = $.jstepperArrows[i], + fillStyle = (state == 2) ? hcolor : (state == 3) ? acolor : color, + draw = { fillStyle: fillStyle }, + w = $elm.width(), h = $elm.height(); + + if (w <= 0) w = $elm.attr('width'); + if (h <= 0) h = $elm.attr('height'); + + $.each(desc.poly,function(i,v){ + ++i; + draw['x'+i] = v[0] * w; + draw['y'+i] = v[1] * h; + }); + $elm.restoreCanvas().clearCanvas().drawLine(draw); + }, + + updateNumber: function() { + $marq.html((active || placeholder === null) ? val.toString() : placeholder); + return this; + }, + + _doclick: function(i) { + this.add(i ? 1 : -1); + this._drawArrow(i, 3); + var self = this; + setTimeout(function(){ self._drawArrow(i, 2); }, 50); + }, + + add: function(x) { + val = (((val - min) + x + span) % span) + min; + this.updateNumber(); + this.didChange(val); + return this; + }, + + min: function(v) { + if (typeof v === un) return min; + this.setRange(v,max); + return this; + }, + + max: function(v) { + if (typeof v === un) return max; + this.setRange(min,v); + return this; + }, + + val: function(v) { + if (typeof v === un) return val; + val = (((v - min) + span) % span) + min; + this.updateNumber(); + return this; + }, + + setRange: function(lo, hi, ini) { + if (lo > hi) hi = (lo += hi -= lo) - hi; + min = lo; max = hi; span = hi - lo + 1; + if (typeof ini !== un) val = ini; + if (val < min) val = min; + if (val > max) val = max; + this.updateNumber(); + return this; + }, + + active: function(a) { + if (typeof a === un) return active; + (active = a) ? $marq.removeClass('inactive') : $marq.addClass('inactive'); + this.updateNumber(); + return this; + }, + + disable: function() { this.active(false); return this; }, + enable: function() { this.active(true); return this; }, + + clearPlaceholder: function() { + this.setPlaceholder(null); + return this; + }, + setPlaceholder: function(p) { + placeholder = p; + if (!active) this.updateNumber(); + return this; + }, + + didChange: onChange + + }; + + // set hover and click for each arrow + $.each($.jstepperArrows, function(i,desc) { + var $elm = $(arrow[i]), + w = arrowWidth ? arrowWidth : $elm.width() ? $elm.width() : 15, + h = arrowHeight ? arrowHeight : $elm.height() ? $elm.height() : 24; + $elm[0]._index = i; + $elm + .css({float:'left'}) + .attr({width:w,height:h,'class':desc.name}) + .hover( + function(e) { $stepper[0].ui._drawArrow(e.target._index, 2); }, + function(e) { $stepper[0].ui._drawArrow(e.target._index, 1); } + ) + .click(function(e){ + $stepper[0].ui._doclick(e.target._index); + return false; + }); + }); + + // init the visuals first time + $stepper[0].ui.refresh(); + + }); // this.each + + }; // $.fn.jstepper + +})( jQuery ); + From b2627200eacc755b109cc2ab0851d092da04efb1 Mon Sep 17 00:00:00 2001 From: Scott Lahteine <sourcetree@thinkyhead.com> Date: Thu, 5 Feb 2015 08:19:09 -0800 Subject: [PATCH 02/41] Get thermistors from config, add temp sensors --- Marlin/configurator/index.html | 5 +++++ Marlin/configurator/js/configurator.js | 20 ++++++++++++++++---- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/Marlin/configurator/index.html b/Marlin/configurator/index.html index ea613d0177..aad22492a6 100644 --- a/Marlin/configurator/index.html +++ b/Marlin/configurator/index.html @@ -40,6 +40,11 @@ <label>PS Default Off:</label> <input name="PS_DEFAULT_OFF" type="checkbox" value="1" checked /> + <label class="newline">Temp Sensor 0:</label><select name="TEMP_SENSOR_0"></select> + <label class="newline">Temp Sensor 1:</label><select name="TEMP_SENSOR_1"></select> + <label class="newline">Temp Sensor 2:</label><select name="TEMP_SENSOR_2"></select> + <label class="newline">Bed Temp Sensor:</label><select name="TEMP_SENSOR_BED"></select> + <h2>Marlin/Configuration.h</h2> <pre id="config_text" class="prettyprint linenums"></pre> <h2>Marlin/Configuration_adv.h</h2> diff --git a/Marlin/configurator/js/configurator.js b/Marlin/configurator/js/configurator.js index 8189b24fa8..1b022a9006 100644 --- a/Marlin/configurator/js/configurator.js +++ b/Marlin/configurator/js/configurator.js @@ -68,15 +68,23 @@ var configuratorApp = (function(){ boards_list = {}; $.get(marlin_config + "/boards.h", function(txt) { // Get all the boards and save them into an object - var r, findDef = new RegExp('[ \\t]*#define[ \\t]+(BOARD_[^ \\t]+)[ \\t]+(\\d+)[ \\t]*(//[ \\t]*)?(.+)?', 'mg'); + var r, findDef = new RegExp('[ \\t]*#define[ \\t]+(BOARD_[^ \\t]+)[ \\t]+(\\d+)[ \\t]*(//[ \\t]*)?(.+)?', 'gm'); while((r = findDef.exec(txt)) !== null) { - boards_list[r[1]] = r[2].prePad(r[2] < 100 ? (r[2] < 10 ? 5 : 4) : 0, ' ') + " — " + r[4].replace(/\).*/, ')'); + boards_list[r[1]] = r[2].prePad(3, ' ') + " — " + r[4].replace(/\).*/, ')'); } }); // Read Configuration.h $.get(marlin_config+"/Configuration.h", function(txt) { + // File contents into the textarea $config.text(txt); + // Get all the thermistors and save them into an object + var r, s, findDef = new RegExp('(//.*\n)+\\s+(#define[ \\t]+TEMP_SENSOR_0)', 'g'); + r = findDef.exec(txt); + findDef = new RegExp('^//[ \\t]*([-\\d]+)[ \\t]+is[ \\t]+(.*)[ \\t]*$', 'gm'); + while((s = findDef.exec(r[0])) !== null) { + therms_list[s[1]] = s[1].prePad(4, ' ') + " — " + s[2]; + } }); // Read Configuration.h @@ -152,6 +160,12 @@ var configuratorApp = (function(){ this.initField('PS_DEFAULT_OFF'); + $('#TEMP_SENSOR_0, #TEMP_SENSOR_1, #TEMP_SENSOR_2, #TEMP_SENSOR_BED').addOptions(therms_list); + this.initField('TEMP_SENSOR_0'); + this.initField('TEMP_SENSOR_1'); + this.initField('TEMP_SENSOR_2'); + this.initField('TEMP_SENSOR_BED'); + /* $('#serial_stepper').jstepper({ min: 0, @@ -224,8 +238,6 @@ var configuratorApp = (function(){ } // Now set the text in the field $config.text(txt); - - // $config.scrollTo(500); }, setFieldFromDefine: function(name, adv) { From 09a385d9b0e177da6a236416c22bb0ad5acc01de Mon Sep 17 00:00:00 2001 From: Scott Lahteine <sourcetree@thinkyhead.com> Date: Thu, 5 Feb 2015 08:22:51 -0800 Subject: [PATCH 03/41] Add "use strict" to the top. --- Marlin/configurator/js/configurator.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Marlin/configurator/js/configurator.js b/Marlin/configurator/js/configurator.js index 1b022a9006..ebb80bc592 100644 --- a/Marlin/configurator/js/configurator.js +++ b/Marlin/configurator/js/configurator.js @@ -11,6 +11,9 @@ * - Parser to read Marlin Configuration.h and Configuration_adv.h files * - Utilities to replace values in configuration files */ + +"use strict"; + $(function(){ var marlin_config = '..'; From ac7a4358d6323e769eae034a7b9a49db3f6ef9ab Mon Sep 17 00:00:00 2001 From: Scott Lahteine <sourcetree@thinkyhead.com> Date: Thu, 5 Feb 2015 11:14:31 -0800 Subject: [PATCH 04/41] Add a responsive file uploader - Specify HTML5 - Allow drag and drop for loading configurations --- Marlin/configurator/css/configurator.css | 2 +- Marlin/configurator/index.html | 13 +- Marlin/configurator/js/binaryfileuploader.js | 79 +++++++++ Marlin/configurator/js/binarystring.js | 168 +++++++++++++++++++ Marlin/configurator/js/configurator.js | 128 +++++++++++--- 5 files changed, 359 insertions(+), 31 deletions(-) create mode 100644 Marlin/configurator/js/binaryfileuploader.js create mode 100644 Marlin/configurator/js/binarystring.js diff --git a/Marlin/configurator/css/configurator.css b/Marlin/configurator/css/configurator.css index 9c7b1be0a8..9935174150 100644 --- a/Marlin/configurator/css/configurator.css +++ b/Marlin/configurator/css/configurator.css @@ -15,7 +15,7 @@ label, input, select, textarea { display: block; float: left; margin: 1px 0; } label.newline, textarea { clear: both; } 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="checkbox"], input[type="radio"] { 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_text, #config_adv_text { font-family: "Andale mono", monospace; clear: both; }*/ #config_text, #config_adv_text { height: 25em; overflow: auto; background-color: #FFF; color: #888; padding: 10px; } diff --git a/Marlin/configurator/index.html b/Marlin/configurator/index.html index aad22492a6..06ab26d563 100644 --- a/Marlin/configurator/index.html +++ b/Marlin/configurator/index.html @@ -1,15 +1,18 @@ +<!DOCTYPE html> <html> <head> - <title>Marlin Configurator</title> <meta charset="UTF-8"> + <title>Marlin Configurator</title> <script type="text/javascript" src="https://code.jquery.com/jquery-2.1.3.min.js"></script> + <script src="js/binarystring.js"></script> + <script src="js/binaryfileuploader.js"></script> <script src="js/configurator.js"></script> <script src="js/jcanvas.js"></script> <script src="js/jstepper.js"></script> <link rel="stylesheet" href="css/configurator.css" type="text/css" media="all" /> </head> <body> - <div id="main"> + <section id="main"> <h1>Marlin Configurator 0.1a</h1> <p>Enter values in the form, get a Marlin configuration.<br/>Will include a drop-down of known configurations.</p> <ul id="help"> @@ -18,9 +21,9 @@ <form id="config_form"> - <!-- label>Serial Port:</label><input name="SERIAL_PORT" type="text" size="4" maxlength="2" value="99" / --> + <label>Drop Files Here:</label><input type="file" id="file-upload" /> - <label>Serial Port:</label><select name="SERIAL_PORT"></select><div id="serial_stepper"></div> + <label class="newline">Serial Port:</label><select name="SERIAL_PORT"></select><div id="serial_stepper"></div> <label>Baud Rate:</label><select name="BAUDRATE"></select> @@ -52,6 +55,6 @@ <br class="clear" /> </form> - </div> + <section> </body> </html> diff --git a/Marlin/configurator/js/binaryfileuploader.js b/Marlin/configurator/js/binaryfileuploader.js new file mode 100644 index 0000000000..0a1f38f3dc --- /dev/null +++ b/Marlin/configurator/js/binaryfileuploader.js @@ -0,0 +1,79 @@ +function BinaryFileUploader(o) { + this.options = null; + + + this._defaultOptions = { + element: null, // HTML file element + onFileLoad: function(file) { + console.log(file.toString()); + } + }; + + + this._init = function(o) { + if (!this.hasFileUploaderSupport()) return; + + this._verifyDependencies(); + + this.options = this._mergeObjects(this._defaultOptions, o); + this._verifyOptions(); + + this.addFileChangeListener(); + } + + + this.hasFileUploaderSupport = function() { + return !!(window.File && window.FileReader && window.FileList && window.Blob); + } + + this.addFileChangeListener = function() { + this.options.element.addEventListener( + 'change', + this._bind(this, this.onFileChange) + ); + } + + this.onFileChange = function(e) { + // TODO accept multiple files + var file = e.target.files[0], + reader = new FileReader(); + + reader.onload = this._bind(this, this.onFileLoad); + reader.readAsBinaryString(file); + } + + this.onFileLoad = function(e) { + var content = e.target.result, + string = new BinaryString(content); + this.options.onFileLoad(string); + } + + + this._mergeObjects = function(starting, override) { + var merged = starting; + for (key in override) merged[key] = override[key]; + + return merged; + } + + this._verifyOptions = function() { + if (!(this.options.element && this.options.element.type && this.options.element.type === 'file')) { + throw 'Invalid element param in options. Must be a file upload DOM element'; + } + + if (typeof this.options.onFileLoad !== 'function') { + throw 'Invalid onFileLoad param in options. Must be a function'; + } + } + + this._verifyDependencies = function() { + if (!window.BinaryString) throw 'BinaryString is missing. Check that you\'ve correctly included it'; + } + + // helper function for binding methods to objects + this._bind = function(object, method) { + return function() {return method.apply(object, arguments);}; + } + + this._init(o); +} diff --git a/Marlin/configurator/js/binarystring.js b/Marlin/configurator/js/binarystring.js new file mode 100644 index 0000000000..06af64fe2a --- /dev/null +++ b/Marlin/configurator/js/binarystring.js @@ -0,0 +1,168 @@ +function BinaryString(source) { + this._source = null; + this._bytes = []; + this._pos = 0; + this._length = 0; + + this._init = function(source) { + this._source = source; + this._bytes = this._stringToBytes(this._source); + this._length = this._bytes.length; + } + + this.current = function() {return this._pos;} + + this.rewind = function() {return this.jump(0);} + this.end = function() {return this.jump(this.length() - 1);} + this.next = function() {return this.jump(this.current() + 1);} + this.prev = function() {return this.jump(this.current() - 1);} + + this.jump = function(pos) { + if (pos < 0 || pos >= this.length()) return false; + + this._pos = pos; + return true; + } + + this.readByte = function(pos) { + pos = (typeof pos == 'number') ? pos : this.current(); + return this.readBytes(1, pos)[0]; + } + + this.readBytes = function(length, pos) { + length = length || 1; + pos = (typeof pos == 'number') ? pos : this.current(); + + if (pos > this.length() || + pos < 0 || + length <= 0 || + pos + length > this.length() || + pos + length < 0 + ) { + return false; + } + + var bytes = []; + + for (var i = pos; i < pos + length; i++) { + bytes.push(this._bytes[i]); + } + + return bytes; + } + + this.length = function() {return this._length;} + + this.toString = function() { + var string = '', + length = this.length(); + + for (var i = 0; i < length; i++) { + string += String.fromCharCode(this.readByte(i)); + } + + return string; + } + + this.toUtf8 = function() { + var inc = 0, + string = '', + length = this.length(); + + // determine if first 3 characters are the BOM + // then skip them in output if so + if (length >= 3 && + this.readByte(0) === 0xEF && + this.readByte(1) === 0xBB && + this.readByte(2) === 0xBF + ) { + inc = 3; + } + + for (; inc < length; inc++) { + var byte1 = this.readByte(inc), + byte2 = 0, + byte3 = 0, + byte4 = 0, + code1 = 0, + code2 = 0, + point = 0; + + switch (true) { + // single byte character; same as ascii + case (byte1 < 0x80): + code1 = byte1; + break; + + // 2 byte character + case (byte1 >= 0xC2 && byte1 < 0xE0): + byte2 = this.readByte(++inc); + + code1 = ((byte1 & 0x1F) << 6) + + (byte2 & 0x3F); + break; + + // 3 byte character + case (byte1 >= 0xE0 && byte1 < 0xF0): + byte2 = this.readByte(++inc); + byte3 = this.readByte(++inc); + + code1 = ((byte1 & 0xFF) << 12) + + ((byte2 & 0x3F) << 6) + + (byte3 & 0x3F); + break; + + // 4 byte character + case (byte1 >= 0xF0 && byte1 < 0xF5): + byte2 = this.readByte(++inc); + byte3 = this.readByte(++inc); + byte4 = this.readByte(++inc); + + point = ((byte1 & 0x07) << 18) + + ((byte2 & 0x3F) << 12) + + ((byte3 & 0x3F) << 6) + + (byte4 & 0x3F) + point -= 0x10000; + + code1 = (point >> 10) + 0xD800; + code2 = (point & 0x3FF) + 0xDC00; + break; + + default: + throw 'Invalid byte ' + this._byteToString(byte1) + ' whilst converting to UTF-8'; + break; + } + + string += (code2) ? String.fromCharCode(code1, code2) + : String.fromCharCode(code1); + } + + return string; + } + + this.toArray = function() {return this.readBytes(this.length() - 1, 0);} + + + this._stringToBytes = function(str) { + var bytes = [], + chr = 0; + + for (var i = 0; i < str.length; i++) { + chr = str.charCodeAt(i); + bytes.push(chr & 0xFF); + } + + return bytes; + } + + this._byteToString = function(byte) { + var asString = byte.toString(16).toUpperCase(); + while (asString.length < 2) { + asString = '0' + asString; + } + + return '0x' + asString; + } + + this._init(source); +} diff --git a/Marlin/configurator/js/configurator.js b/Marlin/configurator/js/configurator.js index ebb80bc592..4764c6ebe8 100644 --- a/Marlin/configurator/js/configurator.js +++ b/Marlin/configurator/js/configurator.js @@ -55,6 +55,9 @@ var configuratorApp = (function(){ // private variables and functions go here var self, pi2 = Math.PI * 2, + boards_file = 'boards.h', + config_file = 'Configuration.h', + config_adv_file = 'Configuration_adv.h', $config = $('#config_text'), $config_adv = $('#config_adv_text'), boards_list = {}, @@ -67,37 +70,106 @@ var configuratorApp = (function(){ init: function() { self = this; // a 'this' for use when 'this' is something else + // Make a droppable file uploader + var $uploader = $('#file-upload'); + var fileUploader = new BinaryFileUploader({ + element: $uploader[0], + onFileLoad: function(file) { console.log(this); self.handleFileLoad(file, $uploader); } + }); + + if (!fileUploader.hasFileUploaderSupport()) alert('Your browser doesn\'t support the file reading API'); + // Read boards.h boards_list = {}; - $.get(marlin_config + "/boards.h", function(txt) { - // Get all the boards and save them into an object - var r, findDef = new RegExp('[ \\t]*#define[ \\t]+(BOARD_[^ \\t]+)[ \\t]+(\\d+)[ \\t]*(//[ \\t]*)?(.+)?', 'gm'); - while((r = findDef.exec(txt)) !== null) { - boards_list[r[1]] = r[2].prePad(3, ' ') + " — " + r[4].replace(/\).*/, ')'); - } + + var errFunc = function(jqXHR, textStatus, errorThrown) { + alert('Failed to load '+this.url+'. Try the file field.'); + }; + + $.ajax({ + url: marlin_config+'/'+boards_file, + type: 'GET', + async: false, + cache: false, + success: function(txt) { + // Get all the boards and save them into an object + self.initBoardsFromText(txt); + }, + error: errFunc }); // Read Configuration.h - $.get(marlin_config+"/Configuration.h", function(txt) { - // File contents into the textarea - $config.text(txt); - // Get all the thermistors and save them into an object - var r, s, findDef = new RegExp('(//.*\n)+\\s+(#define[ \\t]+TEMP_SENSOR_0)', 'g'); - r = findDef.exec(txt); - findDef = new RegExp('^//[ \\t]*([-\\d]+)[ \\t]+is[ \\t]+(.*)[ \\t]*$', 'gm'); - while((s = findDef.exec(r[0])) !== null) { - therms_list[s[1]] = s[1].prePad(4, ' ') + " — " + s[2]; - } + $.ajax({ + url: marlin_config+'/'+config_file, + type: 'GET', + async: false, + cache: false, + success: function(txt) { + // File contents into the textarea + $config.text(txt); + self.initThermistorsFromText(txt); + }, + error: errFunc }); // Read Configuration.h - $.get(marlin_config+"/Configuration_adv.h", function(txt) { - $config_adv.text(txt); - self.setupConfigForm(); + $.ajax({ + url: marlin_config+'/'+config_adv_file, + type: 'GET', + async: false, + cache: false, + success: function(txt) { + // File contents into the textarea + $config_adv.text(txt); + self.setupConfigForm(); + }, + error: errFunc }); }, + initBoardsFromText: function(txt) { + boards_list = {}; + var r, findDef = new RegExp('[ \\t]*#define[ \\t]+(BOARD_[^ \\t]+)[ \\t]+(\\d+)[ \\t]*(//[ \\t]*)?(.+)?', 'gm'); + while((r = findDef.exec(txt)) !== null) { + boards_list[r[1]] = r[2].prePad(3, ' ') + " — " + r[4].replace(/\).*/, ')'); + } + }, + + initThermistorsFromText: function(txt) { + // Get all the thermistors and save them into an object + var r, s, findDef = new RegExp('(//.*\n)+\\s+(#define[ \\t]+TEMP_SENSOR_0)', 'g'); + r = findDef.exec(txt); + findDef = new RegExp('^//[ \\t]*([-\\d]+)[ \\t]+is[ \\t]+(.*)[ \\t]*$', 'gm'); + while((s = findDef.exec(r[0])) !== null) { + therms_list[s[1]] = s[1].prePad(4, ' ') + " — " + s[2]; + } + }, + + handleFileLoad: function(file, $uploader) { + file += ''; + var filename = $uploader.val().replace(/.*[\/\\](.*)$/, '$1'); + switch(filename) { + case config_file: + $config.text(file); + this.initThermistorsFromText(file); + this.refreshConfigForm(); + break; + case config_adv_file: + $config_adv.text(file); + this.refreshConfigForm(); + break; + case boards_file: + this.initBoardsFromText(file); + $('#MOTHERBOARD').html('').addOptions(boards_list); + this.initField('MOTHERBOARD'); + break; + default: + console.log("Can't parse "+filename); + break; + } + }, + setupConfigForm: function() { // Modify form fields and make the form responsive. // As values change on the form, we could update the @@ -128,6 +200,17 @@ var configuratorApp = (function(){ ); }); + $('#SERIAL_PORT').addOptions([0,1,2,3,4,5,6,7]); + $('#BAUDRATE').addOptions([2400,9600,19200,38400,57600,115200,250000]); + $('#MOTHERBOARD').addOptions(boards_list); + $('#EXTRUDERS').addOptions([1,2,3,4]); + $('#POWER_SUPPLY').addOptions({'1':'ATX','2':'Xbox 360'}); + + this.refreshConfigForm(); + }, + + refreshConfigForm: function() { + /** * For now I'm manually creating these references * but I should be able to parse Configuration.h @@ -140,30 +223,25 @@ var configuratorApp = (function(){ * Then we only need to specify exceptions to * standard behavior, (which is to add a text field) */ - $('#SERIAL_PORT').addOptions([0,1,2,3,4,5,6,7]); this.initField('SERIAL_PORT'); - $('#BAUDRATE').addOptions([2400,9600,19200,38400,57600,115200,250000]); this.initField('BAUDRATE'); this.initField('BTENABLED'); - $('#MOTHERBOARD').addOptions(boards_list); this.initField('MOTHERBOARD'); this.initField('CUSTOM_MENDEL_NAME'); this.initField('MACHINE_UUID'); - $('#EXTRUDERS').addOptions([1,2,3,4]); this.initField('EXTRUDERS'); - $('#POWER_SUPPLY').addOptions({'1':'ATX','2':'Xbox 360'}); this.initField('POWER_SUPPLY'); this.initField('PS_DEFAULT_OFF'); - $('#TEMP_SENSOR_0, #TEMP_SENSOR_1, #TEMP_SENSOR_2, #TEMP_SENSOR_BED').addOptions(therms_list); + $('#TEMP_SENSOR_0, #TEMP_SENSOR_1, #TEMP_SENSOR_2, #TEMP_SENSOR_BED').html('').addOptions(therms_list); this.initField('TEMP_SENSOR_0'); this.initField('TEMP_SENSOR_1'); this.initField('TEMP_SENSOR_2'); From 53f6bbdfe0396d6e0631cdcdb3157357823a75da Mon Sep 17 00:00:00 2001 From: Scott Lahteine <sourcetree@thinkyhead.com> Date: Thu, 5 Feb 2015 11:44:43 -0800 Subject: [PATCH 05/41] Try a stepper for the serial port --- Marlin/configurator/css/configurator.css | 5 +++-- Marlin/configurator/js/configurator.js | 9 ++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Marlin/configurator/css/configurator.css b/Marlin/configurator/css/configurator.css index 9935174150..2409508e6a 100644 --- a/Marlin/configurator/css/configurator.css +++ b/Marlin/configurator/css/configurator.css @@ -14,7 +14,7 @@ img { display: none; } label, input, select, textarea { display: block; float: left; margin: 1px 0; } label.newline, textarea { clear: both; } 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; } #config_form { display: block; background: #DDD; padding: 20px; color: #000; } /*#config_text, #config_adv_text { font-family: "Andale mono", monospace; clear: both; }*/ @@ -24,4 +24,5 @@ input:disabled { color: #BBB; } .clear { clear: both; } h1, h2, h3, h4, h5, h6 { clear: both; } h2 { margin: 0; padding: 1em 0 0; } -.jstepper { display: block; } +#serial_stepper { padding-top: 0.75em; display: block; float: left; } +#SERIAL_PORT { display: none; } \ No newline at end of file diff --git a/Marlin/configurator/js/configurator.js b/Marlin/configurator/js/configurator.js index 4764c6ebe8..dfd91119d5 100644 --- a/Marlin/configurator/js/configurator.js +++ b/Marlin/configurator/js/configurator.js @@ -247,10 +247,10 @@ var configuratorApp = (function(){ this.initField('TEMP_SENSOR_2'); this.initField('TEMP_SENSOR_BED'); -/* + $('#serial_stepper').jstepper({ min: 0, - max: 3, + max: 7, val: $('#SERIAL_PORT').val(), arrowWidth: '18px', arrowHeight: '15px', @@ -258,11 +258,10 @@ var configuratorApp = (function(){ acolor: '#F70', hcolor: '#FF0', id: 'select-me', - stepperClass: 'inner', textStyle: {width:'1.5em',fontSize:'120%',textAlign:'center'}, - // onChange: function(v) { }, + onChange: function(v) { $('#SERIAL_PORT').val(v).trigger('change'); } }); -*/ + // prettyPrint(); }, From 32aaadc301fb84401c70fd2ea417638d5b1e8964 Mon Sep 17 00:00:00 2001 From: Scott Lahteine <sourcetree@thinkyhead.com> Date: Thu, 5 Feb 2015 11:50:42 -0800 Subject: [PATCH 06/41] Include minimized jQuery 2.1.3 --- Marlin/configurator/index.html | 4 ++-- Marlin/configurator/js/jquery-2.1.3.min.js | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 Marlin/configurator/js/jquery-2.1.3.min.js diff --git a/Marlin/configurator/index.html b/Marlin/configurator/index.html index 06ab26d563..65299e3a22 100644 --- a/Marlin/configurator/index.html +++ b/Marlin/configurator/index.html @@ -3,12 +3,12 @@ <head> <meta charset="UTF-8"> <title>Marlin Configurator</title> - <script type="text/javascript" src="https://code.jquery.com/jquery-2.1.3.min.js"></script> + <script src="js/jquery-2.1.3.min.js"></script> <script src="js/binarystring.js"></script> <script src="js/binaryfileuploader.js"></script> - <script src="js/configurator.js"></script> <script src="js/jcanvas.js"></script> <script src="js/jstepper.js"></script> + <script src="js/configurator.js"></script> <link rel="stylesheet" href="css/configurator.css" type="text/css" media="all" /> </head> <body> diff --git a/Marlin/configurator/js/jquery-2.1.3.min.js b/Marlin/configurator/js/jquery-2.1.3.min.js new file mode 100644 index 0000000000..c5e1bfe2f5 --- /dev/null +++ b/Marlin/configurator/js/jquery-2.1.3.min.js @@ -0,0 +1,4 @@ +/*! jQuery v2.1.3 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license */ +!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l=a.document,m="2.1.3",n=function(a,b){return new n.fn.init(a,b)},o=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return b.toUpperCase()};n.fn=n.prototype={jquery:m,constructor:n,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return n.each(this,a,b)},map:function(a){return this.pushStack(n.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},n.extend=n.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||n.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(a=arguments[h]))for(b in a)c=g[b],d=a[b],g!==d&&(j&&d&&(n.isPlainObject(d)||(e=n.isArray(d)))?(e?(e=!1,f=c&&n.isArray(c)?c:[]):f=c&&n.isPlainObject(c)?c:{},g[b]=n.extend(j,f,d)):void 0!==d&&(g[b]=d));return g},n.extend({expando:"jQuery"+(m+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===n.type(a)},isArray:Array.isArray,isWindow:function(a){return null!=a&&a===a.window},isNumeric:function(a){return!n.isArray(a)&&a-parseFloat(a)+1>=0},isPlainObject:function(a){return"object"!==n.type(a)||a.nodeType||n.isWindow(a)?!1:a.constructor&&!j.call(a.constructor.prototype,"isPrototypeOf")?!1:!0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(a){var b,c=eval;a=n.trim(a),a&&(1===a.indexOf("use strict")?(b=l.createElement("script"),b.text=a,l.head.appendChild(b).parentNode.removeChild(b)):c(a))},camelCase:function(a){return a.replace(p,"ms-").replace(q,r)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=s(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(o,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(s(Object(a))?n.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){return null==b?-1:g.call(b,a,c)},merge:function(a,b){for(var c=+b.length,d=0,e=a.length;c>d;d++)a[e++]=b[d];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=s(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(c=a[b],b=a,a=c),n.isFunction(a)?(e=d.call(arguments,2),f=function(){return a.apply(b||this,e.concat(d.call(arguments)))},f.guid=a.guid=a.guid||n.guid++,f):void 0},now:Date.now,support:k}),n.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function s(a){var b=a.length,c=n.type(a);return"function"===c||n.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var t=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=hb(),z=hb(),A=hb(),B=function(a,b){return a===b&&(l=!0),0},C=1<<31,D={}.hasOwnProperty,E=[],F=E.pop,G=E.push,H=E.push,I=E.slice,J=function(a,b){for(var c=0,d=a.length;d>c;c++)if(a[c]===b)return c;return-1},K="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",L="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",N=M.replace("w","w#"),O="\\["+L+"*("+M+")(?:"+L+"*([*^$|!~]?=)"+L+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+N+"))|)"+L+"*\\]",P=":("+M+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+O+")*)|.*)\\)|)",Q=new RegExp(L+"+","g"),R=new RegExp("^"+L+"+|((?:^|[^\\\\])(?:\\\\.)*)"+L+"+$","g"),S=new RegExp("^"+L+"*,"+L+"*"),T=new RegExp("^"+L+"*([>+~]|"+L+")"+L+"*"),U=new RegExp("="+L+"*([^\\]'\"]*?)"+L+"*\\]","g"),V=new RegExp(P),W=new RegExp("^"+N+"$"),X={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),TAG:new RegExp("^("+M.replace("w","w*")+")"),ATTR:new RegExp("^"+O),PSEUDO:new RegExp("^"+P),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+L+"*(even|odd|(([+-]|)(\\d*)n|)"+L+"*(?:([+-]|)"+L+"*(\\d+)|))"+L+"*\\)|)","i"),bool:new RegExp("^(?:"+K+")$","i"),needsContext:new RegExp("^"+L+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+L+"*((?:-\\d)?\\d*)"+L+"*\\)|)(?=[^-]|$)","i")},Y=/^(?:input|select|textarea|button)$/i,Z=/^h\d$/i,$=/^[^{]+\{\s*\[native \w/,_=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ab=/[+~]/,bb=/'|\\/g,cb=new RegExp("\\\\([\\da-f]{1,6}"+L+"?|("+L+")|.)","ig"),db=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},eb=function(){m()};try{H.apply(E=I.call(v.childNodes),v.childNodes),E[v.childNodes.length].nodeType}catch(fb){H={apply:E.length?function(a,b){G.apply(a,I.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function gb(a,b,d,e){var f,h,j,k,l,o,r,s,w,x;if((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,d=d||[],k=b.nodeType,"string"!=typeof a||!a||1!==k&&9!==k&&11!==k)return d;if(!e&&p){if(11!==k&&(f=_.exec(a)))if(j=f[1]){if(9===k){if(h=b.getElementById(j),!h||!h.parentNode)return d;if(h.id===j)return d.push(h),d}else if(b.ownerDocument&&(h=b.ownerDocument.getElementById(j))&&t(b,h)&&h.id===j)return d.push(h),d}else{if(f[2])return H.apply(d,b.getElementsByTagName(a)),d;if((j=f[3])&&c.getElementsByClassName)return H.apply(d,b.getElementsByClassName(j)),d}if(c.qsa&&(!q||!q.test(a))){if(s=r=u,w=b,x=1!==k&&a,1===k&&"object"!==b.nodeName.toLowerCase()){o=g(a),(r=b.getAttribute("id"))?s=r.replace(bb,"\\$&"):b.setAttribute("id",s),s="[id='"+s+"'] ",l=o.length;while(l--)o[l]=s+rb(o[l]);w=ab.test(a)&&pb(b.parentNode)||b,x=o.join(",")}if(x)try{return H.apply(d,w.querySelectorAll(x)),d}catch(y){}finally{r||b.removeAttribute("id")}}}return i(a.replace(R,"$1"),b,d,e)}function hb(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ib(a){return a[u]=!0,a}function jb(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function kb(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function lb(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||C)-(~a.sourceIndex||C);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function mb(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function nb(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function ob(a){return ib(function(b){return b=+b,ib(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function pb(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=gb.support={},f=gb.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=gb.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=g.documentElement,e=g.defaultView,e&&e!==e.top&&(e.addEventListener?e.addEventListener("unload",eb,!1):e.attachEvent&&e.attachEvent("onunload",eb)),p=!f(g),c.attributes=jb(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=jb(function(a){return a.appendChild(g.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=$.test(g.getElementsByClassName),c.getById=jb(function(a){return o.appendChild(a).id=u,!g.getElementsByName||!g.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=$.test(g.querySelectorAll))&&(jb(function(a){o.appendChild(a).innerHTML="<a id='"+u+"'></a><select id='"+u+"-\f]' msallowcapture=''><option selected=''></option></select>",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+L+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+L+"*(?:value|"+K+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),jb(function(a){var b=g.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+L+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=$.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&jb(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",P)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=$.test(o.compareDocumentPosition),t=b||$.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===g||a.ownerDocument===v&&t(v,a)?-1:b===g||b.ownerDocument===v&&t(v,b)?1:k?J(k,a)-J(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,h=[a],i=[b];if(!e||!f)return a===g?-1:b===g?1:e?-1:f?1:k?J(k,a)-J(k,b):0;if(e===f)return lb(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)i.unshift(c);while(h[d]===i[d])d++;return d?lb(h[d],i[d]):h[d]===v?-1:i[d]===v?1:0},g):n},gb.matches=function(a,b){return gb(a,null,null,b)},gb.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(U,"='$1']"),!(!c.matchesSelector||!p||r&&r.test(b)||q&&q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return gb(b,n,null,[a]).length>0},gb.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},gb.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&D.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},gb.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},gb.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=gb.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=gb.selectors={cacheLength:50,createPseudo:ib,match:X,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(cb,db),a[3]=(a[3]||a[4]||a[5]||"").replace(cb,db),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||gb.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&gb.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return X.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&V.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(cb,db).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+L+")"+a+"("+L+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=gb.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(Q," ")+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){k=q[u]||(q[u]={}),j=k[a]||[],n=j[0]===w&&j[1],m=j[0]===w&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[w,n,m];break}}else if(s&&(j=(b[u]||(b[u]={}))[a])&&j[0]===w)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(s&&((l[u]||(l[u]={}))[a]=[w,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||gb.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ib(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=J(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ib(function(a){var b=[],c=[],d=h(a.replace(R,"$1"));return d[u]?ib(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ib(function(a){return function(b){return gb(a,b).length>0}}),contains:ib(function(a){return a=a.replace(cb,db),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ib(function(a){return W.test(a||"")||gb.error("unsupported lang: "+a),a=a.replace(cb,db).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Z.test(a.nodeName)},input:function(a){return Y.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:ob(function(){return[0]}),last:ob(function(a,b){return[b-1]}),eq:ob(function(a,b,c){return[0>c?c+b:c]}),even:ob(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:ob(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:ob(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:ob(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=mb(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=nb(b);function qb(){}qb.prototype=d.filters=d.pseudos,d.setFilters=new qb,g=gb.tokenize=function(a,b){var c,e,f,g,h,i,j,k=z[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){(!c||(e=S.exec(h)))&&(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=T.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(R," ")}),h=h.slice(c.length));for(g in d.filter)!(e=X[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?gb.error(a):z(a,i).slice(0)};function rb(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function sb(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[u]||(b[u]={}),(h=i[d])&&h[0]===w&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function tb(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function ub(a,b,c){for(var d=0,e=b.length;e>d;d++)gb(a,b[d],c);return c}function vb(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function wb(a,b,c,d,e,f){return d&&!d[u]&&(d=wb(d)),e&&!e[u]&&(e=wb(e,f)),ib(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||ub(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:vb(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=vb(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?J(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=vb(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):H.apply(g,r)})}function xb(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=sb(function(a){return a===b},h,!0),l=sb(function(a){return J(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];f>i;i++)if(c=d.relative[a[i].type])m=[sb(tb(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return wb(i>1&&tb(m),i>1&&rb(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(R,"$1"),c,e>i&&xb(a.slice(i,e)),f>e&&xb(a=a.slice(e)),f>e&&rb(a))}m.push(c)}return tb(m)}function yb(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,m,o,p=0,q="0",r=f&&[],s=[],t=j,u=f||e&&d.find.TAG("*",k),v=w+=null==t?1:Math.random()||.1,x=u.length;for(k&&(j=g!==n&&g);q!==x&&null!=(l=u[q]);q++){if(e&&l){m=0;while(o=a[m++])if(o(l,g,h)){i.push(l);break}k&&(w=v)}c&&((l=!o&&l)&&p--,f&&r.push(l))}if(p+=q,c&&q!==p){m=0;while(o=b[m++])o(r,s,g,h);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=F.call(i));s=vb(s)}H.apply(i,s),k&&!f&&s.length>0&&p+b.length>1&&gb.uniqueSort(i)}return k&&(w=v,j=t),r};return c?ib(f):f}return h=gb.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=xb(b[c]),f[u]?d.push(f):e.push(f);f=A(a,yb(e,d)),f.selector=a}return f},i=gb.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(cb,db),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=X.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(cb,db),ab.test(j[0].type)&&pb(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&rb(j),!a)return H.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,ab.test(a)&&pb(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=jb(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),jb(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||kb("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&jb(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||kb("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),jb(function(a){return null==a.getAttribute("disabled")})||kb(K,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),gb}(a);n.find=t,n.expr=t.selectors,n.expr[":"]=n.expr.pseudos,n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=n.expr.match.needsContext,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^.[^:#\[\.,]*$/;function x(a,b,c){if(n.isFunction(b))return n.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return n.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(w.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return g.call(b,a)>=0!==c})}n.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?n.find.matchesSelector(d,a)?[d]:[]:n.find.matches(a,n.grep(b,function(a){return 1===a.nodeType}))},n.fn.extend({find:function(a){var b,c=this.length,d=[],e=this;if("string"!=typeof a)return this.pushStack(n(a).filter(function(){for(b=0;c>b;b++)if(n.contains(e[b],this))return!0}));for(b=0;c>b;b++)n.find(a,e[b],d);return d=this.pushStack(c>1?n.unique(d):d),d.selector=this.selector?this.selector+" "+a:a,d},filter:function(a){return this.pushStack(x(this,a||[],!1))},not:function(a){return this.pushStack(x(this,a||[],!0))},is:function(a){return!!x(this,"string"==typeof a&&u.test(a)?n(a):a||[],!1).length}});var y,z=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,A=n.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a[0]&&">"===a[a.length-1]&&a.length>=3?[null,a,null]:z.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||y).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:l,!0)),v.test(c[1])&&n.isPlainObject(b))for(c in b)n.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}return d=l.getElementById(c[2]),d&&d.parentNode&&(this.length=1,this[0]=d),this.context=l,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?"undefined"!=typeof y.ready?y.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};A.prototype=n.fn,y=n(l);var B=/^(?:parents|prev(?:Until|All))/,C={children:!0,contents:!0,next:!0,prev:!0};n.extend({dir:function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&n(a).is(c))break;d.push(a)}return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),n.fn.extend({has:function(a){var b=n(a,this),c=b.length;return this.filter(function(){for(var a=0;c>a;a++)if(n.contains(this,b[a]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=u.test(a)||"string"!=typeof a?n(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&n.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?n.unique(f):f)},index:function(a){return a?"string"==typeof a?g.call(n(a),this[0]):g.call(this,a.jquery?a[0]:a):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(n.unique(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function D(a,b){while((a=a[b])&&1!==a.nodeType);return a}n.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return n.dir(a,"parentNode")},parentsUntil:function(a,b,c){return n.dir(a,"parentNode",c)},next:function(a){return D(a,"nextSibling")},prev:function(a){return D(a,"previousSibling")},nextAll:function(a){return n.dir(a,"nextSibling")},prevAll:function(a){return n.dir(a,"previousSibling")},nextUntil:function(a,b,c){return n.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return n.dir(a,"previousSibling",c)},siblings:function(a){return n.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return n.sibling(a.firstChild)},contents:function(a){return a.contentDocument||n.merge([],a.childNodes)}},function(a,b){n.fn[a]=function(c,d){var e=n.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=n.filter(d,e)),this.length>1&&(C[a]||n.unique(e),B.test(a)&&e.reverse()),this.pushStack(e)}});var E=/\S+/g,F={};function G(a){var b=F[a]={};return n.each(a.match(E)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a="string"==typeof a?F[a]||G(a):n.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(b=a.memory&&l,c=!0,g=e||0,e=0,f=h.length,d=!0;h&&f>g;g++)if(h[g].apply(l[0],l[1])===!1&&a.stopOnFalse){b=!1;break}d=!1,h&&(i?i.length&&j(i.shift()):b?h=[]:k.disable())},k={add:function(){if(h){var c=h.length;!function g(b){n.each(b,function(b,c){var d=n.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&g(c)})}(arguments),d?f=h.length:b&&(e=c,j(b))}return this},remove:function(){return h&&n.each(arguments,function(a,b){var c;while((c=n.inArray(b,h,c))>-1)h.splice(c,1),d&&(f>=c&&f--,g>=c&&g--)}),this},has:function(a){return a?n.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],f=0,this},disable:function(){return h=i=b=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,b||k.disable(),this},locked:function(){return!i},fireWith:function(a,b){return!h||c&&!i||(b=b||[],b=[a,b.slice?b.slice():b],d?i.push(b):j(b)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!c}};return k},n.extend({Deferred:function(a){var b=[["resolve","done",n.Callbacks("once memory"),"resolved"],["reject","fail",n.Callbacks("once memory"),"rejected"],["notify","progress",n.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return n.Deferred(function(c){n.each(b,function(b,f){var g=n.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&n.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?n.extend(a,d):d}},e={};return d.pipe=d.then,n.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&n.isFunction(a.promise)?e:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var H;n.fn.ready=function(a){return n.ready.promise().done(a),this},n.extend({isReady:!1,readyWait:1,holdReady:function(a){a?n.readyWait++:n.ready(!0)},ready:function(a){(a===!0?--n.readyWait:n.isReady)||(n.isReady=!0,a!==!0&&--n.readyWait>0||(H.resolveWith(l,[n]),n.fn.triggerHandler&&(n(l).triggerHandler("ready"),n(l).off("ready"))))}});function I(){l.removeEventListener("DOMContentLoaded",I,!1),a.removeEventListener("load",I,!1),n.ready()}n.ready.promise=function(b){return H||(H=n.Deferred(),"complete"===l.readyState?setTimeout(n.ready):(l.addEventListener("DOMContentLoaded",I,!1),a.addEventListener("load",I,!1))),H.promise(b)},n.ready.promise();var J=n.access=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===n.type(c)){e=!0;for(h in c)n.access(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,n.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(n(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f};n.acceptData=function(a){return 1===a.nodeType||9===a.nodeType||!+a.nodeType};function K(){Object.defineProperty(this.cache={},0,{get:function(){return{}}}),this.expando=n.expando+K.uid++}K.uid=1,K.accepts=n.acceptData,K.prototype={key:function(a){if(!K.accepts(a))return 0;var b={},c=a[this.expando];if(!c){c=K.uid++;try{b[this.expando]={value:c},Object.defineProperties(a,b)}catch(d){b[this.expando]=c,n.extend(a,b)}}return this.cache[c]||(this.cache[c]={}),c},set:function(a,b,c){var d,e=this.key(a),f=this.cache[e];if("string"==typeof b)f[b]=c;else if(n.isEmptyObject(f))n.extend(this.cache[e],b);else for(d in b)f[d]=b[d];return f},get:function(a,b){var c=this.cache[this.key(a)];return void 0===b?c:c[b]},access:function(a,b,c){var d;return void 0===b||b&&"string"==typeof b&&void 0===c?(d=this.get(a,b),void 0!==d?d:this.get(a,n.camelCase(b))):(this.set(a,b,c),void 0!==c?c:b)},remove:function(a,b){var c,d,e,f=this.key(a),g=this.cache[f];if(void 0===b)this.cache[f]={};else{n.isArray(b)?d=b.concat(b.map(n.camelCase)):(e=n.camelCase(b),b in g?d=[b,e]:(d=e,d=d in g?[d]:d.match(E)||[])),c=d.length;while(c--)delete g[d[c]]}},hasData:function(a){return!n.isEmptyObject(this.cache[a[this.expando]]||{})},discard:function(a){a[this.expando]&&delete this.cache[a[this.expando]]}};var L=new K,M=new K,N=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,O=/([A-Z])/g;function P(a,b,c){var d;if(void 0===c&&1===a.nodeType)if(d="data-"+b.replace(O,"-$1").toLowerCase(),c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:N.test(c)?n.parseJSON(c):c}catch(e){}M.set(a,b,c)}else c=void 0;return c}n.extend({hasData:function(a){return M.hasData(a)||L.hasData(a)},data:function(a,b,c){return M.access(a,b,c) +},removeData:function(a,b){M.remove(a,b)},_data:function(a,b,c){return L.access(a,b,c)},_removeData:function(a,b){L.remove(a,b)}}),n.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=M.get(f),1===f.nodeType&&!L.get(f,"hasDataAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),P(f,d,e[d])));L.set(f,"hasDataAttrs",!0)}return e}return"object"==typeof a?this.each(function(){M.set(this,a)}):J(this,function(b){var c,d=n.camelCase(a);if(f&&void 0===b){if(c=M.get(f,a),void 0!==c)return c;if(c=M.get(f,d),void 0!==c)return c;if(c=P(f,d,void 0),void 0!==c)return c}else this.each(function(){var c=M.get(this,d);M.set(this,d,b),-1!==a.indexOf("-")&&void 0!==c&&M.set(this,a,b)})},null,b,arguments.length>1,null,!0)},removeData:function(a){return this.each(function(){M.remove(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=L.get(a,b),c&&(!d||n.isArray(c)?d=L.access(a,b,n.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=n.queue(a,b),d=c.length,e=c.shift(),f=n._queueHooks(a,b),g=function(){n.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return L.get(a,c)||L.access(a,c,{empty:n.Callbacks("once memory").add(function(){L.remove(a,[b+"queue",c])})})}}),n.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?n.queue(this[0],a):void 0===b?this:this.each(function(){var c=n.queue(this,a,b);n._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&n.dequeue(this,a)})},dequeue:function(a){return this.each(function(){n.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=n.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=L.get(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var Q=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,R=["Top","Right","Bottom","Left"],S=function(a,b){return a=b||a,"none"===n.css(a,"display")||!n.contains(a.ownerDocument,a)},T=/^(?:checkbox|radio)$/i;!function(){var a=l.createDocumentFragment(),b=a.appendChild(l.createElement("div")),c=l.createElement("input");c.setAttribute("type","radio"),c.setAttribute("checked","checked"),c.setAttribute("name","t"),b.appendChild(c),k.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,b.innerHTML="<textarea>x</textarea>",k.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue}();var U="undefined";k.focusinBubbles="onfocusin"in a;var V=/^key/,W=/^(?:mouse|pointer|contextmenu)|click/,X=/^(?:focusinfocus|focusoutblur)$/,Y=/^([^.]*)(?:\.(.+)|)$/;function Z(){return!0}function $(){return!1}function _(){try{return l.activeElement}catch(a){}}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=L.get(a);if(r){c.handler&&(f=c,c=f.handler,e=f.selector),c.guid||(c.guid=n.guid++),(i=r.events)||(i=r.events={}),(g=r.handle)||(g=r.handle=function(b){return typeof n!==U&&n.event.triggered!==b.type?n.event.dispatch.apply(a,arguments):void 0}),b=(b||"").match(E)||[""],j=b.length;while(j--)h=Y.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o&&(l=n.event.special[o]||{},o=(e?l.delegateType:l.bindType)||o,l=n.event.special[o]||{},k=n.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&n.expr.match.needsContext.test(e),namespace:p.join(".")},f),(m=i[o])||(m=i[o]=[],m.delegateCount=0,l.setup&&l.setup.call(a,d,p,g)!==!1||a.addEventListener&&a.addEventListener(o,g,!1)),l.add&&(l.add.call(a,k),k.handler.guid||(k.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,k):m.push(k),n.event.global[o]=!0)}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=L.hasData(a)&&L.get(a);if(r&&(i=r.events)){b=(b||"").match(E)||[""],j=b.length;while(j--)if(h=Y.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=n.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,m=i[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),g=f=m.length;while(f--)k=m[f],!e&&q!==k.origType||c&&c.guid!==k.guid||h&&!h.test(k.namespace)||d&&d!==k.selector&&("**"!==d||!k.selector)||(m.splice(f,1),k.selector&&m.delegateCount--,l.remove&&l.remove.call(a,k));g&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||n.removeEvent(a,o,r.handle),delete i[o])}else for(o in i)n.event.remove(a,o+b[j],c,d,!0);n.isEmptyObject(i)&&(delete r.handle,L.remove(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,m,o,p=[d||l],q=j.call(b,"type")?b.type:b,r=j.call(b,"namespace")?b.namespace.split("."):[];if(g=h=d=d||l,3!==d.nodeType&&8!==d.nodeType&&!X.test(q+n.event.triggered)&&(q.indexOf(".")>=0&&(r=q.split("."),q=r.shift(),r.sort()),k=q.indexOf(":")<0&&"on"+q,b=b[n.expando]?b:new n.Event(q,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=r.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+r.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:n.makeArray(c,[b]),o=n.event.special[q]||{},e||!o.trigger||o.trigger.apply(d,c)!==!1)){if(!e&&!o.noBubble&&!n.isWindow(d)){for(i=o.delegateType||q,X.test(i+q)||(g=g.parentNode);g;g=g.parentNode)p.push(g),h=g;h===(d.ownerDocument||l)&&p.push(h.defaultView||h.parentWindow||a)}f=0;while((g=p[f++])&&!b.isPropagationStopped())b.type=f>1?i:o.bindType||q,m=(L.get(g,"events")||{})[b.type]&&L.get(g,"handle"),m&&m.apply(g,c),m=k&&g[k],m&&m.apply&&n.acceptData(g)&&(b.result=m.apply(g,c),b.result===!1&&b.preventDefault());return b.type=q,e||b.isDefaultPrevented()||o._default&&o._default.apply(p.pop(),c)!==!1||!n.acceptData(d)||k&&n.isFunction(d[q])&&!n.isWindow(d)&&(h=d[k],h&&(d[k]=null),n.event.triggered=q,d[q](),n.event.triggered=void 0,h&&(d[k]=h)),b.result}},dispatch:function(a){a=n.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(L.get(this,"events")||{})[a.type]||[],k=n.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=n.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,c=0;while((g=f.handlers[c++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(g.namespace))&&(a.handleObj=g,a.data=g.data,e=((n.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==e&&(a.result=e)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!==this;i=i.parentNode||this)if(i.disabled!==!0||"click"!==a.type){for(d=[],c=0;h>c;c++)f=b[c],e=f.selector+" ",void 0===d[e]&&(d[e]=f.needsContext?n(e,this).index(i)>=0:n.find(e,this,null,[i]).length),d[e]&&d.push(f);d.length&&g.push({elem:i,handlers:d})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return null==a.which&&(a.which=null!=b.charCode?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,b){var c,d,e,f=b.button;return null==a.pageX&&null!=b.clientX&&(c=a.target.ownerDocument||l,d=c.documentElement,e=c.body,a.pageX=b.clientX+(d&&d.scrollLeft||e&&e.scrollLeft||0)-(d&&d.clientLeft||e&&e.clientLeft||0),a.pageY=b.clientY+(d&&d.scrollTop||e&&e.scrollTop||0)-(d&&d.clientTop||e&&e.clientTop||0)),a.which||void 0===f||(a.which=1&f?1:2&f?3:4&f?2:0),a}},fix:function(a){if(a[n.expando])return a;var b,c,d,e=a.type,f=a,g=this.fixHooks[e];g||(this.fixHooks[e]=g=W.test(e)?this.mouseHooks:V.test(e)?this.keyHooks:{}),d=g.props?this.props.concat(g.props):this.props,a=new n.Event(f),b=d.length;while(b--)c=d[b],a[c]=f[c];return a.target||(a.target=l),3===a.target.nodeType&&(a.target=a.target.parentNode),g.filter?g.filter(a,f):a},special:{load:{noBubble:!0},focus:{trigger:function(){return this!==_()&&this.focus?(this.focus(),!1):void 0},delegateType:"focusin"},blur:{trigger:function(){return this===_()&&this.blur?(this.blur(),!1):void 0},delegateType:"focusout"},click:{trigger:function(){return"checkbox"===this.type&&this.click&&n.nodeName(this,"input")?(this.click(),!1):void 0},_default:function(a){return n.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&a.originalEvent&&(a.originalEvent.returnValue=a.result)}}},simulate:function(a,b,c,d){var e=n.extend(new n.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?n.event.trigger(e,null,b):n.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},n.removeEvent=function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)},n.Event=function(a,b){return this instanceof n.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.returnValue===!1?Z:$):this.type=a,b&&n.extend(this,b),this.timeStamp=a&&a.timeStamp||n.now(),void(this[n.expando]=!0)):new n.Event(a,b)},n.Event.prototype={isDefaultPrevented:$,isPropagationStopped:$,isImmediatePropagationStopped:$,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=Z,a&&a.preventDefault&&a.preventDefault()},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=Z,a&&a.stopPropagation&&a.stopPropagation()},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=Z,a&&a.stopImmediatePropagation&&a.stopImmediatePropagation(),this.stopPropagation()}},n.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(a,b){n.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return(!e||e!==d&&!n.contains(d,e))&&(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),k.focusinBubbles||n.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){n.event.simulate(b,a.target,n.event.fix(a),!0)};n.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=L.access(d,b);e||d.addEventListener(a,c,!0),L.access(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=L.access(d,b)-1;e?L.access(d,b,e):(d.removeEventListener(a,c,!0),L.remove(d,b))}}}),n.fn.extend({on:function(a,b,c,d,e){var f,g;if("object"==typeof a){"string"!=typeof b&&(c=c||b,b=void 0);for(g in a)this.on(g,b,c,a[g],e);return this}if(null==c&&null==d?(d=b,c=b=void 0):null==d&&("string"==typeof b?(d=c,c=void 0):(d=c,c=b,b=void 0)),d===!1)d=$;else if(!d)return this;return 1===e&&(f=d,d=function(a){return n().off(a),f.apply(this,arguments)},d.guid=f.guid||(f.guid=n.guid++)),this.each(function(){n.event.add(this,a,d,c,b)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,n(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return(b===!1||"function"==typeof b)&&(c=b,b=void 0),c===!1&&(c=$),this.each(function(){n.event.remove(this,a,c,b)})},trigger:function(a,b){return this.each(function(){n.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];return c?n.event.trigger(a,b,c,!0):void 0}});var ab=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bb=/<([\w:]+)/,cb=/<|&#?\w+;/,db=/<(?:script|style|link)/i,eb=/checked\s*(?:[^=]|=\s*.checked.)/i,fb=/^$|\/(?:java|ecma)script/i,gb=/^true\/(.*)/,hb=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,ib={option:[1,"<select multiple='multiple'>","</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};ib.optgroup=ib.option,ib.tbody=ib.tfoot=ib.colgroup=ib.caption=ib.thead,ib.th=ib.td;function jb(a,b){return n.nodeName(a,"table")&&n.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function kb(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function lb(a){var b=gb.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function mb(a,b){for(var c=0,d=a.length;d>c;c++)L.set(a[c],"globalEval",!b||L.get(b[c],"globalEval"))}function nb(a,b){var c,d,e,f,g,h,i,j;if(1===b.nodeType){if(L.hasData(a)&&(f=L.access(a),g=L.set(b,f),j=f.events)){delete g.handle,g.events={};for(e in j)for(c=0,d=j[e].length;d>c;c++)n.event.add(b,e,j[e][c])}M.hasData(a)&&(h=M.access(a),i=n.extend({},h),M.set(b,i))}}function ob(a,b){var c=a.getElementsByTagName?a.getElementsByTagName(b||"*"):a.querySelectorAll?a.querySelectorAll(b||"*"):[];return void 0===b||b&&n.nodeName(a,b)?n.merge([a],c):c}function pb(a,b){var c=b.nodeName.toLowerCase();"input"===c&&T.test(a.type)?b.checked=a.checked:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}n.extend({clone:function(a,b,c){var d,e,f,g,h=a.cloneNode(!0),i=n.contains(a.ownerDocument,a);if(!(k.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(g=ob(h),f=ob(a),d=0,e=f.length;e>d;d++)pb(f[d],g[d]);if(b)if(c)for(f=f||ob(a),g=g||ob(h),d=0,e=f.length;e>d;d++)nb(f[d],g[d]);else nb(a,h);return g=ob(h,"script"),g.length>0&&mb(g,!i&&ob(a,"script")),h},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,k=b.createDocumentFragment(),l=[],m=0,o=a.length;o>m;m++)if(e=a[m],e||0===e)if("object"===n.type(e))n.merge(l,e.nodeType?[e]:e);else if(cb.test(e)){f=f||k.appendChild(b.createElement("div")),g=(bb.exec(e)||["",""])[1].toLowerCase(),h=ib[g]||ib._default,f.innerHTML=h[1]+e.replace(ab,"<$1></$2>")+h[2],j=h[0];while(j--)f=f.lastChild;n.merge(l,f.childNodes),f=k.firstChild,f.textContent=""}else l.push(b.createTextNode(e));k.textContent="",m=0;while(e=l[m++])if((!d||-1===n.inArray(e,d))&&(i=n.contains(e.ownerDocument,e),f=ob(k.appendChild(e),"script"),i&&mb(f),c)){j=0;while(e=f[j++])fb.test(e.type||"")&&c.push(e)}return k},cleanData:function(a){for(var b,c,d,e,f=n.event.special,g=0;void 0!==(c=a[g]);g++){if(n.acceptData(c)&&(e=c[L.expando],e&&(b=L.cache[e]))){if(b.events)for(d in b.events)f[d]?n.event.remove(c,d):n.removeEvent(c,d,b.handle);L.cache[e]&&delete L.cache[e]}delete M.cache[c[M.expando]]}}}),n.fn.extend({text:function(a){return J(this,function(a){return void 0===a?n.text(this):this.empty().each(function(){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&(this.textContent=a)})},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=jb(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=jb(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?n.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||n.cleanData(ob(c)),c.parentNode&&(b&&n.contains(c.ownerDocument,c)&&mb(ob(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++)1===a.nodeType&&(n.cleanData(ob(a,!1)),a.textContent="");return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return n.clone(this,a,b)})},html:function(a){return J(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a&&1===b.nodeType)return b.innerHTML;if("string"==typeof a&&!db.test(a)&&!ib[(bb.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(ab,"<$1></$2>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(ob(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,n.cleanData(ob(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,l=this.length,m=this,o=l-1,p=a[0],q=n.isFunction(p);if(q||l>1&&"string"==typeof p&&!k.checkClone&&eb.test(p))return this.each(function(c){var d=m.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(l&&(c=n.buildFragment(a,this[0].ownerDocument,!1,this),d=c.firstChild,1===c.childNodes.length&&(c=d),d)){for(f=n.map(ob(c,"script"),kb),g=f.length;l>j;j++)h=c,j!==o&&(h=n.clone(h,!0,!0),g&&n.merge(f,ob(h,"script"))),b.call(this[j],h,j);if(g)for(i=f[f.length-1].ownerDocument,n.map(f,lb),j=0;g>j;j++)h=f[j],fb.test(h.type||"")&&!L.access(h,"globalEval")&&n.contains(i,h)&&(h.src?n._evalUrl&&n._evalUrl(h.src):n.globalEval(h.textContent.replace(hb,"")))}return this}}),n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){n.fn[a]=function(a){for(var c,d=[],e=n(a),g=e.length-1,h=0;g>=h;h++)c=h===g?this:this.clone(!0),n(e[h])[b](c),f.apply(d,c.get());return this.pushStack(d)}});var qb,rb={};function sb(b,c){var d,e=n(c.createElement(b)).appendTo(c.body),f=a.getDefaultComputedStyle&&(d=a.getDefaultComputedStyle(e[0]))?d.display:n.css(e[0],"display");return e.detach(),f}function tb(a){var b=l,c=rb[a];return c||(c=sb(a,b),"none"!==c&&c||(qb=(qb||n("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=qb[0].contentDocument,b.write(),b.close(),c=sb(a,b),qb.detach()),rb[a]=c),c}var ub=/^margin/,vb=new RegExp("^("+Q+")(?!px)[a-z%]+$","i"),wb=function(b){return b.ownerDocument.defaultView.opener?b.ownerDocument.defaultView.getComputedStyle(b,null):a.getComputedStyle(b,null)};function xb(a,b,c){var d,e,f,g,h=a.style;return c=c||wb(a),c&&(g=c.getPropertyValue(b)||c[b]),c&&(""!==g||n.contains(a.ownerDocument,a)||(g=n.style(a,b)),vb.test(g)&&ub.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f)),void 0!==g?g+"":g}function yb(a,b){return{get:function(){return a()?void delete this.get:(this.get=b).apply(this,arguments)}}}!function(){var b,c,d=l.documentElement,e=l.createElement("div"),f=l.createElement("div");if(f.style){f.style.backgroundClip="content-box",f.cloneNode(!0).style.backgroundClip="",k.clearCloneStyle="content-box"===f.style.backgroundClip,e.style.cssText="border:0;width:0;height:0;top:0;left:-9999px;margin-top:1px;position:absolute",e.appendChild(f);function g(){f.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;display:block;margin-top:1%;top:1%;border:1px;padding:1px;width:4px;position:absolute",f.innerHTML="",d.appendChild(e);var g=a.getComputedStyle(f,null);b="1%"!==g.top,c="4px"===g.width,d.removeChild(e)}a.getComputedStyle&&n.extend(k,{pixelPosition:function(){return g(),b},boxSizingReliable:function(){return null==c&&g(),c},reliableMarginRight:function(){var b,c=f.appendChild(l.createElement("div"));return c.style.cssText=f.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",c.style.marginRight=c.style.width="0",f.style.width="1px",d.appendChild(e),b=!parseFloat(a.getComputedStyle(c,null).marginRight),d.removeChild(e),f.removeChild(c),b}})}}(),n.swap=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e};var zb=/^(none|table(?!-c[ea]).+)/,Ab=new RegExp("^("+Q+")(.*)$","i"),Bb=new RegExp("^([+-])=("+Q+")","i"),Cb={position:"absolute",visibility:"hidden",display:"block"},Db={letterSpacing:"0",fontWeight:"400"},Eb=["Webkit","O","Moz","ms"];function Fb(a,b){if(b in a)return b;var c=b[0].toUpperCase()+b.slice(1),d=b,e=Eb.length;while(e--)if(b=Eb[e]+c,b in a)return b;return d}function Gb(a,b,c){var d=Ab.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function Hb(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;4>f;f+=2)"margin"===c&&(g+=n.css(a,c+R[f],!0,e)),d?("content"===c&&(g-=n.css(a,"padding"+R[f],!0,e)),"margin"!==c&&(g-=n.css(a,"border"+R[f]+"Width",!0,e))):(g+=n.css(a,"padding"+R[f],!0,e),"padding"!==c&&(g+=n.css(a,"border"+R[f]+"Width",!0,e)));return g}function Ib(a,b,c){var d=!0,e="width"===b?a.offsetWidth:a.offsetHeight,f=wb(a),g="border-box"===n.css(a,"boxSizing",!1,f);if(0>=e||null==e){if(e=xb(a,b,f),(0>e||null==e)&&(e=a.style[b]),vb.test(e))return e;d=g&&(k.boxSizingReliable()||e===a.style[b]),e=parseFloat(e)||0}return e+Hb(a,b,c||(g?"border":"content"),d,f)+"px"}function Jb(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=L.get(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&S(d)&&(f[g]=L.access(d,"olddisplay",tb(d.nodeName)))):(e=S(d),"none"===c&&e||L.set(d,"olddisplay",e?c:n.css(d,"display"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&"none"!==d.style.display&&""!==d.style.display||(d.style.display=b?f[g]||"":"none"));return a}n.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=xb(a,"opacity");return""===c?"1":c}}}},cssNumber:{columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":"cssFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=n.camelCase(b),i=a.style;return b=n.cssProps[h]||(n.cssProps[h]=Fb(i,h)),g=n.cssHooks[b]||n.cssHooks[h],void 0===c?g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b]:(f=typeof c,"string"===f&&(e=Bb.exec(c))&&(c=(e[1]+1)*e[2]+parseFloat(n.css(a,b)),f="number"),null!=c&&c===c&&("number"!==f||n.cssNumber[h]||(c+="px"),k.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),g&&"set"in g&&void 0===(c=g.set(a,c,d))||(i[b]=c)),void 0)}},css:function(a,b,c,d){var e,f,g,h=n.camelCase(b);return b=n.cssProps[h]||(n.cssProps[h]=Fb(a.style,h)),g=n.cssHooks[b]||n.cssHooks[h],g&&"get"in g&&(e=g.get(a,!0,c)),void 0===e&&(e=xb(a,b,d)),"normal"===e&&b in Db&&(e=Db[b]),""===c||c?(f=parseFloat(e),c===!0||n.isNumeric(f)?f||0:e):e}}),n.each(["height","width"],function(a,b){n.cssHooks[b]={get:function(a,c,d){return c?zb.test(n.css(a,"display"))&&0===a.offsetWidth?n.swap(a,Cb,function(){return Ib(a,b,d)}):Ib(a,b,d):void 0},set:function(a,c,d){var e=d&&wb(a);return Gb(a,c,d?Hb(a,b,d,"border-box"===n.css(a,"boxSizing",!1,e),e):0)}}}),n.cssHooks.marginRight=yb(k.reliableMarginRight,function(a,b){return b?n.swap(a,{display:"inline-block"},xb,[a,"marginRight"]):void 0}),n.each({margin:"",padding:"",border:"Width"},function(a,b){n.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+R[d]+b]=f[d]||f[d-2]||f[0];return e}},ub.test(a)||(n.cssHooks[a+b].set=Gb)}),n.fn.extend({css:function(a,b){return J(this,function(a,b,c){var d,e,f={},g=0;if(n.isArray(b)){for(d=wb(a),e=b.length;e>g;g++)f[b[g]]=n.css(a,b[g],!1,d);return f}return void 0!==c?n.style(a,b,c):n.css(a,b)},a,b,arguments.length>1)},show:function(){return Jb(this,!0)},hide:function(){return Jb(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){S(this)?n(this).show():n(this).hide()})}});function Kb(a,b,c,d,e){return new Kb.prototype.init(a,b,c,d,e)}n.Tween=Kb,Kb.prototype={constructor:Kb,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(n.cssNumber[c]?"":"px")},cur:function(){var a=Kb.propHooks[this.prop];return a&&a.get?a.get(this):Kb.propHooks._default.get(this)},run:function(a){var b,c=Kb.propHooks[this.prop];return this.pos=b=this.options.duration?n.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):Kb.propHooks._default.set(this),this}},Kb.prototype.init.prototype=Kb.prototype,Kb.propHooks={_default:{get:function(a){var b;return null==a.elem[a.prop]||a.elem.style&&null!=a.elem.style[a.prop]?(b=n.css(a.elem,a.prop,""),b&&"auto"!==b?b:0):a.elem[a.prop]},set:function(a){n.fx.step[a.prop]?n.fx.step[a.prop](a):a.elem.style&&(null!=a.elem.style[n.cssProps[a.prop]]||n.cssHooks[a.prop])?n.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},Kb.propHooks.scrollTop=Kb.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},n.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},n.fx=Kb.prototype.init,n.fx.step={};var Lb,Mb,Nb=/^(?:toggle|show|hide)$/,Ob=new RegExp("^(?:([+-])=|)("+Q+")([a-z%]*)$","i"),Pb=/queueHooks$/,Qb=[Vb],Rb={"*":[function(a,b){var c=this.createTween(a,b),d=c.cur(),e=Ob.exec(b),f=e&&e[3]||(n.cssNumber[a]?"":"px"),g=(n.cssNumber[a]||"px"!==f&&+d)&&Ob.exec(n.css(c.elem,a)),h=1,i=20;if(g&&g[3]!==f){f=f||g[3],e=e||[],g=+d||1;do h=h||".5",g/=h,n.style(c.elem,a,g+f);while(h!==(h=c.cur()/d)&&1!==h&&--i)}return e&&(g=c.start=+g||+d||0,c.unit=f,c.end=e[1]?g+(e[1]+1)*e[2]:+e[2]),c}]};function Sb(){return setTimeout(function(){Lb=void 0}),Lb=n.now()}function Tb(a,b){var c,d=0,e={height:a};for(b=b?1:0;4>d;d+=2-b)c=R[d],e["margin"+c]=e["padding"+c]=a;return b&&(e.opacity=e.width=a),e}function Ub(a,b,c){for(var d,e=(Rb[b]||[]).concat(Rb["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function Vb(a,b,c){var d,e,f,g,h,i,j,k,l=this,m={},o=a.style,p=a.nodeType&&S(a),q=L.get(a,"fxshow");c.queue||(h=n._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,l.always(function(){l.always(function(){h.unqueued--,n.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[o.overflow,o.overflowX,o.overflowY],j=n.css(a,"display"),k="none"===j?L.get(a,"olddisplay")||tb(a.nodeName):j,"inline"===k&&"none"===n.css(a,"float")&&(o.display="inline-block")),c.overflow&&(o.overflow="hidden",l.always(function(){o.overflow=c.overflow[0],o.overflowX=c.overflow[1],o.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],Nb.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(p?"hide":"show")){if("show"!==e||!q||void 0===q[d])continue;p=!0}m[d]=q&&q[d]||n.style(a,d)}else j=void 0;if(n.isEmptyObject(m))"inline"===("none"===j?tb(a.nodeName):j)&&(o.display=j);else{q?"hidden"in q&&(p=q.hidden):q=L.access(a,"fxshow",{}),f&&(q.hidden=!p),p?n(a).show():l.done(function(){n(a).hide()}),l.done(function(){var b;L.remove(a,"fxshow");for(b in m)n.style(a,b,m[b])});for(d in m)g=Ub(p?q[d]:0,d,l),d in q||(q[d]=g.start,p&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function Wb(a,b){var c,d,e,f,g;for(c in a)if(d=n.camelCase(c),e=b[d],f=a[c],n.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=n.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function Xb(a,b,c){var d,e,f=0,g=Qb.length,h=n.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=Lb||Sb(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),1>f&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:n.extend({},b),opts:n.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:Lb||Sb(),duration:c.duration,tweens:[],createTween:function(b,c){var d=n.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;d>c;c++)j.tweens[c].run(1);return b?h.resolveWith(a,[j,b]):h.rejectWith(a,[j,b]),this}}),k=j.props;for(Wb(k,j.opts.specialEasing);g>f;f++)if(d=Qb[f].call(j,a,k,j.opts))return d;return n.map(k,Ub,j),n.isFunction(j.opts.start)&&j.opts.start.call(a,j),n.fx.timer(n.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}n.Animation=n.extend(Xb,{tweener:function(a,b){n.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");for(var c,d=0,e=a.length;e>d;d++)c=a[d],Rb[c]=Rb[c]||[],Rb[c].unshift(b)},prefilter:function(a,b){b?Qb.unshift(a):Qb.push(a)}}),n.speed=function(a,b,c){var d=a&&"object"==typeof a?n.extend({},a):{complete:c||!c&&b||n.isFunction(a)&&a,duration:a,easing:c&&b||b&&!n.isFunction(b)&&b};return d.duration=n.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in n.fx.speeds?n.fx.speeds[d.duration]:n.fx.speeds._default,(null==d.queue||d.queue===!0)&&(d.queue="fx"),d.old=d.complete,d.complete=function(){n.isFunction(d.old)&&d.old.call(this),d.queue&&n.dequeue(this,d.queue)},d},n.fn.extend({fadeTo:function(a,b,c,d){return this.filter(S).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=n.isEmptyObject(a),f=n.speed(b,c,d),g=function(){var b=Xb(this,n.extend({},a),f);(e||L.get(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=n.timers,g=L.get(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&Pb.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));(b||!c)&&n.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=L.get(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=n.timers,g=d?d.length:0;for(c.finish=!0,n.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),n.each(["toggle","show","hide"],function(a,b){var c=n.fn[b];n.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(Tb(b,!0),a,d,e)}}),n.each({slideDown:Tb("show"),slideUp:Tb("hide"),slideToggle:Tb("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){n.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),n.timers=[],n.fx.tick=function(){var a,b=0,c=n.timers;for(Lb=n.now();b<c.length;b++)a=c[b],a()||c[b]!==a||c.splice(b--,1);c.length||n.fx.stop(),Lb=void 0},n.fx.timer=function(a){n.timers.push(a),a()?n.fx.start():n.timers.pop()},n.fx.interval=13,n.fx.start=function(){Mb||(Mb=setInterval(n.fx.tick,n.fx.interval))},n.fx.stop=function(){clearInterval(Mb),Mb=null},n.fx.speeds={slow:600,fast:200,_default:400},n.fn.delay=function(a,b){return a=n.fx?n.fx.speeds[a]||a:a,b=b||"fx",this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},function(){var a=l.createElement("input"),b=l.createElement("select"),c=b.appendChild(l.createElement("option"));a.type="checkbox",k.checkOn=""!==a.value,k.optSelected=c.selected,b.disabled=!0,k.optDisabled=!c.disabled,a=l.createElement("input"),a.value="t",a.type="radio",k.radioValue="t"===a.value}();var Yb,Zb,$b=n.expr.attrHandle;n.fn.extend({attr:function(a,b){return J(this,n.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){n.removeAttr(this,a)})}}),n.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(a&&3!==f&&8!==f&&2!==f)return typeof a.getAttribute===U?n.prop(a,b,c):(1===f&&n.isXMLDoc(a)||(b=b.toLowerCase(),d=n.attrHooks[b]||(n.expr.match.bool.test(b)?Zb:Yb)),void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=n.find.attr(a,b),null==e?void 0:e):null!==c?d&&"set"in d&&void 0!==(e=d.set(a,c,b))?e:(a.setAttribute(b,c+""),c):void n.removeAttr(a,b)) +},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(E);if(f&&1===a.nodeType)while(c=f[e++])d=n.propFix[c]||c,n.expr.match.bool.test(c)&&(a[d]=!1),a.removeAttribute(c)},attrHooks:{type:{set:function(a,b){if(!k.radioValue&&"radio"===b&&n.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}}}),Zb={set:function(a,b,c){return b===!1?n.removeAttr(a,c):a.setAttribute(c,c),c}},n.each(n.expr.match.bool.source.match(/\w+/g),function(a,b){var c=$b[b]||n.find.attr;$b[b]=function(a,b,d){var e,f;return d||(f=$b[b],$b[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,$b[b]=f),e}});var _b=/^(?:input|select|textarea|button)$/i;n.fn.extend({prop:function(a,b){return J(this,n.prop,a,b,arguments.length>1)},removeProp:function(a){return this.each(function(){delete this[n.propFix[a]||a]})}}),n.extend({propFix:{"for":"htmlFor","class":"className"},prop:function(a,b,c){var d,e,f,g=a.nodeType;if(a&&3!==g&&8!==g&&2!==g)return f=1!==g||!n.isXMLDoc(a),f&&(b=n.propFix[b]||b,e=n.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){return a.hasAttribute("tabindex")||_b.test(a.nodeName)||a.href?a.tabIndex:-1}}}}),k.optSelected||(n.propHooks.selected={get:function(a){var b=a.parentNode;return b&&b.parentNode&&b.parentNode.selectedIndex,null}}),n.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){n.propFix[this.toLowerCase()]=this});var ac=/[\t\r\n\f]/g;n.fn.extend({addClass:function(a){var b,c,d,e,f,g,h="string"==typeof a&&a,i=0,j=this.length;if(n.isFunction(a))return this.each(function(b){n(this).addClass(a.call(this,b,this.className))});if(h)for(b=(a||"").match(E)||[];j>i;i++)if(c=this[i],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(ac," "):" ")){f=0;while(e=b[f++])d.indexOf(" "+e+" ")<0&&(d+=e+" ");g=n.trim(d),c.className!==g&&(c.className=g)}return this},removeClass:function(a){var b,c,d,e,f,g,h=0===arguments.length||"string"==typeof a&&a,i=0,j=this.length;if(n.isFunction(a))return this.each(function(b){n(this).removeClass(a.call(this,b,this.className))});if(h)for(b=(a||"").match(E)||[];j>i;i++)if(c=this[i],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(ac," "):"")){f=0;while(e=b[f++])while(d.indexOf(" "+e+" ")>=0)d=d.replace(" "+e+" "," ");g=a?n.trim(d):"",c.className!==g&&(c.className=g)}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):this.each(n.isFunction(a)?function(c){n(this).toggleClass(a.call(this,c,this.className,b),b)}:function(){if("string"===c){var b,d=0,e=n(this),f=a.match(E)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else(c===U||"boolean"===c)&&(this.className&&L.set(this,"__className__",this.className),this.className=this.className||a===!1?"":L.get(this,"__className__")||"")})},hasClass:function(a){for(var b=" "+a+" ",c=0,d=this.length;d>c;c++)if(1===this[c].nodeType&&(" "+this[c].className+" ").replace(ac," ").indexOf(b)>=0)return!0;return!1}});var bc=/\r/g;n.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=n.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,n(this).val()):a,null==e?e="":"number"==typeof e?e+="":n.isArray(e)&&(e=n.map(e,function(a){return null==a?"":a+""})),b=n.valHooks[this.type]||n.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=n.valHooks[e.type]||n.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(bc,""):null==c?"":c)}}}),n.extend({valHooks:{option:{get:function(a){var b=n.find.attr(a,"value");return null!=b?b:n.trim(n.text(a))}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type||0>e,g=f?null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],!(!c.selected&&i!==e||(k.optDisabled?c.disabled:null!==c.getAttribute("disabled"))||c.parentNode.disabled&&n.nodeName(c.parentNode,"optgroup"))){if(b=n(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=n.makeArray(b),g=e.length;while(g--)d=e[g],(d.selected=n.inArray(d.value,f)>=0)&&(c=!0);return c||(a.selectedIndex=-1),f}}}}),n.each(["radio","checkbox"],function(){n.valHooks[this]={set:function(a,b){return n.isArray(b)?a.checked=n.inArray(n(a).val(),b)>=0:void 0}},k.checkOn||(n.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})}),n.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){n.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),n.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}});var cc=n.now(),dc=/\?/;n.parseJSON=function(a){return JSON.parse(a+"")},n.parseXML=function(a){var b,c;if(!a||"string"!=typeof a)return null;try{c=new DOMParser,b=c.parseFromString(a,"text/xml")}catch(d){b=void 0}return(!b||b.getElementsByTagName("parsererror").length)&&n.error("Invalid XML: "+a),b};var ec=/#.*$/,fc=/([?&])_=[^&]*/,gc=/^(.*?):[ \t]*([^\r\n]*)$/gm,hc=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,ic=/^(?:GET|HEAD)$/,jc=/^\/\//,kc=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,lc={},mc={},nc="*/".concat("*"),oc=a.location.href,pc=kc.exec(oc.toLowerCase())||[];function qc(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(E)||[];if(n.isFunction(c))while(d=f[e++])"+"===d[0]?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function rc(a,b,c,d){var e={},f=a===mc;function g(h){var i;return e[h]=!0,n.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function sc(a,b){var c,d,e=n.ajaxSettings.flatOptions||{};for(c in b)void 0!==b[c]&&((e[c]?a:d||(d={}))[c]=b[c]);return d&&n.extend(!0,a,d),a}function tc(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===d&&(d=a.mimeType||b.getResponseHeader("Content-Type"));if(d)for(e in h)if(h[e]&&h[e].test(d)){i.unshift(e);break}if(i[0]in c)f=i[0];else{for(e in c){if(!i[0]||a.converters[e+" "+i[0]]){f=e;break}g||(g=e)}f=f||g}return f?(f!==i[0]&&i.unshift(f),c[f]):void 0}function uc(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}n.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:oc,type:"GET",isLocal:hc.test(pc[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":nc,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":n.parseJSON,"text xml":n.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?sc(sc(a,n.ajaxSettings),b):sc(n.ajaxSettings,a)},ajaxPrefilter:qc(lc),ajaxTransport:qc(mc),ajax:function(a,b){"object"==typeof a&&(b=a,a=void 0),b=b||{};var c,d,e,f,g,h,i,j,k=n.ajaxSetup({},b),l=k.context||k,m=k.context&&(l.nodeType||l.jquery)?n(l):n.event,o=n.Deferred(),p=n.Callbacks("once memory"),q=k.statusCode||{},r={},s={},t=0,u="canceled",v={readyState:0,getResponseHeader:function(a){var b;if(2===t){if(!f){f={};while(b=gc.exec(e))f[b[1].toLowerCase()]=b[2]}b=f[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===t?e:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return t||(a=s[c]=s[c]||a,r[a]=b),this},overrideMimeType:function(a){return t||(k.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>t)for(b in a)q[b]=[q[b],a[b]];else v.always(a[v.status]);return this},abort:function(a){var b=a||u;return c&&c.abort(b),x(0,b),this}};if(o.promise(v).complete=p.add,v.success=v.done,v.error=v.fail,k.url=((a||k.url||oc)+"").replace(ec,"").replace(jc,pc[1]+"//"),k.type=b.method||b.type||k.method||k.type,k.dataTypes=n.trim(k.dataType||"*").toLowerCase().match(E)||[""],null==k.crossDomain&&(h=kc.exec(k.url.toLowerCase()),k.crossDomain=!(!h||h[1]===pc[1]&&h[2]===pc[2]&&(h[3]||("http:"===h[1]?"80":"443"))===(pc[3]||("http:"===pc[1]?"80":"443")))),k.data&&k.processData&&"string"!=typeof k.data&&(k.data=n.param(k.data,k.traditional)),rc(lc,k,b,v),2===t)return v;i=n.event&&k.global,i&&0===n.active++&&n.event.trigger("ajaxStart"),k.type=k.type.toUpperCase(),k.hasContent=!ic.test(k.type),d=k.url,k.hasContent||(k.data&&(d=k.url+=(dc.test(d)?"&":"?")+k.data,delete k.data),k.cache===!1&&(k.url=fc.test(d)?d.replace(fc,"$1_="+cc++):d+(dc.test(d)?"&":"?")+"_="+cc++)),k.ifModified&&(n.lastModified[d]&&v.setRequestHeader("If-Modified-Since",n.lastModified[d]),n.etag[d]&&v.setRequestHeader("If-None-Match",n.etag[d])),(k.data&&k.hasContent&&k.contentType!==!1||b.contentType)&&v.setRequestHeader("Content-Type",k.contentType),v.setRequestHeader("Accept",k.dataTypes[0]&&k.accepts[k.dataTypes[0]]?k.accepts[k.dataTypes[0]]+("*"!==k.dataTypes[0]?", "+nc+"; q=0.01":""):k.accepts["*"]);for(j in k.headers)v.setRequestHeader(j,k.headers[j]);if(k.beforeSend&&(k.beforeSend.call(l,v,k)===!1||2===t))return v.abort();u="abort";for(j in{success:1,error:1,complete:1})v[j](k[j]);if(c=rc(mc,k,b,v)){v.readyState=1,i&&m.trigger("ajaxSend",[v,k]),k.async&&k.timeout>0&&(g=setTimeout(function(){v.abort("timeout")},k.timeout));try{t=1,c.send(r,x)}catch(w){if(!(2>t))throw w;x(-1,w)}}else x(-1,"No Transport");function x(a,b,f,h){var j,r,s,u,w,x=b;2!==t&&(t=2,g&&clearTimeout(g),c=void 0,e=h||"",v.readyState=a>0?4:0,j=a>=200&&300>a||304===a,f&&(u=tc(k,v,f)),u=uc(k,u,v,j),j?(k.ifModified&&(w=v.getResponseHeader("Last-Modified"),w&&(n.lastModified[d]=w),w=v.getResponseHeader("etag"),w&&(n.etag[d]=w)),204===a||"HEAD"===k.type?x="nocontent":304===a?x="notmodified":(x=u.state,r=u.data,s=u.error,j=!s)):(s=x,(a||!x)&&(x="error",0>a&&(a=0))),v.status=a,v.statusText=(b||x)+"",j?o.resolveWith(l,[r,x,v]):o.rejectWith(l,[v,x,s]),v.statusCode(q),q=void 0,i&&m.trigger(j?"ajaxSuccess":"ajaxError",[v,k,j?r:s]),p.fireWith(l,[v,x]),i&&(m.trigger("ajaxComplete",[v,k]),--n.active||n.event.trigger("ajaxStop")))}return v},getJSON:function(a,b,c){return n.get(a,b,c,"json")},getScript:function(a,b){return n.get(a,void 0,b,"script")}}),n.each(["get","post"],function(a,b){n[b]=function(a,c,d,e){return n.isFunction(c)&&(e=e||d,d=c,c=void 0),n.ajax({url:a,type:b,dataType:e,data:c,success:d})}}),n._evalUrl=function(a){return n.ajax({url:a,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})},n.fn.extend({wrapAll:function(a){var b;return n.isFunction(a)?this.each(function(b){n(this).wrapAll(a.call(this,b))}):(this[0]&&(b=n(a,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstElementChild)a=a.firstElementChild;return a}).append(this)),this)},wrapInner:function(a){return this.each(n.isFunction(a)?function(b){n(this).wrapInner(a.call(this,b))}:function(){var b=n(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=n.isFunction(a);return this.each(function(c){n(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){n.nodeName(this,"body")||n(this).replaceWith(this.childNodes)}).end()}}),n.expr.filters.hidden=function(a){return a.offsetWidth<=0&&a.offsetHeight<=0},n.expr.filters.visible=function(a){return!n.expr.filters.hidden(a)};var vc=/%20/g,wc=/\[\]$/,xc=/\r?\n/g,yc=/^(?:submit|button|image|reset|file)$/i,zc=/^(?:input|select|textarea|keygen)/i;function Ac(a,b,c,d){var e;if(n.isArray(b))n.each(b,function(b,e){c||wc.test(a)?d(a,e):Ac(a+"["+("object"==typeof e?b:"")+"]",e,c,d)});else if(c||"object"!==n.type(b))d(a,b);else for(e in b)Ac(a+"["+e+"]",b[e],c,d)}n.param=function(a,b){var c,d=[],e=function(a,b){b=n.isFunction(b)?b():null==b?"":b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(void 0===b&&(b=n.ajaxSettings&&n.ajaxSettings.traditional),n.isArray(a)||a.jquery&&!n.isPlainObject(a))n.each(a,function(){e(this.name,this.value)});else for(c in a)Ac(c,a[c],b,e);return d.join("&").replace(vc,"+")},n.fn.extend({serialize:function(){return n.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=n.prop(this,"elements");return a?n.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!n(this).is(":disabled")&&zc.test(this.nodeName)&&!yc.test(a)&&(this.checked||!T.test(a))}).map(function(a,b){var c=n(this).val();return null==c?null:n.isArray(c)?n.map(c,function(a){return{name:b.name,value:a.replace(xc,"\r\n")}}):{name:b.name,value:c.replace(xc,"\r\n")}}).get()}}),n.ajaxSettings.xhr=function(){try{return new XMLHttpRequest}catch(a){}};var Bc=0,Cc={},Dc={0:200,1223:204},Ec=n.ajaxSettings.xhr();a.attachEvent&&a.attachEvent("onunload",function(){for(var a in Cc)Cc[a]()}),k.cors=!!Ec&&"withCredentials"in Ec,k.ajax=Ec=!!Ec,n.ajaxTransport(function(a){var b;return k.cors||Ec&&!a.crossDomain?{send:function(c,d){var e,f=a.xhr(),g=++Bc;if(f.open(a.type,a.url,a.async,a.username,a.password),a.xhrFields)for(e in a.xhrFields)f[e]=a.xhrFields[e];a.mimeType&&f.overrideMimeType&&f.overrideMimeType(a.mimeType),a.crossDomain||c["X-Requested-With"]||(c["X-Requested-With"]="XMLHttpRequest");for(e in c)f.setRequestHeader(e,c[e]);b=function(a){return function(){b&&(delete Cc[g],b=f.onload=f.onerror=null,"abort"===a?f.abort():"error"===a?d(f.status,f.statusText):d(Dc[f.status]||f.status,f.statusText,"string"==typeof f.responseText?{text:f.responseText}:void 0,f.getAllResponseHeaders()))}},f.onload=b(),f.onerror=b("error"),b=Cc[g]=b("abort");try{f.send(a.hasContent&&a.data||null)}catch(h){if(b)throw h}},abort:function(){b&&b()}}:void 0}),n.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(a){return n.globalEval(a),a}}}),n.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET")}),n.ajaxTransport("script",function(a){if(a.crossDomain){var b,c;return{send:function(d,e){b=n("<script>").prop({async:!0,charset:a.scriptCharset,src:a.url}).on("load error",c=function(a){b.remove(),c=null,a&&e("error"===a.type?404:200,a.type)}),l.head.appendChild(b[0])},abort:function(){c&&c()}}}});var Fc=[],Gc=/(=)\?(?=&|$)|\?\?/;n.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=Fc.pop()||n.expando+"_"+cc++;return this[a]=!0,a}}),n.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(Gc.test(b.url)?"url":"string"==typeof b.data&&!(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&Gc.test(b.data)&&"data");return h||"jsonp"===b.dataTypes[0]?(e=b.jsonpCallback=n.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(Gc,"$1"+e):b.jsonp!==!1&&(b.url+=(dc.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||n.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,Fc.push(e)),g&&n.isFunction(f)&&f(g[0]),g=f=void 0}),"script"):void 0}),n.parseHTML=function(a,b,c){if(!a||"string"!=typeof a)return null;"boolean"==typeof b&&(c=b,b=!1),b=b||l;var d=v.exec(a),e=!c&&[];return d?[b.createElement(d[1])]:(d=n.buildFragment([a],b,e),e&&e.length&&n(e).remove(),n.merge([],d.childNodes))};var Hc=n.fn.load;n.fn.load=function(a,b,c){if("string"!=typeof a&&Hc)return Hc.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(" ");return h>=0&&(d=n.trim(a.slice(h)),a=a.slice(0,h)),n.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(e="POST"),g.length>0&&n.ajax({url:a,type:e,dataType:"html",data:b}).done(function(a){f=arguments,g.html(d?n("<div>").append(n.parseHTML(a)).find(d):a)}).complete(c&&function(a,b){g.each(c,f||[a.responseText,b,a])}),this},n.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){n.fn[b]=function(a){return this.on(b,a)}}),n.expr.filters.animated=function(a){return n.grep(n.timers,function(b){return a===b.elem}).length};var Ic=a.document.documentElement;function Jc(a){return n.isWindow(a)?a:9===a.nodeType&&a.defaultView}n.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=n.css(a,"position"),l=n(a),m={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=n.css(a,"top"),i=n.css(a,"left"),j=("absolute"===k||"fixed"===k)&&(f+i).indexOf("auto")>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),n.isFunction(b)&&(b=b.call(a,c,h)),null!=b.top&&(m.top=b.top-h.top+g),null!=b.left&&(m.left=b.left-h.left+e),"using"in b?b.using.call(a,m):l.css(m)}},n.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){n.offset.setOffset(this,a,b)});var b,c,d=this[0],e={top:0,left:0},f=d&&d.ownerDocument;if(f)return b=f.documentElement,n.contains(b,d)?(typeof d.getBoundingClientRect!==U&&(e=d.getBoundingClientRect()),c=Jc(f),{top:e.top+c.pageYOffset-b.clientTop,left:e.left+c.pageXOffset-b.clientLeft}):e},position:function(){if(this[0]){var a,b,c=this[0],d={top:0,left:0};return"fixed"===n.css(c,"position")?b=c.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),n.nodeName(a[0],"html")||(d=a.offset()),d.top+=n.css(a[0],"borderTopWidth",!0),d.left+=n.css(a[0],"borderLeftWidth",!0)),{top:b.top-d.top-n.css(c,"marginTop",!0),left:b.left-d.left-n.css(c,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||Ic;while(a&&!n.nodeName(a,"html")&&"static"===n.css(a,"position"))a=a.offsetParent;return a||Ic})}}),n.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(b,c){var d="pageYOffset"===c;n.fn[b]=function(e){return J(this,function(b,e,f){var g=Jc(b);return void 0===f?g?g[c]:b[e]:void(g?g.scrollTo(d?a.pageXOffset:f,d?f:a.pageYOffset):b[e]=f)},b,e,arguments.length,null)}}),n.each(["top","left"],function(a,b){n.cssHooks[b]=yb(k.pixelPosition,function(a,c){return c?(c=xb(a,b),vb.test(c)?n(a).position()[b]+"px":c):void 0})}),n.each({Height:"height",Width:"width"},function(a,b){n.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){n.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return J(this,function(b,c,d){var e;return n.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?n.css(b,c,g):n.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),n.fn.size=function(){return this.length},n.fn.andSelf=n.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return n});var Kc=a.jQuery,Lc=a.$;return n.noConflict=function(b){return a.$===n&&(a.$=Lc),b&&a.jQuery===n&&(a.jQuery=Kc),n},typeof b===U&&(a.jQuery=a.$=n),n}); \ No newline at end of file From 94bebf31ac063f87d659fb868334a8599619f4a9 Mon Sep 17 00:00:00 2001 From: Scott Lahteine <sourcetree@thinkyhead.com> Date: Thu, 5 Feb 2015 19:30:11 -0800 Subject: [PATCH 07/41] Pre-collect info about options on field init - When initializing fields use the configuration to determine the format - Cache the line for each option for fastest string compare / replace - Add logging levels for debugging --- Marlin/configurator/index.html | 9 + Marlin/configurator/js/configurator.js | 224 ++++++++++++++++++------- 2 files changed, 176 insertions(+), 57 deletions(-) diff --git a/Marlin/configurator/index.html b/Marlin/configurator/index.html index 65299e3a22..aa2c106a69 100644 --- a/Marlin/configurator/index.html +++ b/Marlin/configurator/index.html @@ -48,6 +48,15 @@ <label class="newline">Temp Sensor 2:</label><select name="TEMP_SENSOR_2"></select> <label class="newline">Bed Temp Sensor:</label><select name="TEMP_SENSOR_BED"></select> + <label class="newline">Redundant Sensor:</label> + <input name="TEMP_SENSOR_1_AS_REDUNDANT" type="checkbox" value="1" checked /> + + <label>Max Diff:</label> + <input name="MAX_REDUNDANT_TEMP_SENSOR_DIFF" type="text" size="3" maxlength="2" /> + + <label class="newline">Temp Residency Time (s):</label> + <input name="TEMP_RESIDENCY_TIME" type="text" size="3" maxlength="2" /> + <h2>Marlin/Configuration.h</h2> <pre id="config_text" class="prettyprint linenums"></pre> <h2>Marlin/Configuration_adv.h</h2> diff --git a/Marlin/configurator/js/configurator.js b/Marlin/configurator/js/configurator.js index dfd91119d5..30ca5ef3a6 100644 --- a/Marlin/configurator/js/configurator.js +++ b/Marlin/configurator/js/configurator.js @@ -34,6 +34,10 @@ String.prototype.zeroPad = function(len) { return len ? this.prePad(len, '0') : this; }; +String.prototype.regEsc = function() { + return this.replace(/[.?*+^$[\]\\(){}|-]/g, "\\$&"); +} + /** * selectField.addOptions takes an array or keyed object */ @@ -66,6 +70,7 @@ var configuratorApp = (function(){ // Return this anonymous object as configuratorApp return { my_public_var: 4, + logging: 1, init: function() { self = this; // a 'this' for use when 'this' is something else @@ -74,7 +79,7 @@ var configuratorApp = (function(){ var $uploader = $('#file-upload'); var fileUploader = new BinaryFileUploader({ element: $uploader[0], - onFileLoad: function(file) { console.log(this); self.handleFileLoad(file, $uploader); } + onFileLoad: function(file) { self.handleFileLoad(file, $uploader); } }); if (!fileUploader.hasFileUploaderSupport()) alert('Your browser doesn\'t support the file reading API'); @@ -107,6 +112,7 @@ var configuratorApp = (function(){ success: function(txt) { // File contents into the textarea $config.text(txt); + // Get thermistor info too self.initThermistorsFromText(txt); }, error: errFunc @@ -130,7 +136,7 @@ var configuratorApp = (function(){ initBoardsFromText: function(txt) { boards_list = {}; - var r, findDef = new RegExp('[ \\t]*#define[ \\t]+(BOARD_[^ \\t]+)[ \\t]+(\\d+)[ \\t]*(//[ \\t]*)?(.+)?', 'gm'); + var r, findDef = new RegExp('[ \\t]*#define[ \\t]+(BOARD_[\\w_]+)[ \\t]+(\\d+)[ \\t]*(//[ \\t]*)?(.+)?', 'gm'); while((r = findDef.exec(txt)) !== null) { boards_list[r[1]] = r[2].prePad(3, ' ') + " — " + r[4].replace(/\).*/, ')'); } @@ -165,7 +171,7 @@ var configuratorApp = (function(){ this.initField('MOTHERBOARD'); break; default: - console.log("Can't parse "+filename); + this.log("Can't parse "+filename, 1); break; } }, @@ -247,6 +253,10 @@ var configuratorApp = (function(){ this.initField('TEMP_SENSOR_2'); this.initField('TEMP_SENSOR_BED'); + this.initField('TEMP_SENSOR_1_AS_REDUNDANT'); + this.initField('MAX_REDUNDANT_TEMP_SENSOR_DIFF'); + + this.initField('TEMP_RESIDENCY_TIME'); $('#serial_stepper').jstepper({ min: 0, @@ -266,58 +276,108 @@ var configuratorApp = (function(){ // prettyPrint(); }, + /** + * initField - make a field responsive and get info + * about its configuration file define + */ initField: function(name) { - var $elm = $('#'+name), isText = $elm.attr('type') == 'text'; + var $elm = $('#'+name), elm = $elm[0]; + if (elm.configInfo === undefined) { + elm.configInfo = this.getDefineInfo(name); + $elm.on($elm.attr('type') == 'text' ? 'input' : 'change', this.handleChange); + } this.setFieldFromDefine(name); - isText ? $elm.bind('input', this.handleChange) : $elm.change(this.handleChange) }, handleChange: function(e) { - self.updateDefineForField(e.target); + self.updateDefineForField(e.target.id); }, handleSwitch: function(e) { var $elm = $(e.target), $prev = $elm.prev(); var on = $elm.prop('checked') || false; $prev.attr('disabled', !on); - self.setDefineEnabled($prev[0], on); + self.setDefineEnabled($prev[0].id, on); }, - setDefineEnabled: function(elm, val) { - var $elm = $(elm); + setDefineEnabled: function(name, val) { + this.log('setDefineEnabled:'+name,3); - // console.log("Enable: " + elm.id + " = " + val); + var $elm = $('#'+name), elm = $elm[0], inf = elm.configInfo; + var $c = $config; // for now + var txt = $c.text(); - var txt = $config.text(); + var slash = val ? '' : '// '; + var newline = inf.line + .replace(/^([ \t]*)(\/\/)([ \t]*)/, '$1$3') // remove slashes + .replace('#define', slash + '#define'); // add them back - var findDef = new RegExp('^[ \\t]*(//[ \\t]*)?(#define[ \\t]+' + elm.id + '([ \\t].*)?)$', 'm'); - txt = txt.replace(findDef, val ? '$2': '//$2'); + txt = txt.replace(inf.line, newline); + inf.line = newline; + this.log(newline, 2); - // Now set the text in the field - $config.text(txt); + $c.text(txt); }, - updateDefineForField: function(elm) { - var $elm = $(elm), - isCheck = $elm.attr('type') == 'checkbox', + defineIsEnabled: function(name, adv) { + this.log('defineIsEnabled:'+name,4); + var $elm = $('#'+name), elm = $elm[0]; + var $c = adv ? $config_adv : $config; + + var result = elm.configInfo.regex.exec($c.text()); + this.log(result,2); + + var on = result !== null ? result[1].trim() != '//' : true; + this.log(name + ' = ' + on, 4); + + return on; + }, + + updateDefineForField: function(name, adv) { + this.log('updateDefineForField:'+name,4); + var $elm = $('#'+name), elm = $elm[0], inf = elm.configInfo; + var $c = adv ? $config_adv : $config; + var txt = $c.text(); + + // var result = inf.repl.exec(txt); + // this.log(result, 2); + + var isCheck = $elm.attr('type') == 'checkbox', val = isCheck ? $elm.prop('checked') : $elm.val(); - // console.log("Set: " + elm.id + " = " + val); - - var txt = $config.text(); - - if (isCheck) { - var findDef = new RegExp('^([ \\t]*)(//[ \\t]*)?(#define[ \\t]+' + elm.id + '([ \\t].*)?)$', 'm'); - txt = txt.replace(findDef, val ? '$1$3': '$1//$3'); + var newline; + switch(inf.type) { + case 'switch': + var slash = val ? '' : '//'; + newline = (inf.pre + slash + inf.define + inf.post); + break; + case 'quoted': + if (isCheck) { + this.log(name + ' should not be a checkbox', 1); + var slash = val ? '' : '//'; + newline = (inf.pre + slash + inf.define + '"'+val+'"' + inf.post); + } + else { + newline = inf.pre + inf.define + '"'+val+'"' + inf.post; + } + break; + case 'plain': + if (isCheck) { + this.log(name + ' should not be a checkbox', 1); + var slash = val ? '' : '//'; + newline = (inf.pre + slash + inf.define + val + inf.post); + } + else { + newline = inf.pre + inf.define + val + inf.post; + } + break; } - else { - // Match the define name, 1 = "#define name ", 3=value, 4=comment - var findDef = new RegExp('^([ \\t]*(//)?[ \\t]*#define[ \\t]+' + elm.id + '[ \\t]+)(.*)([ \\t]*(//)?.*)$', 'm'); - if ($elm.hasClass('quote')) val = '"' + val + '"' - txt = txt.replace(findDef, '$1!!REGEXP!!$4').replace('!!REGEXP!!', val); - } - // Now set the text in the field - $config.text(txt); + + txt = txt.replace(inf.line, newline); + inf.line = newline; + this.log(newline, 2); + + $c.text(txt); }, setFieldFromDefine: function(name, adv) { @@ -325,6 +385,8 @@ var configuratorApp = (function(){ var isCheck = $elm.attr('type') == 'checkbox'; var val = this.defineValue(name, adv); + this.log('setFieldFromDefine:' + name + ' to ' + val, 4); + isCheck ? $elm.prop('checked', val) : $elm.val("" + val); // If the item has a checkbox then set enabled state too @@ -336,40 +398,88 @@ var configuratorApp = (function(){ } }, - defineValue: function(name, adv) { + getDefineInfo: function(name, adv) { + this.log('getDefineInfo:'+name,4); var $elm = $('#'+name), elm = $elm[0]; var $c = adv ? $config_adv : $config; - if ($elm.attr('type') == 'checkbox') { - // maybe spaces, maybe comment, #define, spaces, name, maybe a comment - var findDef = new RegExp('^[ \\t]*(//[ \\t]*)?(#define[ \\t]+' + elm.id + '([ \\t]*(//)?.*)?)$', 'm'); - var result = findDef.exec($c.text()); - return (result ? result[1] == undefined || result[1].trim() != '//' : false); + + // a switch line with no value + var findDef = new RegExp('^(.*//)?(.*#define[ \\t]+' + elm.id + ')([ \\t]*/[*/].*)?$', 'm'); + var result = findDef.exec($c.text()); + if (result !== null) { + var info = { + type: 'switch', + line: result[0], // whole line + pre: result[1] === undefined ? '' : result[1].replace('//',''), + define: result[2], + post: result[3] === undefined ? '' : result[3] + }; + info.regex = new RegExp('(.*//)?(.*' + info.define.regEsc() + info.post.regEsc() + ')', 'm'); + info.repl = info.regex; + this.log(info,2); + return info; } - else { - // maybe spaces, maybe comment, #define, spaces, name, one or more spaces, value, maybe a comment - var findDef = new RegExp('^([ \\t]*(//[ \\t]*)?#define[ \\t]+' + elm.id + '[ \\t]+)(.*)([ \\t]*(//)?.*)$', 'm'); - var result = findDef.exec($c.text()); - if (result !== null) { - var val = result[3]; - if (val.search(/^".*"$/) >= 0) $elm.addClass('quote'); - if ($elm.hasClass('quote')) val = val.replace(/^"(.*)"$/, '$1'); - return val; - } - return 'fail'; + + // a define with quotes + findDef = new RegExp('^(.*//)?(.*#define[ \\t]+' + elm.id + '[ \\t]+)("[^"]*")([ \\t]*/[*/].*)?$', 'm'); + result = findDef.exec($c.text()); + if (result !== null) { + var info = { + type: 'quoted', + line: result[0], + pre: result[1] === undefined ? '' : result[1].replace('//',''), + define: result[2], + post: result[4] === undefined ? '' : result[4] + }; + info.regex = new RegExp('(.*//)?.*' + info.define.regEsc() + '"([^"]*)"' + info.post.regEsc(), 'm'); + info.repl = new RegExp('((.*//)?.*' + info.define.regEsc() + '")[^"]*("' + info.post.regEsc() + ')', 'm'); + this.log(info,2); + return info; + } + + // a define with no quotes + findDef = new RegExp('^(.*//)?(.*#define[ \\t]+' + elm.id + '[ \\t]+)(\\S*)([ \\t]*/[*/].*)?$', 'm'); + result = findDef.exec($c.text()); + if (result !== null) { + var info = { + type: 'plain', + line: result[0], + pre: result[1] === undefined ? '' : result[1].replace('//',''), + define: result[2], + post: result[4] === undefined ? '' : result[4] + }; + info.regex = new RegExp('(.*//)?.*' + info.define.regEsc() + '(\\S*)' + info.post.regEsc(), 'm'); + info.repl = new RegExp('((.*//)?.*' + info.define.regEsc() + ')\\S*(' + info.post.regEsc() + ')', 'm'); + this.log(info,2); + return info; + } + + return null; + }, + + defineValue: function(name, adv) { + this.log('defineValue:'+name,4); + var $elm = $('#'+name), elm = $elm[0]; + var $c = adv ? $config_adv : $config; + var inf = elm.configInfo; + + var result = inf.regex.exec($c.text()); + this.log(result,2); + switch(inf.type) { + case 'switch': return result[1] != '//'; + case 'quoted': return result[2]; + case 'plain': return result[2]; } }, - defineIsEnabled: function(name, adv) { - var $elm = $('#'+name); - var $c = adv ? $config_adv : $config; - var findDef = new RegExp('^[ \\t]*(//[ \\t]*)?(#define[ \\t]+' + name + '([ \\t]*(//)?.*)?)$', 'm'); - var result = findDef.exec($c.text()); - return (result ? result[1].trim() != '//' : false); + log: function(o,l) { + if (l === undefined) l = 0; + if (this.logging>=l*1) console.log(o); }, logOnce: function(o) { if (typeof o.didLogThisObject === 'undefined') { - console.log(o); + this.log(o); o.didLogThisObject = true; } }, From 56769ba4f84a1adf20b96c83469f34d3c0c5e5b3 Mon Sep 17 00:00:00 2001 From: Scott Lahteine <sourcetree@thinkyhead.com> Date: Thu, 5 Feb 2015 19:39:42 -0800 Subject: [PATCH 08/41] Make comment/uncomment a little neater --- Marlin/configurator/js/configurator.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Marlin/configurator/js/configurator.js b/Marlin/configurator/js/configurator.js index 30ca5ef3a6..dd7de6f8e1 100644 --- a/Marlin/configurator/js/configurator.js +++ b/Marlin/configurator/js/configurator.js @@ -307,10 +307,10 @@ var configuratorApp = (function(){ var $c = $config; // for now var txt = $c.text(); - var slash = val ? '' : '// '; + var slash = val ? '' : '//'; var newline = inf.line .replace(/^([ \t]*)(\/\/)([ \t]*)/, '$1$3') // remove slashes - .replace('#define', slash + '#define'); // add them back + .replace(inf.pre+inf.define, inf.pre+slash+inf.define); // add them back txt = txt.replace(inf.line, newline); inf.line = newline; From b51204cc1c67100e38efbf223a70151a7a2f9b06 Mon Sep 17 00:00:00 2001 From: Scott Lahteine <sourcetree@thinkyhead.com> Date: Thu, 5 Feb 2015 20:28:39 -0800 Subject: [PATCH 09/41] Add fieldsets and make them into tabs --- Marlin/configurator/css/configurator.css | 34 +++++++++++++++- Marlin/configurator/index.html | 51 ++++++++++++++---------- Marlin/configurator/js/configurator.js | 24 +++++++++++ 3 files changed, 86 insertions(+), 23 deletions(-) diff --git a/Marlin/configurator/css/configurator.css b/Marlin/configurator/css/configurator.css index 2409508e6a..418000deee 100644 --- a/Marlin/configurator/css/configurator.css +++ b/Marlin/configurator/css/configurator.css @@ -12,7 +12,7 @@ p { width: 80%; color: #FF0; } #help strong { color: #0DD; } img { display: none; } label, input, select, textarea { display: block; float: left; margin: 1px 0; } -label.newline, textarea { clear: both; } +label.newline, textarea, fieldset { clear: both; } label { width: 130px; height: 1em; padding: 10px 480px 10px 1em; margin-right: -470px; text-align: right; } input[type="text"], select { margin: 0.75em 0 0; } input[type="checkbox"], input[type="radio"], input[type="file"] { margin: 1em 0 0; } @@ -25,4 +25,34 @@ input:disabled { color: #BBB; } h1, h2, h3, h4, h5, h6 { clear: both; } h2 { margin: 0; padding: 1em 0 0; } #serial_stepper { padding-top: 0.75em; display: block; float: left; } -#SERIAL_PORT { display: none; } \ No newline at end of file +#SERIAL_PORT { display: none; } + +ul.tabs { display: inline; list-style: none; } +ul.tabs li { display: inline; } +ul.tabs li a, +ul.tabs li a.active:hover, +ul.tabs li a.active:active { + display: block; + float: left; + background: #666; + color: #CCC; + font-size: 150%; + border-radius: 0.25em 0.25em 0 0; + margin: 0 4px 0 0; + padding: 2px 4px; + text-decoration: none; + } +ul.tabs li a.active:link, +ul.tabs li a.active:visited { + background: #DDD; + color: #900; + cursor: default; + } +ul.tabs li a:hover, +ul.tabs li a:active { + background: #777; + color: #DDD; + } + +fieldset { display: none; border: 1px solid #AAA; border-radius: 1em; } +fieldset legend { display: none; } diff --git a/Marlin/configurator/index.html b/Marlin/configurator/index.html index aa2c106a69..66be7514c6 100644 --- a/Marlin/configurator/index.html +++ b/Marlin/configurator/index.html @@ -19,43 +19,52 @@ <li><strong>HELP</strong> - This is the help region</li> </ul> + <div id="tabs"></div> + <form id="config_form"> <label>Drop Files Here:</label><input type="file" id="file-upload" /> - <label class="newline">Serial Port:</label><select name="SERIAL_PORT"></select><div id="serial_stepper"></div> + <fieldset id="machine"> + <legend>Machine</legend> - <label>Baud Rate:</label><select name="BAUDRATE"></select> + <label class="newline">Serial Port:</label><select name="SERIAL_PORT"></select><div id="serial_stepper"></div> - <label>AT90USB BT IF:</label> - <input name="BTENABLED" type="checkbox" value="1" checked /> + <label>Baud Rate:</label><select name="BAUDRATE"></select> - <label class="newline">Motherboard:</label><select name="MOTHERBOARD"></select> + <label>AT90USB BT IF:</label> + <input name="BTENABLED" type="checkbox" value="1" checked /> - <label class="newline">Custom Name:</label><input name="CUSTOM_MENDEL_NAME" class="switchable" type="text" size="14" maxlength="12" value="" /> + <label class="newline">Motherboard:</label><select name="MOTHERBOARD"></select> - <label class="newline">Machine UUID:</label><input name="MACHINE_UUID" class="switchable" type="text" size="38" maxlength="36" value="" /> + <label class="newline">Custom Name:</label><input name="CUSTOM_MENDEL_NAME" class="switchable" type="text" size="14" maxlength="12" value="" /> - <label class="newline">Extruders:</label><select name="EXTRUDERS"></select> + <label class="newline">Machine UUID:</label><input name="MACHINE_UUID" class="switchable" type="text" size="38" maxlength="36" value="" /> - <label class="newline">Power Supply:</label><select name="POWER_SUPPLY"></select> + <label class="newline">Extruders:</label><select name="EXTRUDERS"></select> - <label>PS Default Off:</label> - <input name="PS_DEFAULT_OFF" type="checkbox" value="1" checked /> + <label class="newline">Power Supply:</label><select name="POWER_SUPPLY"></select> - <label class="newline">Temp Sensor 0:</label><select name="TEMP_SENSOR_0"></select> - <label class="newline">Temp Sensor 1:</label><select name="TEMP_SENSOR_1"></select> - <label class="newline">Temp Sensor 2:</label><select name="TEMP_SENSOR_2"></select> - <label class="newline">Bed Temp Sensor:</label><select name="TEMP_SENSOR_BED"></select> + <label>PS Default Off:</label> + <input name="PS_DEFAULT_OFF" type="checkbox" value="1" checked /> + </fieldset> - <label class="newline">Redundant Sensor:</label> - <input name="TEMP_SENSOR_1_AS_REDUNDANT" type="checkbox" value="1" checked /> + <fieldset id="temperature"> + <legend>Temperature</legend> + <label class="newline">Temp Sensor 0:</label><select name="TEMP_SENSOR_0"></select> + <label class="newline">Temp Sensor 1:</label><select name="TEMP_SENSOR_1"></select> + <label class="newline">Temp Sensor 2:</label><select name="TEMP_SENSOR_2"></select> + <label class="newline">Bed Temp Sensor:</label><select name="TEMP_SENSOR_BED"></select> - <label>Max Diff:</label> - <input name="MAX_REDUNDANT_TEMP_SENSOR_DIFF" type="text" size="3" maxlength="2" /> + <label class="newline">Redundant Sensor:</label> + <input name="TEMP_SENSOR_1_AS_REDUNDANT" type="checkbox" value="1" checked /> - <label class="newline">Temp Residency Time (s):</label> - <input name="TEMP_RESIDENCY_TIME" type="text" size="3" maxlength="2" /> + <label>Max Diff:</label> + <input name="MAX_REDUNDANT_TEMP_SENSOR_DIFF" type="text" size="3" maxlength="2" /> + + <label class="newline">Temp Residency Time (s):</label> + <input name="TEMP_RESIDENCY_TIME" type="text" size="3" maxlength="2" /> + </fieldset> <h2>Marlin/Configuration.h</h2> <pre id="config_text" class="prettyprint linenums"></pre> diff --git a/Marlin/configurator/js/configurator.js b/Marlin/configurator/js/configurator.js index dd7de6f8e1..2dfa2d2178 100644 --- a/Marlin/configurator/js/configurator.js +++ b/Marlin/configurator/js/configurator.js @@ -75,6 +75,30 @@ var configuratorApp = (function(){ init: function() { self = this; // a 'this' for use when 'this' is something else + // Make tabs for the fieldsets + var $fset = $('#config_form fieldset'); + var $tabs = $('<ul>',{class:'tabs'}), ind = 1; + $('#config_form fieldset').each(function(){ + var tabID = 'TAB'+ind; + $(this).addClass(tabID); + var $leg = $(this).find('legend'); + var $link = $('<a>',{href:'#'+ind,id:tabID}).text($leg.text()); + $tabs.append($('<li>').append($link)); + $link.click(function(e){ + e.preventDefault; + var ind = this.id; + $tabs.find('.active').removeClass('active'); + $(this).addClass('active'); + $fset.hide(); + $fset.filter('.'+this.id).show(); + return false; + }); + ind++; + }); + $tabs.appendTo('#tabs'); + $('<br>',{class:'clear'}).appendTo('#tabs'); + $tabs.find('a:first').trigger('click'); + // Make a droppable file uploader var $uploader = $('#file-upload'); var fileUploader = new BinaryFileUploader({ From 4d341bb758a2a954991119c073ad27545bff3764 Mon Sep 17 00:00:00 2001 From: Scott Lahteine <sourcetree@thinkyhead.com> Date: Fri, 6 Feb 2015 14:58:47 -0800 Subject: [PATCH 10/41] Copy configs into subfolder Browsers may not want to load files outside the folder, but they may be okay with these relative references within the folder. --- Marlin/configurator/config/Configuration.h | 828 ++++++++++++++++++ .../configurator/config/Configuration_adv.h | 535 +++++++++++ Marlin/configurator/config/boards.h | 59 ++ Marlin/configurator/css/configurator.css | 4 +- Marlin/configurator/index.html | 5 +- Marlin/configurator/js/configurator.js | 3 +- 6 files changed, 1426 insertions(+), 8 deletions(-) create mode 100644 Marlin/configurator/config/Configuration.h create mode 100644 Marlin/configurator/config/Configuration_adv.h create mode 100644 Marlin/configurator/config/boards.h diff --git a/Marlin/configurator/config/Configuration.h b/Marlin/configurator/config/Configuration.h new file mode 100644 index 0000000000..770c86eb1e --- /dev/null +++ b/Marlin/configurator/config/Configuration.h @@ -0,0 +1,828 @@ +#ifndef CONFIGURATION_H +#define CONFIGURATION_H + +#include "boards.h" + +//=========================================================================== +//============================= Getting Started ============================= +//=========================================================================== +/* +Here are some standard links for getting your machine calibrated: + * http://reprap.org/wiki/Calibration + * http://youtu.be/wAL9d7FgInk + * http://calculator.josefprusa.cz + * http://reprap.org/wiki/Triffid_Hunter%27s_Calibration_Guide + * http://www.thingiverse.com/thing:5573 + * https://sites.google.com/site/repraplogphase/calibration-of-your-reprap + * http://www.thingiverse.com/thing:298812 +*/ + +// This configuration file contains the basic settings. +// Advanced settings can be found in Configuration_adv.h +// BASIC SETTINGS: select your board type, temperature sensor type, axis scaling, and endstop configuration + +//=========================================================================== +//============================= DELTA Printer =============================== +//=========================================================================== +// For a Delta printer replace the configuration files with the files in the +// example_configurations/delta directory. +// + +//=========================================================================== +//============================= SCARA Printer =============================== +//=========================================================================== +// For a Delta printer replace the configuration files with the files in the +// example_configurations/SCARA directory. +// + +// User-specified version info of this build to display in [Pronterface, etc] terminal window during +// startup. Implementation of an idea by Prof Braino to inform user that any changes made to this +// build by the user have been successfully uploaded into firmware. +#define STRING_VERSION "1.0.2" +#define STRING_URL "reprap.org" +#define STRING_VERSION_CONFIG_H __DATE__ " " __TIME__ // build date and time +#define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes. +#define STRING_SPLASH_LINE1 "v" STRING_VERSION // will be shown during bootup in line 1 +//#define STRING_SPLASH_LINE2 STRING_VERSION_CONFIG_H // will be shown during bootup in line2 + +// SERIAL_PORT selects which serial port should be used for communication with the host. +// This allows the connection of wireless adapters (for instance) to non-default port pins. +// Serial port 0 is still used by the Arduino bootloader regardless of this setting. +#define SERIAL_PORT 0 + +// This determines the communication speed of the printer +#define BAUDRATE 250000 + +// This enables the serial port associated to the Bluetooth interface +//#define BTENABLED // Enable BT interface on AT90USB devices + +// The following define selects which electronics board you have. +// Please choose the name from boards.h that matches your setup +#ifndef MOTHERBOARD + #define MOTHERBOARD BOARD_ULTIMAKER +#endif + +// Define this to set a custom name for your generic Mendel, +// #define CUSTOM_MENDEL_NAME "This Mendel" + +// Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines) +// You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4) +// #define MACHINE_UUID "00000000-0000-0000-0000-000000000000" + +// This defines the number of extruders +#define EXTRUDERS 1 + +//// The following define selects which power supply you have. Please choose the one that matches your setup +// 1 = ATX +// 2 = X-Box 360 203Watts (the blue wire connected to PS_ON and the red wire to VCC) + +#define POWER_SUPPLY 1 + +// Define this to have the electronics keep the power supply off on startup. If you don't know what this is leave it. +// #define PS_DEFAULT_OFF + +//=========================================================================== +//============================= Thermal Settings ============================ +//=========================================================================== +// +//--NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table +// +//// Temperature sensor settings: +// -2 is thermocouple with MAX6675 (only for sensor 0) +// -1 is thermocouple with AD595 +// 0 is not used +// 1 is 100k thermistor - best choice for EPCOS 100k (4.7k pullup) +// 2 is 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup) +// 3 is Mendel-parts thermistor (4.7k pullup) +// 4 is 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !! +// 5 is 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup) +// 6 is 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup) +// 7 is 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup) +// 71 is 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup) +// 8 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) +// 9 is 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup) +// 10 is 100k RS thermistor 198-961 (4.7k pullup) +// 11 is 100k beta 3950 1% thermistor (4.7k pullup) +// 12 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed) +// 13 is 100k Hisens 3950 1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE" +// 20 is the PT100 circuit found in the Ultimainboard V2.x +// 60 is 100k Maker's Tool Works Kapton Bed Thermistor beta=3950 +// +// 1k ohm pullup tables - This is not normal, you would have to have changed out your 4.7k for 1k +// (but gives greater accuracy and more stable PID) +// 51 is 100k thermistor - EPCOS (1k pullup) +// 52 is 200k thermistor - ATC Semitec 204GT-2 (1k pullup) +// 55 is 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup) +// +// 1047 is Pt1000 with 4k7 pullup +// 1010 is Pt1000 with 1k pullup (non standard) +// 147 is Pt100 with 4k7 pullup +// 110 is Pt100 with 1k pullup (non standard) + +#define TEMP_SENSOR_0 -1 +#define TEMP_SENSOR_1 -1 +#define TEMP_SENSOR_2 0 +#define TEMP_SENSOR_BED 0 + +// This makes temp sensor 1 a redundant sensor for sensor 0. If the temperatures difference between these sensors is to high the print will be aborted. +//#define TEMP_SENSOR_1_AS_REDUNDANT +#define MAX_REDUNDANT_TEMP_SENSOR_DIFF 10 + +// Actual temperature must be close to target for this long before M109 returns success +#define TEMP_RESIDENCY_TIME 10 // (seconds) +#define TEMP_HYSTERESIS 3 // (degC) range of +/- temperatures considered "close" to the target one +#define TEMP_WINDOW 1 // (degC) Window around target to start the residency timer x degC early. + +// The minimal temperature defines the temperature below which the heater will not be enabled It is used +// to check that the wiring to the thermistor is not broken. +// Otherwise this would lead to the heater being powered on all the time. +#define HEATER_0_MINTEMP 5 +#define HEATER_1_MINTEMP 5 +#define HEATER_2_MINTEMP 5 +#define BED_MINTEMP 5 + +// When temperature exceeds max temp, your heater will be switched off. +// This feature exists to protect your hotend from overheating accidentally, but *NOT* from thermistor short/failure! +// You should use MINTEMP for thermistor short/failure protection. +#define HEATER_0_MAXTEMP 275 +#define HEATER_1_MAXTEMP 275 +#define HEATER_2_MAXTEMP 275 +#define BED_MAXTEMP 150 + +// If your bed has low resistance e.g. .6 ohm and throws the fuse you can duty cycle it to reduce the +// average current. The value should be an integer and the heat bed will be turned on for 1 interval of +// HEATER_BED_DUTY_CYCLE_DIVIDER intervals. +//#define HEATER_BED_DUTY_CYCLE_DIVIDER 4 + +// If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS +//#define EXTRUDER_WATTS (12.0*12.0/6.7) // P=I^2/R +//#define BED_WATTS (12.0*12.0/1.1) // P=I^2/R + +//=========================================================================== +//============================= PID Settings ================================ +//=========================================================================== +// PID Tuning Guide here: http://reprap.org/wiki/PID_Tuning + +// Comment the following line to disable PID and enable bang-bang. +#define PIDTEMP +#define BANG_MAX 255 // limits current to nozzle while in bang-bang mode; 255=full current +#define PID_MAX BANG_MAX // limits current to nozzle while PID is active (see PID_FUNCTIONAL_RANGE below); 255=full current +#ifdef PIDTEMP + //#define PID_DEBUG // Sends debug data to the serial port. + //#define PID_OPENLOOP 1 // Puts PID in open loop. M104/M140 sets the output power from 0 to PID_MAX + //#define SLOW_PWM_HEATERS // PWM with very low frequency (roughly 0.125Hz=8s) and minimum state time of approximately 1s useful for heaters driven by a relay + //#define PID_PARAMS_PER_EXTRUDER // Uses separate PID parameters for each extruder (useful for mismatched extruders) + // Set/get with gcode: M301 E[extruder number, 0-2] + #define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature + // is more then PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max. + #define PID_INTEGRAL_DRIVE_MAX PID_MAX //limit for the integral term + #define K1 0.95 //smoothing factor within the PID + #define PID_dT ((OVERSAMPLENR * 10.0)/(F_CPU / 64.0 / 256.0)) //sampling period of the temperature routine + +// If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it +// Ultimaker + #define DEFAULT_Kp 22.2 + #define DEFAULT_Ki 1.08 + #define DEFAULT_Kd 114 + +// MakerGear +// #define DEFAULT_Kp 7.0 +// #define DEFAULT_Ki 0.1 +// #define DEFAULT_Kd 12 + +// Mendel Parts V9 on 12V +// #define DEFAULT_Kp 63.0 +// #define DEFAULT_Ki 2.25 +// #define DEFAULT_Kd 440 +#endif // PIDTEMP + +//=========================================================================== +//============================= PID > Bed Temperature Control =============== +//=========================================================================== +// Select PID or bang-bang with PIDTEMPBED. If bang-bang, BED_LIMIT_SWITCHING will enable hysteresis +// +// Uncomment this to enable PID on the bed. It uses the same frequency PWM as the extruder. +// If your PID_dT above is the default, and correct for your hardware/configuration, that means 7.689Hz, +// which is fine for driving a square wave into a resistive load and does not significantly impact you FET heating. +// This also works fine on a Fotek SSR-10DA Solid State Relay into a 250W heater. +// If your configuration is significantly different than this and you don't understand the issues involved, you probably +// shouldn't use bed PID until someone else verifies your hardware works. +// If this is enabled, find your own PID constants below. +//#define PIDTEMPBED +// +//#define BED_LIMIT_SWITCHING + +// This sets the max power delivered to the bed, and replaces the HEATER_BED_DUTY_CYCLE_DIVIDER option. +// all forms of bed control obey this (PID, bang-bang, bang-bang with hysteresis) +// setting this to anything other than 255 enables a form of PWM to the bed just like HEATER_BED_DUTY_CYCLE_DIVIDER did, +// so you shouldn't use it unless you are OK with PWM on your bed. (see the comment on enabling PIDTEMPBED) +#define MAX_BED_POWER 255 // limits duty cycle to bed; 255=full current + +#ifdef PIDTEMPBED +//120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+) +//from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10) + #define DEFAULT_bedKp 10.00 + #define DEFAULT_bedKi .023 + #define DEFAULT_bedKd 305.4 + +//120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+) +//from pidautotune +// #define DEFAULT_bedKp 97.1 +// #define DEFAULT_bedKi 1.41 +// #define DEFAULT_bedKd 1675.16 + +// FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles. +#endif // PIDTEMPBED + + +//this prevents dangerous Extruder moves, i.e. if the temperature is under the limit +//can be software-disabled for whatever purposes by +#define PREVENT_DANGEROUS_EXTRUDE +//if PREVENT_DANGEROUS_EXTRUDE is on, you can still disable (uncomment) very long bits of extrusion separately. +#define PREVENT_LENGTHY_EXTRUDE + +#define EXTRUDE_MINTEMP 170 +#define EXTRUDE_MAXLENGTH (X_MAX_LENGTH+Y_MAX_LENGTH) //prevent extrusion of very large distances. + +//=========================================================================== +//============================= Thermal Runaway Protection ================== +//=========================================================================== +/* +This is a feature to protect your printer from burn up in flames if it has +a thermistor coming off place (this happened to a friend of mine recently and +motivated me writing this feature). + +The issue: If a thermistor come off, it will read a lower temperature than actual. +The system will turn the heater on forever, burning up the filament and anything +else around. + +After the temperature reaches the target for the first time, this feature will +start measuring for how long the current temperature stays below the target +minus _HYSTERESIS (set_temperature - THERMAL_RUNAWAY_PROTECTION_HYSTERESIS). + +If it stays longer than _PERIOD, it means the thermistor temperature +cannot catch up with the target, so something *may be* wrong. Then, to be on the +safe side, the system will he halt. + +Bear in mind the count down will just start AFTER the first time the +thermistor temperature is over the target, so you will have no problem if +your extruder heater takes 2 minutes to hit the target on heating. + +*/ +// If you want to enable this feature for all your extruder heaters, +// uncomment the 2 defines below: + +// Parameters for all extruder heaters +//#define THERMAL_RUNAWAY_PROTECTION_PERIOD 40 //in seconds +//#define THERMAL_RUNAWAY_PROTECTION_HYSTERESIS 4 // in degree Celsius + +// If you want to enable this feature for your bed heater, +// uncomment the 2 defines below: + +// Parameters for the bed heater +//#define THERMAL_RUNAWAY_PROTECTION_BED_PERIOD 20 //in seconds +//#define THERMAL_RUNAWAY_PROTECTION_BED_HYSTERESIS 2 // in degree Celsius + + +//=========================================================================== +//============================= Mechanical Settings ========================= +//=========================================================================== + +// Uncomment the following line to enable CoreXY kinematics +// #define COREXY + +// coarse Endstop Settings +#define ENDSTOPPULLUPS // Comment this out (using // at the start of the line) to disable the endstop pullup resistors + +#ifndef ENDSTOPPULLUPS + // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined + // #define ENDSTOPPULLUP_XMAX + // #define ENDSTOPPULLUP_YMAX + // #define ENDSTOPPULLUP_ZMAX + // #define ENDSTOPPULLUP_XMIN + // #define ENDSTOPPULLUP_YMIN + // #define ENDSTOPPULLUP_ZMIN +#endif + +#ifdef ENDSTOPPULLUPS + #define ENDSTOPPULLUP_XMAX + #define ENDSTOPPULLUP_YMAX + #define ENDSTOPPULLUP_ZMAX + #define ENDSTOPPULLUP_XMIN + #define ENDSTOPPULLUP_YMIN + #define ENDSTOPPULLUP_ZMIN +#endif + +// The pullups are needed if you directly connect a mechanical endswitch between the signal and ground pins. +const bool X_MIN_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop. +const bool Y_MIN_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop. +const bool Z_MIN_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop. +const bool X_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop. +const bool Y_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop. +const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop. +//#define DISABLE_MAX_ENDSTOPS +//#define DISABLE_MIN_ENDSTOPS + +// Disable max endstops for compatibility with endstop checking routine +#if defined(COREXY) && !defined(DISABLE_MAX_ENDSTOPS) + #define DISABLE_MAX_ENDSTOPS +#endif + +// For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1 +#define X_ENABLE_ON 0 +#define Y_ENABLE_ON 0 +#define Z_ENABLE_ON 0 +#define E_ENABLE_ON 0 // For all extruders + +// Disables axis when it's not being used. +#define DISABLE_X false +#define DISABLE_Y false +#define DISABLE_Z false +#define DISABLE_E false // For all extruders +#define DISABLE_INACTIVE_EXTRUDER true //disable only inactive extruders and keep active extruder enabled + +#define INVERT_X_DIR true // for Mendel set to false, for Orca set to true +#define INVERT_Y_DIR false // for Mendel set to true, for Orca set to false +#define INVERT_Z_DIR true // for Mendel set to false, for Orca set to true +#define INVERT_E0_DIR false // for direct drive extruder v9 set to true, for geared extruder set to false +#define INVERT_E1_DIR false // for direct drive extruder v9 set to true, for geared extruder set to false +#define INVERT_E2_DIR false // for direct drive extruder v9 set to true, for geared extruder set to false + +// ENDSTOP SETTINGS: +// Sets direction of endstops when homing; 1=MAX, -1=MIN +#define X_HOME_DIR -1 +#define Y_HOME_DIR -1 +#define Z_HOME_DIR -1 + +#define min_software_endstops true // If true, axis won't move to coordinates less than HOME_POS. +#define max_software_endstops true // If true, axis won't move to coordinates greater than the defined lengths below. + +// Travel limits after homing (units are in mm) +#define X_MAX_POS 205 +#define X_MIN_POS 0 +#define Y_MAX_POS 205 +#define Y_MIN_POS 0 +#define Z_MAX_POS 200 +#define Z_MIN_POS 0 + +#define X_MAX_LENGTH (X_MAX_POS - X_MIN_POS) +#define Y_MAX_LENGTH (Y_MAX_POS - Y_MIN_POS) +#define Z_MAX_LENGTH (Z_MAX_POS - Z_MIN_POS) + + +//=========================================================================== +//============================= Bed Auto Leveling =========================== +//=========================================================================== + +//#define ENABLE_AUTO_BED_LEVELING // Delete the comment to enable (remove // at the start of the line) +#define Z_PROBE_REPEATABILITY_TEST // If not commented out, Z-Probe Repeatability test will be included if Auto Bed Leveling is Enabled. + +#ifdef ENABLE_AUTO_BED_LEVELING + +// There are 2 different ways to pick the X and Y locations to probe: + +// - "grid" mode +// Probe every point in a rectangular grid +// You must specify the rectangle, and the density of sample points +// This mode is preferred because there are more measurements. +// It used to be called ACCURATE_BED_LEVELING but "grid" is more descriptive + +// - "3-point" mode +// Probe 3 arbitrary points on the bed (that aren't colinear) +// You must specify the X & Y coordinates of all 3 points + + #define AUTO_BED_LEVELING_GRID + // with AUTO_BED_LEVELING_GRID, the bed is sampled in a + // AUTO_BED_LEVELING_GRID_POINTSxAUTO_BED_LEVELING_GRID_POINTS grid + // and least squares solution is calculated + // Note: this feature occupies 10'206 byte + #ifdef AUTO_BED_LEVELING_GRID + + // set the rectangle in which to probe + #define LEFT_PROBE_BED_POSITION 15 + #define RIGHT_PROBE_BED_POSITION 170 + #define BACK_PROBE_BED_POSITION 180 + #define FRONT_PROBE_BED_POSITION 20 + + // set the number of grid points per dimension + // I wouldn't see a reason to go above 3 (=9 probing points on the bed) + #define AUTO_BED_LEVELING_GRID_POINTS 2 + + + #else // not AUTO_BED_LEVELING_GRID + // with no grid, just probe 3 arbitrary points. A simple cross-product + // is used to esimate the plane of the print bed + + #define ABL_PROBE_PT_1_X 15 + #define ABL_PROBE_PT_1_Y 180 + #define ABL_PROBE_PT_2_X 15 + #define ABL_PROBE_PT_2_Y 20 + #define ABL_PROBE_PT_3_X 170 + #define ABL_PROBE_PT_3_Y 20 + + #endif // AUTO_BED_LEVELING_GRID + + + // these are the offsets to the probe relative to the extruder tip (Hotend - Probe) + // X and Y offsets must be integers + #define X_PROBE_OFFSET_FROM_EXTRUDER -25 + #define Y_PROBE_OFFSET_FROM_EXTRUDER -29 + #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35 + + #define Z_RAISE_BEFORE_HOMING 4 // (in mm) Raise Z before homing (G28) for Probe Clearance. + // Be sure you have this distance over your Z_MAX_POS in case + + #define XY_TRAVEL_SPEED 8000 // X and Y axis travel speed between probes, in mm/min + + #define Z_RAISE_BEFORE_PROBING 15 //How much the extruder will be raised before traveling to the first probing point. + #define Z_RAISE_BETWEEN_PROBINGS 5 //How much the extruder will be raised when traveling from between next probing points + + //#define Z_PROBE_SLED // turn on if you have a z-probe mounted on a sled like those designed by Charles Bell + //#define SLED_DOCKING_OFFSET 5 // the extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. + + //If defined, the Probe servo will be turned on only during movement and then turned off to avoid jerk + //The value is the delay to turn the servo off after powered on - depends on the servo speed; 300ms is good value, but you can try lower it. + // You MUST HAVE the SERVO_ENDSTOPS defined to use here a value higher than zero otherwise your code will not compile. + +// #define PROBE_SERVO_DEACTIVATION_DELAY 300 + + +//If you have enabled the Bed Auto Leveling and are using the same Z Probe for Z Homing, +//it is highly recommended you let this Z_SAFE_HOMING enabled!!! + + #define Z_SAFE_HOMING // This feature is meant to avoid Z homing with probe outside the bed area. + // When defined, it will: + // - Allow Z homing only after X and Y homing AND stepper drivers still enabled + // - If stepper drivers timeout, it will need X and Y homing again before Z homing + // - Position the probe in a defined XY point before Z Homing when homing all axis (G28) + // - Block Z homing only when the probe is outside bed area. + + #ifdef Z_SAFE_HOMING + + #define Z_SAFE_HOMING_X_POINT (X_MAX_LENGTH/2) // X point for Z homing when homing all axis (G28) + #define Z_SAFE_HOMING_Y_POINT (Y_MAX_LENGTH/2) // Y point for Z homing when homing all axis (G28) + + #endif + + #ifdef AUTO_BED_LEVELING_GRID // Check if Probe_Offset * Grid Points is greater than Probing Range + #if X_PROBE_OFFSET_FROM_EXTRUDER < 0 + #if (-(X_PROBE_OFFSET_FROM_EXTRUDER * (AUTO_BED_LEVELING_GRID_POINTS-1)) >= (RIGHT_PROBE_BED_POSITION - LEFT_PROBE_BED_POSITION)) + #error "The X axis probing range is not enough to fit all the points defined in AUTO_BED_LEVELING_GRID_POINTS" + #endif + #else + #if ((X_PROBE_OFFSET_FROM_EXTRUDER * (AUTO_BED_LEVELING_GRID_POINTS-1)) >= (RIGHT_PROBE_BED_POSITION - LEFT_PROBE_BED_POSITION)) + #error "The X axis probing range is not enough to fit all the points defined in AUTO_BED_LEVELING_GRID_POINTS" + #endif + #endif + #if Y_PROBE_OFFSET_FROM_EXTRUDER < 0 + #if (-(Y_PROBE_OFFSET_FROM_EXTRUDER * (AUTO_BED_LEVELING_GRID_POINTS-1)) >= (BACK_PROBE_BED_POSITION - FRONT_PROBE_BED_POSITION)) + #error "The Y axis probing range is not enough to fit all the points defined in AUTO_BED_LEVELING_GRID_POINTS" + #endif + #else + #if ((Y_PROBE_OFFSET_FROM_EXTRUDER * (AUTO_BED_LEVELING_GRID_POINTS-1)) >= (BACK_PROBE_BED_POSITION - FRONT_PROBE_BED_POSITION)) + #error "The Y axis probing range is not enough to fit all the points defined in AUTO_BED_LEVELING_GRID_POINTS" + #endif + #endif + + + #endif + +#endif // ENABLE_AUTO_BED_LEVELING + + +// The position of the homing switches +//#define MANUAL_HOME_POSITIONS // If defined, MANUAL_*_HOME_POS below will be used +//#define BED_CENTER_AT_0_0 // If defined, the center of the bed is at (X=0, Y=0) + +//Manual homing switch locations: +// For deltabots this means top and center of the Cartesian print volume. +#define MANUAL_X_HOME_POS 0 +#define MANUAL_Y_HOME_POS 0 +#define MANUAL_Z_HOME_POS 0 +//#define MANUAL_Z_HOME_POS 402 // For delta: Distance between nozzle and print surface after homing. + +//// MOVEMENT SETTINGS +#define NUM_AXIS 4 // The axis order in all axis related arrays is X, Y, Z, E +#define HOMING_FEEDRATE {50*60, 50*60, 4*60, 0} // set the homing speeds (mm/min) + +// default settings + +#define DEFAULT_AXIS_STEPS_PER_UNIT {78.7402,78.7402,200.0*8/3,760*1.1} // default steps per unit for Ultimaker +#define DEFAULT_MAX_FEEDRATE {500, 500, 5, 25} // (mm/sec) +#define DEFAULT_MAX_ACCELERATION {9000,9000,100,10000} // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for Skeinforge 40+, for older versions raise them a lot. + +#define DEFAULT_ACCELERATION 3000 // X, Y, Z and E max acceleration in mm/s^2 for printing moves +#define DEFAULT_RETRACT_ACCELERATION 3000 // X, Y, Z and E max acceleration in mm/s^2 for retracts + +// Offset of the extruders (uncomment if using more than one and relying on firmware to position when changing). +// The offset has to be X=0, Y=0 for the extruder 0 hotend (default extruder). +// For the other hotends it is their distance from the extruder 0 hotend. +// #define EXTRUDER_OFFSET_X {0.0, 20.00} // (in mm) for each extruder, offset of the hotend on the X axis +// #define EXTRUDER_OFFSET_Y {0.0, 5.00} // (in mm) for each extruder, offset of the hotend on the Y axis + +// The speed change that does not require acceleration (i.e. the software might assume it can be done instantaneously) +#define DEFAULT_XYJERK 20.0 // (mm/sec) +#define DEFAULT_ZJERK 0.4 // (mm/sec) +#define DEFAULT_EJERK 5.0 // (mm/sec) + + +//============================================================================= +//============================= Additional Features =========================== +//============================================================================= + +// Custom M code points +#define CUSTOM_M_CODES +#ifdef CUSTOM_M_CODES + #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851 + #define Z_PROBE_OFFSET_RANGE_MIN -15 + #define Z_PROBE_OFFSET_RANGE_MAX -5 +#endif + + +// EEPROM +// The microcontroller can store settings in the EEPROM, e.g. max velocity... +// M500 - stores parameters in EEPROM +// M501 - reads parameters from EEPROM (if you need reset them after you changed them temporarily). +// M502 - reverts to the default "factory settings". You still need to store them in EEPROM afterwards if you want to. +//define this to enable EEPROM support +//#define EEPROM_SETTINGS +//to disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out: +// please keep turned on if you can. +//#define EEPROM_CHITCHAT + +// Preheat Constants +#define PLA_PREHEAT_HOTEND_TEMP 180 +#define PLA_PREHEAT_HPB_TEMP 70 +#define PLA_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255 + +#define ABS_PREHEAT_HOTEND_TEMP 240 +#define ABS_PREHEAT_HPB_TEMP 100 +#define ABS_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255 + +//LCD and SD support + +// Character based displays can have different extended charsets. +#define DISPLAY_CHARSET_HD44780_JAPAN // "ääööüüß23°" +//#define DISPLAY_CHARSET_HD44780_WESTERN // "ÄäÖöÜüß²³°" if you see a '~' instead of a 'arrow_right' at the right of submenuitems - this is the right one. + +//#define ULTRA_LCD //general LCD support, also 16x2 +//#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family) +//#define SDSUPPORT // Enable SD Card Support in Hardware Console +//#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication +//#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder +//#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking +//#define ULTIMAKERCONTROLLER //as available from the Ultimaker online store. +//#define ULTIPANEL //the UltiPanel as on Thingiverse +//#define LCD_FEEDBACK_FREQUENCY_HZ 1000 // this is the tone frequency the buzzer plays when on UI feedback. ie Screen Click +//#define LCD_FEEDBACK_FREQUENCY_DURATION_MS 100 // the duration the buzzer plays the UI feedback sound. ie Screen Click + +// The MaKr3d Makr-Panel with graphic controller and SD support +// http://reprap.org/wiki/MaKr3d_MaKrPanel +//#define MAKRPANEL + +// The RepRapDiscount Smart Controller (white PCB) +// http://reprap.org/wiki/RepRapDiscount_Smart_Controller +//#define REPRAP_DISCOUNT_SMART_CONTROLLER + +// The GADGETS3D G3D LCD/SD Controller (blue PCB) +// http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel +//#define G3D_PANEL + +// The RepRapDiscount FULL GRAPHIC Smart Controller (quadratic white PCB) +// http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller +// +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +//#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER + +// The RepRapWorld REPRAPWORLD_KEYPAD v1.1 +// http://reprapworld.com/?products_details&products_id=202&cPath=1591_1626 +//#define REPRAPWORLD_KEYPAD +//#define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0 // how much should be moved when a key is pressed, eg 10.0 means 10mm per click + +// The Elefu RA Board Control Panel +// http://www.elefu.com/index.php?route=product/product&product_id=53 +// REMEMBER TO INSTALL LiquidCrystal_I2C.h in your ARDUINO library folder: https://github.com/kiyoshigawa/LiquidCrystal_I2C +//#define RA_CONTROL_PANEL + +//automatic expansion +#if defined (MAKRPANEL) + #define DOGLCD + #define SDSUPPORT + #define ULTIPANEL + #define NEWPANEL + #define DEFAULT_LCD_CONTRAST 17 +#endif + +#if defined (REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) + #define DOGLCD + #define U8GLIB_ST7920 + #define REPRAP_DISCOUNT_SMART_CONTROLLER +#endif + +#if defined(ULTIMAKERCONTROLLER) || defined(REPRAP_DISCOUNT_SMART_CONTROLLER) || defined(G3D_PANEL) + #define ULTIPANEL + #define NEWPANEL +#endif + +#if defined(REPRAPWORLD_KEYPAD) + #define NEWPANEL + #define ULTIPANEL +#endif +#if defined(RA_CONTROL_PANEL) + #define ULTIPANEL + #define NEWPANEL + #define LCD_I2C_TYPE_PCA8574 + #define LCD_I2C_ADDRESS 0x27 // I2C Address of the port expander +#endif + +//I2C PANELS + +//#define LCD_I2C_SAINSMART_YWROBOT +#ifdef LCD_I2C_SAINSMART_YWROBOT + // This uses the LiquidCrystal_I2C library ( https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home ) + // Make sure it is placed in the Arduino libraries directory. + #define LCD_I2C_TYPE_PCF8575 + #define LCD_I2C_ADDRESS 0x27 // I2C Address of the port expander + #define NEWPANEL + #define ULTIPANEL +#endif + +// PANELOLU2 LCD with status LEDs, separate encoder and click inputs +//#define LCD_I2C_PANELOLU2 +#ifdef LCD_I2C_PANELOLU2 + // This uses the LiquidTWI2 library v1.2.3 or later ( https://github.com/lincomatic/LiquidTWI2 ) + // Make sure the LiquidTWI2 directory is placed in the Arduino or Sketchbook libraries subdirectory. + // (v1.2.3 no longer requires you to define PANELOLU in the LiquidTWI2.h library header file) + // Note: The PANELOLU2 encoder click input can either be directly connected to a pin + // (if BTN_ENC defined to != -1) or read through I2C (when BTN_ENC == -1). + #define LCD_I2C_TYPE_MCP23017 + #define LCD_I2C_ADDRESS 0x20 // I2C Address of the port expander + #define LCD_USE_I2C_BUZZER //comment out to disable buzzer on LCD + #define NEWPANEL + #define ULTIPANEL + + #ifndef ENCODER_PULSES_PER_STEP + #define ENCODER_PULSES_PER_STEP 4 + #endif + + #ifndef ENCODER_STEPS_PER_MENU_ITEM + #define ENCODER_STEPS_PER_MENU_ITEM 1 + #endif + + + #ifdef LCD_USE_I2C_BUZZER + #define LCD_FEEDBACK_FREQUENCY_HZ 1000 + #define LCD_FEEDBACK_FREQUENCY_DURATION_MS 100 + #endif + +#endif + +// Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs +//#define LCD_I2C_VIKI +#ifdef LCD_I2C_VIKI + // This uses the LiquidTWI2 library v1.2.3 or later ( https://github.com/lincomatic/LiquidTWI2 ) + // Make sure the LiquidTWI2 directory is placed in the Arduino or Sketchbook libraries subdirectory. + // Note: The pause/stop/resume LCD button pin should be connected to the Arduino + // BTN_ENC pin (or set BTN_ENC to -1 if not used) + #define LCD_I2C_TYPE_MCP23017 + #define LCD_I2C_ADDRESS 0x20 // I2C Address of the port expander + #define LCD_USE_I2C_BUZZER //comment out to disable buzzer on LCD (requires LiquidTWI2 v1.2.3 or later) + #define NEWPANEL + #define ULTIPANEL +#endif + +// Shift register panels +// --------------------- +// 2 wire Non-latching LCD SR from: +// https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/schematics#!shiftregister-connection + +//#define SAV_3DLCD +#ifdef SAV_3DLCD + #define SR_LCD_2W_NL // Non latching 2 wire shiftregister + #define NEWPANEL + #define ULTIPANEL +#endif + + +#ifdef ULTIPANEL +// #define NEWPANEL //enable this if you have a click-encoder panel + #define SDSUPPORT + #define ULTRA_LCD + #ifdef DOGLCD // Change number of lines to match the DOG graphic display + #define LCD_WIDTH 22 + #define LCD_HEIGHT 5 + #else + #define LCD_WIDTH 20 + #define LCD_HEIGHT 4 + #endif +#else //no panel but just LCD + #ifdef ULTRA_LCD + #ifdef DOGLCD // Change number of lines to match the 128x64 graphics display + #define LCD_WIDTH 22 + #define LCD_HEIGHT 5 + #else + #define LCD_WIDTH 16 + #define LCD_HEIGHT 2 + #endif + #endif +#endif + +// default LCD contrast for dogm-like LCD displays +#ifdef DOGLCD +# ifndef DEFAULT_LCD_CONTRAST +# define DEFAULT_LCD_CONTRAST 32 +# endif +#endif + +// Increase the FAN pwm frequency. Removes the PWM noise but increases heating in the FET/Arduino +//#define FAST_PWM_FAN + +// Temperature status LEDs that display the hotend and bet temperature. +// If all hotends and bed temperature and temperature setpoint are < 54C then the BLUE led is on. +// Otherwise the RED led is on. There is 1C hysteresis. +//#define TEMP_STAT_LEDS + +// Use software PWM to drive the fan, as for the heaters. This uses a very low frequency +// which is not ass annoying as with the hardware PWM. On the other hand, if this frequency +// is too low, you should also increment SOFT_PWM_SCALE. +//#define FAN_SOFT_PWM + +// Incrementing this by 1 will double the software PWM frequency, +// affecting heaters, and the fan if FAN_SOFT_PWM is enabled. +// However, control resolution will be halved for each increment; +// at zero value, there are 128 effective control positions. +#define SOFT_PWM_SCALE 0 + +// M240 Triggers a camera by emulating a Canon RC-1 Remote +// Data from: http://www.doc-diy.net/photo/rc-1_hacked/ +// #define PHOTOGRAPH_PIN 23 + +// SF send wrong arc g-codes when using Arc Point as fillet procedure +//#define SF_ARC_FIX + +// Support for the BariCUDA Paste Extruder. +//#define BARICUDA + +//define BlinkM/CyzRgb Support +//#define BLINKM + +/*********************************************************************\ +* R/C SERVO support +* Sponsored by TrinityLabs, Reworked by codexmas +**********************************************************************/ + +// Number of servos +// +// If you select a configuration below, this will receive a default value and does not need to be set manually +// set it manually if you have more servos than extruders and wish to manually control some +// leaving it undefined or defining as 0 will disable the servo subsystem +// If unsure, leave commented / disabled +// +//#define NUM_SERVOS 3 // Servo index starts with 0 for M280 command + +// Servo Endstops +// +// This allows for servo actuated endstops, primary usage is for the Z Axis to eliminate calibration or bed height changes. +// Use M206 command to correct for switch height offset to actual nozzle height. Store that setting with M500. +// +//#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1 +//#define SERVO_ENDSTOP_ANGLES {0,0, 0,0, 70,0} // X,Y,Z Axis Extend and Retract angles + +/**********************************************************************\ + * Support for a filament diameter sensor + * Also allows adjustment of diameter at print time (vs at slicing) + * Single extruder only at this point (extruder 0) + * + * Motherboards + * 34 - RAMPS1.4 - uses Analog input 5 on the AUX2 connector + * 81 - Printrboard - Uses Analog input 2 on the Exp1 connector (version B,C,D,E) + * 301 - Rambo - uses Analog input 3 + * Note may require analog pins to be defined for different motherboards + **********************************************************************/ +// Uncomment below to enable +//#define FILAMENT_SENSOR + +#define FILAMENT_SENSOR_EXTRUDER_NUM 0 //The number of the extruder that has the filament sensor (0,1,2) +#define MEASUREMENT_DELAY_CM 14 //measurement delay in cm. This is the distance from filament sensor to middle of barrel + +#define DEFAULT_NOMINAL_FILAMENT_DIA 3.0 //Enter the diameter (in mm) of the filament generally used (3.0 mm or 1.75 mm) - this is then used in the slicer software. Used for sensor reading validation +#define MEASURED_UPPER_LIMIT 3.30 //upper limit factor used for sensor reading validation in mm +#define MEASURED_LOWER_LIMIT 1.90 //lower limit factor for sensor reading validation in mm +#define MAX_MEASUREMENT_DELAY 20 //delay buffer size in bytes (1 byte = 1cm)- limits maximum measurement delay allowable (must be larger than MEASUREMENT_DELAY_CM and lower number saves RAM) + +//defines used in the code +#define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA //set measured to nominal initially + +//When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status. Status will appear for 5 sec. +//#define FILAMENT_LCD_DISPLAY + + + + + + +#include "Configuration_adv.h" +#include "thermistortables.h" + +#endif //__CONFIGURATION_H diff --git a/Marlin/configurator/config/Configuration_adv.h b/Marlin/configurator/config/Configuration_adv.h new file mode 100644 index 0000000000..a503e640f5 --- /dev/null +++ b/Marlin/configurator/config/Configuration_adv.h @@ -0,0 +1,535 @@ +#ifndef CONFIGURATION_ADV_H +#define CONFIGURATION_ADV_H + +//=========================================================================== +//=============================Thermal Settings ============================ +//=========================================================================== + +#ifdef BED_LIMIT_SWITCHING + #define BED_HYSTERESIS 2 //only disable heating if T>target+BED_HYSTERESIS and enable heating if T>target-BED_HYSTERESIS +#endif +#define BED_CHECK_INTERVAL 5000 //ms between checks in bang-bang control + +//// Heating sanity check: +// This waits for the watch period in milliseconds whenever an M104 or M109 increases the target temperature +// If the temperature has not increased at the end of that period, the target temperature is set to zero. +// It can be reset with another M104/M109. This check is also only triggered if the target temperature and the current temperature +// differ by at least 2x WATCH_TEMP_INCREASE +//#define WATCH_TEMP_PERIOD 40000 //40 seconds +//#define WATCH_TEMP_INCREASE 10 //Heat up at least 10 degree in 20 seconds + +#ifdef PIDTEMP + // this adds an experimental additional term to the heating power, proportional to the extrusion speed. + // if Kc is chosen well, the additional required power due to increased melting should be compensated. + #define PID_ADD_EXTRUSION_RATE + #ifdef PID_ADD_EXTRUSION_RATE + #define DEFAULT_Kc (1) //heating power=Kc*(e_speed) + #endif +#endif + + +//automatic temperature: The hot end target temperature is calculated by all the buffered lines of gcode. +//The maximum buffered steps/sec of the extruder motor are called "se". +//You enter the autotemp mode by a M109 S<mintemp> B<maxtemp> F<factor> +// the target temperature is set to mintemp+factor*se[steps/sec] and limited by mintemp and maxtemp +// you exit the value by any M109 without F* +// Also, if the temperature is set to a value <mintemp, it is not changed by autotemp. +// on an Ultimaker, some initial testing worked with M109 S215 B260 F1 in the start.gcode +#define AUTOTEMP +#ifdef AUTOTEMP + #define AUTOTEMP_OLDWEIGHT 0.98 +#endif + +//Show Temperature ADC value +//The M105 command return, besides traditional information, the ADC value read from temperature sensors. +//#define SHOW_TEMP_ADC_VALUES + +// extruder run-out prevention. +//if the machine is idle, and the temperature over MINTEMP, every couple of SECONDS some filament is extruded +//#define EXTRUDER_RUNOUT_PREVENT +#define EXTRUDER_RUNOUT_MINTEMP 190 +#define EXTRUDER_RUNOUT_SECONDS 30. +#define EXTRUDER_RUNOUT_ESTEPS 14. //mm filament +#define EXTRUDER_RUNOUT_SPEED 1500. //extrusion speed +#define EXTRUDER_RUNOUT_EXTRUDE 100 + +//These defines help to calibrate the AD595 sensor in case you get wrong temperature measurements. +//The measured temperature is defined as "actualTemp = (measuredTemp * TEMP_SENSOR_AD595_GAIN) + TEMP_SENSOR_AD595_OFFSET" +#define TEMP_SENSOR_AD595_OFFSET 0.0 +#define TEMP_SENSOR_AD595_GAIN 1.0 + +//This is for controlling a fan to cool down the stepper drivers +//it will turn on when any driver is enabled +//and turn off after the set amount of seconds from last driver being disabled again +#define CONTROLLERFAN_PIN -1 //Pin used for the fan to cool controller (-1 to disable) +#define CONTROLLERFAN_SECS 60 //How many seconds, after all motors were disabled, the fan should run +#define CONTROLLERFAN_SPEED 255 // == full speed + +// When first starting the main fan, run it at full speed for the +// given number of milliseconds. This gets the fan spinning reliably +// before setting a PWM value. (Does not work with software PWM for fan on Sanguinololu) +//#define FAN_KICKSTART_TIME 100 + +// Extruder cooling fans +// Configure fan pin outputs to automatically turn on/off when the associated +// extruder temperature is above/below EXTRUDER_AUTO_FAN_TEMPERATURE. +// Multiple extruders can be assigned to the same pin in which case +// the fan will turn on when any selected extruder is above the threshold. +#define EXTRUDER_0_AUTO_FAN_PIN -1 +#define EXTRUDER_1_AUTO_FAN_PIN -1 +#define EXTRUDER_2_AUTO_FAN_PIN -1 +#define EXTRUDER_3_AUTO_FAN_PIN -1 +#define EXTRUDER_AUTO_FAN_TEMPERATURE 50 +#define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed + + +//=========================================================================== +//=============================Mechanical Settings=========================== +//=========================================================================== + +#define ENDSTOPS_ONLY_FOR_HOMING // If defined the endstops will only be used for homing + + +//// AUTOSET LOCATIONS OF LIMIT SWITCHES +//// Added by ZetaPhoenix 09-15-2012 +#ifdef MANUAL_HOME_POSITIONS // Use manual limit switch locations + #define X_HOME_POS MANUAL_X_HOME_POS + #define Y_HOME_POS MANUAL_Y_HOME_POS + #define Z_HOME_POS MANUAL_Z_HOME_POS +#else //Set min/max homing switch positions based upon homing direction and min/max travel limits + //X axis + #if X_HOME_DIR == -1 + #ifdef BED_CENTER_AT_0_0 + #define X_HOME_POS X_MAX_LENGTH * -0.5 + #else + #define X_HOME_POS X_MIN_POS + #endif //BED_CENTER_AT_0_0 + #else + #ifdef BED_CENTER_AT_0_0 + #define X_HOME_POS X_MAX_LENGTH * 0.5 + #else + #define X_HOME_POS X_MAX_POS + #endif //BED_CENTER_AT_0_0 + #endif //X_HOME_DIR == -1 + + //Y axis + #if Y_HOME_DIR == -1 + #ifdef BED_CENTER_AT_0_0 + #define Y_HOME_POS Y_MAX_LENGTH * -0.5 + #else + #define Y_HOME_POS Y_MIN_POS + #endif //BED_CENTER_AT_0_0 + #else + #ifdef BED_CENTER_AT_0_0 + #define Y_HOME_POS Y_MAX_LENGTH * 0.5 + #else + #define Y_HOME_POS Y_MAX_POS + #endif //BED_CENTER_AT_0_0 + #endif //Y_HOME_DIR == -1 + + // Z axis + #if Z_HOME_DIR == -1 //BED_CENTER_AT_0_0 not used + #define Z_HOME_POS Z_MIN_POS + #else + #define Z_HOME_POS Z_MAX_POS + #endif //Z_HOME_DIR == -1 +#endif //End auto min/max positions +//END AUTOSET LOCATIONS OF LIMIT SWITCHES -ZP + + +//#define Z_LATE_ENABLE // Enable Z the last moment. Needed if your Z driver overheats. + +// A single Z stepper driver is usually used to drive 2 stepper motors. +// Uncomment this define to utilize a separate stepper driver for each Z axis motor. +// Only a few motherboards support this, like RAMPS, which have dual extruder support (the 2nd, often unused, extruder driver is used +// to control the 2nd Z axis stepper motor). The pins are currently only defined for a RAMPS motherboards. +// On a RAMPS (or other 5 driver) motherboard, using this feature will limit you to using 1 extruder. +//#define Z_DUAL_STEPPER_DRIVERS + +#ifdef Z_DUAL_STEPPER_DRIVERS + #undef EXTRUDERS + #define EXTRUDERS 1 +#endif + +// Same again but for Y Axis. +//#define Y_DUAL_STEPPER_DRIVERS + +// Define if the two Y drives need to rotate in opposite directions +#define INVERT_Y2_VS_Y_DIR true + +#ifdef Y_DUAL_STEPPER_DRIVERS + #undef EXTRUDERS + #define EXTRUDERS 1 +#endif + +#if defined (Z_DUAL_STEPPER_DRIVERS) && defined (Y_DUAL_STEPPER_DRIVERS) + #error "You cannot have dual drivers for both Y and Z" +#endif + +// Enable this for dual x-carriage printers. +// A dual x-carriage design has the advantage that the inactive extruder can be parked which +// prevents hot-end ooze contaminating the print. It also reduces the weight of each x-carriage +// allowing faster printing speeds. +//#define DUAL_X_CARRIAGE +#ifdef DUAL_X_CARRIAGE +// Configuration for second X-carriage +// Note: the first x-carriage is defined as the x-carriage which homes to the minimum endstop; +// the second x-carriage always homes to the maximum endstop. +#define X2_MIN_POS 80 // set minimum to ensure second x-carriage doesn't hit the parked first X-carriage +#define X2_MAX_POS 353 // set maximum to the distance between toolheads when both heads are homed +#define X2_HOME_DIR 1 // the second X-carriage always homes to the maximum endstop position +#define X2_HOME_POS X2_MAX_POS // default home position is the maximum carriage position + // However: In this mode the EXTRUDER_OFFSET_X value for the second extruder provides a software + // override for X2_HOME_POS. This also allow recalibration of the distance between the two endstops + // without modifying the firmware (through the "M218 T1 X???" command). + // Remember: you should set the second extruder x-offset to 0 in your slicer. + +// Pins for second x-carriage stepper driver (defined here to avoid further complicating pins.h) +#define X2_ENABLE_PIN 29 +#define X2_STEP_PIN 25 +#define X2_DIR_PIN 23 + +// There are a few selectable movement modes for dual x-carriages using M605 S<mode> +// Mode 0: Full control. The slicer has full control over both x-carriages and can achieve optimal travel results +// as long as it supports dual x-carriages. (M605 S0) +// Mode 1: Auto-park mode. The firmware will automatically park and unpark the x-carriages on tool changes so +// that additional slicer support is not required. (M605 S1) +// Mode 2: Duplication mode. The firmware will transparently make the second x-carriage and extruder copy all +// actions of the first x-carriage. This allows the printer to print 2 arbitrary items at +// once. (2nd extruder x offset and temp offset are set using: M605 S2 [Xnnn] [Rmmm]) + +// This is the default power-up mode which can be later using M605. +#define DEFAULT_DUAL_X_CARRIAGE_MODE 0 + +// Default settings in "Auto-park Mode" +#define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder +#define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder + +// Default x offset in duplication mode (typically set to half print bed width) +#define DEFAULT_DUPLICATION_X_OFFSET 100 + +#endif //DUAL_X_CARRIAGE + +//homing hits the endstop, then retracts by this distance, before it tries to slowly bump again: +#define X_HOME_RETRACT_MM 5 +#define Y_HOME_RETRACT_MM 5 +#define Z_HOME_RETRACT_MM 2 +//#define QUICK_HOME //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially. + +#define AXIS_RELATIVE_MODES {false, false, false, false} +#ifdef CONFIG_STEPPERS_TOSHIBA +#define MAX_STEP_FREQUENCY 10000 // Max step frequency for Toshiba Stepper Controllers +#else +#define MAX_STEP_FREQUENCY 40000 // Max step frequency for Ultimaker (5000 pps / half step) +#endif +//By default pololu step drivers require an active high signal. However, some high power drivers require an active low signal as step. +#define INVERT_X_STEP_PIN false +#define INVERT_Y_STEP_PIN false +#define INVERT_Z_STEP_PIN false +#define INVERT_E_STEP_PIN false + +//default stepper release if idle +#define DEFAULT_STEPPER_DEACTIVE_TIME 60 + +#define DEFAULT_MINIMUMFEEDRATE 0.0 // minimum feedrate +#define DEFAULT_MINTRAVELFEEDRATE 0.0 + +// Feedrates for manual moves along X, Y, Z, E from panel +#ifdef ULTIPANEL +#define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // set the speeds for manual moves (mm/min) +#endif + +//Comment to disable setting feedrate multiplier via encoder +#ifdef ULTIPANEL + #define ULTIPANEL_FEEDMULTIPLY +#endif + +// minimum time in microseconds that a movement needs to take if the buffer is emptied. +#define DEFAULT_MINSEGMENTTIME 20000 + +// If defined the movements slow down when the look ahead buffer is only half full +#define SLOWDOWN + +// Frequency limit +// See nophead's blog for more info +// Not working O +//#define XY_FREQUENCY_LIMIT 15 + +// Minimum planner junction speed. Sets the default minimum speed the planner plans for at the end +// of the buffer and all stops. This should not be much greater than zero and should only be changed +// if unwanted behavior is observed on a user's machine when running at very slow speeds. +#define MINIMUM_PLANNER_SPEED 0.05// (mm/sec) + +// MS1 MS2 Stepper Driver Microstepping mode table +#define MICROSTEP1 LOW,LOW +#define MICROSTEP2 HIGH,LOW +#define MICROSTEP4 LOW,HIGH +#define MICROSTEP8 HIGH,HIGH +#define MICROSTEP16 HIGH,HIGH + +// Microstep setting (Only functional when stepper driver microstep pins are connected to MCU. +#define MICROSTEP_MODES {16,16,16,16,16} // [1,2,4,8,16] + +// Motor Current setting (Only functional when motor driver current ref pins are connected to a digital trimpot on supported boards) +#define DIGIPOT_MOTOR_CURRENT {135,135,135,135,135} // Values 0-255 (RAMBO 135 = ~0.75A, 185 = ~1A) + +// uncomment to enable an I2C based DIGIPOT like on the Azteeg X3 Pro +//#define DIGIPOT_I2C +// Number of channels available for I2C digipot, For Azteeg X3 Pro we have 8 +#define DIGIPOT_I2C_NUM_CHANNELS 8 +// actual motor currents in Amps, need as many here as DIGIPOT_I2C_NUM_CHANNELS +#define DIGIPOT_I2C_MOTOR_CURRENTS {1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0} + +//=========================================================================== +//=============================Additional Features=========================== +//=========================================================================== + +//#define CHDK 4 //Pin for triggering CHDK to take a picture see how to use it here http://captain-slow.dk/2014/03/09/3d-printing-timelapses/ +#define CHDK_DELAY 50 //How long in ms the pin should stay HIGH before going LOW again + +#define SD_FINISHED_STEPPERRELEASE true //if sd support and the file is finished: disable steppers? +#define SD_FINISHED_RELEASECOMMAND "M84 X Y Z E" // You might want to keep the z enabled so your bed stays in place. + +#define SDCARD_RATHERRECENTFIRST //reverse file order of sd card menu display. Its sorted practically after the file system block order. +// if a file is deleted, it frees a block. hence, the order is not purely chronological. To still have auto0.g accessible, there is again the option to do that. +// using: +//#define MENU_ADDAUTOSTART + +// Show a progress bar on HD44780 LCDs for SD printing +//#define LCD_PROGRESS_BAR + +#ifdef LCD_PROGRESS_BAR + // Amount of time (ms) to show the bar + #define PROGRESS_BAR_BAR_TIME 2000 + // Amount of time (ms) to show the status message + #define PROGRESS_BAR_MSG_TIME 3000 + // Amount of time (ms) to retain the status message (0=forever) + #define PROGRESS_MSG_EXPIRE 0 + // Enable this to show messages for MSG_TIME then hide them + //#define PROGRESS_MSG_ONCE + #ifdef DOGLCD + #warning LCD_PROGRESS_BAR does not apply to graphical displays at this time. + #endif + #ifdef FILAMENT_LCD_DISPLAY + #error LCD_PROGRESS_BAR and FILAMENT_LCD_DISPLAY are not fully compatible. Comment out this line to use both. + #endif +#endif + +// The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation. +//#define USE_WATCHDOG + +#ifdef USE_WATCHDOG +// If you have a watchdog reboot in an ArduinoMega2560 then the device will hang forever, as a watchdog reset will leave the watchdog on. +// The "WATCHDOG_RESET_MANUAL" goes around this by not using the hardware reset. +// However, THIS FEATURE IS UNSAFE!, as it will only work if interrupts are disabled. And the code could hang in an interrupt routine with interrupts disabled. +//#define WATCHDOG_RESET_MANUAL +#endif + +// Enable the option to stop SD printing when hitting and endstops, needs to be enabled from the LCD menu when this option is enabled. +//#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED + +// Babystepping enables the user to control the axis in tiny amounts, independently from the normal printing process +// it can e.g. be used to change z-positions in the print startup phase in real-time +// does not respect endstops! +//#define BABYSTEPPING +#ifdef BABYSTEPPING + #define BABYSTEP_XY //not only z, but also XY in the menu. more clutter, more functions + #define BABYSTEP_INVERT_Z false //true for inverse movements in Z + #define BABYSTEP_Z_MULTIPLICATOR 2 //faster z movements + + #ifdef COREXY + #error BABYSTEPPING not implemented for COREXY yet. + #endif + + #ifdef DELTA + #ifdef BABYSTEP_XY + #error BABYSTEPPING only implemented for Z axis on deltabots. + #endif + #endif +#endif + +// extruder advance constant (s2/mm3) +// +// advance (steps) = STEPS_PER_CUBIC_MM_E * EXTRUDER_ADVANCE_K * cubic mm per second ^ 2 +// +// Hooke's law says: force = k * distance +// Bernoulli's principle says: v ^ 2 / 2 + g . h + pressure / density = constant +// so: v ^ 2 is proportional to number of steps we advance the extruder +//#define ADVANCE + +#ifdef ADVANCE + #define EXTRUDER_ADVANCE_K .0 + + #define D_FILAMENT 2.85 + #define STEPS_MM_E 836 + #define EXTRUSION_AREA (0.25 * D_FILAMENT * D_FILAMENT * 3.14159) + #define STEPS_PER_CUBIC_MM_E (axis_steps_per_unit[E_AXIS]/ EXTRUSION_AREA) + +#endif // ADVANCE + +// Arc interpretation settings: +#define MM_PER_ARC_SEGMENT 1 +#define N_ARC_CORRECTION 25 + +const unsigned int dropsegments=5; //everything with less than this number of steps will be ignored as move and joined with the next movement + +// If you are using a RAMPS board or cheap E-bay purchased boards that do not detect when an SD card is inserted +// You can get round this by connecting a push button or single throw switch to the pin defined as SDCARDCARDDETECT +// in the pins.h file. When using a push button pulling the pin to ground this will need inverted. This setting should +// be commented out otherwise +#define SDCARDDETECTINVERTED + +#ifdef ULTIPANEL + #undef SDCARDDETECTINVERTED +#endif + +// Power Signal Control Definitions +// By default use ATX definition +#ifndef POWER_SUPPLY + #define POWER_SUPPLY 1 +#endif +// 1 = ATX +#if (POWER_SUPPLY == 1) + #define PS_ON_AWAKE LOW + #define PS_ON_ASLEEP HIGH +#endif +// 2 = X-Box 360 203W +#if (POWER_SUPPLY == 2) + #define PS_ON_AWAKE HIGH + #define PS_ON_ASLEEP LOW +#endif + +// Control heater 0 and heater 1 in parallel. +//#define HEATERS_PARALLEL + +//=========================================================================== +//=============================Buffers ============================ +//=========================================================================== + +// The number of linear motions that can be in the plan at any give time. +// THE BLOCK_BUFFER_SIZE NEEDS TO BE A POWER OF 2, i.g. 8,16,32 because shifts and ors are used to do the ring-buffering. +#if defined SDSUPPORT + #define BLOCK_BUFFER_SIZE 16 // SD,LCD,Buttons take more memory, block buffer needs to be smaller +#else + #define BLOCK_BUFFER_SIZE 16 // maximize block buffer +#endif + + +//The ASCII buffer for receiving from the serial: +#define MAX_CMD_SIZE 96 +#define BUFSIZE 4 + + +// Firmware based and LCD controlled retract +// M207 and M208 can be used to define parameters for the retraction. +// The retraction can be called by the slicer using G10 and G11 +// until then, intended retractions can be detected by moves that only extrude and the direction. +// the moves are than replaced by the firmware controlled ones. + +// #define FWRETRACT //ONLY PARTIALLY TESTED +#ifdef FWRETRACT + #define MIN_RETRACT 0.1 //minimum extruded mm to accept a automatic gcode retraction attempt + #define RETRACT_LENGTH 3 //default retract length (positive mm) + #define RETRACT_LENGTH_SWAP 13 //default swap retract length (positive mm), for extruder change + #define RETRACT_FEEDRATE 45 //default feedrate for retracting (mm/s) + #define RETRACT_ZLIFT 0 //default retract Z-lift + #define RETRACT_RECOVER_LENGTH 0 //default additional recover length (mm, added to retract length when recovering) + #define RETRACT_RECOVER_LENGTH_SWAP 0 //default additional swap recover length (mm, added to retract length when recovering from extruder change) + #define RETRACT_RECOVER_FEEDRATE 8 //default feedrate for recovering from retraction (mm/s) +#endif + +//adds support for experimental filament exchange support M600; requires display +#ifdef ULTIPANEL + #define FILAMENTCHANGEENABLE + #ifdef FILAMENTCHANGEENABLE + #define FILAMENTCHANGE_XPOS 3 + #define FILAMENTCHANGE_YPOS 3 + #define FILAMENTCHANGE_ZADD 10 + #define FILAMENTCHANGE_FIRSTRETRACT -2 + #define FILAMENTCHANGE_FINALRETRACT -100 + #endif +#endif + +#ifdef FILAMENTCHANGEENABLE + #ifdef EXTRUDER_RUNOUT_PREVENT + #error EXTRUDER_RUNOUT_PREVENT currently incompatible with FILAMENTCHANGE + #endif +#endif + +//=========================================================================== +//============================= Define Defines ============================ +//=========================================================================== + +#if defined (ENABLE_AUTO_BED_LEVELING) && defined (DELTA) + #error "Bed Auto Leveling is still not compatible with Delta Kinematics." +#endif + +#if EXTRUDERS > 1 && defined TEMP_SENSOR_1_AS_REDUNDANT + #error "You cannot use TEMP_SENSOR_1_AS_REDUNDANT if EXTRUDERS > 1" +#endif + +#if EXTRUDERS > 1 && defined HEATERS_PARALLEL + #error "You cannot use HEATERS_PARALLEL if EXTRUDERS > 1" +#endif + +#if TEMP_SENSOR_0 > 0 + #define THERMISTORHEATER_0 TEMP_SENSOR_0 + #define HEATER_0_USES_THERMISTOR +#endif +#if TEMP_SENSOR_1 > 0 + #define THERMISTORHEATER_1 TEMP_SENSOR_1 + #define HEATER_1_USES_THERMISTOR +#endif +#if TEMP_SENSOR_2 > 0 + #define THERMISTORHEATER_2 TEMP_SENSOR_2 + #define HEATER_2_USES_THERMISTOR +#endif +#if TEMP_SENSOR_3 > 0 + #define THERMISTORHEATER_3 TEMP_SENSOR_3 + #define HEATER_3_USES_THERMISTOR +#endif +#if TEMP_SENSOR_BED > 0 + #define THERMISTORBED TEMP_SENSOR_BED + #define BED_USES_THERMISTOR +#endif +#if TEMP_SENSOR_0 == -1 + #define HEATER_0_USES_AD595 +#endif +#if TEMP_SENSOR_1 == -1 + #define HEATER_1_USES_AD595 +#endif +#if TEMP_SENSOR_2 == -1 + #define HEATER_2_USES_AD595 +#endif +#if TEMP_SENSOR_3 == -1 + #define HEATER_3_USES_AD595 +#endif +#if TEMP_SENSOR_BED == -1 + #define BED_USES_AD595 +#endif +#if TEMP_SENSOR_0 == -2 + #define HEATER_0_USES_MAX6675 +#endif +#if TEMP_SENSOR_0 == 0 + #undef HEATER_0_MINTEMP + #undef HEATER_0_MAXTEMP +#endif +#if TEMP_SENSOR_1 == 0 + #undef HEATER_1_MINTEMP + #undef HEATER_1_MAXTEMP +#endif +#if TEMP_SENSOR_2 == 0 + #undef HEATER_2_MINTEMP + #undef HEATER_2_MAXTEMP +#endif +#if TEMP_SENSOR_3 == 0 + #undef HEATER_3_MINTEMP + #undef HEATER_3_MAXTEMP +#endif +#if TEMP_SENSOR_BED == 0 + #undef BED_MINTEMP + #undef BED_MAXTEMP +#endif + + +#endif //__CONFIGURATION_ADV_H diff --git a/Marlin/configurator/config/boards.h b/Marlin/configurator/config/boards.h new file mode 100644 index 0000000000..c6997fe87b --- /dev/null +++ b/Marlin/configurator/config/boards.h @@ -0,0 +1,59 @@ +#ifndef BOARDS_H +#define BOARDS_H + +#define BOARD_UNKNOWN -1 + +#define BOARD_GEN7_CUSTOM 10 // Gen7 custom (Alfons3 Version) "https://github.com/Alfons3/Generation_7_Electronics" +#define BOARD_GEN7_12 11 // Gen7 v1.1, v1.2 +#define BOARD_GEN7_13 12 // Gen7 v1.3 +#define BOARD_GEN7_14 13 // Gen7 v1.4 +#define BOARD_CHEAPTRONIC 2 // Cheaptronic v1.0 +#define BOARD_SETHI 20 // Sethi 3D_1 +#define BOARD_RAMPS_OLD 3 // MEGA/RAMPS up to 1.2 +#define BOARD_RAMPS_13_EFB 33 // RAMPS 1.3 / 1.4 (Power outputs: Extruder, Fan, Bed) +#define BOARD_RAMPS_13_EEB 34 // RAMPS 1.3 / 1.4 (Power outputs: Extruder0, Extruder1, Bed) +#define BOARD_RAMPS_13_EFF 35 // RAMPS 1.3 / 1.4 (Power outputs: Extruder, Fan, Fan) +#define BOARD_RAMPS_13_EEF 36 // RAMPS 1.3 / 1.4 (Power outputs: Extruder0, Extruder1, Fan) +#define BOARD_DUEMILANOVE_328P 4 // Duemilanove w/ ATMega328P pin assignments +#define BOARD_GEN6 5 // Gen6 +#define BOARD_GEN6_DELUXE 51 // Gen6 deluxe +#define BOARD_SANGUINOLOLU_11 6 // Sanguinololu < 1.2 +#define BOARD_SANGUINOLOLU_12 62 // Sanguinololu 1.2 and above +#define BOARD_MELZI 63 // Melzi +#define BOARD_STB_11 64 // STB V1.1 +#define BOARD_AZTEEG_X1 65 // Azteeg X1 +#define BOARD_MELZI_1284 66 // Melzi with ATmega1284 (MaKr3d version) +#define BOARD_AZTEEG_X3 67 // Azteeg X3 +#define BOARD_AZTEEG_X3_PRO 68 // Azteeg X3 Pro +#define BOARD_ULTIMAKER 7 // Ultimaker +#define BOARD_ULTIMAKER_OLD 71 // Ultimaker (Older electronics. Pre 1.5.4. This is rare) +#define BOARD_ULTIMAIN_2 72 // Ultimainboard 2.x (Uses TEMP_SENSOR 20) +#define BOARD_3DRAG 77 // 3Drag Controller +#define BOARD_K8200 78 // Vellemann K8200 Controller (derived from 3Drag Controller) +#define BOARD_TEENSYLU 8 // Teensylu +#define BOARD_RUMBA 80 // Rumba +#define BOARD_PRINTRBOARD 81 // Printrboard (AT90USB1286) +#define BOARD_BRAINWAVE 82 // Brainwave (AT90USB646) +#define BOARD_SAV_MKI 83 // SAV Mk-I (AT90USB1286) +#define BOARD_TEENSY2 84 // Teensy++2.0 (AT90USB1286) - CLI compile: DEFINES=AT90USBxx_TEENSYPP_ASSIGNMENTS HARDWARE_MOTHERBOARD=84 make +#define BOARD_GEN3_PLUS 9 // Gen3+ +#define BOARD_GEN3_MONOLITHIC 22 // Gen3 Monolithic Electronics +#define BOARD_MEGATRONICS 70 // Megatronics +#define BOARD_MEGATRONICS_2 701 // Megatronics v2.0 +#define BOARD_MEGATRONICS_1 702 // Minitronics v1.0 +#define BOARD_MEGATRONICS_3 703 // Megatronics v3.0 +#define BOARD_OMCA_A 90 // Alpha OMCA board +#define BOARD_OMCA 91 // Final OMCA board +#define BOARD_RAMBO 301 // Rambo +#define BOARD_ELEFU_3 21 // Elefu Ra Board (v3) +#define BOARD_5DPRINT 88 // 5DPrint D8 Driver Board +#define BOARD_LEAPFROG 999 // Leapfrog +#define BOARD_WITBOX 41 // bq WITBOX +#define BOARD_HEPHESTOS 42 // bq Prusa i3 Hephestos + +#define BOARD_99 99 // This is in pins.h but...? + +#define MB(board) (MOTHERBOARD==BOARD_##board) +#define IS_RAMPS (MB(RAMPS_OLD) || MB(RAMPS_13_EFB) || MB(RAMPS_13_EEB) || MB(RAMPS_13_EFF) || MB(RAMPS_13_EEF)) + +#endif //__BOARDS_H diff --git a/Marlin/configurator/css/configurator.css b/Marlin/configurator/css/configurator.css index 418000deee..9236ec442e 100644 --- a/Marlin/configurator/css/configurator.css +++ b/Marlin/configurator/css/configurator.css @@ -1,8 +1,8 @@ /* configurator.css */ /* Styles for Marlin Configurator */ -body { margin: 0; padding: 0; background: #458; color: #FFC; font-family: sans-serif; } -#main { float: left; width: 100%; margin-right: -100%; } +body { margin: 0; padding: 0; background: #56A; color: #FFC; font-family: sans-serif; } +#main { max-width: 1000px; margin: 0 auto; } #main { padding: 0 4%; width: 92%; } #main { font-family: monospace; } .info { color: #AAF; } diff --git a/Marlin/configurator/index.html b/Marlin/configurator/index.html index 66be7514c6..2cfbc0affe 100644 --- a/Marlin/configurator/index.html +++ b/Marlin/configurator/index.html @@ -14,10 +14,7 @@ <body> <section id="main"> <h1>Marlin Configurator 0.1a</h1> - <p>Enter values in the form, get a Marlin configuration.<br/>Will include a drop-down of known configurations.</p> - <ul id="help"> - <li><strong>HELP</strong> - This is the help region</li> - </ul> + <p>Enter values in the form, get a Marlin configuration. Will include a drop-down of known configurations.</p> <div id="tabs"></div> diff --git a/Marlin/configurator/js/configurator.js b/Marlin/configurator/js/configurator.js index 2dfa2d2178..87464e7e93 100644 --- a/Marlin/configurator/js/configurator.js +++ b/Marlin/configurator/js/configurator.js @@ -16,7 +16,7 @@ $(function(){ -var marlin_config = '..'; +var marlin_config = 'config'; // Extend String String.prototype.lpad = function(len, chr) { @@ -296,7 +296,6 @@ var configuratorApp = (function(){ onChange: function(v) { $('#SERIAL_PORT').val(v).trigger('change'); } }); - // prettyPrint(); }, From 9c0adae3cd9ee73d405df0291ad99ba401e444e5 Mon Sep 17 00:00:00 2001 From: Scott Lahteine <sourcetree@thinkyhead.com> Date: Fri, 6 Feb 2015 17:57:31 -0800 Subject: [PATCH 11/41] Scroll to setting position in file when edited MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Animate scrolling to the edited item’s position - Sanity check file drops and show warnings - Fix form init / refresh on new configuration drop - Document the API methods that get/set defines --- Marlin/configurator/js/configurator.js | 247 +++++++++++++++++-------- 1 file changed, 165 insertions(+), 82 deletions(-) diff --git a/Marlin/configurator/js/configurator.js b/Marlin/configurator/js/configurator.js index 87464e7e93..68ce56dcc4 100644 --- a/Marlin/configurator/js/configurator.js +++ b/Marlin/configurator/js/configurator.js @@ -59,13 +59,16 @@ var configuratorApp = (function(){ // private variables and functions go here var self, pi2 = Math.PI * 2, + has_boards = false, has_config = false, has_config_adv = false, boards_file = 'boards.h', config_file = 'Configuration.h', config_adv_file = 'Configuration_adv.h', $config = $('#config_text'), $config_adv = $('#config_adv_text'), boards_list = {}, - therms_list = {}; + therms_list = {}, + total_config_lines, + total_config_adv_lines; // Return this anonymous object as configuratorApp return { @@ -75,6 +78,9 @@ var configuratorApp = (function(){ init: function() { self = this; // a 'this' for use when 'this' is something else + // Set up the form + this.setupConfigForm(); + // Make tabs for the fieldsets var $fset = $('#config_form fieldset'); var $tabs = $('<ul>',{class:'tabs'}), ind = 1; @@ -123,6 +129,7 @@ var configuratorApp = (function(){ success: function(txt) { // Get all the boards and save them into an object self.initBoardsFromText(txt); + has_boards = true; }, error: errFunc }); @@ -138,6 +145,7 @@ var configuratorApp = (function(){ $config.text(txt); // Get thermistor info too self.initThermistorsFromText(txt); + has_config = true; }, error: errFunc }); @@ -151,7 +159,8 @@ var configuratorApp = (function(){ success: function(txt) { // File contents into the textarea $config_adv.text(txt); - self.setupConfigForm(); + has_config_adv = true; + self.refreshConfigForm(); }, error: errFunc }); @@ -164,6 +173,8 @@ var configuratorApp = (function(){ while((r = findDef.exec(txt)) !== null) { boards_list[r[1]] = r[2].prePad(3, ' ') + " — " + r[4].replace(/\).*/, ')'); } + this.log("Loaded boards", 0); + this.log(boards_list, 0); }, initThermistorsFromText: function(txt) { @@ -180,19 +191,36 @@ var configuratorApp = (function(){ file += ''; var filename = $uploader.val().replace(/.*[\/\\](.*)$/, '$1'); switch(filename) { - case config_file: - $config.text(file); - this.initThermistorsFromText(file); - this.refreshConfigForm(); - break; - case config_adv_file: - $config_adv.text(file); - this.refreshConfigForm(); - break; case boards_file: this.initBoardsFromText(file); + has_boards = true; $('#MOTHERBOARD').html('').addOptions(boards_list); - this.initField('MOTHERBOARD'); + if (has_config) this.initField('MOTHERBOARD'); + break; + case config_file: + if (has_boards) { + $config.text(file); + has_config = true; + total_config_lines = file.replace(/[^\n]+/g, '').length; + this.initThermistorsFromText(file); + this.purgeDefineInfo(false); + this.refreshConfigForm(); + } + else { + alert("Upload a " + boards_file + " file first!"); + } + break; + case config_adv_file: + if (has_config) { + $config_adv.text(file); + has_config_adv = true; + total_config_adv_lines = file.replace(/[^\n]+/g, '').length; + this.purgeDefineInfo(true); + this.refreshConfigForm(); + } + else { + alert("Upload a " + config_file + " file first!"); + } break; default: this.log("Can't parse "+filename, 1); @@ -232,11 +260,23 @@ var configuratorApp = (function(){ $('#SERIAL_PORT').addOptions([0,1,2,3,4,5,6,7]); $('#BAUDRATE').addOptions([2400,9600,19200,38400,57600,115200,250000]); - $('#MOTHERBOARD').addOptions(boards_list); $('#EXTRUDERS').addOptions([1,2,3,4]); $('#POWER_SUPPLY').addOptions({'1':'ATX','2':'Xbox 360'}); - this.refreshConfigForm(); + $('#serial_stepper').jstepper({ + min: 0, + max: 7, + val: $('#SERIAL_PORT').val(), + arrowWidth: '18px', + arrowHeight: '15px', + color: '#FFF', + acolor: '#F70', + hcolor: '#FF0', + id: 'select-me', + textStyle: {width:'1.5em',fontSize:'120%',textAlign:'center'}, + onChange: function(v) { $('#SERIAL_PORT').val(v).trigger('change'); } + }); + }, refreshConfigForm: function() { @@ -259,6 +299,7 @@ var configuratorApp = (function(){ this.initField('BTENABLED'); + $('#MOTHERBOARD').html('').addOptions(boards_list); this.initField('MOTHERBOARD'); this.initField('CUSTOM_MENDEL_NAME'); @@ -282,20 +323,6 @@ var configuratorApp = (function(){ this.initField('TEMP_RESIDENCY_TIME'); - $('#serial_stepper').jstepper({ - min: 0, - max: 7, - val: $('#SERIAL_PORT').val(), - arrowWidth: '18px', - arrowHeight: '15px', - color: '#FFF', - acolor: '#F70', - hcolor: '#FF0', - id: 'select-me', - textStyle: {width:'1.5em',fontSize:'120%',textAlign:'center'}, - onChange: function(v) { $('#SERIAL_PORT').val(v).trigger('change'); } - }); - // prettyPrint(); }, @@ -303,17 +330,18 @@ var configuratorApp = (function(){ * initField - make a field responsive and get info * about its configuration file define */ - initField: function(name) { + initField: function(name, adv) { + this.log("initField:"+name,3); var $elm = $('#'+name), elm = $elm[0]; - if (elm.configInfo === undefined) { - elm.configInfo = this.getDefineInfo(name); + if (elm.defineInfo === undefined) { + elm.defineInfo = this.getDefineInfo(name, adv); $elm.on($elm.attr('type') == 'text' ? 'input' : 'change', this.handleChange); } this.setFieldFromDefine(name); }, handleChange: function(e) { - self.updateDefineForField(e.target.id); + self.updateDefineFromField(e.target.id); }, handleSwitch: function(e) { @@ -323,12 +351,43 @@ var configuratorApp = (function(){ self.setDefineEnabled($prev[0].id, on); }, - setDefineEnabled: function(name, val) { - this.log('setDefineEnabled:'+name,3); + /** + * Get the current value of a #define (from the config text) + */ + defineValue: function(name) { + this.log('defineValue:'+name,4); + var $elm = $('#'+name), elm = $elm[0], inf = elm.defineInfo; + var result = inf.regex.exec($(inf.field).text()); - var $elm = $('#'+name), elm = $elm[0], inf = elm.configInfo; - var $c = $config; // for now - var txt = $c.text(); + this.log(result,2); + + return inf.type == 'switch' ? result[inf.val_i] != '//' : result[inf.val_i]; + }, + + /** + * Get the current enabled state of a #define (from the config text) + */ + defineIsEnabled: function(name) { + this.log('defineIsEnabled:'+name,4); + var $elm = $('#'+name), elm = $elm[0], inf = elm.defineInfo; + var result = inf.regex.exec($(inf.field).text()); + + this.log(result,2); + + var on = result !== null ? result[1].trim() != '//' : true; + this.log(name + ' = ' + on, 4); + + return on; + }, + + /** + * Set a #define enabled or disabled by altering the config text + */ + setDefineEnabled: function(name, val) { + this.log('setDefineEnabled:'+name,4); + + var $elm = $('#'+name), elm = $elm[0], inf = elm.defineInfo; + var $c = $(inf.field), txt = $c.text(); var slash = val ? '' : '//'; var newline = inf.line @@ -342,25 +401,13 @@ var configuratorApp = (function(){ $c.text(txt); }, - defineIsEnabled: function(name, adv) { - this.log('defineIsEnabled:'+name,4); - var $elm = $('#'+name), elm = $elm[0]; - var $c = adv ? $config_adv : $config; - - var result = elm.configInfo.regex.exec($c.text()); - this.log(result,2); - - var on = result !== null ? result[1].trim() != '//' : true; - this.log(name + ' = ' + on, 4); - - return on; - }, - - updateDefineForField: function(name, adv) { - this.log('updateDefineForField:'+name,4); - var $elm = $('#'+name), elm = $elm[0], inf = elm.configInfo; - var $c = adv ? $config_adv : $config; - var txt = $c.text(); + /** + * Update a #define (from the form) by altering the config text + */ + updateDefineFromField: function(name) { + this.log('updateDefineFromField:'+name,4); + var $elm = $('#'+name), elm = $elm[0], inf = elm.defineInfo; + var $c = $(inf.field), txt = $c.text(); // var result = inf.repl.exec(txt); // this.log(result, 2); @@ -401,27 +448,71 @@ var configuratorApp = (function(){ this.log(newline, 2); $c.text(txt); + + // Scroll to the altered text if it isn't visible + var halfHeight = $c.height()/2, scrollHeight = $c.prop('scrollHeight'), + textScrollY = inf.lineNum * scrollHeight/(inf.adv ? total_config_adv_lines : total_config_lines) - halfHeight; + + if (textScrollY < 0) + textScrollY = 0; + else if (textScrollY > scrollHeight) + textScrollY = scrollHeight - 1; + + if (Math.abs($c.prop('scrollTop') - textScrollY) > halfHeight) + $c.animate({ scrollTop: textScrollY < 0 ? 0 : textScrollY }); + }, - setFieldFromDefine: function(name, adv) { - var $elm = $('#'+name), elm = $elm[0]; - var isCheck = $elm.attr('type') == 'checkbox'; - var val = this.defineValue(name, adv); + /** + * Set a form field to the current #define value in the config text + */ + setFieldFromDefine: function(name) { + var $elm = $('#'+name), val = this.defineValue(name); this.log('setFieldFromDefine:' + name + ' to ' + val, 4); - isCheck ? $elm.prop('checked', val) : $elm.val("" + val); + // Set the field value + $elm.attr('type') == 'checkbox' ? $elm.prop('checked', val) : $elm.val(''+val); // If the item has a checkbox then set enabled state too var $cb = $('#'+name+'-switch'); if ($cb.length) { - var on = self.defineIsEnabled(name,adv); - $elm.attr('disabled', !on); - $cb.prop('checked', on); + var on = self.defineIsEnabled(name); + $elm.attr('disabled', !on); // enable/disable the form field (could also dim it) + $cb.prop('checked', on); // check/uncheck the checkbox } }, + /** + * Purge #define information for one of the config files + */ + purgeDefineInfo: function(adv) { + if (typeof adv == 'undefined') adv = false; + $('[defineInfo]').each(function() { + if (adv === this.defineInfo.adv) $(this).removeProp('defineInfo'); + }); + }, + + /** + * Update #define information for one of the config files + */ + refreshDefineInfo: function(adv) { + if (typeof adv == 'undefined') adv = false; + $('[defineInfo]').each(function() { + if (adv == this.defineInfo.adv) this.defineInfo = self.getDefineInfo(this.id, adv); + }); + }, + + /** + * Get information about a #define from configuration file text: + * + * Pre-examine the #define for its prefix, value position, suffix, etc. + * Construct a regex for the #define to quickly find (and replace) values. + * Store the existing #define line as the key to finding it later. + * Determine the line number of the #define so it can be scrolled to. + */ getDefineInfo: function(name, adv) { + if (typeof adv == 'undefined') adv = false; this.log('getDefineInfo:'+name,4); var $elm = $('#'+name), elm = $elm[0]; var $c = adv ? $config_adv : $config; @@ -431,14 +522,14 @@ var configuratorApp = (function(){ var result = findDef.exec($c.text()); if (result !== null) { var info = { - type: 'switch', + type:'switch', adv:adv, field:$c[0], val_i: 1, line: result[0], // whole line pre: result[1] === undefined ? '' : result[1].replace('//',''), define: result[2], post: result[3] === undefined ? '' : result[3] }; - info.regex = new RegExp('(.*//)?(.*' + info.define.regEsc() + info.post.regEsc() + ')', 'm'); - info.repl = info.regex; + info.repl = info.regex = new RegExp('(.*//)?(.*' + info.define.regEsc() + info.post.regEsc() + ')', 'm'); + info.lineNum = this.getLineInText(info.line, $c.text()); this.log(info,2); return info; } @@ -448,7 +539,7 @@ var configuratorApp = (function(){ result = findDef.exec($c.text()); if (result !== null) { var info = { - type: 'quoted', + type:'quoted', adv:adv, field:$c[0], val_i: 2, line: result[0], pre: result[1] === undefined ? '' : result[1].replace('//',''), define: result[2], @@ -456,6 +547,7 @@ var configuratorApp = (function(){ }; info.regex = new RegExp('(.*//)?.*' + info.define.regEsc() + '"([^"]*)"' + info.post.regEsc(), 'm'); info.repl = new RegExp('((.*//)?.*' + info.define.regEsc() + '")[^"]*("' + info.post.regEsc() + ')', 'm'); + info.lineNum = this.getLineInText(info.line, $c.text()); this.log(info,2); return info; } @@ -465,7 +557,7 @@ var configuratorApp = (function(){ result = findDef.exec($c.text()); if (result !== null) { var info = { - type: 'plain', + type:'plain', adv:adv, field:$c[0], val_i: 2, line: result[0], pre: result[1] === undefined ? '' : result[1].replace('//',''), define: result[2], @@ -473,6 +565,7 @@ var configuratorApp = (function(){ }; info.regex = new RegExp('(.*//)?.*' + info.define.regEsc() + '(\\S*)' + info.post.regEsc(), 'm'); info.repl = new RegExp('((.*//)?.*' + info.define.regEsc() + ')\\S*(' + info.post.regEsc() + ')', 'm'); + info.lineNum = this.getLineInText(info.line, $c.text()); this.log(info,2); return info; } @@ -480,19 +573,9 @@ var configuratorApp = (function(){ return null; }, - defineValue: function(name, adv) { - this.log('defineValue:'+name,4); - var $elm = $('#'+name), elm = $elm[0]; - var $c = adv ? $config_adv : $config; - var inf = elm.configInfo; - - var result = inf.regex.exec($c.text()); - this.log(result,2); - switch(inf.type) { - case 'switch': return result[1] != '//'; - case 'quoted': return result[2]; - case 'plain': return result[2]; - } + getLineInText: function(line, txt) { + var pos = txt.indexOf(line); + return (pos < 0) ? pos : txt.substr(0, pos).replace(/[^\n]+/g, '').length; }, log: function(o,l) { From 37c43a7ab3e5b985d1a29aa35cce4900a3f4a49f Mon Sep 17 00:00:00 2001 From: Scott Lahteine <sourcetree@thinkyhead.com> Date: Fri, 6 Feb 2015 18:09:14 -0800 Subject: [PATCH 12/41] Scroll to reveal on switches as well --- Marlin/configurator/js/configurator.js | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/Marlin/configurator/js/configurator.js b/Marlin/configurator/js/configurator.js index 68ce56dcc4..5718090531 100644 --- a/Marlin/configurator/js/configurator.js +++ b/Marlin/configurator/js/configurator.js @@ -399,6 +399,9 @@ var configuratorApp = (function(){ this.log(newline, 2); $c.text(txt); + + // Scroll to reveal the define + this.scrollToDefine(name); }, /** @@ -449,6 +452,17 @@ var configuratorApp = (function(){ $c.text(txt); + // Scroll to reveal the define + this.scrollToDefine(name); + }, + + /** + * Scroll the field to show a define + */ + scrollToDefine: function(name, always) { + this.log('scrollToDefine:'+name,4); + var $elm = $('#'+name), inf = $elm[0].defineInfo, $c = $(inf.field); + // Scroll to the altered text if it isn't visible var halfHeight = $c.height()/2, scrollHeight = $c.prop('scrollHeight'), textScrollY = inf.lineNum * scrollHeight/(inf.adv ? total_config_adv_lines : total_config_lines) - halfHeight; @@ -458,7 +472,7 @@ var configuratorApp = (function(){ else if (textScrollY > scrollHeight) textScrollY = scrollHeight - 1; - if (Math.abs($c.prop('scrollTop') - textScrollY) > halfHeight) + if (always == true || Math.abs($c.prop('scrollTop') - textScrollY) > halfHeight) $c.animate({ scrollTop: textScrollY < 0 ? 0 : textScrollY }); }, From 4bb72f94809d25f8d3bd971729a28319156a049f Mon Sep 17 00:00:00 2001 From: Scott Lahteine <sourcetree@thinkyhead.com> Date: Fri, 6 Feb 2015 23:46:16 -0800 Subject: [PATCH 13/41] Highlight the edited line - Add a span to the edited text line to provide a highlight - Scroll and highlight for switch checkboxes also - Clean up initialization - More API documentation - Smarter handling of asynchronous file loading during init --- Marlin/configurator/css/configurator.css | 22 +- Marlin/configurator/index.html | 9 +- Marlin/configurator/js/configurator.js | 288 +++++++++++++---------- 3 files changed, 192 insertions(+), 127 deletions(-) diff --git a/Marlin/configurator/css/configurator.css b/Marlin/configurator/css/configurator.css index 9236ec442e..2572c1c8ba 100644 --- a/Marlin/configurator/css/configurator.css +++ b/Marlin/configurator/css/configurator.css @@ -2,13 +2,19 @@ /* Styles for Marlin Configurator */ body { margin: 0; padding: 0; background: #56A; color: #FFC; font-family: sans-serif; } + #main { max-width: 1000px; margin: 0 auto; } #main { padding: 0 4%; width: 92%; } #main { font-family: monospace; } + +#message { width: 80%; margin: 0 auto 0.25em; color: #FF0; text-align: center; } +#message p { padding: 2px 0; } +#message p.error, #message p.message { color: #F00; background: #FF4; font-weight: bold; border-radius: 0.8em; } +#message p.message { color: #080; background: #CFC; } + .info { color: #AAF; } .info span { color: #FFF; } .info span span { color: #000; font-weight: bold; } -p { width: 80%; color: #FF0; } #help strong { color: #0DD; } img { display: none; } label, input, select, textarea { display: block; float: left; margin: 1px 0; } @@ -24,8 +30,6 @@ input:disabled { color: #BBB; } .clear { clear: both; } h1, h2, h3, h4, h5, h6 { clear: both; } h2 { margin: 0; padding: 1em 0 0; } -#serial_stepper { padding-top: 0.75em; display: block; float: left; } -#SERIAL_PORT { display: none; } ul.tabs { display: inline; list-style: none; } ul.tabs li { display: inline; } @@ -56,3 +60,15 @@ ul.tabs li a:active { fieldset { display: none; border: 1px solid #AAA; border-radius: 1em; } fieldset legend { display: none; } + +.hilightable span { + display: block; + float: left; + width: 100%; + height: 1.3em; + background: rgba(225,255,0,1); + margin: 0 -100% -1em 0; + } + +#serial_stepper { padding-top: 0.75em; display: block; float: left; } +#SERIAL_PORT { display: none; } diff --git a/Marlin/configurator/index.html b/Marlin/configurator/index.html index 2cfbc0affe..e52c163f5a 100644 --- a/Marlin/configurator/index.html +++ b/Marlin/configurator/index.html @@ -14,7 +14,10 @@ <body> <section id="main"> <h1>Marlin Configurator 0.1a</h1> - <p>Enter values in the form, get a Marlin configuration. Will include a drop-down of known configurations.</p> + + <div id="message"> + <p class="info">Enter values in the form, get a Marlin configuration.<br/>Will include a drop-down of known configurations.</p> + </div> <div id="tabs"></div> @@ -64,9 +67,9 @@ </fieldset> <h2>Marlin/Configuration.h</h2> - <pre id="config_text" class="prettyprint linenums"></pre> + <pre id="config_text" class="hilightable"></pre> <h2>Marlin/Configuration_adv.h</h2> - <pre id="config_adv_text" class="prettyprint linenums"></pre> + <pre id="config_adv_text" class="hilightable"></pre> <br class="clear" /> </form> diff --git a/Marlin/configurator/js/configurator.js b/Marlin/configurator/js/configurator.js index 5718090531..25f8a7ed95 100644 --- a/Marlin/configurator/js/configurator.js +++ b/Marlin/configurator/js/configurator.js @@ -79,7 +79,7 @@ var configuratorApp = (function(){ self = this; // a 'this' for use when 'this' is something else // Set up the form - this.setupConfigForm(); + this.initConfigForm(); // Make tabs for the fieldsets var $fset = $('#config_form fieldset'); @@ -105,78 +105,87 @@ var configuratorApp = (function(){ $('<br>',{class:'clear'}).appendTo('#tabs'); $tabs.find('a:first').trigger('click'); - // Make a droppable file uploader + // Make a droppable file uploader, if possible var $uploader = $('#file-upload'); var fileUploader = new BinaryFileUploader({ element: $uploader[0], onFileLoad: function(file) { self.handleFileLoad(file, $uploader); } }); + if (!fileUploader.hasFileUploaderSupport()) + this.setMessage("Your browser doesn't support the file reading API.", 'error'); - if (!fileUploader.hasFileUploaderSupport()) alert('Your browser doesn\'t support the file reading API'); - - // Read boards.h - boards_list = {}; - - var errFunc = function(jqXHR, textStatus, errorThrown) { - alert('Failed to load '+this.url+'. Try the file field.'); - }; - - $.ajax({ - url: marlin_config+'/'+boards_file, - type: 'GET', - async: false, - cache: false, - success: function(txt) { - // Get all the boards and save them into an object - self.initBoardsFromText(txt); - has_boards = true; - }, - error: errFunc + // Read boards.h, Configuration.h, Configuration_adv.h + var ajax_count = 0, success_count = 0; + var loaded_items = {}; + var config_files = [boards_file, config_file, config_adv_file]; + $.each(config_files, function(i,fname){ + self.log("Loading " + fname + "...", 3); + $.ajax({ + url: marlin_config+'/'+fname, + type: 'GET', + async: true, + cache: false, + success: function(txt) { + self.log("Loaded " + fname + "...", 3); + loaded_items[fname] = function(){ self.fileLoaded(fname, txt); }; + success_count++; + }, + complete: function() { + ajax_count++; + if (ajax_count >= 3) { + $.each(config_files, function(i,fname){ if (typeof loaded_items[fname] != 'undefined') loaded_items[fname](); }); + self.refreshConfigForm(); + if (success_count < ajax_count) + self.setMessage('Unable to load configurations. Use the upload field instead.', 'error'); + } + } + }); }); - - // Read Configuration.h - $.ajax({ - url: marlin_config+'/'+config_file, - type: 'GET', - async: false, - cache: false, - success: function(txt) { - // File contents into the textarea - $config.text(txt); - // Get thermistor info too - self.initThermistorsFromText(txt); - has_config = true; - }, - error: errFunc - }); - - // Read Configuration.h - $.ajax({ - url: marlin_config+'/'+config_adv_file, - type: 'GET', - async: false, - cache: false, - success: function(txt) { - // File contents into the textarea - $config_adv.text(txt); - has_config_adv = true; - self.refreshConfigForm(); - }, - error: errFunc - }); - }, + setMessage: function(msg,type) { + if (msg) { + if (typeof type == 'undefined') type = 'message'; + var $err = $('<p class="'+type+'">'+msg+'</p>'), err = $err[0]; + $('#message').prepend($err); + var baseColor = $err.css('color').replace(/rgba?\(([^),]+,[^),]+,[^),]+).*/, 'rgba($1,'); + var d = new Date(); + err.startTime = d.getTime(); + err.pulser = setInterval(function(){ + d = new Date(); + var pulse_time = (d.getTime() - err.startTime); + $err.css({color:baseColor+(0.5+Math.sin(pulse_time/200)*0.4)+')'}); + if (pulse_time > 5000) { + clearInterval(err.pulser); + $err.remove(); + } + }, 50); + } + else { + $('#message p.error, #message p.warning').each(function() { + if (typeof this.pulser != 'undefined' && this.pulser) + clearInterval(this.pulser); + $(this).remove(); + }); + } + }, + + /** + * Init the boards array from a boards.h file + */ initBoardsFromText: function(txt) { boards_list = {}; var r, findDef = new RegExp('[ \\t]*#define[ \\t]+(BOARD_[\\w_]+)[ \\t]+(\\d+)[ \\t]*(//[ \\t]*)?(.+)?', 'gm'); while((r = findDef.exec(txt)) !== null) { boards_list[r[1]] = r[2].prePad(3, ' ') + " — " + r[4].replace(/\).*/, ')'); } - this.log("Loaded boards", 0); - this.log(boards_list, 0); + this.log("Loaded boards", 3); this.log(boards_list, 3); + has_boards = true; }, + /** + * Init the thermistors array from the Configuration.h file + */ initThermistorsFromText: function(txt) { // Get all the thermistors and save them into an object var r, s, findDef = new RegExp('(//.*\n)+\\s+(#define[ \\t]+TEMP_SENSOR_0)', 'g'); @@ -187,40 +196,17 @@ var configuratorApp = (function(){ } }, - handleFileLoad: function(file, $uploader) { - file += ''; + /** + * Handle a file being dropped on the file field + */ + handleFileLoad: function(txt, $uploader) { + txt += ''; var filename = $uploader.val().replace(/.*[\/\\](.*)$/, '$1'); switch(filename) { case boards_file: - this.initBoardsFromText(file); - has_boards = true; - $('#MOTHERBOARD').html('').addOptions(boards_list); - if (has_config) this.initField('MOTHERBOARD'); - break; case config_file: - if (has_boards) { - $config.text(file); - has_config = true; - total_config_lines = file.replace(/[^\n]+/g, '').length; - this.initThermistorsFromText(file); - this.purgeDefineInfo(false); - this.refreshConfigForm(); - } - else { - alert("Upload a " + boards_file + " file first!"); - } - break; case config_adv_file: - if (has_config) { - $config_adv.text(file); - has_config_adv = true; - total_config_adv_lines = file.replace(/[^\n]+/g, '').length; - this.purgeDefineInfo(true); - this.refreshConfigForm(); - } - else { - alert("Upload a " + config_file + " file first!"); - } + this.fileLoaded(filename, txt); break; default: this.log("Can't parse "+filename, 1); @@ -228,7 +214,49 @@ var configuratorApp = (function(){ } }, - setupConfigForm: function() { + fileLoaded: function(filename, txt) { + this.log("fileLoaded:"+filename,4); + switch(filename) { + case boards_file: + this.initBoardsFromText(txt); + $('#MOTHERBOARD').html('').addOptions(boards_list); + if (has_config) this.initField('MOTHERBOARD'); + this.setMessage(boards_file+' loaded successfully.'); + break; + case config_file: + if (has_boards) { + $config.text(txt); + total_config_lines = txt.split(/\r?\n|\r/).length; + this.initThermistorsFromText(txt); + this.purgeDefineInfo(false); + this.refreshConfigForm(); + this.setMessage(config_file+' loaded successfully.'); + has_config = true; + } + else { + this.setMessage("Upload a " + boards_file + " file first!", 'error'); + } + break; + case config_adv_file: + if (has_config) { + $config_adv.text(txt); + total_config_adv_lines = txt.split(/\r?\n|\r/).length; + this.purgeDefineInfo(true); + this.refreshConfigForm(); + this.setMessage(config_adv_file+' loaded successfully.'); + has_config_adv = true; + } + else { + this.setMessage("Upload a " + config_file + " file first!", 'error'); + } + break; + } + }, + + /** + * Add enhancements to the form + */ + initConfigForm: function() { // Modify form fields and make the form responsive. // As values change on the form, we could update the // contents of text areas containing the configs, for @@ -258,14 +286,16 @@ var configuratorApp = (function(){ ); }); + // Add options to the popup menus $('#SERIAL_PORT').addOptions([0,1,2,3,4,5,6,7]); $('#BAUDRATE').addOptions([2400,9600,19200,38400,57600,115200,250000]); $('#EXTRUDERS').addOptions([1,2,3,4]); $('#POWER_SUPPLY').addOptions({'1':'ATX','2':'Xbox 360'}); + // Replace the Serial popup menu with a stepper control $('#serial_stepper').jstepper({ min: 0, - max: 7, + max: 3, val: $('#SERIAL_PORT').val(), arrowWidth: '18px', arrowHeight: '15px', @@ -276,7 +306,6 @@ var configuratorApp = (function(){ textStyle: {width:'1.5em',fontSize:'120%',textAlign:'center'}, onChange: function(v) { $('#SERIAL_PORT').val(v).trigger('change'); } }); - }, refreshConfigForm: function() { @@ -322,30 +351,36 @@ var configuratorApp = (function(){ this.initField('MAX_REDUNDANT_TEMP_SENSOR_DIFF'); this.initField('TEMP_RESIDENCY_TIME'); + }, - // prettyPrint(); + setTextAndHighlight: function($field, txt, name) { + var $elm = $('#'+name), elm = $elm[0], inf = elm.defineInfo; + if (inf == null) return; }, /** - * initField - make a field responsive and get info - * about its configuration file define + * Make a field responsive and initialize its defineInfo */ initField: function(name, adv) { - this.log("initField:"+name,3); + this.log("initField:"+name,4); var $elm = $('#'+name), elm = $elm[0]; - if (elm.defineInfo === undefined) { + if (elm.defineInfo == null) { elm.defineInfo = this.getDefineInfo(name, adv); $elm.on($elm.attr('type') == 'text' ? 'input' : 'change', this.handleChange); } this.setFieldFromDefine(name); }, - handleChange: function(e) { - self.updateDefineFromField(e.target.id); - }, + /** + * Handle any value field being changed + */ + handleChange: function() { self.updateDefineFromField(this.id); }, - handleSwitch: function(e) { - var $elm = $(e.target), $prev = $elm.prev(); + /** + * Handle a switch checkbox being changed + */ + handleSwitch: function() { + var $elm = $(this), $prev = $elm.prev(); var on = $elm.prop('checked') || false; $prev.attr('disabled', !on); self.setDefineEnabled($prev[0].id, on); @@ -357,6 +392,7 @@ var configuratorApp = (function(){ defineValue: function(name) { this.log('defineValue:'+name,4); var $elm = $('#'+name), elm = $elm[0], inf = elm.defineInfo; + if (inf == null) return 'n/a'; var result = inf.regex.exec($(inf.field).text()); this.log(result,2); @@ -370,12 +406,13 @@ var configuratorApp = (function(){ defineIsEnabled: function(name) { this.log('defineIsEnabled:'+name,4); var $elm = $('#'+name), elm = $elm[0], inf = elm.defineInfo; + if (inf == null) return false; var result = inf.regex.exec($(inf.field).text()); this.log(result,2); var on = result !== null ? result[1].trim() != '//' : true; - this.log(name + ' = ' + on, 4); + this.log(name + ' = ' + on, 2); return on; }, @@ -385,23 +422,15 @@ var configuratorApp = (function(){ */ setDefineEnabled: function(name, val) { this.log('setDefineEnabled:'+name,4); - - var $elm = $('#'+name), elm = $elm[0], inf = elm.defineInfo; - var $c = $(inf.field), txt = $c.text(); + var $elm = $('#'+name), inf = $elm[0].defineInfo; + if (inf == null) return; var slash = val ? '' : '//'; var newline = inf.line - .replace(/^([ \t]*)(\/\/)([ \t]*)/, '$1$3') // remove slashes - .replace(inf.pre+inf.define, inf.pre+slash+inf.define); // add them back + .replace(/^([ \t]*)(\/\/)([ \t]*)/, '$1$3') // remove slashes + .replace(inf.pre+inf.define, inf.pre+slash+inf.define); // add them back - txt = txt.replace(inf.line, newline); - inf.line = newline; - this.log(newline, 2); - - $c.text(txt); - - // Scroll to reveal the define - this.scrollToDefine(name); + this.setDefineLine(name, newline); }, /** @@ -409,11 +438,8 @@ var configuratorApp = (function(){ */ updateDefineFromField: function(name) { this.log('updateDefineFromField:'+name,4); - var $elm = $('#'+name), elm = $elm[0], inf = elm.defineInfo; - var $c = $(inf.field), txt = $c.text(); - - // var result = inf.repl.exec(txt); - // this.log(result, 2); + var $elm = $('#'+name), inf = $elm[0].defineInfo; + if (inf == null) return; var isCheck = $elm.attr('type') == 'checkbox', val = isCheck ? $elm.prop('checked') : $elm.val(); @@ -446,18 +472,36 @@ var configuratorApp = (function(){ break; } - txt = txt.replace(inf.line, newline); + this.setDefineLine(name, newline); + }, + + /** + * Set the define's line in the text to a new line, + * then update, highlight, and scroll to the line + */ + setDefineLine: function(name, newline) { + var $elm = $('#'+name), elm = $elm[0], inf = elm.defineInfo; + var $c = $(inf.field), txt = $c.text(); + + var hilite_token = '[HIGHLIGHTER-TOKEN]'; + + txt = txt.replace(inf.line, hilite_token + newline); inf.line = newline; + this.log(newline, 2); - $c.text(txt); + // Convert txt into HTML before storing + var html = $('<div/>').text(txt).html().replace(hilite_token, '<span></span>'); + + // Set the final text including the highlighter + $c.html(html); // Scroll to reveal the define this.scrollToDefine(name); }, /** - * Scroll the field to show a define + * Scroll a pre box to reveal a #define */ scrollToDefine: function(name, always) { this.log('scrollToDefine:'+name,4); @@ -474,7 +518,6 @@ var configuratorApp = (function(){ if (always == true || Math.abs($c.prop('scrollTop') - textScrollY) > halfHeight) $c.animate({ scrollTop: textScrollY < 0 ? 0 : textScrollY }); - }, /** @@ -587,6 +630,9 @@ var configuratorApp = (function(){ return null; }, + /** + * Count the number of lines before a match, return -1 on fail + */ getLineInText: function(line, txt) { var pos = txt.indexOf(line); return (pos < 0) ? pos : txt.substr(0, pos).replace(/[^\n]+/g, '').length; From 12a3975341978566e4447a0abaa049010e371247 Mon Sep 17 00:00:00 2001 From: Scott Lahteine <sourcetree@thinkyhead.com> Date: Sat, 7 Feb 2015 00:46:14 -0800 Subject: [PATCH 14/41] Close section tag, add String.prototype.lineCount --- Marlin/configurator/index.html | 2 +- Marlin/configurator/js/configurator.js | 22 +++++++--------------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/Marlin/configurator/index.html b/Marlin/configurator/index.html index e52c163f5a..279f07e98f 100644 --- a/Marlin/configurator/index.html +++ b/Marlin/configurator/index.html @@ -73,6 +73,6 @@ <br class="clear" /> </form> - <section> + </section> </body> </html> diff --git a/Marlin/configurator/js/configurator.js b/Marlin/configurator/js/configurator.js index 25f8a7ed95..e761aecf96 100644 --- a/Marlin/configurator/js/configurator.js +++ b/Marlin/configurator/js/configurator.js @@ -25,18 +25,10 @@ String.prototype.lpad = function(len, chr) { if (need > 0) { s = new Array(need+1).join(chr) + s; } return s; }; - -String.prototype.prePad = function(len, chr) { - return len ? this.lpad(len, chr) : this; -}; - -String.prototype.zeroPad = function(len) { - return len ? this.prePad(len, '0') : this; -}; - -String.prototype.regEsc = function() { - return this.replace(/[.?*+^$[\]\\(){}|-]/g, "\\$&"); -} +String.prototype.prePad = function(len, chr) { return len ? this.lpad(len, chr) : this; }; +String.prototype.zeroPad = function(len) { return this.prePad(len, '0'); }; +String.prototype.regEsc = function() { return this.replace(/[.?*+^$[\]\\(){}|-]/g, "\\$&"); } +String.prototype.lineCount = function() { return this.split(/\r?\n|\r/).length; }; /** * selectField.addOptions takes an array or keyed object @@ -226,7 +218,7 @@ var configuratorApp = (function(){ case config_file: if (has_boards) { $config.text(txt); - total_config_lines = txt.split(/\r?\n|\r/).length; + total_config_lines = txt.lineCount(); this.initThermistorsFromText(txt); this.purgeDefineInfo(false); this.refreshConfigForm(); @@ -240,7 +232,7 @@ var configuratorApp = (function(){ case config_adv_file: if (has_config) { $config_adv.text(txt); - total_config_adv_lines = txt.split(/\r?\n|\r/).length; + total_config_adv_lines = txt.lineCount(); this.purgeDefineInfo(true); this.refreshConfigForm(); this.setMessage(config_adv_file+' loaded successfully.'); @@ -635,7 +627,7 @@ var configuratorApp = (function(){ */ getLineInText: function(line, txt) { var pos = txt.indexOf(line); - return (pos < 0) ? pos : txt.substr(0, pos).replace(/[^\n]+/g, '').length; + return (pos < 0) ? pos : txt.substr(0, pos).lineCount(); }, log: function(o,l) { From 26474020951fcf97696e99b6fa561d6b68a6e983 Mon Sep 17 00:00:00 2001 From: Scott Lahteine <sourcetree@thinkyhead.com> Date: Sat, 7 Feb 2015 02:04:44 -0800 Subject: [PATCH 15/41] Use info.repl in updateDefineFromField, fix regex --- Marlin/configurator/css/configurator.css | 4 +- Marlin/configurator/index.html | 2 +- Marlin/configurator/js/configurator.js | 131 +++++++++++------------ 3 files changed, 63 insertions(+), 74 deletions(-) diff --git a/Marlin/configurator/css/configurator.css b/Marlin/configurator/css/configurator.css index 2572c1c8ba..5fb1f8d582 100644 --- a/Marlin/configurator/css/configurator.css +++ b/Marlin/configurator/css/configurator.css @@ -6,8 +6,8 @@ body { margin: 0; padding: 0; background: #56A; color: #FFC; font-family: sans-s #main { max-width: 1000px; margin: 0 auto; } #main { padding: 0 4%; width: 92%; } #main { font-family: monospace; } - -#message { width: 80%; margin: 0 auto 0.25em; color: #FF0; text-align: center; } +h1, #message { text-align: center; } +#message { width: 80%; margin: 0 auto 0.25em; color: #FF0; } #message p { padding: 2px 0; } #message p.error, #message p.message { color: #F00; background: #FF4; font-weight: bold; border-radius: 0.8em; } #message p.message { color: #080; background: #CFC; } diff --git a/Marlin/configurator/index.html b/Marlin/configurator/index.html index 279f07e98f..f6c318ccf3 100644 --- a/Marlin/configurator/index.html +++ b/Marlin/configurator/index.html @@ -13,7 +13,7 @@ </head> <body> <section id="main"> - <h1>Marlin Configurator 0.1a</h1> + <h1>Marlin Configurator</h1> <div id="message"> <p class="info">Enter values in the form, get a Marlin configuration.<br/>Will include a drop-down of known configurations.</p> diff --git a/Marlin/configurator/js/configurator.js b/Marlin/configurator/js/configurator.js index e761aecf96..5bd580025b 100644 --- a/Marlin/configurator/js/configurator.js +++ b/Marlin/configurator/js/configurator.js @@ -125,7 +125,7 @@ var configuratorApp = (function(){ complete: function() { ajax_count++; if (ajax_count >= 3) { - $.each(config_files, function(i,fname){ if (typeof loaded_items[fname] != 'undefined') loaded_items[fname](); }); + $.each(config_files, function(i,fname){ if (loaded_items[fname] !== undefined) loaded_items[fname](); }); self.refreshConfigForm(); if (success_count < ajax_count) self.setMessage('Unable to load configurations. Use the upload field instead.', 'error'); @@ -137,7 +137,7 @@ var configuratorApp = (function(){ setMessage: function(msg,type) { if (msg) { - if (typeof type == 'undefined') type = 'message'; + if (type === undefined) type = 'message'; var $err = $('<p class="'+type+'">'+msg+'</p>'), err = $err[0]; $('#message').prepend($err); var baseColor = $err.css('color').replace(/rgba?\(([^),]+,[^),]+,[^),]+).*/, 'rgba($1,'); @@ -155,7 +155,7 @@ var configuratorApp = (function(){ } else { $('#message p.error, #message p.warning').each(function() { - if (typeof this.pulser != 'undefined' && this.pulser) + if (this.pulser !== undefined && this.pulser) clearInterval(this.pulser); $(this).remove(); }); @@ -440,30 +440,16 @@ var configuratorApp = (function(){ switch(inf.type) { case 'switch': var slash = val ? '' : '//'; - newline = (inf.pre + slash + inf.define + inf.post); + newline = inf.line.replace(inf.repl, '$1'+slash+'$3'); break; case 'quoted': - if (isCheck) { - this.log(name + ' should not be a checkbox', 1); - var slash = val ? '' : '//'; - newline = (inf.pre + slash + inf.define + '"'+val+'"' + inf.post); - } - else { - newline = inf.pre + inf.define + '"'+val+'"' + inf.post; - } - break; case 'plain': - if (isCheck) { - this.log(name + ' should not be a checkbox', 1); - var slash = val ? '' : '//'; - newline = (inf.pre + slash + inf.define + val + inf.post); - } - else { - newline = inf.pre + inf.define + val + inf.post; - } + if (isCheck) + this.setMessage(name + ' should not be a checkbox!', 'error'); + else + newline = inf.line.replace(inf.repl, '$1'+val.replace('$','\\$')+'$3'); break; } - this.setDefineLine(name, newline); }, @@ -536,7 +522,7 @@ var configuratorApp = (function(){ * Purge #define information for one of the config files */ purgeDefineInfo: function(adv) { - if (typeof adv == 'undefined') adv = false; + if (adv === undefined) adv = false; $('[defineInfo]').each(function() { if (adv === this.defineInfo.adv) $(this).removeProp('defineInfo'); }); @@ -546,7 +532,7 @@ var configuratorApp = (function(){ * Update #define information for one of the config files */ refreshDefineInfo: function(adv) { - if (typeof adv == 'undefined') adv = false; + if (adv === undefined) adv = false; $('[defineInfo]').each(function() { if (adv == this.defineInfo.adv) this.defineInfo = self.getDefineInfo(this.id, adv); }); @@ -561,7 +547,7 @@ var configuratorApp = (function(){ * Determine the line number of the #define so it can be scrolled to. */ getDefineInfo: function(name, adv) { - if (typeof adv == 'undefined') adv = false; + if (adv === undefined) adv = false; this.log('getDefineInfo:'+name,4); var $elm = $('#'+name), elm = $elm[0]; var $c = adv ? $config_adv : $config; @@ -569,63 +555,66 @@ var configuratorApp = (function(){ // a switch line with no value var findDef = new RegExp('^(.*//)?(.*#define[ \\t]+' + elm.id + ')([ \\t]*/[*/].*)?$', 'm'); var result = findDef.exec($c.text()); + var info = { type:0, adv:adv, field:$c[0], val_i: 2 }; if (result !== null) { - var info = { - type:'switch', adv:adv, field:$c[0], val_i: 1, - line: result[0], // whole line - pre: result[1] === undefined ? '' : result[1].replace('//',''), + $.extend(info, { + val_i: 1, + type: 'switch', + line: result[0], // whole line + pre: result[1] === undefined ? '' : result[1].replace('//',''), define: result[2], - post: result[3] === undefined ? '' : result[3] - }; - info.repl = info.regex = new RegExp('(.*//)?(.*' + info.define.regEsc() + info.post.regEsc() + ')', 'm'); - info.lineNum = this.getLineInText(info.line, $c.text()); - this.log(info,2); - return info; + post: result[3] === undefined ? '' : result[3] + }); + info.regex = new RegExp('( *//)?( *' + info.define.regEsc() + info.post.regEsc() + ')', 'm'); + info.repl = new RegExp('( *)(\/\/)?( *' + info.define.regEsc() + info.post.regEsc() + ')', 'm'); + } + else { + // a define with quotes + findDef = new RegExp('^(.*//)?(.*#define[ \\t]+' + elm.id + '[ \\t]+)("[^"]*")([ \\t]*/[*/].*)?$', 'm'); + result = findDef.exec($c.text()); + if (result !== null) { + $.extend(info, { + type: 'quoted', + line: result[0], + pre: result[1] === undefined ? '' : result[1].replace('//',''), + define: result[2], + post: result[4] === undefined ? '' : result[4] + }); + info.regex = new RegExp('( *//)? *' + info.define.regEsc() + '"([^"]*)"' + info.post.regEsc(), 'm'); + info.repl = new RegExp('(( *//)? *' + info.define.regEsc() + '")[^"]*("' + info.post.regEsc() + ')', 'm'); + } + else { + // a define with no quotes + findDef = new RegExp('^( *//)?( *#define[ \\t]+' + elm.id + '[ \\t]+)(\\S*)([ \\t]*/[*/].*)?$', 'm'); + result = findDef.exec($c.text()); + if (result !== null) { + $.extend(info, { + type: 'plain', + line: result[0], + pre: result[1] === undefined ? '' : result[1].replace('//',''), + define: result[2], + post: result[4] === undefined ? '' : result[4] + }); + info.regex = new RegExp('( *//)? *' + info.define.regEsc() + '(\\S*)' + info.post.regEsc(), 'm'); + info.repl = new RegExp('(( *//)? *' + info.define.regEsc() + ')\\S*(' + info.post.regEsc() + ')', 'm'); + } + } } - // a define with quotes - findDef = new RegExp('^(.*//)?(.*#define[ \\t]+' + elm.id + '[ \\t]+)("[^"]*")([ \\t]*/[*/].*)?$', 'm'); - result = findDef.exec($c.text()); - if (result !== null) { - var info = { - type:'quoted', adv:adv, field:$c[0], val_i: 2, - line: result[0], - pre: result[1] === undefined ? '' : result[1].replace('//',''), - define: result[2], - post: result[4] === undefined ? '' : result[4] - }; - info.regex = new RegExp('(.*//)?.*' + info.define.regEsc() + '"([^"]*)"' + info.post.regEsc(), 'm'); - info.repl = new RegExp('((.*//)?.*' + info.define.regEsc() + '")[^"]*("' + info.post.regEsc() + ')', 'm'); - info.lineNum = this.getLineInText(info.line, $c.text()); + if (info.type) { + info.lineNum = this.getLineNumberOfText(info.line, $c.text()); this.log(info,2); - return info; } + else + info = null; - // a define with no quotes - findDef = new RegExp('^(.*//)?(.*#define[ \\t]+' + elm.id + '[ \\t]+)(\\S*)([ \\t]*/[*/].*)?$', 'm'); - result = findDef.exec($c.text()); - if (result !== null) { - var info = { - type:'plain', adv:adv, field:$c[0], val_i: 2, - line: result[0], - pre: result[1] === undefined ? '' : result[1].replace('//',''), - define: result[2], - post: result[4] === undefined ? '' : result[4] - }; - info.regex = new RegExp('(.*//)?.*' + info.define.regEsc() + '(\\S*)' + info.post.regEsc(), 'm'); - info.repl = new RegExp('((.*//)?.*' + info.define.regEsc() + ')\\S*(' + info.post.regEsc() + ')', 'm'); - info.lineNum = this.getLineInText(info.line, $c.text()); - this.log(info,2); - return info; - } - - return null; + return info; }, /** * Count the number of lines before a match, return -1 on fail */ - getLineInText: function(line, txt) { + getLineNumberOfText: function(line, txt) { var pos = txt.indexOf(line); return (pos < 0) ? pos : txt.substr(0, pos).lineCount(); }, @@ -636,7 +625,7 @@ var configuratorApp = (function(){ }, logOnce: function(o) { - if (typeof o.didLogThisObject === 'undefined') { + if (o.didLogThisObject === undefined) { this.log(o); o.didLogThisObject = true; } From 90fa1345b0dbb332dd58c5d2d83561e90d96ed16 Mon Sep 17 00:00:00 2001 From: Scott Lahteine <sourcetree@thinkyhead.com> Date: Sat, 7 Feb 2015 03:02:26 -0800 Subject: [PATCH 16/41] Fix purge + refresh of define info --- Marlin/configurator/js/configurator.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Marlin/configurator/js/configurator.js b/Marlin/configurator/js/configurator.js index 5bd580025b..36d6d290c9 100644 --- a/Marlin/configurator/js/configurator.js +++ b/Marlin/configurator/js/configurator.js @@ -523,8 +523,9 @@ var configuratorApp = (function(){ */ purgeDefineInfo: function(adv) { if (adv === undefined) adv = false; - $('[defineInfo]').each(function() { - if (adv === this.defineInfo.adv) $(this).removeProp('defineInfo'); + $('[name]').each(function() { + var inf = this.defineInfo; + if (inf && adv === inf.adv) $(this).removeProp('defineInfo'); }); }, @@ -533,8 +534,9 @@ var configuratorApp = (function(){ */ refreshDefineInfo: function(adv) { if (adv === undefined) adv = false; - $('[defineInfo]').each(function() { - if (adv == this.defineInfo.adv) this.defineInfo = self.getDefineInfo(this.id, adv); + $('[name]').each(function() { + var inf = this.defineInfo; + if (inf && adv == inf.adv) this.defineInfo = self.getDefineInfo(this.id, adv); }); }, From 1a548c1bc1a0b01ab54ab6425cf8c4c4e7f8df1f Mon Sep 17 00:00:00 2001 From: Scott Lahteine <sourcetree@thinkyhead.com> Date: Sat, 7 Feb 2015 06:20:04 -0800 Subject: [PATCH 17/41] Find nearby comments and make them into tooltips --- Marlin/configurator/css/configurator.css | 49 ++++++++++++++ Marlin/configurator/js/configurator.js | 83 ++++++++++++++++-------- 2 files changed, 105 insertions(+), 27 deletions(-) diff --git a/Marlin/configurator/css/configurator.css b/Marlin/configurator/css/configurator.css index 5fb1f8d582..1062e53aa1 100644 --- a/Marlin/configurator/css/configurator.css +++ b/Marlin/configurator/css/configurator.css @@ -72,3 +72,52 @@ fieldset legend { display: none; } #serial_stepper { padding-top: 0.75em; display: block; float: left; } #SERIAL_PORT { display: none; } + +.tooltip { position: relative; } +.tooltip::before { + content: attr(data-tooltip); + font-family: sans-serif; + font-size: 85%; + text-align: left; + position: absolute; + z-index: 999; + /*white-space:pre-wrap;*/ + bottom: 9999px; + left: 110px; + color: #000; + padding: 8px; + line-height: 1.1; + max-width: 30em; + opacity: 0; + border-radius: 1em; + border: 2px solid #73d699; + background: #e2ff99; /* Old browsers */ + background: -moz-linear-gradient(top, #e2ff99 0%, #73d699 100%); /* FF3.6+ */ + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#e2ff99), color-stop(100%,#73d699)); /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(top, #e2ff99 0%,#73d699 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, #e2ff99 0%,#73d699 100%); /* Opera 11.10+ */ + background: -ms-linear-gradient(top, #e2ff99 0%,#73d699 100%); /* IE10+ */ + background: linear-gradient(to bottom, #e2ff99 0%,#73d699 100%); /* W3C */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e2ff99', endColorstr='#73d699',GradientType=0 ); /* IE6-9 */ + -webkit-box-shadow: 0px 6px 25px -4px rgba(0,0,0,0.75); + -moz-box-shadow: 0px 6px 25px -4px rgba(0,0,0,0.75); + box-shadow: 0px 6px 25px -4px rgba(0,0,0,0.75); + } +.tooltip:hover::before { + opacity: 1; + bottom: 30px; + } +.tooltip:hover::after { + content: ""; + opacity: 1; + width: 0; + height: 0; + border-left: 8px solid transparent; + border-right: 8px solid transparent; + border-top: 8px solid #73d699; + z-index: 999; + position: absolute; + /*white-space: nowrap;*/ + top: 2px; + left: 130px; + } diff --git a/Marlin/configurator/js/configurator.js b/Marlin/configurator/js/configurator.js index 36d6d290c9..64dca1f8f2 100644 --- a/Marlin/configurator/js/configurator.js +++ b/Marlin/configurator/js/configurator.js @@ -28,7 +28,7 @@ String.prototype.lpad = function(len, chr) { String.prototype.prePad = function(len, chr) { return len ? this.lpad(len, chr) : this; }; String.prototype.zeroPad = function(len) { return this.prePad(len, '0'); }; String.prototype.regEsc = function() { return this.replace(/[.?*+^$[\]\\(){}|-]/g, "\\$&"); } -String.prototype.lineCount = function() { return this.split(/\r?\n|\r/).length; }; +String.prototype.lineCount = function() { var len = this.split(/\r?\n|\r/).length; return len > 0 ? len - 1 : len; }; /** * selectField.addOptions takes an array or keyed object @@ -206,6 +206,9 @@ var configuratorApp = (function(){ } }, + /** + * Process a file after it's been successfully loaded + */ fileLoaded: function(filename, txt) { this.log("fileLoaded:"+filename,4); switch(filename) { @@ -263,10 +266,8 @@ var configuratorApp = (function(){ var name = $(this).attr('name'); $(this).attr({id: name}); // Attach its label sibling - var $label = $(this).prev(); - if ($label[0].tagName == 'LABEL') { - $label.attr('for',name); - } + var $label = $(this).prev('label'); + if ($label.length) $label.attr('for',name); }); // Get all 'switchable' class items and add a checkbox @@ -300,6 +301,9 @@ var configuratorApp = (function(){ }); }, + /** + * Update all fields on the form after loading a configuration + */ refreshConfigForm: function() { /** @@ -345,11 +349,6 @@ var configuratorApp = (function(){ this.initField('TEMP_RESIDENCY_TIME'); }, - setTextAndHighlight: function($field, txt, name) { - var $elm = $('#'+name), elm = $elm[0], inf = elm.defineInfo; - if (inf == null) return; - }, - /** * Make a field responsive and initialize its defineInfo */ @@ -357,8 +356,15 @@ var configuratorApp = (function(){ this.log("initField:"+name,4); var $elm = $('#'+name), elm = $elm[0]; if (elm.defineInfo == null) { - elm.defineInfo = this.getDefineInfo(name, adv); + var inf = elm.defineInfo = this.getDefineInfo(name, adv); $elm.on($elm.attr('type') == 'text' ? 'input' : 'change', this.handleChange); + var comm = inf.comment; + var $tipme = $elm.prev('label'); + if ($tipme.length) { + comm ? + $tipme.addClass('tooltip').attr('data-tooltip',comm) : + $tipme.removeClass('tooltip').removeAttr('data-tooltip'); + } } this.setFieldFromDefine(name); }, @@ -551,13 +557,14 @@ var configuratorApp = (function(){ getDefineInfo: function(name, adv) { if (adv === undefined) adv = false; this.log('getDefineInfo:'+name,4); - var $elm = $('#'+name), elm = $elm[0]; - var $c = adv ? $config_adv : $config; + var $elm = $('#'+name), elm = $elm[0], + $c = adv ? $config_adv : $config, + txt = $c.text(); // a switch line with no value - var findDef = new RegExp('^(.*//)?(.*#define[ \\t]+' + elm.id + ')([ \\t]*/[*/].*)?$', 'm'); - var result = findDef.exec($c.text()); - var info = { type:0, adv:adv, field:$c[0], val_i: 2 }; + var findDef = new RegExp('^([ \\t]*//)?([ \\t]*#define[ \\t]+' + elm.id + ')([ \\t]*/[*/].*)?$', 'm'), + result = findDef.exec(txt), + info = { type:0, adv:adv, field:$c[0], val_i: 2 }; if (result !== null) { $.extend(info, { val_i: 1, @@ -567,13 +574,13 @@ var configuratorApp = (function(){ define: result[2], post: result[3] === undefined ? '' : result[3] }); - info.regex = new RegExp('( *//)?( *' + info.define.regEsc() + info.post.regEsc() + ')', 'm'); - info.repl = new RegExp('( *)(\/\/)?( *' + info.define.regEsc() + info.post.regEsc() + ')', 'm'); + info.regex = new RegExp('([ \\t]*//)?([ \\t]*' + info.define.regEsc() + info.post.regEsc() + ')', 'm'); + info.repl = new RegExp('([ \\t]*)(\/\/)?([ \\t]*' + info.define.regEsc() + info.post.regEsc() + ')', 'm'); } else { // a define with quotes findDef = new RegExp('^(.*//)?(.*#define[ \\t]+' + elm.id + '[ \\t]+)("[^"]*")([ \\t]*/[*/].*)?$', 'm'); - result = findDef.exec($c.text()); + result = findDef.exec(txt); if (result !== null) { $.extend(info, { type: 'quoted', @@ -582,13 +589,13 @@ var configuratorApp = (function(){ define: result[2], post: result[4] === undefined ? '' : result[4] }); - info.regex = new RegExp('( *//)? *' + info.define.regEsc() + '"([^"]*)"' + info.post.regEsc(), 'm'); - info.repl = new RegExp('(( *//)? *' + info.define.regEsc() + '")[^"]*("' + info.post.regEsc() + ')', 'm'); + info.regex = new RegExp('([ \\t]*//)?[ \\t]*' + info.define.regEsc() + '"([^"]*)"' + info.post.regEsc(), 'm'); + info.repl = new RegExp('(([ \\t]*//)?[ \\t]*' + info.define.regEsc() + '")[^"]*("' + info.post.regEsc() + ')', 'm'); } else { // a define with no quotes - findDef = new RegExp('^( *//)?( *#define[ \\t]+' + elm.id + '[ \\t]+)(\\S*)([ \\t]*/[*/].*)?$', 'm'); - result = findDef.exec($c.text()); + findDef = new RegExp('^([ \\t]*//)?([ \\t]*#define[ \\t]+' + elm.id + '[ \\t]+)(\\S*)([ \\t]*/[*/].*)?$', 'm'); + result = findDef.exec(txt); if (result !== null) { $.extend(info, { type: 'plain', @@ -597,19 +604,41 @@ var configuratorApp = (function(){ define: result[2], post: result[4] === undefined ? '' : result[4] }); - info.regex = new RegExp('( *//)? *' + info.define.regEsc() + '(\\S*)' + info.post.regEsc(), 'm'); - info.repl = new RegExp('(( *//)? *' + info.define.regEsc() + ')\\S*(' + info.post.regEsc() + ')', 'm'); + info.regex = new RegExp('([ \\t]*//)?[ \\t]*' + info.define.regEsc() + '(\\S*)' + info.post.regEsc(), 'm'); + info.repl = new RegExp('(([ \\t]*//)?[ \\t]*' + info.define.regEsc() + ')\\S*(' + info.post.regEsc() + ')', 'm'); } } } if (info.type) { - info.lineNum = this.getLineNumberOfText(info.line, $c.text()); - this.log(info,2); + var comment = ''; + // Get the end-of-line comment, if there is one + findDef = new RegExp('.*#define[ \\t].*/[/*]+[ \\t]*(.*)'); + if (info.line.search(findDef) >= 0) { + comment = info.line.replace(findDef, '$1'); + } + else { + // Get all the comments immediately before the item + var r, s; + findDef = new RegExp('([ \\t]*(//|#)[^\n]+\n){1,4}\\s{0,1}' + info.line, 'g'); + if (r = findDef.exec(txt)) { + findDef = new RegExp('^[ \\t]*//+[ \\t]*(.*)[ \\t]*$', 'gm'); + while((s = findDef.exec(r[0])) !== null) { + if (s[1].match(/\/\/[ \\t]*#define/) == null) + comment += s[1] + "\n"; + } + } + } + $.extend(info, { + comment: comment.trim(), + lineNum: this.getLineNumberOfText(info.line, txt) + }); } else info = null; + this.log(info,2); + return info; }, From c99f1de9f35551ee3886704bdb3f984b40881ff1 Mon Sep 17 00:00:00 2001 From: Scott Lahteine <sourcetree@thinkyhead.com> Date: Sat, 7 Feb 2015 07:39:10 -0800 Subject: [PATCH 18/41] Fix tooltips blocking clicks --- Marlin/configurator/css/configurator.css | 38 ++++++++---------------- Marlin/configurator/index.html | 1 + Marlin/configurator/js/configurator.js | 38 +++++++++++++++++------- 3 files changed, 42 insertions(+), 35 deletions(-) diff --git a/Marlin/configurator/css/configurator.css b/Marlin/configurator/css/configurator.css index 1062e53aa1..6d0c63029f 100644 --- a/Marlin/configurator/css/configurator.css +++ b/Marlin/configurator/css/configurator.css @@ -3,7 +3,7 @@ body { margin: 0; padding: 0; background: #56A; color: #FFC; font-family: sans-serif; } -#main { max-width: 1000px; margin: 0 auto; } +#main { max-width: 1000px; margin: 0 auto; position: relative; } #main { padding: 0 4%; width: 92%; } #main { font-family: monospace; } h1, #message { text-align: center; } @@ -73,24 +73,18 @@ fieldset legend { display: none; } #serial_stepper { padding-top: 0.75em; display: block; float: left; } #SERIAL_PORT { display: none; } -.tooltip { position: relative; } -.tooltip::before { - content: attr(data-tooltip); - font-family: sans-serif; - font-size: 85%; - text-align: left; +#tooltip { + display: none; + max-width: 30em; + padding: 8px; + border: 2px solid #73d699; + border-radius: 1em; position: absolute; z-index: 999; - /*white-space:pre-wrap;*/ - bottom: 9999px; - left: 110px; + font-family: sans-serif; + font-size: 85%; color: #000; - padding: 8px; line-height: 1.1; - max-width: 30em; - opacity: 0; - border-radius: 1em; - border: 2px solid #73d699; background: #e2ff99; /* Old browsers */ background: -moz-linear-gradient(top, #e2ff99 0%, #73d699 100%); /* FF3.6+ */ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#e2ff99), color-stop(100%,#73d699)); /* Chrome,Safari4+ */ @@ -103,21 +97,15 @@ fieldset legend { display: none; } -moz-box-shadow: 0px 6px 25px -4px rgba(0,0,0,0.75); box-shadow: 0px 6px 25px -4px rgba(0,0,0,0.75); } -.tooltip:hover::before { - opacity: 1; - bottom: 30px; - } -.tooltip:hover::after { +#tooltip>span { + position: absolute; content: ""; - opacity: 1; width: 0; height: 0; border-left: 8px solid transparent; border-right: 8px solid transparent; border-top: 8px solid #73d699; z-index: 999; - position: absolute; - /*white-space: nowrap;*/ - top: 2px; - left: 130px; + bottom: -10px; + left: 20px; } diff --git a/Marlin/configurator/index.html b/Marlin/configurator/index.html index f6c318ccf3..ccdd5e9799 100644 --- a/Marlin/configurator/index.html +++ b/Marlin/configurator/index.html @@ -20,6 +20,7 @@ </div> <div id="tabs"></div> + <div id="tooltip"></div> <form id="config_form"> diff --git a/Marlin/configurator/js/configurator.js b/Marlin/configurator/js/configurator.js index 64dca1f8f2..8bbf9d7e35 100644 --- a/Marlin/configurator/js/configurator.js +++ b/Marlin/configurator/js/configurator.js @@ -60,7 +60,8 @@ var configuratorApp = (function(){ boards_list = {}, therms_list = {}, total_config_lines, - total_config_adv_lines; + total_config_adv_lines, + hover_timer; // Return this anonymous object as configuratorApp return { @@ -111,14 +112,12 @@ var configuratorApp = (function(){ var loaded_items = {}; var config_files = [boards_file, config_file, config_adv_file]; $.each(config_files, function(i,fname){ - self.log("Loading " + fname + "...", 3); $.ajax({ url: marlin_config+'/'+fname, type: 'GET', async: true, cache: false, success: function(txt) { - self.log("Loaded " + fname + "...", 3); loaded_items[fname] = function(){ self.fileLoaded(fname, txt); }; success_count++; }, @@ -358,12 +357,31 @@ var configuratorApp = (function(){ if (elm.defineInfo == null) { var inf = elm.defineInfo = this.getDefineInfo(name, adv); $elm.on($elm.attr('type') == 'text' ? 'input' : 'change', this.handleChange); - var comm = inf.comment; - var $tipme = $elm.prev('label'); - if ($tipme.length) { - comm ? - $tipme.addClass('tooltip').attr('data-tooltip',comm) : - $tipme.removeClass('tooltip').removeAttr('data-tooltip'); + + if (inf.comment) { + var $tipme = $elm.prev('label'); + if (inf.comment && $tipme.length) { + var $tt = $('#tooltip'); + $tipme.hover( + function() { + var offs = $tipme.offset(); + $tt.text(inf.comment) + .append('<span>') + .css({bottom:($tt.parent().height()-offs.top+20)+'px',left:(offs.left+70)+'px'}) + .show(); + if (hover_timer) { + clearTimeout(hover_timer); + hover_timer = null; + } + }, + function() { + hover_timer = setTimeout(function(){ + hover_timer = null; + $tt.fadeOut(400); + }, 400); + } + ); + } } } this.setFieldFromDefine(name); @@ -622,7 +640,7 @@ var configuratorApp = (function(){ var r, s; findDef = new RegExp('([ \\t]*(//|#)[^\n]+\n){1,4}\\s{0,1}' + info.line, 'g'); if (r = findDef.exec(txt)) { - findDef = new RegExp('^[ \\t]*//+[ \\t]*(.*)[ \\t]*$', 'gm'); + findDef = new RegExp('^[ \\t]*//+[ \\t]*([^#].*)[ \\t]*$', 'gm'); while((s = findDef.exec(r[0])) !== null) { if (s[1].match(/\/\/[ \\t]*#define/) == null) comment += s[1] + "\n"; From 5d159851e55a96977c6823d8235107fcc7ee5130 Mon Sep 17 00:00:00 2001 From: Scott Lahteine <sourcetree@thinkyhead.com> Date: Sat, 7 Feb 2015 09:03:00 -0800 Subject: [PATCH 19/41] Fix positioning of tooltip --- Marlin/configurator/css/configurator.css | 4 ++-- Marlin/configurator/index.html | 3 ++- Marlin/configurator/js/configurator.js | 12 ++++++------ 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Marlin/configurator/css/configurator.css b/Marlin/configurator/css/configurator.css index 6d0c63029f..57b95eb8ab 100644 --- a/Marlin/configurator/css/configurator.css +++ b/Marlin/configurator/css/configurator.css @@ -3,7 +3,7 @@ body { margin: 0; padding: 0; background: #56A; color: #FFC; font-family: sans-serif; } -#main { max-width: 1000px; margin: 0 auto; position: relative; } +#main { max-width: 1000px; margin: 0 auto; } #main { padding: 0 4%; width: 92%; } #main { font-family: monospace; } h1, #message { text-align: center; } @@ -22,7 +22,7 @@ label.newline, textarea, fieldset { clear: both; } label { width: 130px; height: 1em; padding: 10px 480px 10px 1em; margin-right: -470px; text-align: right; } input[type="text"], select { margin: 0.75em 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; position: relative; } /*#config_text, #config_adv_text { font-family: "Andale mono", monospace; clear: both; }*/ #config_text, #config_adv_text { height: 25em; overflow: auto; background-color: #FFF; color: #888; padding: 10px; } input[type="checkbox"], input[type="radio"].enabler { margin-left: 1em; } diff --git a/Marlin/configurator/index.html b/Marlin/configurator/index.html index ccdd5e9799..5e8b205175 100644 --- a/Marlin/configurator/index.html +++ b/Marlin/configurator/index.html @@ -20,10 +20,11 @@ </div> <div id="tabs"></div> - <div id="tooltip"></div> <form id="config_form"> + <div id="tooltip"></div> + <label>Drop Files Here:</label><input type="file" id="file-upload" /> <fieldset id="machine"> diff --git a/Marlin/configurator/js/configurator.js b/Marlin/configurator/js/configurator.js index 8bbf9d7e35..b96a7f41a8 100644 --- a/Marlin/configurator/js/configurator.js +++ b/Marlin/configurator/js/configurator.js @@ -55,6 +55,7 @@ var configuratorApp = (function(){ boards_file = 'boards.h', config_file = 'Configuration.h', config_adv_file = 'Configuration_adv.h', + $tooltip = $('#tooltip'), $config = $('#config_text'), $config_adv = $('#config_adv_text'), boards_list = {}, @@ -360,14 +361,13 @@ var configuratorApp = (function(){ if (inf.comment) { var $tipme = $elm.prev('label'); - if (inf.comment && $tipme.length) { - var $tt = $('#tooltip'); + if ($tipme.length) { $tipme.hover( function() { - var offs = $tipme.offset(); - $tt.text(inf.comment) + var pos = $tipme.position(); + $tooltip.text(inf.comment) .append('<span>') - .css({bottom:($tt.parent().height()-offs.top+20)+'px',left:(offs.left+70)+'px'}) + .css({bottom:($tooltip.parent().outerHeight()-pos.top)+'px',left:(pos.left+70)+'px'}) .show(); if (hover_timer) { clearTimeout(hover_timer); @@ -377,7 +377,7 @@ var configuratorApp = (function(){ function() { hover_timer = setTimeout(function(){ hover_timer = null; - $tt.fadeOut(400); + $tooltip.fadeOut(400); }, 400); } ); From 78b9428f4e472768ad3fed2974dd24ff43ff7bd2 Mon Sep 17 00:00:00 2001 From: Scott Lahteine <sourcetree@thinkyhead.com> Date: Sat, 7 Feb 2015 10:34:16 -0800 Subject: [PATCH 20/41] Avoid capturing disabled items in comments --- Marlin/configurator/js/configurator.js | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Marlin/configurator/js/configurator.js b/Marlin/configurator/js/configurator.js index b96a7f41a8..aa363cfe0b 100644 --- a/Marlin/configurator/js/configurator.js +++ b/Marlin/configurator/js/configurator.js @@ -629,8 +629,8 @@ var configuratorApp = (function(){ } if (info.type) { - var comment = ''; // Get the end-of-line comment, if there is one + var comment = ''; findDef = new RegExp('.*#define[ \\t].*/[/*]+[ \\t]*(.*)'); if (info.line.search(findDef) >= 0) { comment = info.line.replace(findDef, '$1'); @@ -638,12 +638,15 @@ var configuratorApp = (function(){ else { // Get all the comments immediately before the item var r, s; - findDef = new RegExp('([ \\t]*(//|#)[^\n]+\n){1,4}\\s{0,1}' + info.line, 'g'); + findDef = new RegExp('(([ \\t]*(//|#)[^\n]+\n){1,4})([ \\t]*\n){0,1}' + info.line, 'g'); if (r = findDef.exec(txt)) { - findDef = new RegExp('^[ \\t]*//+[ \\t]*([^#].*)[ \\t]*$', 'gm'); - while((s = findDef.exec(r[0])) !== null) { - if (s[1].match(/\/\/[ \\t]*#define/) == null) - comment += s[1] + "\n"; + findDef = new RegExp('^[ \\t]*(//+[ \\t]*.*)[ \\t]*$', 'gm'); + while((s = findDef.exec(r[1])) !== null) { + if (s[1].match(/^\/\/[ \\t]*#define[ \\t]/) != null) { + comment = ''; + break; + } + comment += s[1] + "\n"; } } } From 69240d41b0c2512d0b5b37901a6eeb681c37eaca Mon Sep 17 00:00:00 2001 From: Scott Lahteine <sourcetree@thinkyhead.com> Date: Sat, 7 Feb 2015 10:45:56 -0800 Subject: [PATCH 21/41] Offset the timing of the pulsing animation --- Marlin/configurator/js/configurator.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Marlin/configurator/js/configurator.js b/Marlin/configurator/js/configurator.js index aa363cfe0b..a31b908c5c 100644 --- a/Marlin/configurator/js/configurator.js +++ b/Marlin/configurator/js/configurator.js @@ -62,7 +62,8 @@ var configuratorApp = (function(){ therms_list = {}, total_config_lines, total_config_adv_lines, - hover_timer; + hover_timer, + pulse_offset = 0; // Return this anonymous object as configuratorApp return { @@ -142,12 +143,13 @@ var configuratorApp = (function(){ $('#message').prepend($err); var baseColor = $err.css('color').replace(/rgba?\(([^),]+,[^),]+,[^),]+).*/, 'rgba($1,'); var d = new Date(); - err.startTime = d.getTime(); + err.pulse_offset = (pulse_offset += 200); + err.startTime = d.getTime() + pulse_offset; err.pulser = setInterval(function(){ d = new Date(); - var pulse_time = (d.getTime() - err.startTime); + var pulse_time = d.getTime() + err.pulse_offset; $err.css({color:baseColor+(0.5+Math.sin(pulse_time/200)*0.4)+')'}); - if (pulse_time > 5000) { + if (pulse_time - err.startTime > 5000) { clearInterval(err.pulser); $err.remove(); } From 0116320d2cd5a94da1c84125aa8c42568580dc6f Mon Sep 17 00:00:00 2001 From: Scott Lahteine <sourcetree@thinkyhead.com> Date: Sat, 7 Feb 2015 11:04:10 -0800 Subject: [PATCH 22/41] Strip slashes off the front of tooltips --- Marlin/configurator/js/configurator.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Marlin/configurator/js/configurator.js b/Marlin/configurator/js/configurator.js index a31b908c5c..e0319b4ae3 100644 --- a/Marlin/configurator/js/configurator.js +++ b/Marlin/configurator/js/configurator.js @@ -642,9 +642,9 @@ var configuratorApp = (function(){ var r, s; findDef = new RegExp('(([ \\t]*(//|#)[^\n]+\n){1,4})([ \\t]*\n){0,1}' + info.line, 'g'); if (r = findDef.exec(txt)) { - findDef = new RegExp('^[ \\t]*(//+[ \\t]*.*)[ \\t]*$', 'gm'); + findDef = new RegExp('^[ \\t]*//+[ \\t]*(.*)[ \\t]*$', 'gm'); while((s = findDef.exec(r[1])) !== null) { - if (s[1].match(/^\/\/[ \\t]*#define[ \\t]/) != null) { + if (s[1].match(/^#define[ \\t]/) != null) { comment = ''; break; } From 4228758f1db49fe36dafd57a51d49cfd90ec7ef3 Mon Sep 17 00:00:00 2001 From: Scott Lahteine <sourcetree@thinkyhead.com> Date: Sat, 7 Feb 2015 11:58:19 -0800 Subject: [PATCH 23/41] Clean up and improve tooltips, show the name --- Marlin/configurator/css/configurator.css | 11 ++++++- Marlin/configurator/js/configurator.js | 38 ++++++++++++------------ 2 files changed, 29 insertions(+), 20 deletions(-) diff --git a/Marlin/configurator/css/configurator.css b/Marlin/configurator/css/configurator.css index 57b95eb8ab..ca2f3f8662 100644 --- a/Marlin/configurator/css/configurator.css +++ b/Marlin/configurator/css/configurator.css @@ -24,7 +24,15 @@ input[type="text"], select { margin: 0.75em 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; position: relative; } /*#config_text, #config_adv_text { font-family: "Andale mono", monospace; clear: both; }*/ -#config_text, #config_adv_text { height: 25em; overflow: auto; background-color: #FFF; color: #888; padding: 10px; } +#config_text, #config_adv_text { + height: 25em; + padding: 10px; + border: 2px solid #888; + border-radius: 5px; + overflow: auto; + background-color: #FFF; + color: #000; + } input[type="checkbox"], input[type="radio"].enabler { margin-left: 1em; } input:disabled { color: #BBB; } .clear { clear: both; } @@ -109,3 +117,4 @@ fieldset legend { display: none; } bottom: -10px; left: 20px; } +#tooltip>strong { color: #00B; } \ No newline at end of file diff --git a/Marlin/configurator/js/configurator.js b/Marlin/configurator/js/configurator.js index e0319b4ae3..126308d215 100644 --- a/Marlin/configurator/js/configurator.js +++ b/Marlin/configurator/js/configurator.js @@ -27,6 +27,7 @@ String.prototype.lpad = function(len, chr) { }; String.prototype.prePad = function(len, chr) { return len ? this.lpad(len, chr) : this; }; String.prototype.zeroPad = function(len) { return this.prePad(len, '0'); }; +String.prototype.toHTML = function() { return jQuery('<div>').text(this).html(); }; String.prototype.regEsc = function() { return this.replace(/[.?*+^$[\]\\(){}|-]/g, "\\$&"); } String.prototype.lineCount = function() { var len = this.split(/\r?\n|\r/).length; return len > 0 ? len - 1 : len; }; @@ -367,7 +368,7 @@ var configuratorApp = (function(){ $tipme.hover( function() { var pos = $tipme.position(); - $tooltip.text(inf.comment) + $tooltip.html(inf.comment) .append('<span>') .css({bottom:($tooltip.parent().outerHeight()-pos.top)+'px',left:(pos.left+70)+'px'}) .show(); @@ -484,6 +485,7 @@ var configuratorApp = (function(){ * then update, highlight, and scroll to the line */ setDefineLine: function(name, newline) { + this.log('setDefineLine:'+name+'\n'+newline,4); var $elm = $('#'+name), elm = $elm[0], inf = elm.defineInfo; var $c = $(inf.field), txt = $c.text(); @@ -492,10 +494,8 @@ var configuratorApp = (function(){ txt = txt.replace(inf.line, hilite_token + newline); inf.line = newline; - this.log(newline, 2); - // Convert txt into HTML before storing - var html = $('<div/>').text(txt).html().replace(hilite_token, '<span></span>'); + var html = txt.toHTML().replace(hilite_token, '<span></span>'); // Set the final text including the highlighter $c.html(html); @@ -634,26 +634,26 @@ var configuratorApp = (function(){ // Get the end-of-line comment, if there is one var comment = ''; findDef = new RegExp('.*#define[ \\t].*/[/*]+[ \\t]*(.*)'); - if (info.line.search(findDef) >= 0) { + if (info.line.search(findDef) >= 0) comment = info.line.replace(findDef, '$1'); - } - else { - // Get all the comments immediately before the item - var r, s; - findDef = new RegExp('(([ \\t]*(//|#)[^\n]+\n){1,4})([ \\t]*\n){0,1}' + info.line, 'g'); - if (r = findDef.exec(txt)) { - findDef = new RegExp('^[ \\t]*//+[ \\t]*(.*)[ \\t]*$', 'gm'); - while((s = findDef.exec(r[1])) !== null) { - if (s[1].match(/^#define[ \\t]/) != null) { - comment = ''; - break; - } - comment += s[1] + "\n"; + + // Get all the comments immediately before the item + var r, s; + findDef = new RegExp('(([ \\t]*(//|#)[^\n]+\n){1,4})([ \\t]*\n){0,1}' + info.line.regEsc(), 'g'); + if (r = findDef.exec(txt)) { + findDef = new RegExp('^[ \\t]*//+[ \\t]*(.*)[ \\t]*$', 'gm'); + while((s = findDef.exec(r[1])) !== null) { + if (s[1].match(/^#define[ \\t]/) != null) { + comment = ''; + break; } + comment += ' ' + s[1] + "\n"; } } + + findDef = new RegExp('^[ \\t]*'+name+'[ \\t]*', 'm'); $.extend(info, { - comment: comment.trim(), + comment: '<strong>'+name+'</strong> '+comment.replace(findDef,'').trim().toHTML(), lineNum: this.getLineNumberOfText(info.line, txt) }); } From ba24a09f243227688910afdd98bfd1b2fc9fe3ae Mon Sep 17 00:00:00 2001 From: Scott Lahteine <sourcetree@thinkyhead.com> Date: Mon, 9 Feb 2015 04:34:57 -0800 Subject: [PATCH 24/41] Use api.github to get Configurations - Make api.github the default source for configurations - Remove configurations from the configurator - Continuation and enhancements --- Marlin/configurator/css/configurator.css | 70 ++++- Marlin/configurator/index.html | 21 +- Marlin/configurator/js/configurator.js | 340 +++++++++++++---------- 3 files changed, 273 insertions(+), 158 deletions(-) diff --git a/Marlin/configurator/css/configurator.css b/Marlin/configurator/css/configurator.css index ca2f3f8662..6203114750 100644 --- a/Marlin/configurator/css/configurator.css +++ b/Marlin/configurator/css/configurator.css @@ -2,7 +2,7 @@ /* Styles for Marlin Configurator */ body { margin: 0; padding: 0; background: #56A; color: #FFC; font-family: sans-serif; } - +fieldset { height: 16.1em; overflow: auto; margin-top: 10px; } #main { max-width: 1000px; margin: 0 auto; } #main { padding: 0 4%; width: 92%; } #main { font-family: monospace; } @@ -19,10 +19,23 @@ h1, #message { text-align: center; } img { display: none; } label, input, select, textarea { display: block; float: left; margin: 1px 0; } label.newline, textarea, fieldset { clear: both; } -label { width: 130px; height: 1em; padding: 10px 480px 10px 1em; margin-right: -470px; text-align: right; } +label { + width: 140px; /* label area */ + height: 1em; + padding: 10px 460px 10px 1em; + margin-right: -450px; + text-align: right; + } input[type="text"], select { margin: 0.75em 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; position: relative; } +#config_form { + display: block; + background: #EEE; + padding: 6px 20px 20px; + color: #000; + position: relative; + } + /*#config_text, #config_adv_text { font-family: "Andale mono", monospace; clear: both; }*/ #config_text, #config_adv_text { height: 25em; @@ -32,6 +45,8 @@ input[type="checkbox"], input[type="radio"], input[type="file"] { margin: 1em 0 overflow: auto; background-color: #FFF; color: #000; + font-family: "Fira Mono"; + font-size: small; } input[type="checkbox"], input[type="radio"].enabler { margin-left: 1em; } input:disabled { color: #BBB; } @@ -39,31 +54,35 @@ input:disabled { color: #BBB; } h1, h2, h3, h4, h5, h6 { clear: both; } h2 { margin: 0; padding: 1em 0 0; } -ul.tabs { display: inline; list-style: none; } +ul.tabs { padding: 0; list-style: none; } ul.tabs li { display: inline; } ul.tabs li a, ul.tabs li a.active:hover, ul.tabs li a.active:active { display: block; float: left; - background: #666; + background: #1E4059; color: #CCC; - font-size: 150%; + font-size: 110%; border-radius: 0.25em 0.25em 0 0; margin: 0 4px 0 0; - padding: 2px 4px; + padding: 2px 8px; text-decoration: none; + font-family: georgia,"times new roman",times; } ul.tabs li a.active:link, ul.tabs li a.active:visited { background: #DDD; - color: #900; + color: #06F; cursor: default; + margin-top: -4px; + padding-bottom: 4px; + padding-top: 4px; } ul.tabs li a:hover, ul.tabs li a:active { - background: #777; - color: #DDD; + background: #000; + color: #FFF; } fieldset { display: none; border: 1px solid #AAA; border-radius: 1em; } @@ -117,4 +136,33 @@ fieldset legend { display: none; } bottom: -10px; left: 20px; } -#tooltip>strong { color: #00B; } \ No newline at end of file +#tooltip>strong { color: #00B; } + +span.disclose { + float: right; + margin-top: -10px; + width: 0; + height: 0; + cursor: pointer; + border-left: 8px solid transparent; + border-right: 8px solid transparent; + border-top: 10px solid #000; + } +span.disclose.closed { + margin: -14px 4px 0 0; + border-top: 8px solid transparent; + border-bottom: 8px solid transparent; + border-right: 10px solid #000; + } +span.disclose.almost { + -ms-transform: rotate(45deg); /* IE 9 */ + -webkit-transform: rotate(45deg); /* Chrome, Safari, Opera */ + transform: rotate(45deg); + } +span.disclose.closed.almost { + -ms-transform: rotate(315deg); /* IE 9 */ + -webkit-transform: rotate(315deg); /* Chrome, Safari, Opera */ + transform: rotate(315deg); + } +#tipson { float: right; font-weight: bold; font-size: 100%; font-family: helvetica; } +#tipson input { float: none; display: inline; } diff --git a/Marlin/configurator/index.html b/Marlin/configurator/index.html index 5e8b205175..46f862bf1c 100644 --- a/Marlin/configurator/index.html +++ b/Marlin/configurator/index.html @@ -3,6 +3,7 @@ <head> <meta charset="UTF-8"> <title>Marlin Configurator</title> + <link href='http://fonts.googleapis.com/css?family=Fira+Mono&subset=latin,latin-ext' rel='stylesheet' type='text/css' /> <script src="js/jquery-2.1.3.min.js"></script> <script src="js/binarystring.js"></script> <script src="js/binaryfileuploader.js"></script> @@ -26,6 +27,8 @@ <div id="tooltip"></div> <label>Drop Files Here:</label><input type="file" id="file-upload" /> + <div id="tipson"><input type="checkbox" checked /> ?</div> + <br class="clear" /> <fieldset id="machine"> <legend>Machine</legend> @@ -64,13 +67,25 @@ <label>Max Diff:</label> <input name="MAX_REDUNDANT_TEMP_SENSOR_DIFF" type="text" size="3" maxlength="2" /> - <label class="newline">Temp Residency Time (s):</label> + <label>Temp Residency Time (s):</label> <input name="TEMP_RESIDENCY_TIME" type="text" size="3" maxlength="2" /> </fieldset> - <h2>Marlin/Configuration.h</h2> + <fieldset id="hotends"> + <legend>Hot Ends</legend> + </fieldset> + + <fieldset id="heatbed"> + <legend>Heated Bed</legend> + </fieldset> + + <fieldset id="more"> + <legend>More…</legend> + </fieldset> + + <h2>Marlin/Configuration.h</h2><span class="disclose"></span> <pre id="config_text" class="hilightable"></pre> - <h2>Marlin/Configuration_adv.h</h2> + <h2>Marlin/Configuration_adv.h</h2><span class="disclose"></span> <pre id="config_adv_text" class="hilightable"></pre> <br class="clear" /> diff --git a/Marlin/configurator/js/configurator.js b/Marlin/configurator/js/configurator.js index 126308d215..1675013a09 100644 --- a/Marlin/configurator/js/configurator.js +++ b/Marlin/configurator/js/configurator.js @@ -16,9 +16,9 @@ $(function(){ -var marlin_config = 'config'; +var marlin_config = 'https://api.github.com/repos/MarlinFirmware/Marlin/contents/Marlin'; -// Extend String +// Extend builtins String.prototype.lpad = function(len, chr) { if (chr === undefined) { chr = ' '; } var s = this+'', need = len - s.length; @@ -29,7 +29,13 @@ String.prototype.prePad = function(len, chr) { return len ? this.lpad(len, chr) String.prototype.zeroPad = function(len) { return this.prePad(len, '0'); }; String.prototype.toHTML = function() { return jQuery('<div>').text(this).html(); }; String.prototype.regEsc = function() { return this.replace(/[.?*+^$[\]\\(){}|-]/g, "\\$&"); } -String.prototype.lineCount = function() { var len = this.split(/\r?\n|\r/).length; return len > 0 ? len - 1 : len; }; +String.prototype.lineCount = function() { var len = this.split(/\r?\n|\r/).length; return len > 0 ? len - 1 : 0; }; +String.prototype.toLabel = function() { return this.replace(/_/g, ' ').toTitleCase(); } +String.prototype.toTitleCase = function() { return this.replace(/([A-Z])(\w+)/gi, function(m,p1,p2) { return p1.toUpperCase() + p2.toLowerCase(); }); } +Number.prototype.limit = function(m1, m2) { + if (m2 == null) return this > m1 ? m1 : this; + return this < m1 ? m1 : this > m2 ? m2 : this; +}; /** * selectField.addOptions takes an array or keyed object @@ -56,9 +62,11 @@ var configuratorApp = (function(){ boards_file = 'boards.h', config_file = 'Configuration.h', config_adv_file = 'Configuration_adv.h', + $form = $('#config_form'), $tooltip = $('#tooltip'), $config = $('#config_text'), $config_adv = $('#config_adv_text'), + define_list = [[],[]], boards_list = {}, therms_list = {}, total_config_lines, @@ -74,32 +82,11 @@ var configuratorApp = (function(){ init: function() { self = this; // a 'this' for use when 'this' is something else - // Set up the form + // Set up the form, creating fields and fieldsets as-needed this.initConfigForm(); - // Make tabs for the fieldsets - var $fset = $('#config_form fieldset'); - var $tabs = $('<ul>',{class:'tabs'}), ind = 1; - $('#config_form fieldset').each(function(){ - var tabID = 'TAB'+ind; - $(this).addClass(tabID); - var $leg = $(this).find('legend'); - var $link = $('<a>',{href:'#'+ind,id:tabID}).text($leg.text()); - $tabs.append($('<li>').append($link)); - $link.click(function(e){ - e.preventDefault; - var ind = this.id; - $tabs.find('.active').removeClass('active'); - $(this).addClass('active'); - $fset.hide(); - $fset.filter('.'+this.id).show(); - return false; - }); - ind++; - }); - $tabs.appendTo('#tabs'); - $('<br>',{class:'clear'}).appendTo('#tabs'); - $tabs.find('a:first').trigger('click'); + // Make tabs for all the fieldsets + this.makeTabsForFieldsets(); // Make a droppable file uploader, if possible var $uploader = $('#file-upload'); @@ -110,25 +97,35 @@ var configuratorApp = (function(){ if (!fileUploader.hasFileUploaderSupport()) this.setMessage("Your browser doesn't support the file reading API.", 'error'); + // Make the disclosure items work + $('.disclose').click(function(){ + var $dis = $(this), $pre = $dis.next('pre'); + var didAnim = function() {$dis.toggleClass('closed almost');}; + $dis.addClass('almost').hasClass('closed') + ? $pre.slideDown(500, didAnim) + : $pre.slideUp(500, didAnim); + }); + // Read boards.h, Configuration.h, Configuration_adv.h var ajax_count = 0, success_count = 0; var loaded_items = {}; var config_files = [boards_file, config_file, config_adv_file]; + var isGithub = marlin_config.match('api.github'); $.each(config_files, function(i,fname){ $.ajax({ url: marlin_config+'/'+fname, type: 'GET', + dataType: isGithub ? 'jsonp' : 'script', async: true, cache: false, success: function(txt) { - loaded_items[fname] = function(){ self.fileLoaded(fname, txt); }; + loaded_items[fname] = function(){ self.fileLoaded(fname, isGithub ? atob(txt.data.content) : txt); }; success_count++; }, complete: function() { ajax_count++; if (ajax_count >= 3) { - $.each(config_files, function(i,fname){ if (loaded_items[fname] !== undefined) loaded_items[fname](); }); - self.refreshConfigForm(); + $.each(config_files, function(){ if (loaded_items[this]) loaded_items[this](); }); if (success_count < ajax_count) self.setMessage('Unable to load configurations. Use the upload field instead.', 'error'); } @@ -137,34 +134,6 @@ var configuratorApp = (function(){ }); }, - setMessage: function(msg,type) { - if (msg) { - if (type === undefined) type = 'message'; - var $err = $('<p class="'+type+'">'+msg+'</p>'), err = $err[0]; - $('#message').prepend($err); - var baseColor = $err.css('color').replace(/rgba?\(([^),]+,[^),]+,[^),]+).*/, 'rgba($1,'); - var d = new Date(); - err.pulse_offset = (pulse_offset += 200); - err.startTime = d.getTime() + pulse_offset; - err.pulser = setInterval(function(){ - d = new Date(); - var pulse_time = d.getTime() + err.pulse_offset; - $err.css({color:baseColor+(0.5+Math.sin(pulse_time/200)*0.4)+')'}); - if (pulse_time - err.startTime > 5000) { - clearInterval(err.pulser); - $err.remove(); - } - }, 50); - } - else { - $('#message p.error, #message p.warning').each(function() { - if (this.pulser !== undefined && this.pulser) - clearInterval(this.pulser); - $(this).remove(); - }); - } - }, - /** * Init the boards array from a boards.h file */ @@ -174,7 +143,7 @@ var configuratorApp = (function(){ while((r = findDef.exec(txt)) !== null) { boards_list[r[1]] = r[2].prePad(3, ' ') + " — " + r[4].replace(/\).*/, ')'); } - this.log("Loaded boards", 3); this.log(boards_list, 3); + this.log("Loaded boards " + boards_list.join(' '), 3); has_boards = true; }, @@ -191,6 +160,45 @@ var configuratorApp = (function(){ } }, + /** + * Get all the unique define names + */ + getDefinesFromText: function(txt) { + // Get all the unique #define's and save them in an array + var r, define_obj = {}, findDef = new RegExp('#define[ \\t]+(\\w+)', 'gm'); + var cnt = 0; + while((r = findDef.exec(txt)) !== null) { + if (cnt++ && !(r[1] in define_obj)) define_obj[r[1]] = null; + } + this.log(Object.keys(define_obj), 2); + return Object.keys(define_obj); + }, + + /** + * Create placeholder fields for defines, as needed + */ + createFieldsForDefines: function(adv) { + var e = adv ? 1 : 0, n = 0; + var fail_list = []; + $.each(define_list[e], function(i,name) { + if (!$('#'+name).length) { + var $ff = $('#more'); + var inf = self.getDefineInfo(name, adv); + if (inf) { + var $newlabel = $('<label>',{for:name}).text(name.toLabel()); + // if (!(++n % 3)) + $newlabel.addClass('newline'); + var $newfield = inf.type == 'switch' ? $('<input>',{type:'checkbox'}) : $('<input>',{type:'text',size:10,maxlength:40}); + $newfield.attr({id:name,name:name}).prop({defineInfo:inf}); + $ff.append($newlabel, $newfield); + } + else + fail_list.push(name); + } + }); + if (fail_list) this.log('Unable to parse:\n' + fail_list.join('\n'), 2); + }, + /** * Handle a file being dropped on the file field */ @@ -204,7 +212,7 @@ var configuratorApp = (function(){ this.fileLoaded(filename, txt); break; default: - this.log("Can't parse "+filename, 1); + this.setMessage("Can't parse '"+filename+"'!"); break; } }, @@ -214,12 +222,12 @@ var configuratorApp = (function(){ */ fileLoaded: function(filename, txt) { this.log("fileLoaded:"+filename,4); + var err; switch(filename) { case boards_file: this.initBoardsFromText(txt); $('#MOTHERBOARD').html('').addOptions(boards_list); if (has_config) this.initField('MOTHERBOARD'); - this.setMessage(boards_file+' loaded successfully.'); break; case config_file: if (has_boards) { @@ -227,12 +235,14 @@ var configuratorApp = (function(){ total_config_lines = txt.lineCount(); this.initThermistorsFromText(txt); this.purgeDefineInfo(false); + define_list[0] = this.getDefinesFromText(txt); + this.log(define_list[0], 2); + this.createFieldsForDefines(0); this.refreshConfigForm(); - this.setMessage(config_file+' loaded successfully.'); has_config = true; } else { - this.setMessage("Upload a " + boards_file + " file first!", 'error'); + err = boards_file; } break; case config_adv_file: @@ -240,15 +250,20 @@ var configuratorApp = (function(){ $config_adv.text(txt); total_config_adv_lines = txt.lineCount(); this.purgeDefineInfo(true); + define_list[1] = this.getDefinesFromText(txt); + this.log(define_list[1], 2); this.refreshConfigForm(); - this.setMessage(config_adv_file+' loaded successfully.'); has_config_adv = true; } else { - this.setMessage("Upload a " + config_file + " file first!", 'error'); + err = config_file; } break; } + this.setMessage(err + ? 'Please upload a "' + boards_file + '" file first!' + : '"' + filename + '" loaded successfully.', err ? 'error' : 'message' + ); }, /** @@ -264,7 +279,7 @@ var configuratorApp = (function(){ // while(!$config.text() == null) {} // Go through all form items with names - $('#config_form').find('[name]').each(function() { + $form.find('[name]').each(function() { // Set its id to its name var name = $(this).attr('name'); $(this).attr({id: name}); @@ -304,52 +319,59 @@ var configuratorApp = (function(){ }); }, + /** + * Make tabs to switch between fieldsets + */ + makeTabsForFieldsets: function() { + // Make tabs for the fieldsets + var $fset = $form.find('fieldset'); + var $tabs = $('<ul>',{class:'tabs'}), ind = 1; + $fset.each(function(){ + var tabID = 'TAB'+ind; + $(this).addClass(tabID); + var $leg = $(this).find('legend'); + var $link = $('<a>',{href:'#'+ind,id:tabID}).text($leg.text()); + $tabs.append($('<li>').append($link)); + $link.click(function(e){ + e.preventDefault; + var ind = this.id; + $tabs.find('.active').removeClass('active'); + $(this).addClass('active'); + $fset.hide(); + $fset.filter('.'+this.id).show(); + return false; + }); + ind++; + }); + $('#tabs').html('').append($tabs); + $('<br>',{class:'clear'}).appendTo('#tabs'); + $tabs.find('a:first').trigger('click'); + }, + /** * Update all fields on the form after loading a configuration */ refreshConfigForm: function() { /** - * For now I'm manually creating these references - * but I should be able to parse Configuration.h - * and iterate the #defines. + * Any manually-created form elements will remain + * where they are. Unknown defines (currently most) + * are added to the "More..." tab for now. * - * For any #ifdef blocks I can create field groups - * which can be dimmed together when the option - * is disabled. + * Specific exceptions can be managed by applying + * classes to the associated form fields. + * Sorting and arrangement can come from an included + * js file that describes the configuration in JSON. * - * Then we only need to specify exceptions to - * standard behavior, (which is to add a text field) + * For now I'm trying to derive information + * about options directly from the config file. */ - this.initField('SERIAL_PORT'); - - this.initField('BAUDRATE'); - - this.initField('BTENABLED'); $('#MOTHERBOARD').html('').addOptions(boards_list); - this.initField('MOTHERBOARD'); - - this.initField('CUSTOM_MENDEL_NAME'); - - this.initField('MACHINE_UUID'); - - this.initField('EXTRUDERS'); - - this.initField('POWER_SUPPLY'); - - this.initField('PS_DEFAULT_OFF'); $('#TEMP_SENSOR_0, #TEMP_SENSOR_1, #TEMP_SENSOR_2, #TEMP_SENSOR_BED').html('').addOptions(therms_list); - this.initField('TEMP_SENSOR_0'); - this.initField('TEMP_SENSOR_1'); - this.initField('TEMP_SENSOR_2'); - this.initField('TEMP_SENSOR_BED'); - this.initField('TEMP_SENSOR_1_AS_REDUNDANT'); - this.initField('MAX_REDUNDANT_TEMP_SENSOR_DIFF'); - - this.initField('TEMP_RESIDENCY_TIME'); + $.each(define_list, function() { $.each(this, function() { if ($('#'+this).length) self.initField(this); }); }); }, /** @@ -362,19 +384,21 @@ var configuratorApp = (function(){ var inf = elm.defineInfo = this.getDefineInfo(name, adv); $elm.on($elm.attr('type') == 'text' ? 'input' : 'change', this.handleChange); - if (inf.comment) { + if (inf.tooltip) { var $tipme = $elm.prev('label'); if ($tipme.length) { $tipme.hover( function() { - var pos = $tipme.position(); - $tooltip.html(inf.comment) - .append('<span>') - .css({bottom:($tooltip.parent().outerHeight()-pos.top)+'px',left:(pos.left+70)+'px'}) - .show(); - if (hover_timer) { - clearTimeout(hover_timer); - hover_timer = null; + if ($('#tipson input').prop('checked')) { + var pos = $tipme.position(); + $tooltip.html(inf.tooltip) + .append('<span>') + .css({bottom:($tooltip.parent().outerHeight()-pos.top)+'px',left:(pos.left+70)+'px'}) + .show(); + if (hover_timer) { + clearTimeout(hover_timer); + hover_timer = null; + } } }, function() { @@ -410,7 +434,7 @@ var configuratorApp = (function(){ */ defineValue: function(name) { this.log('defineValue:'+name,4); - var $elm = $('#'+name), elm = $elm[0], inf = elm.defineInfo; + var inf = $('#'+name)[0].defineInfo; if (inf == null) return 'n/a'; var result = inf.regex.exec($(inf.field).text()); @@ -424,7 +448,7 @@ var configuratorApp = (function(){ */ defineIsEnabled: function(name) { this.log('defineIsEnabled:'+name,4); - var $elm = $('#'+name), elm = $elm[0], inf = elm.defineInfo; + var inf = $('#'+name)[0].defineInfo; if (inf == null) return false; var result = inf.regex.exec($(inf.field).text()); @@ -441,15 +465,14 @@ var configuratorApp = (function(){ */ setDefineEnabled: function(name, val) { this.log('setDefineEnabled:'+name,4); - var $elm = $('#'+name), inf = $elm[0].defineInfo; - if (inf == null) return; - - var slash = val ? '' : '//'; - var newline = inf.line - .replace(/^([ \t]*)(\/\/)([ \t]*)/, '$1$3') // remove slashes - .replace(inf.pre+inf.define, inf.pre+slash+inf.define); // add them back - - this.setDefineLine(name, newline); + var inf = $('#'+name)[0].defineInfo; + if (inf) { + var slash = val ? '' : '//'; + var newline = inf.line + .replace(/^([ \t]*)(\/\/)([ \t]*)/, '$1$3') // remove slashes + .replace(inf.pre+inf.define, inf.pre+slash+inf.define); // add them back + this.setDefineLine(name, newline); + } }, /** @@ -486,7 +509,7 @@ var configuratorApp = (function(){ */ setDefineLine: function(name, newline) { this.log('setDefineLine:'+name+'\n'+newline,4); - var $elm = $('#'+name), elm = $elm[0], inf = elm.defineInfo; + var inf = $('#'+name)[0].defineInfo; var $c = $(inf.field), txt = $c.text(); var hilite_token = '[HIGHLIGHTER-TOKEN]'; @@ -501,7 +524,7 @@ var configuratorApp = (function(){ $c.html(html); // Scroll to reveal the define - this.scrollToDefine(name); + if ($c.is(':visible')) this.scrollToDefine(name); }, /** @@ -509,19 +532,17 @@ var configuratorApp = (function(){ */ scrollToDefine: function(name, always) { this.log('scrollToDefine:'+name,4); - var $elm = $('#'+name), inf = $elm[0].defineInfo, $c = $(inf.field); + var inf = $('#'+name)[0].defineInfo, $c = $(inf.field); // Scroll to the altered text if it isn't visible var halfHeight = $c.height()/2, scrollHeight = $c.prop('scrollHeight'), - textScrollY = inf.lineNum * scrollHeight/(inf.adv ? total_config_adv_lines : total_config_lines) - halfHeight; + lineHeight = scrollHeight/(inf.adv ? total_config_adv_lines : total_config_lines), + textScrollY = (inf.lineNum * lineHeight - halfHeight).limit(0, scrollHeight - 1); - if (textScrollY < 0) - textScrollY = 0; - else if (textScrollY > scrollHeight) - textScrollY = scrollHeight - 1; - - if (always == true || Math.abs($c.prop('scrollTop') - textScrollY) > halfHeight) - $c.animate({ scrollTop: textScrollY < 0 ? 0 : textScrollY }); + if (always || Math.abs($c.prop('scrollTop') - textScrollY) > halfHeight) { + $c.find('span').height(lineHeight); + $c.animate({ scrollTop: textScrollY }); + } }, /** @@ -530,7 +551,7 @@ var configuratorApp = (function(){ setFieldFromDefine: function(name) { var $elm = $('#'+name), val = this.defineValue(name); - this.log('setFieldFromDefine:' + name + ' to ' + val, 4); + this.log('setFieldFromDefine:' + name + ' to ' + val, 2); // Set the field value $elm.attr('type') == 'checkbox' ? $elm.prop('checked', val) : $elm.val(''+val); @@ -569,20 +590,20 @@ var configuratorApp = (function(){ /** * Get information about a #define from configuration file text: * - * Pre-examine the #define for its prefix, value position, suffix, etc. - * Construct a regex for the #define to quickly find (and replace) values. - * Store the existing #define line as the key to finding it later. - * Determine the line number of the #define so it can be scrolled to. + * - Pre-examine the #define for its prefix, value position, suffix, etc. + * - Construct RegExp's for the #define to quickly find (and replace) values. + * - Store the existing #define line as a fast key to finding it later. + * - Determine the line number of the #define so it can be scrolled to. + * - Gather nearby comments to be used as tooltips. */ getDefineInfo: function(name, adv) { if (adv === undefined) adv = false; this.log('getDefineInfo:'+name,4); - var $elm = $('#'+name), elm = $elm[0], - $c = adv ? $config_adv : $config, + var $c = adv ? $config_adv : $config, txt = $c.text(); // a switch line with no value - var findDef = new RegExp('^([ \\t]*//)?([ \\t]*#define[ \\t]+' + elm.id + ')([ \\t]*/[*/].*)?$', 'm'), + var findDef = new RegExp('^([ \\t]*//)?([ \\t]*#define[ \\t]+' + name + ')([ \\t]*/[*/].*)?$', 'm'), result = findDef.exec(txt), info = { type:0, adv:adv, field:$c[0], val_i: 2 }; if (result !== null) { @@ -599,7 +620,7 @@ var configuratorApp = (function(){ } else { // a define with quotes - findDef = new RegExp('^(.*//)?(.*#define[ \\t]+' + elm.id + '[ \\t]+)("[^"]*")([ \\t]*/[*/].*)?$', 'm'); + findDef = new RegExp('^(.*//)?(.*#define[ \\t]+' + name + '[ \\t]+)("[^"]*")([ \\t]*/[*/].*)?$', 'm'); result = findDef.exec(txt); if (result !== null) { $.extend(info, { @@ -614,7 +635,7 @@ var configuratorApp = (function(){ } else { // a define with no quotes - findDef = new RegExp('^([ \\t]*//)?([ \\t]*#define[ \\t]+' + elm.id + '[ \\t]+)(\\S*)([ \\t]*/[*/].*)?$', 'm'); + findDef = new RegExp('^([ \\t]*//)?([ \\t]*#define[ \\t]+' + name + '[ \\t]+)(\\S*)([ \\t]*/[*/].*)?$', 'm'); result = findDef.exec(txt); if (result !== null) { $.extend(info, { @@ -632,10 +653,10 @@ var configuratorApp = (function(){ if (info.type) { // Get the end-of-line comment, if there is one - var comment = ''; + var tooltip = ''; findDef = new RegExp('.*#define[ \\t].*/[/*]+[ \\t]*(.*)'); if (info.line.search(findDef) >= 0) - comment = info.line.replace(findDef, '$1'); + tooltip = info.line.replace(findDef, '$1'); // Get all the comments immediately before the item var r, s; @@ -644,16 +665,16 @@ var configuratorApp = (function(){ findDef = new RegExp('^[ \\t]*//+[ \\t]*(.*)[ \\t]*$', 'gm'); while((s = findDef.exec(r[1])) !== null) { if (s[1].match(/^#define[ \\t]/) != null) { - comment = ''; + tooltip = ''; break; } - comment += ' ' + s[1] + "\n"; + tooltip += ' ' + s[1] + "\n"; } } findDef = new RegExp('^[ \\t]*'+name+'[ \\t]*', 'm'); $.extend(info, { - comment: '<strong>'+name+'</strong> '+comment.replace(findDef,'').trim().toHTML(), + tooltip: '<strong>'+name+'</strong> '+tooltip.replace(findDef,'').trim().toHTML(), lineNum: this.getLineNumberOfText(info.line, txt) }); } @@ -673,6 +694,37 @@ var configuratorApp = (function(){ return (pos < 0) ? pos : txt.substr(0, pos).lineCount(); }, + /** + * Add a temporary message to the page + */ + setMessage: function(msg,type) { + if (msg) { + if (type === undefined) type = 'message'; + var $err = $('<p class="'+type+'">'+msg+'</p>'), err = $err[0]; + $('#message').prepend($err); + var baseColor = $err.css('color').replace(/rgba?\(([^),]+,[^),]+,[^),]+).*/, 'rgba($1,'); + var d = new Date(); + err.pulse_offset = (pulse_offset += 200); + err.startTime = d.getTime() + pulse_offset; + err.pulser = setInterval(function(){ + d = new Date(); + var pulse_time = d.getTime() + err.pulse_offset; + $err.css({color:baseColor+(0.5+Math.sin(pulse_time/200)*0.4)+')'}); + if (pulse_time - err.startTime > 5000) { + clearInterval(err.pulser); + $err.remove(); + } + }, 50); + } + else { + $('#message p.error, #message p.warning').each(function() { + if (this.pulser !== undefined && this.pulser) + clearInterval(this.pulser); + $(this).remove(); + }); + } + }, + log: function(o,l) { if (l === undefined) l = 0; if (this.logging>=l*1) console.log(o); From 52c3cf6d34e9577dd79ffc34395458152483cb70 Mon Sep 17 00:00:00 2001 From: Scott Lahteine <sourcetree@thinkyhead.com> Date: Mon, 9 Feb 2015 05:07:05 -0800 Subject: [PATCH 25/41] Fix a logging error --- Marlin/configurator/js/configurator.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/configurator/js/configurator.js b/Marlin/configurator/js/configurator.js index 1675013a09..7ebda35436 100644 --- a/Marlin/configurator/js/configurator.js +++ b/Marlin/configurator/js/configurator.js @@ -143,7 +143,7 @@ var configuratorApp = (function(){ while((r = findDef.exec(txt)) !== null) { boards_list[r[1]] = r[2].prePad(3, ' ') + " — " + r[4].replace(/\).*/, ')'); } - this.log("Loaded boards " + boards_list.join(' '), 3); + this.log("Loaded boards:\n" + Object.keys(boards_list).join('\n'), 3); has_boards = true; }, From e74138b2becfe6ebb6a25cb5a0e41c1488fdd91d Mon Sep 17 00:00:00 2001 From: Scott Lahteine <sourcetree@thinkyhead.com> Date: Wed, 11 Feb 2015 04:59:07 -0800 Subject: [PATCH 26/41] More robust fetch code, download buttons MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Fetch code now handles github, local, or http: access - Download button creates a time-stamped inline download - More complete error messages - Show warnings when approaching the hourly fetch quota (limit reloading!) - Added my test domain (where the _htaccess is deployed) - `_htaccess` file added to set Access-Control-Allow-Origin “*” - Marlin logo with css - Limit selectable areas to avoid annoying selections - Messages now persist until dismissed - Default repo for files set to thinkyhead, ‘marlin_configurator’ branch - Cosmetic changes --- Marlin/configurator/config/Configuration.h | 1 + Marlin/configurator/config/_htaccess | 1 + Marlin/configurator/css/configurator.css | 174 +++++++++++++++---- Marlin/configurator/css/logo.png | Bin 0 -> 1266 bytes Marlin/configurator/index.html | 25 ++- Marlin/configurator/js/configurator.js | 191 ++++++++++++++++++--- 6 files changed, 321 insertions(+), 71 deletions(-) create mode 100644 Marlin/configurator/config/_htaccess create mode 100644 Marlin/configurator/css/logo.png diff --git a/Marlin/configurator/config/Configuration.h b/Marlin/configurator/config/Configuration.h index 770c86eb1e..13d5545e40 100644 --- a/Marlin/configurator/config/Configuration.h +++ b/Marlin/configurator/config/Configuration.h @@ -51,6 +51,7 @@ Here are some standard links for getting your machine calibrated: #define SERIAL_PORT 0 // This determines the communication speed of the printer +// :[2400,9600,19200,38400,57600,115200,250000] #define BAUDRATE 250000 // This enables the serial port associated to the Bluetooth interface diff --git a/Marlin/configurator/config/_htaccess b/Marlin/configurator/config/_htaccess new file mode 100644 index 0000000000..f289550940 --- /dev/null +++ b/Marlin/configurator/config/_htaccess @@ -0,0 +1 @@ +Header set Access-Control-Allow-Origin "*" diff --git a/Marlin/configurator/css/configurator.css b/Marlin/configurator/css/configurator.css index 6203114750..e9ef345d9e 100644 --- a/Marlin/configurator/css/configurator.css +++ b/Marlin/configurator/css/configurator.css @@ -1,22 +1,82 @@ /* configurator.css */ /* Styles for Marlin Configurator */ -body { margin: 0; padding: 0; background: #56A; color: #FFC; font-family: sans-serif; } -fieldset { height: 16.1em; overflow: auto; margin-top: 10px; } -#main { max-width: 1000px; margin: 0 auto; } -#main { padding: 0 4%; width: 92%; } -#main { font-family: monospace; } -h1, #message { text-align: center; } +.clear { clear: both; } + +/* Prevent selection except PRE tags */ +* { + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + } +pre { + -webkit-touch-callout: text; + -webkit-user-select: text; + -khtml-user-select: text; + -moz-user-select: text; + -ms-user-select: text; + user-select: text; + } + +body { margin: 0; padding: 0; background: #56A; color: #000; font-family: monospace; } +#main { + max-width: 1000px; + margin: 0 auto; + padding: 0 4%; width: 92%; + } + +h1, h2, h3, h4, h5, h6 { clear: both; } + +h1, p.info { font-family: sans-serif; } +h1 { + background: transparent url(logo.png) right top no-repeat; + height: 38px; + margin-bottom: -30px; + } +p.info { padding: 0; color: #000; } +p.info span { color: #800; } + +#message { text-align: center; } #message { width: 80%; margin: 0 auto 0.25em; color: #FF0; } #message p { padding: 2px 0; } #message p.error, #message p.message { color: #F00; background: #FF4; font-weight: bold; border-radius: 0.8em; } #message p.message { color: #080; background: #CFC; } +#message p.message span { + color: #A00; + background: rgba(255, 255, 255, 1); + border: 1px solid rgba(0,0,0,0.5); + border-radius: 1em; + float: right; + margin-right: 0.5em; + padding: 0 3px; + font-family: sans-serif; + font-size: small; + position: relative; + top: -1px; + } -.info { color: #AAF; } -.info span { color: #FFF; } -.info span span { color: #000; font-weight: bold; } #help strong { color: #0DD; } img { display: none; } + +/* Forms */ + +#config_form { + display: block; + background: #EEE; + padding: 6px 20px 20px; + color: #000; + position: relative; + border-top-right-radius: 1.5em; + } +fieldset { + height: 16.1em; + overflow-y: scroll; + overflow-x: hidden; + margin-top: 10px; + } label, input, select, textarea { display: block; float: left; margin: 1px 0; } label.newline, textarea, fieldset { clear: both; } label { @@ -28,31 +88,9 @@ label { } input[type="text"], select { margin: 0.75em 0 0; } input[type="checkbox"], input[type="radio"], input[type="file"] { margin: 1em 0 0; } -#config_form { - display: block; - background: #EEE; - padding: 6px 20px 20px; - color: #000; - position: relative; - } - -/*#config_text, #config_adv_text { font-family: "Andale mono", monospace; clear: both; }*/ -#config_text, #config_adv_text { - height: 25em; - padding: 10px; - border: 2px solid #888; - border-radius: 5px; - overflow: auto; - background-color: #FFF; - color: #000; - font-family: "Fira Mono"; - font-size: small; - } input[type="checkbox"], input[type="radio"].enabler { margin-left: 1em; } + input:disabled { color: #BBB; } -.clear { clear: both; } -h1, h2, h3, h4, h5, h6 { clear: both; } -h2 { margin: 0; padding: 1em 0 0; } ul.tabs { padding: 0; list-style: none; } ul.tabs li { display: inline; } @@ -100,6 +138,8 @@ fieldset legend { display: none; } #serial_stepper { padding-top: 0.75em; display: block; float: left; } #SERIAL_PORT { display: none; } +/* Tooltips */ + #tooltip { display: none; max-width: 30em; @@ -138,18 +178,61 @@ fieldset legend { display: none; } } #tooltip>strong { color: #00B; } -span.disclose { +/* Tooltips Checkbox */ + +#tipson { float: right; font-weight: bold; font-size: 100%; font-family: helvetica; } +#tipson input { float: none; display: inline; } + +/* Config Text */ + +pre.config { + height: 25em; + padding: 10px; + border: 2px solid #888; + border-radius: 5px; + overflow: auto; + clear: both; + background-color: #FFF; + color: #000; + font-family: "Fira Mono"; + font-size: small; + } + +/* Pre Headers */ + +h2 { + width: 100%; + margin: 12px -300px 4px 0; + padding: 0; + float: left; + } + +/* Disclosure Widget */ + +span.disclose, a.download {︎ + display: block; float: right; - margin-top: -10px; + margin-top: 12px; + } + +span.disclose { + margin-right: -10px; /* total width */ + margin-left: 14px; width: 0; height: 0; + position: relative; + left: 3px; + top: 3px; cursor: pointer; border-left: 8px solid transparent; border-right: 8px solid transparent; border-top: 10px solid #000; } span.disclose.closed { - margin: -14px 4px 0 0; + margin-right: -8px; /* total width */ + margin-left: 10px; + left: 0; + top: 0; border-top: 8px solid transparent; border-bottom: 8px solid transparent; border-right: 10px solid #000; @@ -160,9 +243,26 @@ span.disclose.almost { transform: rotate(45deg); } span.disclose.closed.almost { + left: 1px; + top: 3px; -ms-transform: rotate(315deg); /* IE 9 */ -webkit-transform: rotate(315deg); /* Chrome, Safari, Opera */ transform: rotate(315deg); } -#tipson { float: right; font-weight: bold; font-size: 100%; font-family: helvetica; } -#tipson input { float: none; display: inline; } + +/* Download Button */ + +a.download { + visibility: hidden; + padding: 2px; + border: 1px solid #494; + border-radius: 4px; + margin: 12px 0 0; + background: #FFF; + color: #494; + font-family: sans-serif; + font-size: small; + font-weight: bold; + text-decoration: none; + } + diff --git a/Marlin/configurator/css/logo.png b/Marlin/configurator/css/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..0618dc17ae4ab7842475d493592e8184fd9a77e9 GIT binary patch literal 1266 zcmV<O1P%L%P)<h;3K|Lk000e1NJLTq003|R001Tk1ONa4wm#P?00009a7bBm000fw z000fw0YWI7cmMzc7->U8P*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-muNV4mRU;^fLC zz`#&YR8r&~<QN$d8KuB}o`H>lnSp_Ufq@}0xwybFAi#%#fq@|}KQEO56)-X|e7nZL z$iTqBa9P*U#mSX{G{Bl%P*lRez;J+pfx##xwK$o9f#C}S14DXwNkIt%17i#W1A|CX zc0maP17iUL1A|C*NRTrF17iyV0~1e4YDEbH0|SF|enDkXW_m`6f}y3QrGjHhep0GJ zaAk2xYHqQDXI^rCQ9*uDVo7QW0|Nup4h9AW240u^5(W3f%sd4n162kpgNVo|1qcff zJ_s=cNG>fZg9jx8g8+j9g8_pBLjXe}Lp{R+hNBE`7{wV~7)u#fFy3PlV+vxLz;uCG zm^qSpA@ds+OO_6nTdaDlt*rOhEZL^9ePa)2-_4=K(Z%tFGm-NGmm}8}ZcXk5JW@PU zd4+f<@d@)y<Co!IETAK>L(o<5icqT158+-B6_LH7;i6x}CW#w~Uy-Pgl#@Irl`kzV zeL|*8R$ca%T%Wv){2zs_iiJvgN^h0dsuZZ2sQy$tsNSU!s;Q*;LF<6_B%M@UD?LHI zSNcZ`78uqV#TeU~$eS{ozBIdFzSClf<pirb>s*^S+dw;4dus<{M;#|MXC)T}S9v!D zcV!QCPhBq)ZyO(X-(bH4|NMaZz==UigLj2o41F2S6d@OB6%`R(5i>J(Puzn9wnW{e zu;hl6HK{k#IWjCVGqdJqU(99Cv(K+6*i`tgSi2;vbXD1#3jNBGs$DgVwO(~o>mN4i zHPtkqZIx>)Y(Ls5-Br|mx>vQYvH$Kwn@O`L|D75??eGkZnf<fA&q<hjdcOIBrHe!s zw=Vg%EOYt2l_9H6uW?zsZ@uM)ZJSIsZ`o?HZTk+Zo%?sY?m4?JZ2yCUIfs58X+I`@ ze8oxYQ|HbkpZ#@y(nak{N3SGa{daxNO`BVH@6_K@zJKCj-ea*R`=4dL5P5m<b^crV zcNac1eKP(0>g$5<;Xeg_o%+-I&+-3%01W^SH2RkDT>t<8AY({UO#lFTB>(_`g8%^e z{{R4h=>PzAFaQARU;qF*m;eA5Z<1fdMgRZ-R7pfZRCwC#nZXi+APhv=jQ{`3+e>SU zEwExT0#k1aB9BcrieUOYke@DaZ0n+BfG@n6D53S@jyIo#3Zl)6r_I^s3(a$gHoJ+i z8O9t<Kcur!1*J^XZlZ8K9-0*uaV|u0xB-Q=f@sw~nxZREO%oiAmT_~@)Cr@~GBV=U z&O8(bLhe*I*Sk_KT6<7R*GE-xQ#!I>-4w!>lD)I5aQuq5<D9nWH^h>`YrT4&lOvip zoaVIG{TQOs7N=c(wXgXx<Xp74bf+{Wc9<24_kU-##puV%!|^pacGpxkEy`llJ6pqe z@i{EES}dMFROg;dZ1Kg7xYK{|{sE)kWEKLXGosHZK_-Ldc85L+#{s0vs?+t;+BpX~ z&?rGBGa4e8z<GDJ+Znug9VBeT+U4ovmJ+cZ;<LbD|MNNH573r&PvQ7>o5iy4C)Wy? c%(Cq<0NcG|Qs2|@asU7T07*qoM6N<$f&+;(;s5{u literal 0 HcmV?d00001 diff --git a/Marlin/configurator/index.html b/Marlin/configurator/index.html index 46f862bf1c..ffd4a36f53 100644 --- a/Marlin/configurator/index.html +++ b/Marlin/configurator/index.html @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> - <title>Marlin Configurator</title> + <title>Marlin Firmware Configurator</title> <link href='http://fonts.googleapis.com/css?family=Fira+Mono&subset=latin,latin-ext' rel='stylesheet' type='text/css' /> <script src="js/jquery-2.1.3.min.js"></script> <script src="js/binarystring.js"></script> @@ -15,11 +15,9 @@ <body> <section id="main"> <h1>Marlin Configurator</h1> + <p class="info">Select presets (coming soon), modify, and download.</p> - <div id="message"> - <p class="info">Enter values in the form, get a Marlin configuration.<br/>Will include a drop-down of known configurations.</p> - </div> - + <div id="message"></div> <div id="tabs"></div> <form id="config_form"> @@ -83,10 +81,19 @@ <legend>More…</legend> </fieldset> - <h2>Marlin/Configuration.h</h2><span class="disclose"></span> - <pre id="config_text" class="hilightable"></pre> - <h2>Marlin/Configuration_adv.h</h2><span class="disclose"></span> - <pre id="config_adv_text" class="hilightable"></pre> + <section id="config_text"> + <h2>Configuration.h</h2> + <span class="disclose"></span> + <a href="" class="download">Download</a> + <pre class="hilightable config"></pre> + </section> + + <section id="config_adv_text"> + <h2>Configuration_adv.h</h2> + <span class="disclose"></span> + <a href="" class="download">Download</a> + <pre class="hilightable config"></pre> + </section> <br class="clear" /> </form> diff --git a/Marlin/configurator/js/configurator.js b/Marlin/configurator/js/configurator.js index 7ebda35436..88af7d6524 100644 --- a/Marlin/configurator/js/configurator.js +++ b/Marlin/configurator/js/configurator.js @@ -16,7 +16,62 @@ $(function(){ -var marlin_config = 'https://api.github.com/repos/MarlinFirmware/Marlin/contents/Marlin'; +/** + * Github API useful GET paths. (Start with "https://api.github.com/repos/:owner/:repo/") + * + * contributors Get a list of contributors + * tags Get a list of tags + * contents/[path]?ref=branch/tag/commit Get the contents of a file + */ + + // GitHub + // Warning! Limited to 60 requests per hour! +var config = { + type: 'github', + host: 'https://api.github.com', + owner: 'thinkyhead', + repo: 'Marlin', + ref: 'marlin_configurator', + path: 'Marlin/configurator/config' +}; +/**/ + +/* // Remote +var config = { + type: 'remote', + host: 'http://www.thinkyhead.com', + path: '_marlin/config' +}; +/**/ + +/* // Local +var config = { + type: 'local', + path: 'config' +}; +/**/ + +function github_command(conf, command, path) { + var req = conf.host+'/repos/'+conf.owner+'/'+conf.repo+'/'+command; + if (path) req += '/' + path; + return req; +} +function config_path(item) { + var path = '', ref = ''; + switch(config.type) { + case 'github': + path = github_command(config, 'contents', config.path); + if (config.ref !== undefined) ref = '?ref=' + config.ref; + break; + case 'remote': + path = config.host + '/' + config.path + '/'; + break; + case 'local': + path = config.path + '/'; + break; + } + return path + '/' + item + ref; +} // Extend builtins String.prototype.lpad = function(len, chr) { @@ -25,6 +80,7 @@ String.prototype.lpad = function(len, chr) { if (need > 0) { s = new Array(need+1).join(chr) + s; } return s; }; + String.prototype.prePad = function(len, chr) { return len ? this.lpad(len, chr) : this; }; String.prototype.zeroPad = function(len) { return this.prePad(len, '0'); }; String.prototype.toHTML = function() { return jQuery('<div>').text(this).html(); }; @@ -36,6 +92,19 @@ Number.prototype.limit = function(m1, m2) { if (m2 == null) return this > m1 ? m1 : this; return this < m1 ? m1 : this > m2 ? m2 : this; }; +Date.prototype.fileStamp = function(filename) { + var fs = this.getFullYear() + + ((this.getMonth()+1)+'').zeroPad(2) + + (this.getDate()+'').zeroPad(2) + + (this.getHours()+'').zeroPad(2) + + (this.getMinutes()+'').zeroPad(2) + + (this.getSeconds()+'').zeroPad(2); + + if (filename !== undefined) + return filename.replace(/^(.+)(\.\w+)$/g, '$1-['+fs+']$2'); + + return fs; +} /** * selectField.addOptions takes an array or keyed object @@ -49,6 +118,12 @@ $.fn.extend({ sel.append( $('<option>',{value:isArr?v:k}).text(v) ); }); }); + }, + noSelect: function() { + return this + .attr('unselectable', 'on') + .css('user-select', 'none') + .on('selectstart', false); } }); @@ -62,10 +137,11 @@ var configuratorApp = (function(){ boards_file = 'boards.h', config_file = 'Configuration.h', config_adv_file = 'Configuration_adv.h', + $msgbox = $('#message'), $form = $('#config_form'), $tooltip = $('#tooltip'), - $config = $('#config_text'), - $config_adv = $('#config_adv_text'), + $config = $('#config_text pre'), + $config_adv = $('#config_adv_text pre'), define_list = [[],[]], boards_list = {}, therms_list = {}, @@ -88,6 +164,9 @@ var configuratorApp = (function(){ // Make tabs for all the fieldsets this.makeTabsForFieldsets(); + // No selection on errors + $msgbox.noSelect(); + // Make a droppable file uploader, if possible var $uploader = $('#file-upload'); var fileUploader = new BinaryFileUploader({ @@ -99,41 +178,98 @@ var configuratorApp = (function(){ // Make the disclosure items work $('.disclose').click(function(){ - var $dis = $(this), $pre = $dis.next('pre'); + var $dis = $(this), $pre = $dis.nextAll('pre:first'); var didAnim = function() {$dis.toggleClass('closed almost');}; $dis.addClass('almost').hasClass('closed') - ? $pre.slideDown(500, didAnim) - : $pre.slideUp(500, didAnim); + ? $pre.slideDown(200, didAnim) + : $pre.slideUp(200, didAnim); }); // Read boards.h, Configuration.h, Configuration_adv.h var ajax_count = 0, success_count = 0; var loaded_items = {}; var config_files = [boards_file, config_file, config_adv_file]; - var isGithub = marlin_config.match('api.github'); + var isGithub = config.type == 'github'; + var rateLimit = 0; $.each(config_files, function(i,fname){ + var url = config_path(fname); $.ajax({ - url: marlin_config+'/'+fname, + url: url, type: 'GET', - dataType: isGithub ? 'jsonp' : 'script', + dataType: isGithub ? 'jsonp' : undefined, async: true, cache: false, + error: function(req, stat, err) { + self.log(req, 1); + if (req.status == 200) { + if (typeof req.responseText === 'string') { + var txt = req.responseText; + loaded_items[fname] = function(){ self.fileLoaded(fname, txt); }; + success_count++; + // self.setMessage('The request for "'+fname+'" may be malformed.', 'error'); + } + } + else { + self.setRequestError(req.status ? req.status : '(Access-Control-Allow-Origin?)', url); + } + }, success: function(txt) { - loaded_items[fname] = function(){ self.fileLoaded(fname, isGithub ? atob(txt.data.content) : txt); }; - success_count++; + if (isGithub && typeof txt.meta.status !== undefined && txt.meta.status != 200) { + self.setRequestError(txt.meta.status, url); + } + else { + // self.log(txt, 1); + if (isGithub) { + rateLimit = { + quota: 1 * txt.meta['X-RateLimit-Remaining'], + timeLeft: Math.floor(txt.meta['X-RateLimit-Reset'] - Date.now()/1000), + }; + } + loaded_items[fname] = function(){ self.fileLoaded(fname, isGithub ? atob(txt.data.content) : txt); }; + success_count++; + } }, complete: function() { ajax_count++; if (ajax_count >= 3) { $.each(config_files, function(){ if (loaded_items[this]) loaded_items[this](); }); if (success_count < ajax_count) - self.setMessage('Unable to load configurations. Use the upload field instead.', 'error'); + self.setMessage('Unable to load configurations. Try the upload field.', 'error'); + var r; + if (r = rateLimit) { + if (r.quota < 20) { + self.setMessage( + 'Approaching request limit (' + + r.quota + ' remaining.' + + ' Reset in ' + Math.floor(r.timeLeft/60) + ':' + (r.timeLeft%60+'').zeroPad(2) + ')' + ); + } + } } } }); }); }, + createDownloadLink: function(adv) { + var $c = adv ? $config_adv : $config, txt = $c.text(); + var filename = (adv ? config_adv_file : config_file); + $c.prevAll('.download:first') + .mouseover(function() { + var d = new Date(), fn = d.fileStamp(filename); + $(this).attr({ download:fn, href:'download:'+fn, title:'download:'+fn }); + }) + .click(function(){ + var $button = $(this); + $(this).attr({ href:'data:text/plain;charset=utf-8,' + encodeURIComponent($c.text()) }); + setTimeout(function(){ + $button.attr({ href:$button.attr('title') }); + }, 100); + return true; + }) + .css({visibility:'visible'}); + }, + /** * Init the boards array from a boards.h file */ @@ -239,6 +375,7 @@ var configuratorApp = (function(){ this.log(define_list[0], 2); this.createFieldsForDefines(0); this.refreshConfigForm(); + this.createDownloadLink(false); has_config = true; } else { @@ -253,6 +390,7 @@ var configuratorApp = (function(){ define_list[1] = this.getDefinesFromText(txt); this.log(define_list[1], 2); this.refreshConfigForm(); + this.createDownloadLink(true); has_config_adv = true; } else { @@ -289,7 +427,7 @@ var configuratorApp = (function(){ }); // Get all 'switchable' class items and add a checkbox - $('#config_form .switchable').each(function(){ + $form.find('.switchable').each(function(){ $(this).after( $('<input>',{type:'checkbox',value:'1',class:'enabler'}).prop('checked',true) .attr('id',this.id + '-switch') @@ -651,6 +789,7 @@ var configuratorApp = (function(){ } } + // Success? if (info.type) { // Get the end-of-line comment, if there is one var tooltip = ''; @@ -668,11 +807,11 @@ var configuratorApp = (function(){ tooltip = ''; break; } - tooltip += ' ' + s[1] + "\n"; + tooltip += ' ' + s[1] + '\n'; } } - findDef = new RegExp('^[ \\t]*'+name+'[ \\t]*', 'm'); + findDef = new RegExp('^[ \\t]*'+name); // To strip the name from the start $.extend(info, { tooltip: '<strong>'+name+'</strong> '+tooltip.replace(findDef,'').trim().toHTML(), lineNum: this.getLineNumberOfText(info.line, txt) @@ -700,24 +839,22 @@ var configuratorApp = (function(){ setMessage: function(msg,type) { if (msg) { if (type === undefined) type = 'message'; - var $err = $('<p class="'+type+'">'+msg+'</p>'), err = $err[0]; - $('#message').prepend($err); + var $err = $('<p class="'+type+'">'+msg+'<span>x</span></p>').appendTo($msgbox), err = $err[0]; var baseColor = $err.css('color').replace(/rgba?\(([^),]+,[^),]+,[^),]+).*/, 'rgba($1,'); - var d = new Date(); err.pulse_offset = (pulse_offset += 200); - err.startTime = d.getTime() + pulse_offset; + err.startTime = Date.now() + pulse_offset; err.pulser = setInterval(function(){ - d = new Date(); - var pulse_time = d.getTime() + err.pulse_offset; - $err.css({color:baseColor+(0.5+Math.sin(pulse_time/200)*0.4)+')'}); - if (pulse_time - err.startTime > 5000) { + var pulse_time = Date.now() + err.pulse_offset; + var opac = 0.5+Math.sin(pulse_time/200)*0.4; + $err.css({color:baseColor+(opac)+')'}); + if (pulse_time - err.startTime > 2500 && opac > 0.899) { clearInterval(err.pulser); - $err.remove(); } }, 50); + $err.click(function(e) { $(this).remove(); return false; }).css({cursor:'pointer'}); } else { - $('#message p.error, #message p.warning').each(function() { + $msgbox.find('p.error, p.warning').each(function() { if (this.pulser !== undefined && this.pulser) clearInterval(this.pulser); $(this).remove(); @@ -725,6 +862,10 @@ var configuratorApp = (function(){ } }, + setRequestError: function(stat, path) { + self.setMessage('Error '+stat+' – ' + path.replace(/^(https:\/\/[^\/]+\/)?.+(\/[^\/]+)$/, '$1...$2'), 'error'); + }, + log: function(o,l) { if (l === undefined) l = 0; if (this.logging>=l*1) console.log(o); From ec53c6309a2b1a4df82f239513c1fd1e08d32500 Mon Sep 17 00:00:00 2001 From: Scott Lahteine <sourcetree@thinkyhead.com> Date: Fri, 13 Feb 2015 03:02:56 -0800 Subject: [PATCH 27/41] More fields, options in config, fix tooltips --- Marlin/configurator/config/Configuration.h | 6 +- Marlin/configurator/css/configurator.css | 18 +- Marlin/configurator/js/configurator.js | 222 +++++++++++++-------- 3 files changed, 162 insertions(+), 84 deletions(-) diff --git a/Marlin/configurator/config/Configuration.h b/Marlin/configurator/config/Configuration.h index 13d5545e40..e0c9cc3010 100644 --- a/Marlin/configurator/config/Configuration.h +++ b/Marlin/configurator/config/Configuration.h @@ -48,6 +48,7 @@ Here are some standard links for getting your machine calibrated: // SERIAL_PORT selects which serial port should be used for communication with the host. // This allows the connection of wireless adapters (for instance) to non-default port pins. // Serial port 0 is still used by the Arduino bootloader regardless of this setting. +// :[0,1,2,3,4,5,6,7] #define SERIAL_PORT 0 // This determines the communication speed of the printer @@ -71,12 +72,13 @@ Here are some standard links for getting your machine calibrated: // #define MACHINE_UUID "00000000-0000-0000-0000-000000000000" // This defines the number of extruders +// :[1,2,3,4] #define EXTRUDERS 1 //// The following define selects which power supply you have. Please choose the one that matches your setup // 1 = ATX // 2 = X-Box 360 203Watts (the blue wire connected to PS_ON and the red wire to VCC) - +// :{1:'ATX',2:'X-Box 360'} #define POWER_SUPPLY 1 // Define this to have the electronics keep the power supply off on startup. If you don't know what this is leave it. @@ -119,7 +121,7 @@ Here are some standard links for getting your machine calibrated: // 1010 is Pt1000 with 1k pullup (non standard) // 147 is Pt100 with 4k7 pullup // 110 is Pt100 with 1k pullup (non standard) - +// :{ 0: "Not used", 4: "10k !! do not use for a hotend. Bad resolution at high temp. !!", 1: "100k / 4.7k - EPCOS", 51: "100k / 1k - EPCOS", 6: "100k / 4.7k EPCOS - Not as accurate as Table 1", 5: "100K / 4.7k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", 7: "100k / 4.7k Honeywell 135-104LAG-J01", 71: "100k / 4.7k Honeywell 135-104LAF-J01", 8: "100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT", 9: "100k / 4.7k GE Sensing AL03006-58.2K-97-G1", 10: "100k / 4.7k RS 198-961", 11: "100k / 4.7k beta 3950 1%", 12: "100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT (calibrated for Makibox hot bed)", 13: "100k Hisens 3950 1% up to 300°C for hotend 'Simple ONE ' & hotend 'All In ONE'", 60: "100k Maker's Tool Works Kapton Bed Thermistor beta=3950", 55: "100k / 1k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", 2: "200k / 4.7k - ATC Semitec 204GT-2", 52: "200k / 1k - ATC Semitec 204GT-2", '-2': "Thermocouple + MAX6675 (only for sensor 0)", '-1': "Thermocouple + AD595", 3: "Mendel-parts / 4.7k", 1047: "Pt1000 / 4.7k", 1010: "Pt1000 / 1k (non standard)", 20: "PT100 (Ultimainboard V2.x)", 147: "Pt100 / 4.7k", 110: "Pt100 / 1k (non-standard)" } #define TEMP_SENSOR_0 -1 #define TEMP_SENSOR_1 -1 #define TEMP_SENSOR_2 0 diff --git a/Marlin/configurator/css/configurator.css b/Marlin/configurator/css/configurator.css index e9ef345d9e..62157078f0 100644 --- a/Marlin/configurator/css/configurator.css +++ b/Marlin/configurator/css/configurator.css @@ -41,9 +41,10 @@ p.info span { color: #800; } #message { text-align: center; } #message { width: 80%; margin: 0 auto 0.25em; color: #FF0; } -#message p { padding: 2px 0; } -#message p.error, #message p.message { color: #F00; background: #FF4; font-weight: bold; border-radius: 0.8em; } +#message p { padding: 2px 0; font-weight: bold; border-radius: 0.8em; } #message p.message { color: #080; background: #CFC; } +#message p.error { color: #F00; background: #FF4; } +#message p.warning { color: #FF0; background: #BA4; } #message p.message span { color: #A00; background: rgba(255, 255, 255, 1); @@ -92,6 +93,17 @@ input[type="checkbox"], input[type="radio"].enabler { margin-left: 1em; } input:disabled { color: #BBB; } +#more input[type="text"] { width: 20em; } + +#more label { + width: 240px; /* label area */ + height: 1em; + padding: 10px 360px 10px 1em; + margin-right: -350px; + text-align: right; + } + + ul.tabs { padding: 0; list-style: none; } ul.tabs li { display: inline; } ul.tabs li a, @@ -136,7 +148,7 @@ fieldset legend { display: none; } } #serial_stepper { padding-top: 0.75em; display: block; float: left; } -#SERIAL_PORT { display: none; } +/*#SERIAL_PORT { display: none; }*/ /* Tooltips */ diff --git a/Marlin/configurator/js/configurator.js b/Marlin/configurator/js/configurator.js index 88af7d6524..0d7de3608b 100644 --- a/Marlin/configurator/js/configurator.js +++ b/Marlin/configurator/js/configurator.js @@ -165,7 +165,7 @@ var configuratorApp = (function(){ this.makeTabsForFieldsets(); // No selection on errors - $msgbox.noSelect(); + // $msgbox.noSelect(); // Make a droppable file uploader, if possible var $uploader = $('#file-upload'); @@ -231,30 +231,39 @@ var configuratorApp = (function(){ }, complete: function() { ajax_count++; - if (ajax_count >= 3) { - $.each(config_files, function(){ if (loaded_items[this]) loaded_items[this](); }); + if (ajax_count >= config_files.length) { + // If not all files loaded set an error if (success_count < ajax_count) self.setMessage('Unable to load configurations. Try the upload field.', 'error'); + + // Is the request near the rate limit? Set an error. var r; if (r = rateLimit) { if (r.quota < 20) { self.setMessage( 'Approaching request limit (' + r.quota + ' remaining.' + - ' Reset in ' + Math.floor(r.timeLeft/60) + ':' + (r.timeLeft%60+'').zeroPad(2) + ')' + ' Reset in ' + Math.floor(r.timeLeft/60) + ':' + (r.timeLeft%60+'').zeroPad(2) + ')', + 'warning' ); } } + // Post-process all the loaded files + $.each(config_files, function(){ if (loaded_items[this]) loaded_items[this](); }); } } }); }); }, - createDownloadLink: function(adv) { + /** + * Make a download link visible and active + */ + activateDownloadLink: function(adv) { var $c = adv ? $config_adv : $config, txt = $c.text(); var filename = (adv ? config_adv_file : config_file); $c.prevAll('.download:first') + .unbind('mouseover click') .mouseover(function() { var d = new Date(), fn = d.fileStamp(filename); $(this).attr({ download:fn, href:'download:'+fn, title:'download:'+fn }); @@ -300,32 +309,41 @@ var configuratorApp = (function(){ * Get all the unique define names */ getDefinesFromText: function(txt) { + var leave_out_defines = ['CONFIGURATION_H', 'CONFIGURATION_ADV_H', 'STRING_VERSION', 'STRING_URL', 'STRING_VERSION_CONFIG_H', 'STRING_CONFIG_H_AUTHOR', 'STRING_SPLASH_LINE1', 'STRING_SPLASH_LINE2']; // Get all the unique #define's and save them in an array var r, define_obj = {}, findDef = new RegExp('#define[ \\t]+(\\w+)', 'gm'); - var cnt = 0; while((r = findDef.exec(txt)) !== null) { - if (cnt++ && !(r[1] in define_obj)) define_obj[r[1]] = null; + if ($.inArray(r[1], leave_out_defines) < 0 && !(r[1] in define_obj)) + define_obj[r[1]] = null; } this.log(Object.keys(define_obj), 2); return Object.keys(define_obj); }, /** - * Create placeholder fields for defines, as needed + * Create fields for any defines that have none */ createFieldsForDefines: function(adv) { var e = adv ? 1 : 0, n = 0; var fail_list = []; $.each(define_list[e], function(i,name) { if (!$('#'+name).length) { - var $ff = $('#more'); - var inf = self.getDefineInfo(name, adv); + var $ff = $('#more'), + inf = self.getDefineInfo(name, adv); if (inf) { var $newlabel = $('<label>',{for:name}).text(name.toLabel()); // if (!(++n % 3)) $newlabel.addClass('newline'); - var $newfield = inf.type == 'switch' ? $('<input>',{type:'checkbox'}) : $('<input>',{type:'text',size:10,maxlength:40}); + + var $newfield; + if (inf.options !== undefined) { + $newfield = $('<select>'); //.addOptions(inf.options); + } + else { + $newfield = inf.type == 'switch' ? $('<input>',{type:'checkbox'}) : $('<input>',{type:'text',size:10,maxlength:40}); + } $newfield.attr({id:name,name:name}).prop({defineInfo:inf}); + // Add the new field to the form $ff.append($newlabel, $newfield); } else @@ -358,7 +376,7 @@ var configuratorApp = (function(){ */ fileLoaded: function(filename, txt) { this.log("fileLoaded:"+filename,4); - var err; + var err, init_index; switch(filename) { case boards_file: this.initBoardsFromText(txt); @@ -369,13 +387,8 @@ var configuratorApp = (function(){ if (has_boards) { $config.text(txt); total_config_lines = txt.lineCount(); - this.initThermistorsFromText(txt); - this.purgeDefineInfo(false); - define_list[0] = this.getDefinesFromText(txt); - this.log(define_list[0], 2); - this.createFieldsForDefines(0); - this.refreshConfigForm(); - this.createDownloadLink(false); + // this.initThermistorsFromText(txt); + init_index = 0; has_config = true; } else { @@ -386,11 +399,7 @@ var configuratorApp = (function(){ if (has_config) { $config_adv.text(txt); total_config_adv_lines = txt.lineCount(); - this.purgeDefineInfo(true); - define_list[1] = this.getDefinesFromText(txt); - this.log(define_list[1], 2); - this.refreshConfigForm(); - this.createDownloadLink(true); + init_index = 1; has_config_adv = true; } else { @@ -398,6 +407,16 @@ var configuratorApp = (function(){ } break; } + // When a config file loads defines might change + if (init_index != null) { + var adv = init_index == 1; + define_list[init_index] = this.getDefinesFromText(txt); + this.log(define_list[init_index], 2); + this.purgeDefineInfo(adv); + this.createFieldsForDefines(init_index); + this.refreshConfigForm(init_index); + this.activateDownloadLink(adv); + } this.setMessage(err ? 'Please upload a "' + boards_file + '" file first!' : '"' + filename + '" loaded successfully.', err ? 'error' : 'message' @@ -405,7 +424,7 @@ var configuratorApp = (function(){ }, /** - * Add enhancements to the form + * Add initial enhancements to the existing form */ initConfigForm: function() { // Modify form fields and make the form responsive. @@ -436,12 +455,13 @@ var configuratorApp = (function(){ }); // Add options to the popup menus - $('#SERIAL_PORT').addOptions([0,1,2,3,4,5,6,7]); - $('#BAUDRATE').addOptions([2400,9600,19200,38400,57600,115200,250000]); - $('#EXTRUDERS').addOptions([1,2,3,4]); - $('#POWER_SUPPLY').addOptions({'1':'ATX','2':'Xbox 360'}); + // $('#SERIAL_PORT').addOptions([0,1,2,3,4,5,6,7]); + // $('#BAUDRATE').addOptions([2400,9600,19200,38400,57600,115200,250000]); + // $('#EXTRUDERS').addOptions([1,2,3,4]); + // $('#POWER_SUPPLY').addOptions({'1':'ATX','2':'Xbox 360'}); // Replace the Serial popup menu with a stepper control + /* $('#serial_stepper').jstepper({ min: 0, max: 3, @@ -455,6 +475,7 @@ var configuratorApp = (function(){ textStyle: {width:'1.5em',fontSize:'120%',textAlign:'center'}, onChange: function(v) { $('#SERIAL_PORT').val(v).trigger('change'); } }); + */ }, /** @@ -462,8 +483,9 @@ var configuratorApp = (function(){ */ makeTabsForFieldsets: function() { // Make tabs for the fieldsets - var $fset = $form.find('fieldset'); - var $tabs = $('<ul>',{class:'tabs'}), ind = 1; + var $fset = $form.find('fieldset'), + $tabs = $('<ul>',{class:'tabs'}), + ind = 1; $fset.each(function(){ var tabID = 'TAB'+ind; $(this).addClass(tabID); @@ -489,7 +511,7 @@ var configuratorApp = (function(){ /** * Update all fields on the form after loading a configuration */ - refreshConfigForm: function() { + refreshConfigForm: function(init_index) { /** * Any manually-created form elements will remain @@ -499,56 +521,72 @@ var configuratorApp = (function(){ * Specific exceptions can be managed by applying * classes to the associated form fields. * Sorting and arrangement can come from an included - * js file that describes the configuration in JSON. + * Javascript file that describes the configuration + * in JSON, or using information added to the config + * files. * - * For now I'm trying to derive information - * about options directly from the config file. */ + // Refresh the motherboard menu with new options $('#MOTHERBOARD').html('').addOptions(boards_list); - $('#TEMP_SENSOR_0, #TEMP_SENSOR_1, #TEMP_SENSOR_2, #TEMP_SENSOR_BED').html('').addOptions(therms_list); - - $.each(define_list, function() { $.each(this, function() { if ($('#'+this).length) self.initField(this); }); }); + // Init all existing fields, getting define info for any that need it + // refreshing the options and updating their current values + $.each(define_list[init_index], function() { + if ($('#'+this).length) + self.initField(this,init_index==1); + else + self.log(this + " is not on the page yet.", 2); + }); }, /** - * Make a field responsive and initialize its defineInfo + * Get the defineInfo for a field on the form + * Make it responsive, add a tooltip */ initField: function(name, adv) { this.log("initField:"+name,4); - var $elm = $('#'+name), elm = $elm[0]; - if (elm.defineInfo == null) { - var inf = elm.defineInfo = this.getDefineInfo(name, adv); - $elm.on($elm.attr('type') == 'text' ? 'input' : 'change', this.handleChange); + var $elm = $('#'+name), elm = $elm[0], inf = elm.defineInfo; + if (inf == null) + inf = elm.defineInfo = this.getDefineInfo(name, adv); - if (inf.tooltip) { - var $tipme = $elm.prev('label'); - if ($tipme.length) { - $tipme.hover( - function() { - if ($('#tipson input').prop('checked')) { - var pos = $tipme.position(); - $tooltip.html(inf.tooltip) - .append('<span>') - .css({bottom:($tooltip.parent().outerHeight()-pos.top)+'px',left:(pos.left+70)+'px'}) - .show(); - if (hover_timer) { - clearTimeout(hover_timer); - hover_timer = null; - } - } - }, - function() { - hover_timer = setTimeout(function(){ + // Set options on the field if there are any + if (inf.options !== undefined) + $elm.html('').addOptions(inf.options); + + // Create a tooltip if there is one + if (inf.tooltip) { + var $tipme = $elm.prev('label'); + if ($tipme.length) { + $tipme.unbind('mouseenter mouseleave'); + $tipme.hover( + function() { + if ($('#tipson input').prop('checked')) { + var pos = $tipme.position(); + $tooltip.html(inf.tooltip) + .append('<span>') + .css({bottom:($tooltip.parent().outerHeight()-pos.top)+'px',left:(pos.left+70)+'px'}) + .show(); + if (hover_timer) { + clearTimeout(hover_timer); hover_timer = null; - $tooltip.fadeOut(400); - }, 400); + } } - ); - } + }, + function() { + hover_timer = setTimeout(function(){ + hover_timer = null; + $tooltip.fadeOut(400); + }, 400); + } + ); } } + + $elm.unbind('input change'); + $elm.on($elm.attr('type') == 'text' ? 'input' : 'change', this.handleChange); + + // Set the field's initial value from the define this.setFieldFromDefine(name); }, @@ -733,6 +771,7 @@ var configuratorApp = (function(){ * - Store the existing #define line as a fast key to finding it later. * - Determine the line number of the #define so it can be scrolled to. * - Gather nearby comments to be used as tooltips. + * - Look for JSON in nearby comments to use as select options. */ getDefineInfo: function(name, adv) { if (adv === undefined) adv = false; @@ -757,34 +796,50 @@ var configuratorApp = (function(){ info.repl = new RegExp('([ \\t]*)(\/\/)?([ \\t]*' + info.define.regEsc() + info.post.regEsc() + ')', 'm'); } else { - // a define with quotes - findDef = new RegExp('^(.*//)?(.*#define[ \\t]+' + name + '[ \\t]+)("[^"]*")([ \\t]*/[*/].*)?$', 'm'); + // a define with curly braces + findDef = new RegExp('^(.*//)?(.*#define[ \\t]+' + name + '[ \\t]+)(\{[^\}]*\})([ \\t]*/[*/].*)?$', 'm'); result = findDef.exec(txt); if (result !== null) { $.extend(info, { - type: 'quoted', + type: 'list', line: result[0], pre: result[1] === undefined ? '' : result[1].replace('//',''), define: result[2], post: result[4] === undefined ? '' : result[4] }); - info.regex = new RegExp('([ \\t]*//)?[ \\t]*' + info.define.regEsc() + '"([^"]*)"' + info.post.regEsc(), 'm'); - info.repl = new RegExp('(([ \\t]*//)?[ \\t]*' + info.define.regEsc() + '")[^"]*("' + info.post.regEsc() + ')', 'm'); + info.regex = new RegExp('([ \\t]*//)?[ \\t]*' + info.define.regEsc() + '\{([^\}]*)\}' + info.post.regEsc(), 'm'); + info.repl = new RegExp('(([ \\t]*//)?[ \\t]*' + info.define.regEsc() + '\{)[^\}]*(\}' + info.post.regEsc() + ')', 'm'); } else { - // a define with no quotes - findDef = new RegExp('^([ \\t]*//)?([ \\t]*#define[ \\t]+' + name + '[ \\t]+)(\\S*)([ \\t]*/[*/].*)?$', 'm'); + // a define with quotes + findDef = new RegExp('^(.*//)?(.*#define[ \\t]+' + name + '[ \\t]+)("[^"]*")([ \\t]*/[*/].*)?$', 'm'); result = findDef.exec(txt); if (result !== null) { $.extend(info, { - type: 'plain', + type: 'quoted', line: result[0], pre: result[1] === undefined ? '' : result[1].replace('//',''), define: result[2], post: result[4] === undefined ? '' : result[4] }); - info.regex = new RegExp('([ \\t]*//)?[ \\t]*' + info.define.regEsc() + '(\\S*)' + info.post.regEsc(), 'm'); - info.repl = new RegExp('(([ \\t]*//)?[ \\t]*' + info.define.regEsc() + ')\\S*(' + info.post.regEsc() + ')', 'm'); + info.regex = new RegExp('([ \\t]*//)?[ \\t]*' + info.define.regEsc() + '"([^"]*)"' + info.post.regEsc(), 'm'); + info.repl = new RegExp('(([ \\t]*//)?[ \\t]*' + info.define.regEsc() + '")[^"]*("' + info.post.regEsc() + ')', 'm'); + } + else { + // a define with no quotes + findDef = new RegExp('^([ \\t]*//)?([ \\t]*#define[ \\t]+' + name + '[ \\t]+)(\\S*)([ \\t]*/[*/].*)?$', 'm'); + result = findDef.exec(txt); + if (result !== null) { + $.extend(info, { + type: 'plain', + line: result[0], + pre: result[1] === undefined ? '' : result[1].replace('//',''), + define: result[2], + post: result[4] === undefined ? '' : result[4] + }); + info.regex = new RegExp('([ \\t]*//)?[ \\t]*' + info.define.regEsc() + '(\\S*)' + info.post.regEsc(), 'm'); + info.repl = new RegExp('(([ \\t]*//)?[ \\t]*' + info.define.regEsc() + ')\\S*(' + info.post.regEsc() + ')', 'm'); + } } } } @@ -807,13 +862,22 @@ var configuratorApp = (function(){ tooltip = ''; break; } - tooltip += ' ' + s[1] + '\n'; + // JSON data? Save as select options + if (s[1].match(/:[\[{]/) != null) { + // TODO + // :[1-6] = value limits + eval('info.options = ' + s[1].substr(1)); + } + else { + // Other lines added to the tooltip + tooltip += ' ' + s[1] + '\n'; + } } } - findDef = new RegExp('^[ \\t]*'+name); // To strip the name from the start + findDef = new RegExp('^'+name); // To strip the name from the start $.extend(info, { - tooltip: '<strong>'+name+'</strong> '+tooltip.replace(findDef,'').trim().toHTML(), + tooltip: '<strong>'+name+'</strong> '+tooltip.trim().replace(findDef,'').toHTML(), lineNum: this.getLineNumberOfText(info.line, txt) }); } From 83cb702e726079a42adefba3bf44daf7cfc6f4ce Mon Sep 17 00:00:00 2001 From: Scott Lahteine <sourcetree@thinkyhead.com> Date: Sat, 14 Feb 2015 23:44:01 -0800 Subject: [PATCH 28/41] Config sections, multi-field values, toggles, etc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Auto-detect “switchable” items where possible - Handle switchable multi-value fields - Add standard sections to config form - Add section markers to configurations - Add value options to configurations - Remove and re-add fields for loaded configs - Preserve sections across configs - Preserve non-added fields - Style added fields wider & newline by default --- Marlin/configurator/config/Configuration.h | 48 ++++ .../configurator/config/Configuration_adv.h | 36 ++- Marlin/configurator/css/configurator.css | 32 ++- Marlin/configurator/index.html | 26 +- Marlin/configurator/js/configurator.js | 253 ++++++++++++------ 5 files changed, 302 insertions(+), 93 deletions(-) diff --git a/Marlin/configurator/config/Configuration.h b/Marlin/configurator/config/Configuration.h index e0c9cc3010..1727ebc59b 100644 --- a/Marlin/configurator/config/Configuration.h +++ b/Marlin/configurator/config/Configuration.h @@ -35,6 +35,8 @@ Here are some standard links for getting your machine calibrated: // example_configurations/SCARA directory. // +// @section info + // User-specified version info of this build to display in [Pronterface, etc] terminal window during // startup. Implementation of an idea by Prof Braino to inform user that any changes made to this // build by the user have been successfully uploaded into firmware. @@ -45,6 +47,8 @@ Here are some standard links for getting your machine calibrated: #define STRING_SPLASH_LINE1 "v" STRING_VERSION // will be shown during bootup in line 1 //#define STRING_SPLASH_LINE2 STRING_VERSION_CONFIG_H // will be shown during bootup in line2 +// @section machine + // SERIAL_PORT selects which serial port should be used for communication with the host. // This allows the connection of wireless adapters (for instance) to non-default port pins. // Serial port 0 is still used by the Arduino bootloader regardless of this setting. @@ -84,6 +88,8 @@ Here are some standard links for getting your machine calibrated: // Define this to have the electronics keep the power supply off on startup. If you don't know what this is leave it. // #define PS_DEFAULT_OFF +// @section temperature + //=========================================================================== //============================= Thermal Settings ============================ //=========================================================================== @@ -237,6 +243,7 @@ Here are some standard links for getting your machine calibrated: // FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles. #endif // PIDTEMPBED +// @section extruder //this prevents dangerous Extruder moves, i.e. if the temperature is under the limit //can be software-disabled for whatever purposes by @@ -291,9 +298,13 @@ your extruder heater takes 2 minutes to hit the target on heating. //============================= Mechanical Settings ========================= //=========================================================================== +// @section machine + // Uncomment the following line to enable CoreXY kinematics // #define COREXY +// @section homing + // coarse Endstop Settings #define ENDSTOPPULLUPS // Comment this out (using // at the start of the line) to disable the endstop pullup resistors @@ -326,33 +337,51 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of //#define DISABLE_MAX_ENDSTOPS //#define DISABLE_MIN_ENDSTOPS +// @section hidden + // Disable max endstops for compatibility with endstop checking routine #if defined(COREXY) && !defined(DISABLE_MAX_ENDSTOPS) #define DISABLE_MAX_ENDSTOPS #endif +// @section homing + // For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1 +// :[0,1] #define X_ENABLE_ON 0 #define Y_ENABLE_ON 0 #define Z_ENABLE_ON 0 #define E_ENABLE_ON 0 // For all extruders +// @section machine + // Disables axis when it's not being used. #define DISABLE_X false #define DISABLE_Y false #define DISABLE_Z false + +// @section extruder + #define DISABLE_E false // For all extruders #define DISABLE_INACTIVE_EXTRUDER true //disable only inactive extruders and keep active extruder enabled +// @section machine + #define INVERT_X_DIR true // for Mendel set to false, for Orca set to true #define INVERT_Y_DIR false // for Mendel set to true, for Orca set to false #define INVERT_Z_DIR true // for Mendel set to false, for Orca set to true + +// @section extruder + #define INVERT_E0_DIR false // for direct drive extruder v9 set to true, for geared extruder set to false #define INVERT_E1_DIR false // for direct drive extruder v9 set to true, for geared extruder set to false #define INVERT_E2_DIR false // for direct drive extruder v9 set to true, for geared extruder set to false +// @section homing + // ENDSTOP SETTINGS: // Sets direction of endstops when homing; 1=MAX, -1=MIN +// :[-1,1] #define X_HOME_DIR -1 #define Y_HOME_DIR -1 #define Z_HOME_DIR -1 @@ -360,6 +389,8 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of #define min_software_endstops true // If true, axis won't move to coordinates less than HOME_POS. #define max_software_endstops true // If true, axis won't move to coordinates greater than the defined lengths below. +// @section machine + // Travel limits after homing (units are in mm) #define X_MAX_POS 205 #define X_MIN_POS 0 @@ -368,6 +399,8 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of #define Z_MAX_POS 200 #define Z_MIN_POS 0 +// @section hidden + #define X_MAX_LENGTH (X_MAX_POS - X_MIN_POS) #define Y_MAX_LENGTH (Y_MAX_POS - Y_MIN_POS) #define Z_MAX_LENGTH (Z_MAX_POS - Z_MIN_POS) @@ -377,6 +410,8 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of //============================= Bed Auto Leveling =========================== //=========================================================================== +// @section bedlevel + //#define ENABLE_AUTO_BED_LEVELING // Delete the comment to enable (remove // at the start of the line) #define Z_PROBE_REPEATABILITY_TEST // If not commented out, Z-Probe Repeatability test will be included if Auto Bed Leveling is Enabled. @@ -493,6 +528,8 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of #endif // ENABLE_AUTO_BED_LEVELING +// @section homing + // The position of the homing switches //#define MANUAL_HOME_POSITIONS // If defined, MANUAL_*_HOME_POS below will be used //#define BED_CENTER_AT_0_0 // If defined, the center of the bed is at (X=0, Y=0) @@ -504,6 +541,8 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of #define MANUAL_Z_HOME_POS 0 //#define MANUAL_Z_HOME_POS 402 // For delta: Distance between nozzle and print surface after homing. +// @section movement + //// MOVEMENT SETTINGS #define NUM_AXIS 4 // The axis order in all axis related arrays is X, Y, Z, E #define HOMING_FEEDRATE {50*60, 50*60, 4*60, 0} // set the homing speeds (mm/min) @@ -533,6 +572,8 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of //============================= Additional Features =========================== //============================================================================= +// @section more + // Custom M code points #define CUSTOM_M_CODES #ifdef CUSTOM_M_CODES @@ -541,6 +582,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of #define Z_PROBE_OFFSET_RANGE_MAX -5 #endif +// @section extras // EEPROM // The microcontroller can store settings in the EEPROM, e.g. max velocity... @@ -553,6 +595,8 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of // please keep turned on if you can. //#define EEPROM_CHITCHAT +// @section temperature + // Preheat Constants #define PLA_PREHEAT_HOTEND_TEMP 180 #define PLA_PREHEAT_HPB_TEMP 70 @@ -562,6 +606,8 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of #define ABS_PREHEAT_HPB_TEMP 100 #define ABS_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255 +// @section lcd + //LCD and SD support // Character based displays can have different extended charsets. @@ -738,6 +784,8 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of # endif #endif +// @section extras + // Increase the FAN pwm frequency. Removes the PWM noise but increases heating in the FET/Arduino //#define FAST_PWM_FAN diff --git a/Marlin/configurator/config/Configuration_adv.h b/Marlin/configurator/config/Configuration_adv.h index a503e640f5..98740714b7 100644 --- a/Marlin/configurator/config/Configuration_adv.h +++ b/Marlin/configurator/config/Configuration_adv.h @@ -1,6 +1,8 @@ #ifndef CONFIGURATION_ADV_H #define CONFIGURATION_ADV_H +// @section temperature + //=========================================================================== //=============================Thermal Settings ============================ //=========================================================================== @@ -44,6 +46,8 @@ //The M105 command return, besides traditional information, the ADC value read from temperature sensors. //#define SHOW_TEMP_ADC_VALUES +// @section extruder + // extruder run-out prevention. //if the machine is idle, and the temperature over MINTEMP, every couple of SECONDS some filament is extruded //#define EXTRUDER_RUNOUT_PREVENT @@ -53,6 +57,8 @@ #define EXTRUDER_RUNOUT_SPEED 1500. //extrusion speed #define EXTRUDER_RUNOUT_EXTRUDE 100 +// @section temperature + //These defines help to calibrate the AD595 sensor in case you get wrong temperature measurements. //The measured temperature is defined as "actualTemp = (measuredTemp * TEMP_SENSOR_AD595_GAIN) + TEMP_SENSOR_AD595_OFFSET" #define TEMP_SENSOR_AD595_OFFSET 0.0 @@ -70,6 +76,8 @@ // before setting a PWM value. (Does not work with software PWM for fan on Sanguinololu) //#define FAN_KICKSTART_TIME 100 +// @section extruder + // Extruder cooling fans // Configure fan pin outputs to automatically turn on/off when the associated // extruder temperature is above/below EXTRUDER_AUTO_FAN_TEMPERATURE. @@ -87,6 +95,8 @@ //=============================Mechanical Settings=========================== //=========================================================================== +// @section machine + #define ENDSTOPS_ONLY_FOR_HOMING // If defined the endstops will only be used for homing @@ -210,12 +220,16 @@ #endif //DUAL_X_CARRIAGE +// @section homing + //homing hits the endstop, then retracts by this distance, before it tries to slowly bump again: #define X_HOME_RETRACT_MM 5 #define Y_HOME_RETRACT_MM 5 #define Z_HOME_RETRACT_MM 2 //#define QUICK_HOME //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially. +// @section machine + #define AXIS_RELATIVE_MODES {false, false, false, false} #ifdef CONFIG_STEPPERS_TOSHIBA #define MAX_STEP_FREQUENCY 10000 // Max step frequency for Toshiba Stepper Controllers @@ -228,12 +242,14 @@ #define INVERT_Z_STEP_PIN false #define INVERT_E_STEP_PIN false -//default stepper release if idle +//default stepper release if idle. Set to 0 to deactivate. #define DEFAULT_STEPPER_DEACTIVE_TIME 60 #define DEFAULT_MINIMUMFEEDRATE 0.0 // minimum feedrate #define DEFAULT_MINTRAVELFEEDRATE 0.0 +// @section lcd + // Feedrates for manual moves along X, Y, Z, E from panel #ifdef ULTIPANEL #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // set the speeds for manual moves (mm/min) @@ -244,6 +260,8 @@ #define ULTIPANEL_FEEDMULTIPLY #endif +// @section extras + // minimum time in microseconds that a movement needs to take if the buffer is emptied. #define DEFAULT_MINSEGMENTTIME 20000 @@ -287,6 +305,8 @@ //#define CHDK 4 //Pin for triggering CHDK to take a picture see how to use it here http://captain-slow.dk/2014/03/09/3d-printing-timelapses/ #define CHDK_DELAY 50 //How long in ms the pin should stay HIGH before going LOW again +// @section lcd + #define SD_FINISHED_STEPPERRELEASE true //if sd support and the file is finished: disable steppers? #define SD_FINISHED_RELEASECOMMAND "M84 X Y Z E" // You might want to keep the z enabled so your bed stays in place. @@ -315,6 +335,8 @@ #endif #endif +// @section more + // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation. //#define USE_WATCHDOG @@ -373,12 +395,16 @@ const unsigned int dropsegments=5; //everything with less than this number of steps will be ignored as move and joined with the next movement +// @section lcd + // If you are using a RAMPS board or cheap E-bay purchased boards that do not detect when an SD card is inserted // You can get round this by connecting a push button or single throw switch to the pin defined as SDCARDCARDDETECT // in the pins.h file. When using a push button pulling the pin to ground this will need inverted. This setting should // be commented out otherwise #define SDCARDDETECTINVERTED +// @section hidden + #ifdef ULTIPANEL #undef SDCARDDETECTINVERTED #endif @@ -399,6 +425,8 @@ const unsigned int dropsegments=5; //everything with less than this number of st #define PS_ON_ASLEEP LOW #endif +// @section temperature + // Control heater 0 and heater 1 in parallel. //#define HEATERS_PARALLEL @@ -406,6 +434,8 @@ const unsigned int dropsegments=5; //everything with less than this number of st //=============================Buffers ============================ //=========================================================================== +// @section hidden + // The number of linear motions that can be in the plan at any give time. // THE BLOCK_BUFFER_SIZE NEEDS TO BE A POWER OF 2, i.g. 8,16,32 because shifts and ors are used to do the ring-buffering. #if defined SDSUPPORT @@ -414,11 +444,13 @@ const unsigned int dropsegments=5; //everything with less than this number of st #define BLOCK_BUFFER_SIZE 16 // maximize block buffer #endif +// @section more //The ASCII buffer for receiving from the serial: #define MAX_CMD_SIZE 96 #define BUFSIZE 4 +// @section extras // Firmware based and LCD controlled retract // M207 and M208 can be used to define parameters for the retraction. @@ -460,6 +492,8 @@ const unsigned int dropsegments=5; //everything with less than this number of st //============================= Define Defines ============================ //=========================================================================== +// @section hidden + #if defined (ENABLE_AUTO_BED_LEVELING) && defined (DELTA) #error "Bed Auto Leveling is still not compatible with Delta Kinematics." #endif diff --git a/Marlin/configurator/css/configurator.css b/Marlin/configurator/css/configurator.css index 62157078f0..8b8f8c9994 100644 --- a/Marlin/configurator/css/configurator.css +++ b/Marlin/configurator/css/configurator.css @@ -45,7 +45,9 @@ p.info span { color: #800; } #message p.message { color: #080; background: #CFC; } #message p.error { color: #F00; background: #FF4; } #message p.warning { color: #FF0; background: #BA4; } -#message p.message span { +#message p.message span, +#message p.error span, +#message p.warning span { color: #A00; background: rgba(255, 255, 255, 1); border: 1px solid rgba(0,0,0,0.5); @@ -89,21 +91,22 @@ label { } 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"].enabler { margin-left: 1em; } +input[type="checkbox"].enabler, input[type="radio"].enabler { margin-left: 1em; } input:disabled { color: #BBB; } -#more input[type="text"] { width: 20em; } +#config_form input[type="text"].subitem { width: 4em; } +#config_form input[type="text"].subitem+.subitem { margin-left: 4px; } -#more label { - width: 240px; /* label area */ +input[type="text"].added { width: 20em; } +label.added { + width: 275px; /* label area */ height: 1em; padding: 10px 360px 10px 1em; margin-right: -350px; text-align: right; } - ul.tabs { padding: 0; list-style: none; } ul.tabs li { display: inline; } ul.tabs li a, @@ -192,8 +195,19 @@ fieldset legend { display: none; } /* Tooltips Checkbox */ -#tipson { float: right; font-weight: bold; font-size: 100%; font-family: helvetica; } -#tipson input { float: none; display: inline; } +#tipson { + width: auto; + height: auto; + padding: 0; + margin-right: 0; + float: right; + font-weight: bold; + font-size: 100%; + font-family: helvetica; + text-align: left; + cursor: pointer; + } +#tipson input { float: none; display: inline; cursor: pointer; } /* Config Text */ @@ -206,7 +220,7 @@ pre.config { clear: both; background-color: #FFF; color: #000; - font-family: "Fira Mono"; + font-family: "Fira Mono", monospace; font-size: small; } diff --git a/Marlin/configurator/index.html b/Marlin/configurator/index.html index ffd4a36f53..23a8411a20 100644 --- a/Marlin/configurator/index.html +++ b/Marlin/configurator/index.html @@ -25,7 +25,7 @@ <div id="tooltip"></div> <label>Drop Files Here:</label><input type="file" id="file-upload" /> - <div id="tipson"><input type="checkbox" checked /> ?</div> + <label id="tipson"><input type="checkbox" checked /> ?</label> <br class="clear" /> <fieldset id="machine"> @@ -40,9 +40,9 @@ <label class="newline">Motherboard:</label><select name="MOTHERBOARD"></select> - <label class="newline">Custom Name:</label><input name="CUSTOM_MENDEL_NAME" class="switchable" type="text" size="14" maxlength="12" value="" /> + <label class="newline">Custom Name:</label><input name="CUSTOM_MENDEL_NAME" type="text" size="14" maxlength="12" value="" /> - <label class="newline">Machine UUID:</label><input name="MACHINE_UUID" class="switchable" type="text" size="38" maxlength="36" value="" /> + <label class="newline">Machine UUID:</label><input name="MACHINE_UUID" type="text" size="38" maxlength="36" value="" /> <label class="newline">Extruders:</label><select name="EXTRUDERS"></select> @@ -52,6 +52,10 @@ <input name="PS_DEFAULT_OFF" type="checkbox" value="1" checked /> </fieldset> + <fieldset id="homing"> + <legend>Homing</legend> + </fieldset> + <fieldset id="temperature"> <legend>Temperature</legend> <label class="newline">Temp Sensor 0:</label><select name="TEMP_SENSOR_0"></select> @@ -69,12 +73,20 @@ <input name="TEMP_RESIDENCY_TIME" type="text" size="3" maxlength="2" /> </fieldset> - <fieldset id="hotends"> - <legend>Hot Ends</legend> + <fieldset id="extruder"> + <legend>Extruder</legend> </fieldset> - <fieldset id="heatbed"> - <legend>Heated Bed</legend> + <fieldset id="lcd"> + <legend>LCD / SD</legend> + </fieldset> + + <fieldset id="bedlevel"> + <legend>Bed Leveling</legend> + </fieldset> + + <fieldset id="extras"> + <legend>Extras</legend> </fieldset> <fieldset id="more"> diff --git a/Marlin/configurator/js/configurator.js b/Marlin/configurator/js/configurator.js index 0d7de3608b..932123d552 100644 --- a/Marlin/configurator/js/configurator.js +++ b/Marlin/configurator/js/configurator.js @@ -143,6 +143,7 @@ var configuratorApp = (function(){ $config = $('#config_text pre'), $config_adv = $('#config_adv_text pre'), define_list = [[],[]], + define_section = {}, boards_list = {}, therms_list = {}, total_config_lines, @@ -308,16 +309,21 @@ var configuratorApp = (function(){ /** * Get all the unique define names */ - getDefinesFromText: function(txt) { - var leave_out_defines = ['CONFIGURATION_H', 'CONFIGURATION_ADV_H', 'STRING_VERSION', 'STRING_URL', 'STRING_VERSION_CONFIG_H', 'STRING_CONFIG_H_AUTHOR', 'STRING_SPLASH_LINE1', 'STRING_SPLASH_LINE2']; - // Get all the unique #define's and save them in an array - var r, define_obj = {}, findDef = new RegExp('#define[ \\t]+(\\w+)', 'gm'); + updateDefinesFromText: function(index, txt) { + var section = 'machine', + leave_out_defines = ['CONFIGURATION_H', 'CONFIGURATION_ADV_H', 'STRING_VERSION', 'STRING_URL', 'STRING_VERSION_CONFIG_H', 'STRING_CONFIG_H_AUTHOR', 'STRING_SPLASH_LINE1', 'STRING_SPLASH_LINE2'], + define_sect = {}, + r, findDef = new RegExp('(@section|#define)[ \\t]+(\\w+)', 'gm'); while((r = findDef.exec(txt)) !== null) { - if ($.inArray(r[1], leave_out_defines) < 0 && !(r[1] in define_obj)) - define_obj[r[1]] = null; + var name = r[2]; + if (r[1] == '@section') + section = name; + else if ($.inArray(name, leave_out_defines) < 0 && !(name in define_sect)) + define_sect[name] = section; } - this.log(Object.keys(define_obj), 2); - return Object.keys(define_obj); + define_list[index] = Object.keys(define_sect); + $.extend(define_section, define_sect); + this.log(define_list[index], 2); }, /** @@ -327,24 +333,48 @@ var configuratorApp = (function(){ var e = adv ? 1 : 0, n = 0; var fail_list = []; $.each(define_list[e], function(i,name) { - if (!$('#'+name).length) { - var $ff = $('#more'), - inf = self.getDefineInfo(name, adv); + var section = define_section[name]; + if (section != 'hidden' && !$('#'+name).length) { + var inf = self.getDefineInfo(name, adv); + if (inf) { - var $newlabel = $('<label>',{for:name}).text(name.toLabel()); + + var $ff = $('#'+section), $newfield, + $newlabel = $('<label>',{for:name,class:'added'}).text(name.toLabel()); + // if (!(++n % 3)) $newlabel.addClass('newline'); - var $newfield; - if (inf.options !== undefined) { - $newfield = $('<select>'); //.addOptions(inf.options); + $ff.append($newlabel); + + // Multiple fields? + if (inf.type == 'list') { + for (var i=0; i<inf.size; i++) { + var fieldname = i > 0 ? name+'-'+i : name; + $newfield = $('<input>',{type:'text',size:6,maxlength:10,id:fieldname,name:fieldname,class:'subitem added'}).prop({defineInfo:inf}); + $ff.append($newfield); + } } else { - $newfield = inf.type == 'switch' ? $('<input>',{type:'checkbox'}) : $('<input>',{type:'text',size:10,maxlength:40}); + // Items with options, either toggle or select + // TODO: Radio buttons for other values + if (inf.options !== undefined) { + if (inf.type == 'toggle') { + $newfield = $('<input>',{type:'checkbox'}); + } + else { + // Otherwise selectable + $newfield = $('<select>'); + } + // ...Options added when field initialized + } + else { + $newfield = inf.type == 'switch' ? $('<input>',{type:'checkbox'}) : $('<input>',{type:'text',size:10,maxlength:40}); + } + $newfield.attr({id:name,name:name,class:'added'}).prop({defineInfo:inf}); + // Add the new field to the form + $ff.append($newfield); } - $newfield.attr({id:name,name:name}).prop({defineInfo:inf}); - // Add the new field to the form - $ff.append($newlabel, $newfield); } else fail_list.push(name); @@ -410,10 +440,9 @@ var configuratorApp = (function(){ // When a config file loads defines might change if (init_index != null) { var adv = init_index == 1; - define_list[init_index] = this.getDefinesFromText(txt); - this.log(define_list[init_index], 2); - this.purgeDefineInfo(adv); - this.createFieldsForDefines(init_index); + this.purgeAddedFields(init_index); + this.updateDefinesFromText(init_index, txt); + this.createFieldsForDefines(adv); this.refreshConfigForm(init_index); this.activateDownloadLink(adv); } @@ -446,13 +475,14 @@ var configuratorApp = (function(){ }); // Get all 'switchable' class items and add a checkbox - $form.find('.switchable').each(function(){ - $(this).after( - $('<input>',{type:'checkbox',value:'1',class:'enabler'}).prop('checked',true) - .attr('id',this.id + '-switch') - .change(self.handleSwitch) - ); - }); + // $form.find('.switchable').each(function(){ + // $(this).after( + // $('<input>',{type:'checkbox',value:'1',class:'enabler added'}) + // .prop('checked',true) + // .attr('id',this.id + '-switch') + // .change(self.handleSwitch) + // ); + // }); // Add options to the popup menus // $('#SERIAL_PORT').addOptions([0,1,2,3,4,5,6,7]); @@ -516,7 +546,7 @@ var configuratorApp = (function(){ /** * Any manually-created form elements will remain * where they are. Unknown defines (currently most) - * are added to the "More..." tab for now. + * are added to tabs based on section * * Specific exceptions can be managed by applying * classes to the associated form fields. @@ -550,11 +580,7 @@ var configuratorApp = (function(){ if (inf == null) inf = elm.defineInfo = this.getDefineInfo(name, adv); - // Set options on the field if there are any - if (inf.options !== undefined) - $elm.html('').addOptions(inf.options); - - // Create a tooltip if there is one + // Create a tooltip on the label if there is one if (inf.tooltip) { var $tipme = $elm.prev('label'); if ($tipme.length) { @@ -583,8 +609,34 @@ var configuratorApp = (function(){ } } - $elm.unbind('input change'); - $elm.on($elm.attr('type') == 'text' ? 'input' : 'change', this.handleChange); + // Make the element(s) respond to events + if (inf.type == 'list') { + // Multiple fields need to respond + for (var i=0; i<inf.size; i++) { + if (i > 0) $elm = $('#'+name+'-'+i); + $elm.unbind('input'); + $elm.on('input', this.handleChange); + } + } + else { + var elmtype = $elm.attr('type'); + // Set options on single fields if there are any + if (inf.options !== undefined && elmtype === undefined) + $elm.html('').addOptions(inf.options); + $elm.unbind('input change'); + $elm.on(elmtype == 'text' ? 'input' : 'change', this.handleChange); + } + + // Add an enabler checkbox if it needs one + if (inf.switchable && $('#'+name+'-switch').length == 0) { + // $elm = the last element added + $elm.after( + $('<input>',{type:'checkbox',value:'1',class:'enabler added'}) + .prop('checked',self.defineIsEnabled(name)) + .attr({id: name+'-switch'}) + .change(self.handleSwitch) + ); + } // Set the field's initial value from the define this.setFieldFromDefine(name); @@ -592,17 +644,31 @@ var configuratorApp = (function(){ /** * Handle any value field being changed + * this = the field */ handleChange: function() { self.updateDefineFromField(this.id); }, /** * Handle a switch checkbox being changed + * this = the switch checkbox */ handleSwitch: function() { - var $elm = $(this), $prev = $elm.prev(); - var on = $elm.prop('checked') || false; - $prev.attr('disabled', !on); - self.setDefineEnabled($prev[0].id, on); + var $elm = $(this), + name = $elm[0].id.replace(/-.+/,''), + inf = $('#'+name)[0].defineInfo, + on = $elm.prop('checked') || false; + + self.setDefineEnabled(name, on); + + if (inf.type == 'list') { + // Multiple fields? + for (var i=0; i<inf.size; i++) { + $('#'+name+(i?'-'+i:'')).attr('disabled', !on); + } + } + else { + $elm.prev().attr('disabled', !on); + } }, /** @@ -656,11 +722,15 @@ var configuratorApp = (function(){ */ updateDefineFromField: function(name) { this.log('updateDefineFromField:'+name,4); + + // Drop the suffix on sub-fields + name = name.replace(/-\d+$/, ''); + var $elm = $('#'+name), inf = $elm[0].defineInfo; if (inf == null) return; var isCheck = $elm.attr('type') == 'checkbox', - val = isCheck ? $elm.prop('checked') : $elm.val(); + val = isCheck ? $elm.prop('checked') : $elm.val().trim(); var newline; switch(inf.type) { @@ -668,12 +738,19 @@ var configuratorApp = (function(){ var slash = val ? '' : '//'; newline = inf.line.replace(inf.repl, '$1'+slash+'$3'); break; + case 'list': case 'quoted': case 'plain': - if (isCheck) - this.setMessage(name + ' should not be a checkbox!', 'error'); - else - newline = inf.line.replace(inf.repl, '$1'+val.replace('$','\\$')+'$3'); + if (isCheck) this.setMessage(name + ' should not be a checkbox!', 'error'); + case 'toggle': + if (isCheck) { + val = val ? inf.options[1] : inf.options[0]; + } + else { + if (inf.type == 'list') + for (var i=1; i<inf.size; i++) val += ', ' + $('#'+name+'-'+i).val().trim(); + } + newline = inf.line.replace(inf.repl, '$1'+(''+val).replace('$','\\$')+'$3'); break; } this.setDefineLine(name, newline); @@ -725,31 +802,40 @@ var configuratorApp = (function(){ * Set a form field to the current #define value in the config text */ setFieldFromDefine: function(name) { - var $elm = $('#'+name), val = this.defineValue(name); + var $elm = $('#'+name), inf = $elm[0].defineInfo, + val = this.defineValue(name); this.log('setFieldFromDefine:' + name + ' to ' + val, 2); - // Set the field value - $elm.attr('type') == 'checkbox' ? $elm.prop('checked', val) : $elm.val(''+val); - // If the item has a checkbox then set enabled state too - var $cb = $('#'+name+'-switch'); + var $cb = $('#'+name+'-switch'), on = true; if ($cb.length) { - var on = self.defineIsEnabled(name); + on = self.defineIsEnabled(name); + $cb.prop('checked', on); + } + + if (inf.type == 'list') { + $.each(val.split(','),function(i,v){ + var $e = i > 0 ? $('#'+name+'-'+i) : $elm; + $e.val(v.trim()); + $e.attr('disabled', !on); + }); + } + else { + if (inf.type == 'toggle') val = val == inf.options[1]; + $elm.attr('type') == 'checkbox' ? $elm.prop('checked', val) : $elm.val(''+val); $elm.attr('disabled', !on); // enable/disable the form field (could also dim it) - $cb.prop('checked', on); // check/uncheck the checkbox } }, /** - * Purge #define information for one of the config files + * Purge added fields and all their define info */ - purgeDefineInfo: function(adv) { - if (adv === undefined) adv = false; - $('[name]').each(function() { - var inf = this.defineInfo; - if (inf && adv === inf.adv) $(this).removeProp('defineInfo'); + purgeAddedFields: function(index) { + $.each(define_list[index], function(){ + $('#'+this + ",[id^='"+this+"-'],label[for='"+this+"']").filter('.added').remove(); }); + define_list[index] = []; }, /** @@ -805,6 +891,7 @@ var configuratorApp = (function(){ line: result[0], pre: result[1] === undefined ? '' : result[1].replace('//',''), define: result[2], + size: result[3].split(',').length, post: result[4] === undefined ? '' : result[4] }); info.regex = new RegExp('([ \\t]*//)?[ \\t]*' + info.define.regEsc() + '\{([^\}]*)\}' + info.post.regEsc(), 'm'); @@ -837,6 +924,10 @@ var configuratorApp = (function(){ define: result[2], post: result[4] === undefined ? '' : result[4] }); + if (result[3].match(/false|true/)) { + info.type = 'toggle'; + info.options = ['false','true']; + } info.regex = new RegExp('([ \\t]*//)?[ \\t]*' + info.define.regEsc() + '(\\S*)' + info.post.regEsc(), 'm'); info.repl = new RegExp('(([ \\t]*//)?[ \\t]*' + info.define.regEsc() + ')\\S*(' + info.post.regEsc() + ')', 'm'); } @@ -854,31 +945,41 @@ var configuratorApp = (function(){ // Get all the comments immediately before the item var r, s; - findDef = new RegExp('(([ \\t]*(//|#)[^\n]+\n){1,4})([ \\t]*\n){0,1}' + info.line.regEsc(), 'g'); + findDef = new RegExp('(([ \\t]*(//|#)[^\n]+\n){1,4})([ \\t]*\n)?' + info.line.regEsc(), 'g'); if (r = findDef.exec(txt)) { + // Get the text of the found comments findDef = new RegExp('^[ \\t]*//+[ \\t]*(.*)[ \\t]*$', 'gm'); while((s = findDef.exec(r[1])) !== null) { - if (s[1].match(/^#define[ \\t]/) != null) { - tooltip = ''; - break; - } - // JSON data? Save as select options - if (s[1].match(/:[\[{]/) != null) { - // TODO - // :[1-6] = value limits - eval('info.options = ' + s[1].substr(1)); - } - else { - // Other lines added to the tooltip - tooltip += ' ' + s[1] + '\n'; + var tip = s[1].replace(/[ \\t]*(={5,}|@section[ \\t]+\w+)[ \\t]*/g, ''); + if (tip.length) { + if (tip.match(/^#define[ \\t]/) != null) { + tooltip = ''; + break; + } + // JSON data? Save as select options + if (!info.options && tip.match(/:[\[{]/) != null) { + // TODO + // :[1-6] = value limits + var o; eval('o=' + tip.substr(1)); + info.options = o; + if (Object.prototype.toString.call(o) == "[object Array]" && o.length == 2 && !eval(''+o[0])) + info.type = 'toggle'; + } + else { + // Other lines added to the tooltip + tooltip += ' ' + tip + '\n'; + } } } } - findDef = new RegExp('^'+name); // To strip the name from the start + + // Add .tooltip and .lineNum properties to the info + findDef = new RegExp('^'+name); // Strip the name from the tooltip $.extend(info, { tooltip: '<strong>'+name+'</strong> '+tooltip.trim().replace(findDef,'').toHTML(), - lineNum: this.getLineNumberOfText(info.line, txt) + lineNum: this.getLineNumberOfText(info.line, txt), + switchable: (info.type != 'switch' && info.line.match(/^[ \t]*\/\//)) || false // Disabled? Mark as "switchable" }); } else From 84a87a5b1c63e8d5fee7b1723baf98ac64a49825 Mon Sep 17 00:00:00 2001 From: Scott Lahteine <sourcetree@thinkyhead.com> Date: Sun, 15 Feb 2015 23:19:22 -0800 Subject: [PATCH 29/41] Fix up configs a little --- Marlin/configurator/config/Configuration.h | 21 ++++++++++--------- .../configurator/config/Configuration_adv.h | 3 ++- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/Marlin/configurator/config/Configuration.h b/Marlin/configurator/config/Configuration.h index 1727ebc59b..2b97772da9 100644 --- a/Marlin/configurator/config/Configuration.h +++ b/Marlin/configurator/config/Configuration.h @@ -344,17 +344,15 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of #define DISABLE_MAX_ENDSTOPS #endif -// @section homing +// @section machine // For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1 -// :[0,1] +// :{0:'Active Low',1:'Active High'} #define X_ENABLE_ON 0 #define Y_ENABLE_ON 0 #define Z_ENABLE_ON 0 #define E_ENABLE_ON 0 // For all extruders -// @section machine - // Disables axis when it's not being used. #define DISABLE_X false #define DISABLE_Y false @@ -367,15 +365,18 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of // @section machine -#define INVERT_X_DIR true // for Mendel set to false, for Orca set to true -#define INVERT_Y_DIR false // for Mendel set to true, for Orca set to false -#define INVERT_Z_DIR true // for Mendel set to false, for Orca set to true +// Invert the stepper direction. Change (or reverse the motor connector) if an axis goes the wrong way. +#define INVERT_X_DIR true // Mendel: false +#define INVERT_Y_DIR false // Mendel: true +#define INVERT_Z_DIR true // Mendel: false // @section extruder -#define INVERT_E0_DIR false // for direct drive extruder v9 set to true, for geared extruder set to false -#define INVERT_E1_DIR false // for direct drive extruder v9 set to true, for geared extruder set to false -#define INVERT_E2_DIR false // for direct drive extruder v9 set to true, for geared extruder set to false +// For direct drive extruder v9 set to true, for geared extruder set to false. +#define INVERT_E0_DIR false +#define INVERT_E1_DIR false +#define INVERT_E2_DIR false +#define INVERT_E3_DIR false // @section homing diff --git a/Marlin/configurator/config/Configuration_adv.h b/Marlin/configurator/config/Configuration_adv.h index 98740714b7..b31fa2eee9 100644 --- a/Marlin/configurator/config/Configuration_adv.h +++ b/Marlin/configurator/config/Configuration_adv.h @@ -95,7 +95,7 @@ //=============================Mechanical Settings=========================== //=========================================================================== -// @section machine +// @section homing #define ENDSTOPS_ONLY_FOR_HOMING // If defined the endstops will only be used for homing @@ -146,6 +146,7 @@ #endif //End auto min/max positions //END AUTOSET LOCATIONS OF LIMIT SWITCHES -ZP +// @section extras //#define Z_LATE_ENABLE // Enable Z the last moment. Needed if your Z driver overheats. From c0339046933d50438c28ebb3c2b40c2ab0be58ac Mon Sep 17 00:00:00 2001 From: Scott Lahteine <sourcetree@thinkyhead.com> Date: Sun, 15 Feb 2015 23:25:57 -0800 Subject: [PATCH 30/41] Updated config file section markers --- Marlin/configurator/config/Configuration_adv.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Marlin/configurator/config/Configuration_adv.h b/Marlin/configurator/config/Configuration_adv.h index b31fa2eee9..1c118904aa 100644 --- a/Marlin/configurator/config/Configuration_adv.h +++ b/Marlin/configurator/config/Configuration_adv.h @@ -232,11 +232,17 @@ // @section machine #define AXIS_RELATIVE_MODES {false, false, false, false} + +// @section hidden + #ifdef CONFIG_STEPPERS_TOSHIBA -#define MAX_STEP_FREQUENCY 10000 // Max step frequency for Toshiba Stepper Controllers + #define MAX_STEP_FREQUENCY 10000 // Max step frequency for Toshiba Stepper Controllers #else -#define MAX_STEP_FREQUENCY 40000 // Max step frequency for Ultimaker (5000 pps / half step) + #define MAX_STEP_FREQUENCY 40000 // Max step frequency for Ultimaker (5000 pps / half step) #endif + +// @section machine + //By default pololu step drivers require an active high signal. However, some high power drivers require an active low signal as step. #define INVERT_X_STEP_PIN false #define INVERT_Y_STEP_PIN false From da275c72abf755a02a14fefa0c1b29f5b2dd2c98 Mon Sep 17 00:00:00 2001 From: Scott Lahteine <sourcetree@thinkyhead.com> Date: Wed, 18 Feb 2015 21:45:38 -0800 Subject: [PATCH 31/41] Cleanup Github reply.data.content before atob() --- Marlin/configurator/js/configurator.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/configurator/js/configurator.js b/Marlin/configurator/js/configurator.js index 932123d552..169b41f99f 100644 --- a/Marlin/configurator/js/configurator.js +++ b/Marlin/configurator/js/configurator.js @@ -226,7 +226,7 @@ var configuratorApp = (function(){ timeLeft: Math.floor(txt.meta['X-RateLimit-Reset'] - Date.now()/1000), }; } - loaded_items[fname] = function(){ self.fileLoaded(fname, isGithub ? atob(txt.data.content) : txt); }; + loaded_items[fname] = function(){ self.fileLoaded(fname, isGithub ? atob(txt.data.content.replace(/\s/g, '')) : txt); }; success_count++; } }, From 335b7680c9b52f7c5ad308f5acad907066f49883 Mon Sep 17 00:00:00 2001 From: Scott Lahteine <sourcetree@thinkyhead.com> Date: Thu, 19 Feb 2015 03:11:16 -0800 Subject: [PATCH 32/41] Tooltip code, widescreen layout, hide auto-expands Slightly better layout for wide screens. --- Marlin/configurator/config/Configuration.h | 4 ++++ Marlin/configurator/css/configurator.css | 13 +++++++++++-- Marlin/configurator/js/configurator.js | 13 +++++-------- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/Marlin/configurator/config/Configuration.h b/Marlin/configurator/config/Configuration.h index 2b97772da9..76d20326b4 100644 --- a/Marlin/configurator/config/Configuration.h +++ b/Marlin/configurator/config/Configuration.h @@ -655,6 +655,8 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of // REMEMBER TO INSTALL LiquidCrystal_I2C.h in your ARDUINO library folder: https://github.com/kiyoshigawa/LiquidCrystal_I2C //#define RA_CONTROL_PANEL +// @section hidden + //automatic expansion #if defined (MAKRPANEL) #define DOGLCD @@ -778,6 +780,8 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of #endif #endif +// @section lcd + // default LCD contrast for dogm-like LCD displays #ifdef DOGLCD # ifndef DEFAULT_LCD_CONTRAST diff --git a/Marlin/configurator/css/configurator.css b/Marlin/configurator/css/configurator.css index 8b8f8c9994..fc54e8e01a 100644 --- a/Marlin/configurator/css/configurator.css +++ b/Marlin/configurator/css/configurator.css @@ -25,7 +25,7 @@ body { margin: 0; padding: 0; background: #56A; color: #000; font-family: monosp #main { max-width: 1000px; margin: 0 auto; - padding: 0 4%; width: 92%; + padding: 0 2%; width: 96%; } h1, h2, h3, h4, h5, h6 { clear: both; } @@ -83,7 +83,7 @@ fieldset { label, input, select, textarea { display: block; float: left; margin: 1px 0; } label.newline, textarea, fieldset { clear: both; } label { - width: 140px; /* label area */ + width: 120px; /* label area */ height: 1em; padding: 10px 460px 10px 1em; margin-right: -450px; @@ -292,3 +292,12 @@ a.download { text-decoration: none; } +@media all and (min-width: 1100px) { + + #main { max-width: 10000px; } + + fieldset { float: left; width: 50%; height: auto; } + + #config_text, #config_adv_text { float: right; clear: right; width: 45%; } + +} diff --git a/Marlin/configurator/js/configurator.js b/Marlin/configurator/js/configurator.js index 169b41f99f..a662664366 100644 --- a/Marlin/configurator/js/configurator.js +++ b/Marlin/configurator/js/configurator.js @@ -938,24 +938,21 @@ var configuratorApp = (function(){ // Success? if (info.type) { // Get the end-of-line comment, if there is one - var tooltip = ''; + var tooltip = '', eoltip = ''; findDef = new RegExp('.*#define[ \\t].*/[/*]+[ \\t]*(.*)'); if (info.line.search(findDef) >= 0) - tooltip = info.line.replace(findDef, '$1'); + eoltip = tooltip = info.line.replace(findDef, '$1'); // Get all the comments immediately before the item var r, s; - findDef = new RegExp('(([ \\t]*(//|#)[^\n]+\n){1,4})([ \\t]*\n)?' + info.line.regEsc(), 'g'); + findDef = new RegExp('(([ \\t]*(//|#)[^\n]+\n){1,4})' + info.line.regEsc(), 'g'); if (r = findDef.exec(txt)) { // Get the text of the found comments findDef = new RegExp('^[ \\t]*//+[ \\t]*(.*)[ \\t]*$', 'gm'); while((s = findDef.exec(r[1])) !== null) { - var tip = s[1].replace(/[ \\t]*(={5,}|@section[ \\t]+\w+)[ \\t]*/g, ''); + var tip = s[1].replace(/[ \\t]*(={5,}|(#define[ \\t]+.*|@section[ \\t]+\w+))[ \\t]*/g, ''); if (tip.length) { - if (tip.match(/^#define[ \\t]/) != null) { - tooltip = ''; - break; - } + if (tip.match(/^#define[ \\t]/) != null) tooltip = eoltip; // JSON data? Save as select options if (!info.options && tip.match(/:[\[{]/) != null) { // TODO From 5d0c93ae104f7b3216285ba1a4533bd6f66ae582 Mon Sep 17 00:00:00 2001 From: Scott Lahteine <sourcetree@thinkyhead.com> Date: Thu, 19 Feb 2015 03:41:41 -0800 Subject: [PATCH 33/41] Keep config boxes in view on wide screen --- Marlin/configurator/css/configurator.css | 1 + Marlin/configurator/js/configurator.js | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/Marlin/configurator/css/configurator.css b/Marlin/configurator/css/configurator.css index fc54e8e01a..48544de2f9 100644 --- a/Marlin/configurator/css/configurator.css +++ b/Marlin/configurator/css/configurator.css @@ -300,4 +300,5 @@ a.download { #config_text, #config_adv_text { float: right; clear: right; width: 45%; } + pre.config { height: 20em; } } diff --git a/Marlin/configurator/js/configurator.js b/Marlin/configurator/js/configurator.js index a662664366..0092806254 100644 --- a/Marlin/configurator/js/configurator.js +++ b/Marlin/configurator/js/configurator.js @@ -186,6 +186,12 @@ var configuratorApp = (function(){ : $pre.slideUp(200, didAnim); }); + // Fix the config boxes on the screen (in wide style) + $(window).bind('scroll resize', function(){ + var $cfg = $('#config_text'), wtop = $(window).scrollTop(), ctop = $cfg.offset().top; + $cfg.css({ paddingTop: ctop < $form.offset().top+100 && wtop > ctop ? wtop-ctop : 0 }); + }); + // Read boards.h, Configuration.h, Configuration_adv.h var ajax_count = 0, success_count = 0; var loaded_items = {}; From 3aa5f98b642ccfb6b2c71e322405b2253c0fd8ea Mon Sep 17 00:00:00 2001 From: Scott Lahteine <sourcetree@thinkyhead.com> Date: Fri, 20 Feb 2015 02:12:00 -0800 Subject: [PATCH 34/41] Download all as ZIP, adjust layout on resize --- Marlin/configurator/config/boards.h | 12 +- Marlin/configurator/config/language.h | 228 +++++++++++++++++++++++ Marlin/configurator/css/configurator.css | 20 +- Marlin/configurator/index.html | 8 +- Marlin/configurator/js/FileSaver.min.js | 2 + Marlin/configurator/js/configurator.js | 76 ++++++-- Marlin/configurator/js/jszip.min.js | 14 ++ 7 files changed, 335 insertions(+), 25 deletions(-) create mode 100644 Marlin/configurator/config/language.h create mode 100755 Marlin/configurator/js/FileSaver.min.js create mode 100755 Marlin/configurator/js/jszip.min.js diff --git a/Marlin/configurator/config/boards.h b/Marlin/configurator/config/boards.h index c6997fe87b..0798139787 100644 --- a/Marlin/configurator/config/boards.h +++ b/Marlin/configurator/config/boards.h @@ -10,10 +10,10 @@ #define BOARD_CHEAPTRONIC 2 // Cheaptronic v1.0 #define BOARD_SETHI 20 // Sethi 3D_1 #define BOARD_RAMPS_OLD 3 // MEGA/RAMPS up to 1.2 -#define BOARD_RAMPS_13_EFB 33 // RAMPS 1.3 / 1.4 (Power outputs: Extruder, Fan, Bed) -#define BOARD_RAMPS_13_EEB 34 // RAMPS 1.3 / 1.4 (Power outputs: Extruder0, Extruder1, Bed) -#define BOARD_RAMPS_13_EFF 35 // RAMPS 1.3 / 1.4 (Power outputs: Extruder, Fan, Fan) -#define BOARD_RAMPS_13_EEF 36 // RAMPS 1.3 / 1.4 (Power outputs: Extruder0, Extruder1, Fan) +#define BOARD_RAMPS_13_EFB 33 // RAMPS 1.3 / 1.4 (Extruder, Fan, Bed) +#define BOARD_RAMPS_13_EEB 34 // RAMPS 1.3 / 1.4 (Extruder0, Extruder1, Bed) +#define BOARD_RAMPS_13_EFF 35 // RAMPS 1.3 / 1.4 (Extruder, Fan, Fan) +#define BOARD_RAMPS_13_EEF 36 // RAMPS 1.3 / 1.4 (Extruder0, Extruder1, Fan) #define BOARD_DUEMILANOVE_328P 4 // Duemilanove w/ ATMega328P pin assignments #define BOARD_GEN6 5 // Gen6 #define BOARD_GEN6_DELUXE 51 // Gen6 deluxe @@ -28,8 +28,8 @@ #define BOARD_ULTIMAKER 7 // Ultimaker #define BOARD_ULTIMAKER_OLD 71 // Ultimaker (Older electronics. Pre 1.5.4. This is rare) #define BOARD_ULTIMAIN_2 72 // Ultimainboard 2.x (Uses TEMP_SENSOR 20) -#define BOARD_3DRAG 77 // 3Drag Controller -#define BOARD_K8200 78 // Vellemann K8200 Controller (derived from 3Drag Controller) +#define BOARD_3DRAG 77 // 3Drag +#define BOARD_K8200 78 // Vellemann K8200 (derived from 3Drag) #define BOARD_TEENSYLU 8 // Teensylu #define BOARD_RUMBA 80 // Rumba #define BOARD_PRINTRBOARD 81 // Printrboard (AT90USB1286) diff --git a/Marlin/configurator/config/language.h b/Marlin/configurator/config/language.h new file mode 100644 index 0000000000..e13fc3176e --- /dev/null +++ b/Marlin/configurator/config/language.h @@ -0,0 +1,228 @@ +#ifndef LANGUAGE_H +#define LANGUAGE_H + +#include "Configuration.h" + +#define LANGUAGE_CONCAT(M) #M +#define GENERATE_LANGUAGE_INCLUDE(M) LANGUAGE_CONCAT(language_##M.h) + + +// NOTE: IF YOU CHANGE LANGUAGE FILES OR MERGE A FILE WITH CHANGES +// +// ==> ALWAYS TRY TO COMPILE MARLIN WITH/WITHOUT "ULTIPANEL" / "ULTRALCD" / "SDSUPPORT" #define IN "Configuration.h" +// ==> ALSO TRY ALL AVAILABLE LANGUAGE OPTIONS + +// Languages +// en English +// pl Polish +// fr French +// de German +// es Spanish +// ru Russian +// it Italian +// pt Portuguese +// pt-br Portuguese (Brazil) +// fi Finnish +// an Aragonese +// nl Dutch +// ca Catalan +// eu Basque-Euskera + +#ifndef LANGUAGE_INCLUDE + // pick your language from the list above + #define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en) +#endif + +#define PROTOCOL_VERSION "1.0" +#define FIRMWARE_URL "https://github.com/MarlinFirmware/Marlin" + +#if MB(ULTIMAKER)|| MB(ULTIMAKER_OLD)|| MB(ULTIMAIN_2) + #define MACHINE_NAME "Ultimaker" + #define FIRMWARE_URL "http://firmware.ultimaker.com" +#elif MB(RUMBA) + #define MACHINE_NAME "Rumba" +#elif MB(3DRAG) + #define MACHINE_NAME "3Drag" + #define FIRMWARE_URL "http://3dprint.elettronicain.it/" +#elif MB(K8200) + #define MACHINE_NAME "K8200" +#elif MB(5DPRINT) + #define MACHINE_NAME "Makibox" +#elif MB(SAV_MKI) + #define MACHINE_NAME "SAV MkI" + #define FIRMWARE_URL "https://github.com/fmalpartida/Marlin/tree/SAV-MkI-config" +#elif MB(WITBOX) + #define MACHINE_NAME "WITBOX" + #define FIRMWARE_URL "http://www.bq.com/gb/downloads-witbox.html" +#elif MB(HEPHESTOS) + #define MACHINE_NAME "HEPHESTOS" + #define FIRMWARE_URL "http://www.bq.com/gb/downloads-prusa-i3-hephestos.html" +#else // Default firmware set to Mendel + #define MACHINE_NAME "Mendel" +#endif + +#ifdef CUSTOM_MENDEL_NAME + #define MACHINE_NAME CUSTOM_MENDEL_NAME +#endif + +#ifndef MACHINE_UUID + #define MACHINE_UUID "00000000-0000-0000-0000-000000000000" +#endif + + +#define STRINGIFY_(n) #n +#define STRINGIFY(n) STRINGIFY_(n) + + +// Common LCD messages + + /* nothing here yet */ + +// Common serial messages +#define MSG_MARLIN "Marlin" + +// Serial Console Messages (do not translate those!) + +#define MSG_Enqueing "enqueing \"" +#define MSG_POWERUP "PowerUp" +#define MSG_EXTERNAL_RESET " External Reset" +#define MSG_BROWNOUT_RESET " Brown out Reset" +#define MSG_WATCHDOG_RESET " Watchdog Reset" +#define MSG_SOFTWARE_RESET " Software Reset" +#define MSG_AUTHOR " | Author: " +#define MSG_CONFIGURATION_VER " Last Updated: " +#define MSG_FREE_MEMORY " Free Memory: " +#define MSG_PLANNER_BUFFER_BYTES " PlannerBufferBytes: " +#define MSG_OK "ok" +#define MSG_FILE_SAVED "Done saving file." +#define MSG_ERR_LINE_NO "Line Number is not Last Line Number+1, Last Line: " +#define MSG_ERR_CHECKSUM_MISMATCH "checksum mismatch, Last Line: " +#define MSG_ERR_NO_CHECKSUM "No Checksum with line number, Last Line: " +#define MSG_ERR_NO_LINENUMBER_WITH_CHECKSUM "No Line Number with checksum, Last Line: " +#define MSG_FILE_PRINTED "Done printing file" +#define MSG_BEGIN_FILE_LIST "Begin file list" +#define MSG_END_FILE_LIST "End file list" +#define MSG_M104_INVALID_EXTRUDER "M104 Invalid extruder " +#define MSG_M105_INVALID_EXTRUDER "M105 Invalid extruder " +#define MSG_M200_INVALID_EXTRUDER "M200 Invalid extruder " +#define MSG_M218_INVALID_EXTRUDER "M218 Invalid extruder " +#define MSG_M221_INVALID_EXTRUDER "M221 Invalid extruder " +#define MSG_ERR_NO_THERMISTORS "No thermistors - no temperature" +#define MSG_M109_INVALID_EXTRUDER "M109 Invalid extruder " +#define MSG_HEATING "Heating..." +#define MSG_HEATING_COMPLETE "Heating done." +#define MSG_BED_HEATING "Bed Heating." +#define MSG_BED_DONE "Bed done." +#define MSG_M115_REPORT "FIRMWARE_NAME:Marlin V1; Sprinter/grbl mashup for gen6 FIRMWARE_URL:" FIRMWARE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:" MACHINE_NAME " EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID "\n" +#define MSG_COUNT_X " Count X: " +#define MSG_ERR_KILLED "Printer halted. kill() called!" +#define MSG_ERR_STOPPED "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)" +#define MSG_RESEND "Resend: " +#define MSG_UNKNOWN_COMMAND "Unknown command: \"" +#define MSG_ACTIVE_EXTRUDER "Active Extruder: " +#define MSG_INVALID_EXTRUDER "Invalid extruder" +#define MSG_X_MIN "x_min: " +#define MSG_X_MAX "x_max: " +#define MSG_Y_MIN "y_min: " +#define MSG_Y_MAX "y_max: " +#define MSG_Z_MIN "z_min: " +#define MSG_Z_MAX "z_max: " +#define MSG_M119_REPORT "Reporting endstop status" +#define MSG_ENDSTOP_HIT "TRIGGERED" +#define MSG_ENDSTOP_OPEN "open" +#define MSG_HOTEND_OFFSET "Hotend offsets:" + +#define MSG_SD_CANT_OPEN_SUBDIR "Cannot open subdir" +#define MSG_SD_INIT_FAIL "SD init fail" +#define MSG_SD_VOL_INIT_FAIL "volume.init failed" +#define MSG_SD_OPENROOT_FAIL "openRoot failed" +#define MSG_SD_CARD_OK "SD card ok" +#define MSG_SD_WORKDIR_FAIL "workDir open failed" +#define MSG_SD_OPEN_FILE_FAIL "open failed, File: " +#define MSG_SD_FILE_OPENED "File opened: " +#define MSG_SD_SIZE " Size: " +#define MSG_SD_FILE_SELECTED "File selected" +#define MSG_SD_WRITE_TO_FILE "Writing to file: " +#define MSG_SD_PRINTING_BYTE "SD printing byte " +#define MSG_SD_NOT_PRINTING "Not SD printing" +#define MSG_SD_ERR_WRITE_TO_FILE "error writing to file" +#define MSG_SD_CANT_ENTER_SUBDIR "Cannot enter subdir: " + +#define MSG_STEPPER_TOO_HIGH "Steprate too high: " +#define MSG_ENDSTOPS_HIT "endstops hit: " +#define MSG_ERR_COLD_EXTRUDE_STOP " cold extrusion prevented" +#define MSG_ERR_LONG_EXTRUDE_STOP " too long extrusion prevented" +#define MSG_BABYSTEPPING_X "Babystepping X" +#define MSG_BABYSTEPPING_Y "Babystepping Y" +#define MSG_BABYSTEPPING_Z "Babystepping Z" +#define MSG_SERIAL_ERROR_MENU_STRUCTURE "Error in menu structure" + +#define MSG_ERR_EEPROM_WRITE "Error writing to EEPROM!" + +// LCD Menu Messages + +// Add your own character. Reference: https://github.com/MarlinFirmware/Marlin/pull/1434 photos +// and https://www.sparkfun.com/datasheets/LCD/HD44780.pdf page 17-18 +#ifdef DOGLCD + #define STR_Ae "\304" // 'Ä' U8glib + #define STR_ae "\344" // 'ä' + #define STR_Oe "\326" // 'Ö' + #define STR_oe STR_Oe // 'ö' + #define STR_Ue "\334" // 'Ü' + #define STR_ue STR_Ue // 'ü' + #define STR_sz "\337" // 'ß' + #define STR_h2 "\262" // '²' + #define STR_h3 "\263" // '³' + #define STR_Deg "\260" // '°' + #define STR_THERMOMETER "\377" +#else + #ifdef DISPLAY_CHARSET_HD44780_JAPAN // HD44780 ROM Code: A00 (Japan) + #define STR_ae "\xe1" + #define STR_Ae STR_ae + #define STR_oe "\357" + #define STR_Oe STR_oe + #define STR_ue "\365" + #define STR_Ue STR_ue + #define STR_sz "\342" + #define STR_h2 "2" + #define STR_h3 "3" + #define STR_Deg "\271" + #define STR_THERMOMETER "\002" + #endif + #ifdef DISPLAY_CHARSET_HD44780_WESTERN // HD44780 ROM Code: A02 (Western) + #define STR_Ae "\216" + #define STR_ae "\204" + #define STR_Oe "\211" + #define STR_oe "\204" + #define STR_Ue "\212" + #define STR_ue "\201" + #define STR_sz "\160" + #define STR_h2 "\262" + #define STR_h3 "\263" + #define STR_Deg "\337" + #define STR_THERMOMETER "\002" + #endif +#endif +/* +#define TESTSTRING000 "\000\001\002\003\004\005\006\007\010\011\012\013\014\015\016\017" +#define TESTSTRING020 "\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" +#define TESTSTRING040 "\040\041\042\043\044\045\046\047\050\051\052\053\054\055\056\057" +#define TESTSTRING060 "\060\061\062\063\064\065\066\067\070\071\072\073\074\075\076\077" +#define TESTSTRING100 "\100\101\102\103\104\105\106\107\110\111\112\113\114\115\116\117" +#define TESTSTRING120 "\120\121\122\123\124\125\126\127\130\131\132\133\134\135\136\137" +#define TESTSTRING140 "\140\141\142\143\144\145\146\147\150\151\152\153\154\155\156\157" +#define TESTSTRING160 "\160\161\162\163\164\165\166\167\170\171\172\173\174\175\176\177" +#define TESTSTRING200 "\200\201\202\203\204\205\206\207\210\211\212\213\214\215\216\217" +#define TESTSTRING220 "\220\221\222\223\224\225\226\227\230\231\232\233\234\235\236\237" +#define TESTSTRING240 "\240\241\242\243\244\245\246\247\250\251\252\253\254\255\256\257" +#define TESTSTRING260 "\260\261\262\263\264\265\266\267\270\271\272\273\274\275\276\277" +#define TESTSTRING300 "\300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317" +#define TESTSTRING320 "\320\321\322\323\324\325\326\327\330\331\332\333\334\335\336\337" +#define TESTSTRING340 "\340\341\342\343\344\345\346\347\350\351\352\353\354\355\356\357" +#define TESTSTRING360 "\360\361\362\363\364\365\366\367\370\371\372\373\374\375\376\377" +*/ + +#include LANGUAGE_INCLUDE +#include "language_en.h" + +#endif //__LANGUAGE_H diff --git a/Marlin/configurator/css/configurator.css b/Marlin/configurator/css/configurator.css index 48544de2f9..645907f0a8 100644 --- a/Marlin/configurator/css/configurator.css +++ b/Marlin/configurator/css/configurator.css @@ -23,8 +23,8 @@ pre { body { margin: 0; padding: 0; background: #56A; color: #000; font-family: monospace; } #main { - max-width: 1000px; - margin: 0 auto; + max-width: 1100px; + margin: 0 auto 10px; padding: 0 2%; width: 96%; } @@ -32,9 +32,10 @@ h1, h2, h3, h4, h5, h6 { clear: both; } h1, p.info { font-family: sans-serif; } h1 { - background: transparent url(logo.png) right top no-repeat; height: 38px; margin-bottom: -30px; + color: #FFF; + background: transparent url(logo.png) right top no-repeat; } p.info { padding: 0; color: #000; } p.info span { color: #800; } @@ -72,7 +73,8 @@ img { display: none; } padding: 6px 20px 20px; color: #000; position: relative; - border-top-right-radius: 1.5em; + border-radius: 1.5em; + border-top-left-radius: 0; } fieldset { height: 16.1em; @@ -235,7 +237,7 @@ h2 { /* Disclosure Widget */ -span.disclose, a.download {︎ +span.disclose, a.download, a.download-all {︎ display: block; float: right; margin-top: 12px; @@ -278,7 +280,7 @@ span.disclose.closed.almost { /* Download Button */ -a.download { +a.download, a.download-all { visibility: hidden; padding: 2px; border: 1px solid #494; @@ -291,8 +293,9 @@ a.download { font-weight: bold; text-decoration: none; } +a.download-all { margin: 9px 2em 0; color: #449; border-color: #449; } -@media all and (min-width: 1100px) { +@media all and (min-width: 1140px) { #main { max-width: 10000px; } @@ -301,4 +304,7 @@ a.download { #config_text, #config_adv_text { float: right; clear: right; width: 45%; } pre.config { height: 20em; } + + .disclose { display: none; } + } diff --git a/Marlin/configurator/index.html b/Marlin/configurator/index.html index 23a8411a20..aad6736e21 100644 --- a/Marlin/configurator/index.html +++ b/Marlin/configurator/index.html @@ -7,6 +7,8 @@ <script src="js/jquery-2.1.3.min.js"></script> <script src="js/binarystring.js"></script> <script src="js/binaryfileuploader.js"></script> + <script src="js/FileSaver.min.js"></script> + <script src="js/jszip.min.js"></script> <script src="js/jcanvas.js"></script> <script src="js/jstepper.js"></script> <script src="js/configurator.js"></script> @@ -26,7 +28,7 @@ <label>Drop Files Here:</label><input type="file" id="file-upload" /> <label id="tipson"><input type="checkbox" checked /> ?</label> - <br class="clear" /> + <a href="" class="download-all">Download Zip</a> <fieldset id="machine"> <legend>Machine</legend> @@ -89,6 +91,10 @@ <legend>Extras</legend> </fieldset> + <fieldset id="info"> + <legend>Info</legend> + </fieldset> + <fieldset id="more"> <legend>More…</legend> </fieldset> diff --git a/Marlin/configurator/js/FileSaver.min.js b/Marlin/configurator/js/FileSaver.min.js new file mode 100755 index 0000000000..f7319603d7 --- /dev/null +++ b/Marlin/configurator/js/FileSaver.min.js @@ -0,0 +1,2 @@ +/*! @source http://purl.eligrey.com/github/FileSaver.js/blob/master/FileSaver.js */ +var saveAs=saveAs||typeof navigator!=="undefined"&&navigator.msSaveOrOpenBlob&&navigator.msSaveOrOpenBlob.bind(navigator)||function(view){"use strict";if(typeof navigator!=="undefined"&&/MSIE [1-9]\./.test(navigator.userAgent)){return}var doc=view.document,get_URL=function(){return view.URL||view.webkitURL||view},save_link=doc.createElementNS("http://www.w3.org/1999/xhtml","a"),can_use_save_link="download"in save_link,click=function(node){var event=doc.createEvent("MouseEvents");event.initMouseEvent("click",true,false,view,0,0,0,0,0,false,false,false,false,0,null);node.dispatchEvent(event)},webkit_req_fs=view.webkitRequestFileSystem,req_fs=view.requestFileSystem||webkit_req_fs||view.mozRequestFileSystem,throw_outside=function(ex){(view.setImmediate||view.setTimeout)(function(){throw ex},0)},force_saveable_type="application/octet-stream",fs_min_size=0,arbitrary_revoke_timeout=500,revoke=function(file){var revoker=function(){if(typeof file==="string"){get_URL().revokeObjectURL(file)}else{file.remove()}};if(view.chrome){revoker()}else{setTimeout(revoker,arbitrary_revoke_timeout)}},dispatch=function(filesaver,event_types,event){event_types=[].concat(event_types);var i=event_types.length;while(i--){var listener=filesaver["on"+event_types[i]];if(typeof listener==="function"){try{listener.call(filesaver,event||filesaver)}catch(ex){throw_outside(ex)}}}},FileSaver=function(blob,name){var filesaver=this,type=blob.type,blob_changed=false,object_url,target_view,dispatch_all=function(){dispatch(filesaver,"writestart progress write writeend".split(" "))},fs_error=function(){if(blob_changed||!object_url){object_url=get_URL().createObjectURL(blob)}if(target_view){target_view.location.href=object_url}else{var new_tab=view.open(object_url,"_blank");if(new_tab==undefined&&typeof safari!=="undefined"){view.location.href=object_url}}filesaver.readyState=filesaver.DONE;dispatch_all();revoke(object_url)},abortable=function(func){return function(){if(filesaver.readyState!==filesaver.DONE){return func.apply(this,arguments)}}},create_if_not_found={create:true,exclusive:false},slice;filesaver.readyState=filesaver.INIT;if(!name){name="download"}if(can_use_save_link){object_url=get_URL().createObjectURL(blob);save_link.href=object_url;save_link.download=name;click(save_link);filesaver.readyState=filesaver.DONE;dispatch_all();revoke(object_url);return}if(view.chrome&&type&&type!==force_saveable_type){slice=blob.slice||blob.webkitSlice;blob=slice.call(blob,0,blob.size,force_saveable_type);blob_changed=true}if(webkit_req_fs&&name!=="download"){name+=".download"}if(type===force_saveable_type||webkit_req_fs){target_view=view}if(!req_fs){fs_error();return}fs_min_size+=blob.size;req_fs(view.TEMPORARY,fs_min_size,abortable(function(fs){fs.root.getDirectory("saved",create_if_not_found,abortable(function(dir){var save=function(){dir.getFile(name,create_if_not_found,abortable(function(file){file.createWriter(abortable(function(writer){writer.onwriteend=function(event){target_view.location.href=file.toURL();filesaver.readyState=filesaver.DONE;dispatch(filesaver,"writeend",event);revoke(file)};writer.onerror=function(){var error=writer.error;if(error.code!==error.ABORT_ERR){fs_error()}};"writestart progress write abort".split(" ").forEach(function(event){writer["on"+event]=filesaver["on"+event]});writer.write(blob);filesaver.abort=function(){writer.abort();filesaver.readyState=filesaver.DONE};filesaver.readyState=filesaver.WRITING}),fs_error)}),fs_error)};dir.getFile(name,{create:false},abortable(function(file){file.remove();save()}),abortable(function(ex){if(ex.code===ex.NOT_FOUND_ERR){save()}else{fs_error()}}))}),fs_error)}),fs_error)},FS_proto=FileSaver.prototype,saveAs=function(blob,name){return new FileSaver(blob,name)};FS_proto.abort=function(){var filesaver=this;filesaver.readyState=filesaver.DONE;dispatch(filesaver,"abort")};FS_proto.readyState=FS_proto.INIT=0;FS_proto.WRITING=1;FS_proto.DONE=2;FS_proto.error=FS_proto.onwritestart=FS_proto.onprogress=FS_proto.onwrite=FS_proto.onabort=FS_proto.onerror=FS_proto.onwriteend=null;return saveAs}(typeof self!=="undefined"&&self||typeof window!=="undefined"&&window||this.content);if(typeof module!=="undefined"&&module.exports){module.exports.saveAs=saveAs}else if(typeof define!=="undefined"&&define!==null&&define.amd!=null){define([],function(){return saveAs})} diff --git a/Marlin/configurator/js/configurator.js b/Marlin/configurator/js/configurator.js index 0092806254..47d3d3db68 100644 --- a/Marlin/configurator/js/configurator.js +++ b/Marlin/configurator/js/configurator.js @@ -140,8 +140,8 @@ var configuratorApp = (function(){ $msgbox = $('#message'), $form = $('#config_form'), $tooltip = $('#tooltip'), - $config = $('#config_text pre'), - $config_adv = $('#config_adv_text pre'), + $cfg = $('#config_text'), $adv = $('#config_adv_text'), + $config = $cfg.find('pre'), $config_adv = $adv.find('pre'), define_list = [[],[]], define_section = {}, boards_list = {}, @@ -186,11 +186,8 @@ var configuratorApp = (function(){ : $pre.slideUp(200, didAnim); }); - // Fix the config boxes on the screen (in wide style) - $(window).bind('scroll resize', function(){ - var $cfg = $('#config_text'), wtop = $(window).scrollTop(), ctop = $cfg.offset().top; - $cfg.css({ paddingTop: ctop < $form.offset().top+100 && wtop > ctop ? wtop-ctop : 0 }); - }); + // Adjust the form layout for the window size + $(window).bind('scroll resize', this.adjustFormLayout).trigger('resize'); // Read boards.h, Configuration.h, Configuration_adv.h var ajax_count = 0, success_count = 0; @@ -286,6 +283,28 @@ var configuratorApp = (function(){ .css({visibility:'visible'}); }, + /** + * Make the download-all link visible and active + */ + activateDownloadAllLink: function() { + $('.download-all') + .unbind('mouseover click') + .mouseover(function() { + var d = new Date(), fn = d.fileStamp('MarlinConfig.zip'); + $(this).attr({ download:fn, href:'download:'+fn, title:'download:'+fn }); + }) + .click(function(){ + var $button = $(this); + var zip = new JSZip(); + zip.file(config_file, $config.text()); + zip.file(config_adv_file, $config_adv.text()); + var zipped = zip.generate({type:'blob'}); + saveAs(zipped, $button.attr('download')); + return false; + }) + .css({visibility:'visible'}); + }, + /** * Init the boards array from a boards.h file */ @@ -316,8 +335,8 @@ var configuratorApp = (function(){ * Get all the unique define names */ updateDefinesFromText: function(index, txt) { - var section = 'machine', - leave_out_defines = ['CONFIGURATION_H', 'CONFIGURATION_ADV_H', 'STRING_VERSION', 'STRING_URL', 'STRING_VERSION_CONFIG_H', 'STRING_CONFIG_H_AUTHOR', 'STRING_SPLASH_LINE1', 'STRING_SPLASH_LINE2'], + var section = 'hidden', + leave_out_defines = ['CONFIGURATION_H', 'CONFIGURATION_ADV_H'], define_sect = {}, r, findDef = new RegExp('(@section|#define)[ \\t]+(\\w+)', 'gm'); while((r = findDef.exec(txt)) !== null) { @@ -426,6 +445,8 @@ var configuratorApp = (function(){ // this.initThermistorsFromText(txt); init_index = 0; has_config = true; + if (has_config_adv) + this.activateDownloadAllLink(); } else { err = boards_file; @@ -437,6 +458,8 @@ var configuratorApp = (function(){ total_config_adv_lines = txt.lineCount(); init_index = 1; has_config_adv = true; + if (has_config) + this.activateDownloadAllLink(); } else { err = config_file; @@ -448,8 +471,14 @@ var configuratorApp = (function(){ var adv = init_index == 1; this.purgeAddedFields(init_index); this.updateDefinesFromText(init_index, txt); + // TODO: Find sequential names and group them + // Allows related settings to occupy one line in the form + // this.refreshSequentialDefines(); + // TODO: Get dependent groups (#ifdef's) from text + // Allows parent to hide/show or disable/enable dependent fields! + // this.refreshDependentGroups(); // (from all config text) this.createFieldsForDefines(adv); - this.refreshConfigForm(init_index); + this.refreshConfigForm(init_index); // TODO: <-- hide dependent fields this.activateDownloadLink(adv); } this.setMessage(err @@ -1019,7 +1048,11 @@ var configuratorApp = (function(){ clearInterval(err.pulser); } }, 50); - $err.click(function(e) { $(this).remove(); return false; }).css({cursor:'pointer'}); + $err.click(function(e) { + $(this).remove(); + self.adjustFormLayout(); + return false; + }).css({cursor:'pointer'}); } else { $msgbox.find('p.error, p.warning').each(function() { @@ -1028,6 +1061,27 @@ var configuratorApp = (function(){ $(this).remove(); }); } + self.adjustFormLayout(); + }, + + adjustFormLayout: function() { + var wtop = $(window).scrollTop(), + ctop = $cfg.offset().top, + thresh = $form.offset().top+100; + if (ctop < thresh) { + var maxhi = $form.height(); // pad plus heights of config boxes can't be more than this + var pad = wtop > ctop ? wtop-ctop : 0; // pad the top box to stay in view + var innerpad = Math.ceil($cfg.height() - $cfg.find('pre').height()); + // height to use for the inner boxes + var hi = ($(window).height() - ($cfg.offset().top - pad) + wtop - innerpad)/2; + if (hi < 200) hi = 200; + $cfg.css({ paddingTop: pad }); + var $pre = $('pre.config'); + $pre.css({ height: Math.floor(hi) - $pre.position().top }); + } + else { + $cfg.css({ paddingTop: wtop > ctop ? wtop-ctop : 0, height: '' }); + } }, setRequestError: function(stat, path) { diff --git a/Marlin/configurator/js/jszip.min.js b/Marlin/configurator/js/jszip.min.js new file mode 100755 index 0000000000..767d8c11d2 --- /dev/null +++ b/Marlin/configurator/js/jszip.min.js @@ -0,0 +1,14 @@ +/*! + +JSZip - A Javascript class for generating and reading zip files +<http://stuartk.com/jszip> + +(c) 2009-2014 Stuart Knightley <stuart [at] stuartk.com> +Dual licenced under the MIT license or GPLv3. See https://raw.github.com/Stuk/jszip/master/LICENSE.markdown. + +JSZip uses the library pako released under the MIT license : +https://github.com/nodeca/pako/blob/master/LICENSE +*/ +!function(a){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=a();else if("function"==typeof define&&define.amd)define([],a);else{var b;"undefined"!=typeof window?b=window:"undefined"!=typeof global?b=global:"undefined"!=typeof self&&(b=self),b.JSZip=a()}}(function(){return function a(b,c,d){function e(g,h){if(!c[g]){if(!b[g]){var i="function"==typeof require&&require;if(!h&&i)return i(g,!0);if(f)return f(g,!0);throw new Error("Cannot find module '"+g+"'")}var j=c[g]={exports:{}};b[g][0].call(j.exports,function(a){var c=b[g][1][a];return e(c?c:a)},j,j.exports,a,b,c,d)}return c[g].exports}for(var f="function"==typeof require&&require,g=0;g<d.length;g++)e(d[g]);return e}({1:[function(a,b,c){"use strict";var d="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";c.encode=function(a){for(var b,c,e,f,g,h,i,j="",k=0;k<a.length;)b=a.charCodeAt(k++),c=a.charCodeAt(k++),e=a.charCodeAt(k++),f=b>>2,g=(3&b)<<4|c>>4,h=(15&c)<<2|e>>6,i=63&e,isNaN(c)?h=i=64:isNaN(e)&&(i=64),j=j+d.charAt(f)+d.charAt(g)+d.charAt(h)+d.charAt(i);return j},c.decode=function(a){var b,c,e,f,g,h,i,j="",k=0;for(a=a.replace(/[^A-Za-z0-9\+\/\=]/g,"");k<a.length;)f=d.indexOf(a.charAt(k++)),g=d.indexOf(a.charAt(k++)),h=d.indexOf(a.charAt(k++)),i=d.indexOf(a.charAt(k++)),b=f<<2|g>>4,c=(15&g)<<4|h>>2,e=(3&h)<<6|i,j+=String.fromCharCode(b),64!=h&&(j+=String.fromCharCode(c)),64!=i&&(j+=String.fromCharCode(e));return j}},{}],2:[function(a,b){"use strict";function c(){this.compressedSize=0,this.uncompressedSize=0,this.crc32=0,this.compressionMethod=null,this.compressedContent=null}c.prototype={getContent:function(){return null},getCompressedContent:function(){return null}},b.exports=c},{}],3:[function(a,b,c){"use strict";c.STORE={magic:"\x00\x00",compress:function(a){return a},uncompress:function(a){return a},compressInputType:null,uncompressInputType:null},c.DEFLATE=a("./flate")},{"./flate":8}],4:[function(a,b){"use strict";var c=a("./utils"),d=[0,1996959894,3993919788,2567524794,124634137,1886057615,3915621685,2657392035,249268274,2044508324,3772115230,2547177864,162941995,2125561021,3887607047,2428444049,498536548,1789927666,4089016648,2227061214,450548861,1843258603,4107580753,2211677639,325883990,1684777152,4251122042,2321926636,335633487,1661365465,4195302755,2366115317,997073096,1281953886,3579855332,2724688242,1006888145,1258607687,3524101629,2768942443,901097722,1119000684,3686517206,2898065728,853044451,1172266101,3705015759,2882616665,651767980,1373503546,3369554304,3218104598,565507253,1454621731,3485111705,3099436303,671266974,1594198024,3322730930,2970347812,795835527,1483230225,3244367275,3060149565,1994146192,31158534,2563907772,4023717930,1907459465,112637215,2680153253,3904427059,2013776290,251722036,2517215374,3775830040,2137656763,141376813,2439277719,3865271297,1802195444,476864866,2238001368,4066508878,1812370925,453092731,2181625025,4111451223,1706088902,314042704,2344532202,4240017532,1658658271,366619977,2362670323,4224994405,1303535960,984961486,2747007092,3569037538,1256170817,1037604311,2765210733,3554079995,1131014506,879679996,2909243462,3663771856,1141124467,855842277,2852801631,3708648649,1342533948,654459306,3188396048,3373015174,1466479909,544179635,3110523913,3462522015,1591671054,702138776,2966460450,3352799412,1504918807,783551873,3082640443,3233442989,3988292384,2596254646,62317068,1957810842,3939845945,2647816111,81470997,1943803523,3814918930,2489596804,225274430,2053790376,3826175755,2466906013,167816743,2097651377,4027552580,2265490386,503444072,1762050814,4150417245,2154129355,426522225,1852507879,4275313526,2312317920,282753626,1742555852,4189708143,2394877945,397917763,1622183637,3604390888,2714866558,953729732,1340076626,3518719985,2797360999,1068828381,1219638859,3624741850,2936675148,906185462,1090812512,3747672003,2825379669,829329135,1181335161,3412177804,3160834842,628085408,1382605366,3423369109,3138078467,570562233,1426400815,3317316542,2998733608,733239954,1555261956,3268935591,3050360625,752459403,1541320221,2607071920,3965973030,1969922972,40735498,2617837225,3943577151,1913087877,83908371,2512341634,3803740692,2075208622,213261112,2463272603,3855990285,2094854071,198958881,2262029012,4057260610,1759359992,534414190,2176718541,4139329115,1873836001,414664567,2282248934,4279200368,1711684554,285281116,2405801727,4167216745,1634467795,376229701,2685067896,3608007406,1308918612,956543938,2808555105,3495958263,1231636301,1047427035,2932959818,3654703836,1088359270,936918e3,2847714899,3736837829,1202900863,817233897,3183342108,3401237130,1404277552,615818150,3134207493,3453421203,1423857449,601450431,3009837614,3294710456,1567103746,711928724,3020668471,3272380065,1510334235,755167117];b.exports=function(a,b){if("undefined"==typeof a||!a.length)return 0;var e="string"!==c.getTypeOf(a);"undefined"==typeof b&&(b=0);var f=0,g=0,h=0;b=-1^b;for(var i=0,j=a.length;j>i;i++)h=e?a[i]:a.charCodeAt(i),g=255&(b^h),f=d[g],b=b>>>8^f;return-1^b}},{"./utils":21}],5:[function(a,b){"use strict";function c(){this.data=null,this.length=0,this.index=0}var d=a("./utils");c.prototype={checkOffset:function(a){this.checkIndex(this.index+a)},checkIndex:function(a){if(this.length<a||0>a)throw new Error("End of data reached (data length = "+this.length+", asked index = "+a+"). Corrupted zip ?")},setIndex:function(a){this.checkIndex(a),this.index=a},skip:function(a){this.setIndex(this.index+a)},byteAt:function(){},readInt:function(a){var b,c=0;for(this.checkOffset(a),b=this.index+a-1;b>=this.index;b--)c=(c<<8)+this.byteAt(b);return this.index+=a,c},readString:function(a){return d.transformTo("string",this.readData(a))},readData:function(){},lastIndexOfSignature:function(){},readDate:function(){var a=this.readInt(4);return new Date((a>>25&127)+1980,(a>>21&15)-1,a>>16&31,a>>11&31,a>>5&63,(31&a)<<1)}},b.exports=c},{"./utils":21}],6:[function(a,b,c){"use strict";c.base64=!1,c.binary=!1,c.dir=!1,c.createFolders=!1,c.date=null,c.compression=null,c.comment=null},{}],7:[function(a,b,c){"use strict";var d=a("./utils");c.string2binary=function(a){return d.string2binary(a)},c.string2Uint8Array=function(a){return d.transformTo("uint8array",a)},c.uint8Array2String=function(a){return d.transformTo("string",a)},c.string2Blob=function(a){var b=d.transformTo("arraybuffer",a);return d.arrayBuffer2Blob(b)},c.arrayBuffer2Blob=function(a){return d.arrayBuffer2Blob(a)},c.transformTo=function(a,b){return d.transformTo(a,b)},c.getTypeOf=function(a){return d.getTypeOf(a)},c.checkSupport=function(a){return d.checkSupport(a)},c.MAX_VALUE_16BITS=d.MAX_VALUE_16BITS,c.MAX_VALUE_32BITS=d.MAX_VALUE_32BITS,c.pretty=function(a){return d.pretty(a)},c.findCompression=function(a){return d.findCompression(a)},c.isRegExp=function(a){return d.isRegExp(a)}},{"./utils":21}],8:[function(a,b,c){"use strict";var d="undefined"!=typeof Uint8Array&&"undefined"!=typeof Uint16Array&&"undefined"!=typeof Uint32Array,e=a("pako");c.uncompressInputType=d?"uint8array":"array",c.compressInputType=d?"uint8array":"array",c.magic="\b\x00",c.compress=function(a){return e.deflateRaw(a)},c.uncompress=function(a){return e.inflateRaw(a)}},{pako:24}],9:[function(a,b){"use strict";function c(a,b){return this instanceof c?(this.files={},this.comment=null,this.root="",a&&this.load(a,b),void(this.clone=function(){var a=new c;for(var b in this)"function"!=typeof this[b]&&(a[b]=this[b]);return a})):new c(a,b)}var d=a("./base64");c.prototype=a("./object"),c.prototype.load=a("./load"),c.support=a("./support"),c.defaults=a("./defaults"),c.utils=a("./deprecatedPublicUtils"),c.base64={encode:function(a){return d.encode(a)},decode:function(a){return d.decode(a)}},c.compressions=a("./compressions"),b.exports=c},{"./base64":1,"./compressions":3,"./defaults":6,"./deprecatedPublicUtils":7,"./load":10,"./object":13,"./support":17}],10:[function(a,b){"use strict";var c=a("./base64"),d=a("./zipEntries");b.exports=function(a,b){var e,f,g,h;for(b=b||{},b.base64&&(a=c.decode(a)),f=new d(a,b),e=f.files,g=0;g<e.length;g++)h=e[g],this.file(h.fileName,h.decompressed,{binary:!0,optimizedBinaryString:!0,date:h.date,dir:h.dir,comment:h.fileComment.length?h.fileComment:null,createFolders:b.createFolders});return f.zipComment.length&&(this.comment=f.zipComment),this}},{"./base64":1,"./zipEntries":22}],11:[function(a,b){(function(a){"use strict";b.exports=function(b,c){return new a(b,c)},b.exports.test=function(b){return a.isBuffer(b)}}).call(this,"undefined"!=typeof Buffer?Buffer:void 0)},{}],12:[function(a,b){"use strict";function c(a){this.data=a,this.length=this.data.length,this.index=0}var d=a("./uint8ArrayReader");c.prototype=new d,c.prototype.readData=function(a){this.checkOffset(a);var b=this.data.slice(this.index,this.index+a);return this.index+=a,b},b.exports=c},{"./uint8ArrayReader":18}],13:[function(a,b){"use strict";var c=a("./support"),d=a("./utils"),e=a("./crc32"),f=a("./signature"),g=a("./defaults"),h=a("./base64"),i=a("./compressions"),j=a("./compressedObject"),k=a("./nodeBuffer"),l=a("./utf8"),m=a("./stringWriter"),n=a("./uint8ArrayWriter"),o=function(a){if(a._data instanceof j&&(a._data=a._data.getContent(),a.options.binary=!0,a.options.base64=!1,"uint8array"===d.getTypeOf(a._data))){var b=a._data;a._data=new Uint8Array(b.length),0!==b.length&&a._data.set(b,0)}return a._data},p=function(a){var b=o(a),e=d.getTypeOf(b);return"string"===e?!a.options.binary&&c.nodebuffer?k(b,"utf-8"):a.asBinary():b},q=function(a){var b=o(this);return null===b||"undefined"==typeof b?"":(this.options.base64&&(b=h.decode(b)),b=a&&this.options.binary?A.utf8decode(b):d.transformTo("string",b),a||this.options.binary||(b=d.transformTo("string",A.utf8encode(b))),b)},r=function(a,b,c){this.name=a,this.dir=c.dir,this.date=c.date,this.comment=c.comment,this._data=b,this.options=c,this._initialMetadata={dir:c.dir,date:c.date}};r.prototype={asText:function(){return q.call(this,!0)},asBinary:function(){return q.call(this,!1)},asNodeBuffer:function(){var a=p(this);return d.transformTo("nodebuffer",a)},asUint8Array:function(){var a=p(this);return d.transformTo("uint8array",a)},asArrayBuffer:function(){return this.asUint8Array().buffer}};var s=function(a,b){var c,d="";for(c=0;b>c;c++)d+=String.fromCharCode(255&a),a>>>=8;return d},t=function(){var a,b,c={};for(a=0;a<arguments.length;a++)for(b in arguments[a])arguments[a].hasOwnProperty(b)&&"undefined"==typeof c[b]&&(c[b]=arguments[a][b]);return c},u=function(a){return a=a||{},a.base64!==!0||null!==a.binary&&void 0!==a.binary||(a.binary=!0),a=t(a,g),a.date=a.date||new Date,null!==a.compression&&(a.compression=a.compression.toUpperCase()),a},v=function(a,b,c){var e,f=d.getTypeOf(b);if(c=u(c),c.createFolders&&(e=w(a))&&x.call(this,e,!0),c.dir||null===b||"undefined"==typeof b)c.base64=!1,c.binary=!1,b=null;else if("string"===f)c.binary&&!c.base64&&c.optimizedBinaryString!==!0&&(b=d.string2binary(b));else{if(c.base64=!1,c.binary=!0,!(f||b instanceof j))throw new Error("The data of '"+a+"' is in an unsupported format !");"arraybuffer"===f&&(b=d.transformTo("uint8array",b))}var g=new r(a,b,c);return this.files[a]=g,g},w=function(a){"/"==a.slice(-1)&&(a=a.substring(0,a.length-1));var b=a.lastIndexOf("/");return b>0?a.substring(0,b):""},x=function(a,b){return"/"!=a.slice(-1)&&(a+="/"),b="undefined"!=typeof b?b:!1,this.files[a]||v.call(this,a,null,{dir:!0,createFolders:b}),this.files[a]},y=function(a,b){var c,f=new j;return a._data instanceof j?(f.uncompressedSize=a._data.uncompressedSize,f.crc32=a._data.crc32,0===f.uncompressedSize||a.dir?(b=i.STORE,f.compressedContent="",f.crc32=0):a._data.compressionMethod===b.magic?f.compressedContent=a._data.getCompressedContent():(c=a._data.getContent(),f.compressedContent=b.compress(d.transformTo(b.compressInputType,c)))):(c=p(a),(!c||0===c.length||a.dir)&&(b=i.STORE,c=""),f.uncompressedSize=c.length,f.crc32=e(c),f.compressedContent=b.compress(d.transformTo(b.compressInputType,c))),f.compressedSize=f.compressedContent.length,f.compressionMethod=b.magic,f},z=function(a,b,c,g){var h,i,j,k,m=(c.compressedContent,d.transformTo("string",l.utf8encode(b.name))),n=b.comment||"",o=d.transformTo("string",l.utf8encode(n)),p=m.length!==b.name.length,q=o.length!==n.length,r=b.options,t="",u="",v="";j=b._initialMetadata.dir!==b.dir?b.dir:r.dir,k=b._initialMetadata.date!==b.date?b.date:r.date,h=k.getHours(),h<<=6,h|=k.getMinutes(),h<<=5,h|=k.getSeconds()/2,i=k.getFullYear()-1980,i<<=4,i|=k.getMonth()+1,i<<=5,i|=k.getDate(),p&&(u=s(1,1)+s(e(m),4)+m,t+="up"+s(u.length,2)+u),q&&(v=s(1,1)+s(this.crc32(o),4)+o,t+="uc"+s(v.length,2)+v);var w="";w+="\n\x00",w+=p||q?"\x00\b":"\x00\x00",w+=c.compressionMethod,w+=s(h,2),w+=s(i,2),w+=s(c.crc32,4),w+=s(c.compressedSize,4),w+=s(c.uncompressedSize,4),w+=s(m.length,2),w+=s(t.length,2);var x=f.LOCAL_FILE_HEADER+w+m+t,y=f.CENTRAL_FILE_HEADER+"\x00"+w+s(o.length,2)+"\x00\x00\x00\x00"+(j===!0?"\x00\x00\x00":"\x00\x00\x00\x00")+s(g,4)+m+t+o;return{fileRecord:x,dirRecord:y,compressedObject:c}},A={load:function(){throw new Error("Load method is not defined. Is the file jszip-load.js included ?")},filter:function(a){var b,c,d,e,f=[];for(b in this.files)this.files.hasOwnProperty(b)&&(d=this.files[b],e=new r(d.name,d._data,t(d.options)),c=b.slice(this.root.length,b.length),b.slice(0,this.root.length)===this.root&&a(c,e)&&f.push(e));return f},file:function(a,b,c){if(1===arguments.length){if(d.isRegExp(a)){var e=a;return this.filter(function(a,b){return!b.dir&&e.test(a)})}return this.filter(function(b,c){return!c.dir&&b===a})[0]||null}return a=this.root+a,v.call(this,a,b,c),this},folder:function(a){if(!a)return this;if(d.isRegExp(a))return this.filter(function(b,c){return c.dir&&a.test(b)});var b=this.root+a,c=x.call(this,b),e=this.clone();return e.root=c.name,e},remove:function(a){a=this.root+a;var b=this.files[a];if(b||("/"!=a.slice(-1)&&(a+="/"),b=this.files[a]),b&&!b.dir)delete this.files[a];else for(var c=this.filter(function(b,c){return c.name.slice(0,a.length)===a}),d=0;d<c.length;d++)delete this.files[c[d].name];return this},generate:function(a){a=t(a||{},{base64:!0,compression:"STORE",type:"base64",comment:null}),d.checkSupport(a.type);var b,c,e=[],g=0,j=0,k=d.transformTo("string",this.utf8encode(a.comment||this.comment||""));for(var l in this.files)if(this.files.hasOwnProperty(l)){var o=this.files[l],p=o.options.compression||a.compression.toUpperCase(),q=i[p];if(!q)throw new Error(p+" is not a valid compression method !");var r=y.call(this,o,q),u=z.call(this,l,o,r,g);g+=u.fileRecord.length+r.compressedSize,j+=u.dirRecord.length,e.push(u)}var v="";v=f.CENTRAL_DIRECTORY_END+"\x00\x00\x00\x00"+s(e.length,2)+s(e.length,2)+s(j,4)+s(g,4)+s(k.length,2)+k;var w=a.type.toLowerCase();for(b="uint8array"===w||"arraybuffer"===w||"blob"===w||"nodebuffer"===w?new n(g+j+v.length):new m(g+j+v.length),c=0;c<e.length;c++)b.append(e[c].fileRecord),b.append(e[c].compressedObject.compressedContent);for(c=0;c<e.length;c++)b.append(e[c].dirRecord);b.append(v);var x=b.finalize();switch(a.type.toLowerCase()){case"uint8array":case"arraybuffer":case"nodebuffer":return d.transformTo(a.type.toLowerCase(),x);case"blob":return d.arrayBuffer2Blob(d.transformTo("arraybuffer",x));case"base64":return a.base64?h.encode(x):x;default:return x}},crc32:function(a,b){return e(a,b)},utf8encode:function(a){return d.transformTo("string",l.utf8encode(a))},utf8decode:function(a){return l.utf8decode(a)}};b.exports=A},{"./base64":1,"./compressedObject":2,"./compressions":3,"./crc32":4,"./defaults":6,"./nodeBuffer":11,"./signature":14,"./stringWriter":16,"./support":17,"./uint8ArrayWriter":19,"./utf8":20,"./utils":21}],14:[function(a,b,c){"use strict";c.LOCAL_FILE_HEADER="PK",c.CENTRAL_FILE_HEADER="PK",c.CENTRAL_DIRECTORY_END="PK",c.ZIP64_CENTRAL_DIRECTORY_LOCATOR="PK",c.ZIP64_CENTRAL_DIRECTORY_END="PK",c.DATA_DESCRIPTOR="PK\b"},{}],15:[function(a,b){"use strict";function c(a,b){this.data=a,b||(this.data=e.string2binary(this.data)),this.length=this.data.length,this.index=0}var d=a("./dataReader"),e=a("./utils");c.prototype=new d,c.prototype.byteAt=function(a){return this.data.charCodeAt(a)},c.prototype.lastIndexOfSignature=function(a){return this.data.lastIndexOf(a)},c.prototype.readData=function(a){this.checkOffset(a);var b=this.data.slice(this.index,this.index+a);return this.index+=a,b},b.exports=c},{"./dataReader":5,"./utils":21}],16:[function(a,b){"use strict";var c=a("./utils"),d=function(){this.data=[]};d.prototype={append:function(a){a=c.transformTo("string",a),this.data.push(a)},finalize:function(){return this.data.join("")}},b.exports=d},{"./utils":21}],17:[function(a,b,c){(function(a){"use strict";if(c.base64=!0,c.array=!0,c.string=!0,c.arraybuffer="undefined"!=typeof ArrayBuffer&&"undefined"!=typeof Uint8Array,c.nodebuffer="undefined"!=typeof a,c.uint8array="undefined"!=typeof Uint8Array,"undefined"==typeof ArrayBuffer)c.blob=!1;else{var b=new ArrayBuffer(0);try{c.blob=0===new Blob([b],{type:"application/zip"}).size}catch(d){try{var e=window.BlobBuilder||window.WebKitBlobBuilder||window.MozBlobBuilder||window.MSBlobBuilder,f=new e;f.append(b),c.blob=0===f.getBlob("application/zip").size}catch(d){c.blob=!1}}}}).call(this,"undefined"!=typeof Buffer?Buffer:void 0)},{}],18:[function(a,b){"use strict";function c(a){a&&(this.data=a,this.length=this.data.length,this.index=0)}var d=a("./dataReader");c.prototype=new d,c.prototype.byteAt=function(a){return this.data[a]},c.prototype.lastIndexOfSignature=function(a){for(var b=a.charCodeAt(0),c=a.charCodeAt(1),d=a.charCodeAt(2),e=a.charCodeAt(3),f=this.length-4;f>=0;--f)if(this.data[f]===b&&this.data[f+1]===c&&this.data[f+2]===d&&this.data[f+3]===e)return f;return-1},c.prototype.readData=function(a){if(this.checkOffset(a),0===a)return new Uint8Array(0);var b=this.data.subarray(this.index,this.index+a);return this.index+=a,b},b.exports=c},{"./dataReader":5}],19:[function(a,b){"use strict";var c=a("./utils"),d=function(a){this.data=new Uint8Array(a),this.index=0};d.prototype={append:function(a){0!==a.length&&(a=c.transformTo("uint8array",a),this.data.set(a,this.index),this.index+=a.length)},finalize:function(){return this.data}},b.exports=d},{"./utils":21}],20:[function(a,b,c){"use strict";for(var d=a("./utils"),e=a("./support"),f=a("./nodeBuffer"),g=new Array(256),h=0;256>h;h++)g[h]=h>=252?6:h>=248?5:h>=240?4:h>=224?3:h>=192?2:1;g[254]=g[254]=1;var i=function(a){var b,c,d,f,g,h=a.length,i=0;for(f=0;h>f;f++)c=a.charCodeAt(f),55296===(64512&c)&&h>f+1&&(d=a.charCodeAt(f+1),56320===(64512&d)&&(c=65536+(c-55296<<10)+(d-56320),f++)),i+=128>c?1:2048>c?2:65536>c?3:4;for(b=e.uint8array?new Uint8Array(i):new Array(i),g=0,f=0;i>g;f++)c=a.charCodeAt(f),55296===(64512&c)&&h>f+1&&(d=a.charCodeAt(f+1),56320===(64512&d)&&(c=65536+(c-55296<<10)+(d-56320),f++)),128>c?b[g++]=c:2048>c?(b[g++]=192|c>>>6,b[g++]=128|63&c):65536>c?(b[g++]=224|c>>>12,b[g++]=128|c>>>6&63,b[g++]=128|63&c):(b[g++]=240|c>>>18,b[g++]=128|c>>>12&63,b[g++]=128|c>>>6&63,b[g++]=128|63&c);return b},j=function(a,b){var c;for(b=b||a.length,b>a.length&&(b=a.length),c=b-1;c>=0&&128===(192&a[c]);)c--;return 0>c?b:0===c?b:c+g[a[c]]>b?c:b},k=function(a){var b,c,e,f,h=a.length,i=new Array(2*h);for(c=0,b=0;h>b;)if(e=a[b++],128>e)i[c++]=e;else if(f=g[e],f>4)i[c++]=65533,b+=f-1;else{for(e&=2===f?31:3===f?15:7;f>1&&h>b;)e=e<<6|63&a[b++],f--;f>1?i[c++]=65533:65536>e?i[c++]=e:(e-=65536,i[c++]=55296|e>>10&1023,i[c++]=56320|1023&e)}return i.length!==c&&(i.subarray?i=i.subarray(0,c):i.length=c),d.applyFromCharCode(i)};c.utf8encode=function(a){return e.nodebuffer?f(a,"utf-8"):i(a)},c.utf8decode=function(a){if(e.nodebuffer)return d.transformTo("nodebuffer",a).toString("utf-8");a=d.transformTo(e.uint8array?"uint8array":"array",a);for(var b=[],c=0,f=a.length,g=65536;f>c;){var h=j(a,Math.min(c+g,f));b.push(e.uint8array?k(a.subarray(c,h)):k(a.slice(c,h))),c=h}return b.join("")}},{"./nodeBuffer":11,"./support":17,"./utils":21}],21:[function(a,b,c){"use strict";function d(a){return a}function e(a,b){for(var c=0;c<a.length;++c)b[c]=255&a.charCodeAt(c);return b}function f(a){var b=65536,d=[],e=a.length,f=c.getTypeOf(a),g=0,h=!0;try{switch(f){case"uint8array":String.fromCharCode.apply(null,new Uint8Array(0));break;case"nodebuffer":String.fromCharCode.apply(null,j(0))}}catch(i){h=!1}if(!h){for(var k="",l=0;l<a.length;l++)k+=String.fromCharCode(a[l]);return k}for(;e>g&&b>1;)try{d.push("array"===f||"nodebuffer"===f?String.fromCharCode.apply(null,a.slice(g,Math.min(g+b,e))):String.fromCharCode.apply(null,a.subarray(g,Math.min(g+b,e)))),g+=b}catch(i){b=Math.floor(b/2)}return d.join("")}function g(a,b){for(var c=0;c<a.length;c++)b[c]=a[c];return b}var h=a("./support"),i=a("./compressions"),j=a("./nodeBuffer");c.string2binary=function(a){for(var b="",c=0;c<a.length;c++)b+=String.fromCharCode(255&a.charCodeAt(c));return b},c.arrayBuffer2Blob=function(a){c.checkSupport("blob");try{return new Blob([a],{type:"application/zip"})}catch(b){try{var d=window.BlobBuilder||window.WebKitBlobBuilder||window.MozBlobBuilder||window.MSBlobBuilder,e=new d;return e.append(a),e.getBlob("application/zip")}catch(b){throw new Error("Bug : can't construct the Blob.")}}},c.applyFromCharCode=f;var k={};k.string={string:d,array:function(a){return e(a,new Array(a.length))},arraybuffer:function(a){return k.string.uint8array(a).buffer},uint8array:function(a){return e(a,new Uint8Array(a.length))},nodebuffer:function(a){return e(a,j(a.length))}},k.array={string:f,array:d,arraybuffer:function(a){return new Uint8Array(a).buffer},uint8array:function(a){return new Uint8Array(a)},nodebuffer:function(a){return j(a)}},k.arraybuffer={string:function(a){return f(new Uint8Array(a))},array:function(a){return g(new Uint8Array(a),new Array(a.byteLength))},arraybuffer:d,uint8array:function(a){return new Uint8Array(a)},nodebuffer:function(a){return j(new Uint8Array(a))}},k.uint8array={string:f,array:function(a){return g(a,new Array(a.length))},arraybuffer:function(a){return a.buffer},uint8array:d,nodebuffer:function(a){return j(a)}},k.nodebuffer={string:f,array:function(a){return g(a,new Array(a.length))},arraybuffer:function(a){return k.nodebuffer.uint8array(a).buffer},uint8array:function(a){return g(a,new Uint8Array(a.length))},nodebuffer:d},c.transformTo=function(a,b){if(b||(b=""),!a)return b;c.checkSupport(a);var d=c.getTypeOf(b),e=k[d][a](b);return e},c.getTypeOf=function(a){return"string"==typeof a?"string":"[object Array]"===Object.prototype.toString.call(a)?"array":h.nodebuffer&&j.test(a)?"nodebuffer":h.uint8array&&a instanceof Uint8Array?"uint8array":h.arraybuffer&&a instanceof ArrayBuffer?"arraybuffer":void 0},c.checkSupport=function(a){var b=h[a.toLowerCase()];if(!b)throw new Error(a+" is not supported by this browser")},c.MAX_VALUE_16BITS=65535,c.MAX_VALUE_32BITS=-1,c.pretty=function(a){var b,c,d="";for(c=0;c<(a||"").length;c++)b=a.charCodeAt(c),d+="\\x"+(16>b?"0":"")+b.toString(16).toUpperCase();return d},c.findCompression=function(a){for(var b in i)if(i.hasOwnProperty(b)&&i[b].magic===a)return i[b];return null},c.isRegExp=function(a){return"[object RegExp]"===Object.prototype.toString.call(a)}},{"./compressions":3,"./nodeBuffer":11,"./support":17}],22:[function(a,b){"use strict";function c(a,b){this.files=[],this.loadOptions=b,a&&this.load(a)}var d=a("./stringReader"),e=a("./nodeBufferReader"),f=a("./uint8ArrayReader"),g=a("./utils"),h=a("./signature"),i=a("./zipEntry"),j=a("./support"),k=a("./object");c.prototype={checkSignature:function(a){var b=this.reader.readString(4);if(b!==a)throw new Error("Corrupted zip or bug : unexpected signature ("+g.pretty(b)+", expected "+g.pretty(a)+")")},readBlockEndOfCentral:function(){this.diskNumber=this.reader.readInt(2),this.diskWithCentralDirStart=this.reader.readInt(2),this.centralDirRecordsOnThisDisk=this.reader.readInt(2),this.centralDirRecords=this.reader.readInt(2),this.centralDirSize=this.reader.readInt(4),this.centralDirOffset=this.reader.readInt(4),this.zipCommentLength=this.reader.readInt(2),this.zipComment=this.reader.readString(this.zipCommentLength),this.zipComment=k.utf8decode(this.zipComment)},readBlockZip64EndOfCentral:function(){this.zip64EndOfCentralSize=this.reader.readInt(8),this.versionMadeBy=this.reader.readString(2),this.versionNeeded=this.reader.readInt(2),this.diskNumber=this.reader.readInt(4),this.diskWithCentralDirStart=this.reader.readInt(4),this.centralDirRecordsOnThisDisk=this.reader.readInt(8),this.centralDirRecords=this.reader.readInt(8),this.centralDirSize=this.reader.readInt(8),this.centralDirOffset=this.reader.readInt(8),this.zip64ExtensibleData={};for(var a,b,c,d=this.zip64EndOfCentralSize-44,e=0;d>e;)a=this.reader.readInt(2),b=this.reader.readInt(4),c=this.reader.readString(b),this.zip64ExtensibleData[a]={id:a,length:b,value:c}},readBlockZip64EndOfCentralLocator:function(){if(this.diskWithZip64CentralDirStart=this.reader.readInt(4),this.relativeOffsetEndOfZip64CentralDir=this.reader.readInt(8),this.disksCount=this.reader.readInt(4),this.disksCount>1)throw new Error("Multi-volumes zip are not supported")},readLocalFiles:function(){var a,b;for(a=0;a<this.files.length;a++)b=this.files[a],this.reader.setIndex(b.localHeaderOffset),this.checkSignature(h.LOCAL_FILE_HEADER),b.readLocalPart(this.reader),b.handleUTF8()},readCentralDir:function(){var a;for(this.reader.setIndex(this.centralDirOffset);this.reader.readString(4)===h.CENTRAL_FILE_HEADER;)a=new i({zip64:this.zip64},this.loadOptions),a.readCentralPart(this.reader),this.files.push(a)},readEndOfCentral:function(){var a=this.reader.lastIndexOfSignature(h.CENTRAL_DIRECTORY_END);if(-1===a)throw new Error("Corrupted zip : can't find end of central directory");if(this.reader.setIndex(a),this.checkSignature(h.CENTRAL_DIRECTORY_END),this.readBlockEndOfCentral(),this.diskNumber===g.MAX_VALUE_16BITS||this.diskWithCentralDirStart===g.MAX_VALUE_16BITS||this.centralDirRecordsOnThisDisk===g.MAX_VALUE_16BITS||this.centralDirRecords===g.MAX_VALUE_16BITS||this.centralDirSize===g.MAX_VALUE_32BITS||this.centralDirOffset===g.MAX_VALUE_32BITS){if(this.zip64=!0,a=this.reader.lastIndexOfSignature(h.ZIP64_CENTRAL_DIRECTORY_LOCATOR),-1===a)throw new Error("Corrupted zip : can't find the ZIP64 end of central directory locator");this.reader.setIndex(a),this.checkSignature(h.ZIP64_CENTRAL_DIRECTORY_LOCATOR),this.readBlockZip64EndOfCentralLocator(),this.reader.setIndex(this.relativeOffsetEndOfZip64CentralDir),this.checkSignature(h.ZIP64_CENTRAL_DIRECTORY_END),this.readBlockZip64EndOfCentral()}},prepareReader:function(a){var b=g.getTypeOf(a);this.reader="string"!==b||j.uint8array?"nodebuffer"===b?new e(a):new f(g.transformTo("uint8array",a)):new d(a,this.loadOptions.optimizedBinaryString)},load:function(a){this.prepareReader(a),this.readEndOfCentral(),this.readCentralDir(),this.readLocalFiles()}},b.exports=c},{"./nodeBufferReader":12,"./object":13,"./signature":14,"./stringReader":15,"./support":17,"./uint8ArrayReader":18,"./utils":21,"./zipEntry":23}],23:[function(a,b){"use strict";function c(a,b){this.options=a,this.loadOptions=b}var d=a("./stringReader"),e=a("./utils"),f=a("./compressedObject"),g=a("./object");c.prototype={isEncrypted:function(){return 1===(1&this.bitFlag)},useUTF8:function(){return 2048===(2048&this.bitFlag)},prepareCompressedContent:function(a,b,c){return function(){var d=a.index;a.setIndex(b);var e=a.readData(c);return a.setIndex(d),e}},prepareContent:function(a,b,c,d,f){return function(){var a=e.transformTo(d.uncompressInputType,this.getCompressedContent()),b=d.uncompress(a);if(b.length!==f)throw new Error("Bug : uncompressed data size mismatch");return b}},readLocalPart:function(a){var b,c;if(a.skip(22),this.fileNameLength=a.readInt(2),c=a.readInt(2),this.fileName=a.readString(this.fileNameLength),a.skip(c),-1==this.compressedSize||-1==this.uncompressedSize)throw new Error("Bug or corrupted zip : didn't get enough informations from the central directory (compressedSize == -1 || uncompressedSize == -1)");if(b=e.findCompression(this.compressionMethod),null===b)throw new Error("Corrupted zip : compression "+e.pretty(this.compressionMethod)+" unknown (inner file : "+this.fileName+")");if(this.decompressed=new f,this.decompressed.compressedSize=this.compressedSize,this.decompressed.uncompressedSize=this.uncompressedSize,this.decompressed.crc32=this.crc32,this.decompressed.compressionMethod=this.compressionMethod,this.decompressed.getCompressedContent=this.prepareCompressedContent(a,a.index,this.compressedSize,b),this.decompressed.getContent=this.prepareContent(a,a.index,this.compressedSize,b,this.uncompressedSize),this.loadOptions.checkCRC32&&(this.decompressed=e.transformTo("string",this.decompressed.getContent()),g.crc32(this.decompressed)!==this.crc32))throw new Error("Corrupted zip : CRC32 mismatch")},readCentralPart:function(a){if(this.versionMadeBy=a.readString(2),this.versionNeeded=a.readInt(2),this.bitFlag=a.readInt(2),this.compressionMethod=a.readString(2),this.date=a.readDate(),this.crc32=a.readInt(4),this.compressedSize=a.readInt(4),this.uncompressedSize=a.readInt(4),this.fileNameLength=a.readInt(2),this.extraFieldsLength=a.readInt(2),this.fileCommentLength=a.readInt(2),this.diskNumberStart=a.readInt(2),this.internalFileAttributes=a.readInt(2),this.externalFileAttributes=a.readInt(4),this.localHeaderOffset=a.readInt(4),this.isEncrypted())throw new Error("Encrypted zip are not supported");this.fileName=a.readString(this.fileNameLength),this.readExtraFields(a),this.parseZIP64ExtraField(a),this.fileComment=a.readString(this.fileCommentLength),this.dir=16&this.externalFileAttributes?!0:!1},parseZIP64ExtraField:function(){if(this.extraFields[1]){var a=new d(this.extraFields[1].value);this.uncompressedSize===e.MAX_VALUE_32BITS&&(this.uncompressedSize=a.readInt(8)),this.compressedSize===e.MAX_VALUE_32BITS&&(this.compressedSize=a.readInt(8)),this.localHeaderOffset===e.MAX_VALUE_32BITS&&(this.localHeaderOffset=a.readInt(8)),this.diskNumberStart===e.MAX_VALUE_32BITS&&(this.diskNumberStart=a.readInt(4))}},readExtraFields:function(a){var b,c,d,e=a.index;for(this.extraFields=this.extraFields||{};a.index<e+this.extraFieldsLength;)b=a.readInt(2),c=a.readInt(2),d=a.readString(c),this.extraFields[b]={id:b,length:c,value:d}},handleUTF8:function(){if(this.useUTF8())this.fileName=g.utf8decode(this.fileName),this.fileComment=g.utf8decode(this.fileComment);else{var a=this.findExtraFieldUnicodePath();null!==a&&(this.fileName=a);var b=this.findExtraFieldUnicodeComment();null!==b&&(this.fileComment=b)}},findExtraFieldUnicodePath:function(){var a=this.extraFields[28789];if(a){var b=new d(a.value);return 1!==b.readInt(1)?null:g.crc32(this.fileName)!==b.readInt(4)?null:g.utf8decode(b.readString(a.length-5))}return null},findExtraFieldUnicodeComment:function(){var a=this.extraFields[25461];if(a){var b=new d(a.value);return 1!==b.readInt(1)?null:g.crc32(this.fileComment)!==b.readInt(4)?null:g.utf8decode(b.readString(a.length-5))}return null}},b.exports=c},{"./compressedObject":2,"./object":13,"./stringReader":15,"./utils":21}],24:[function(a,b){"use strict";var c=a("./lib/utils/common").assign,d=a("./lib/deflate"),e=a("./lib/inflate"),f=a("./lib/zlib/constants"),g={};c(g,d,e,f),b.exports=g},{"./lib/deflate":25,"./lib/inflate":26,"./lib/utils/common":27,"./lib/zlib/constants":30}],25:[function(a,b,c){"use strict";function d(a,b){var c=new s(b);if(c.push(a,!0),c.err)throw c.msg;return c.result}function e(a,b){return b=b||{},b.raw=!0,d(a,b)}function f(a,b){return b=b||{},b.gzip=!0,d(a,b)}var g=a("./zlib/deflate.js"),h=a("./utils/common"),i=a("./utils/strings"),j=a("./zlib/messages"),k=a("./zlib/zstream"),l=0,m=4,n=0,o=1,p=-1,q=0,r=8,s=function(a){this.options=h.assign({level:p,method:r,chunkSize:16384,windowBits:15,memLevel:8,strategy:q,to:""},a||{});var b=this.options;b.raw&&b.windowBits>0?b.windowBits=-b.windowBits:b.gzip&&b.windowBits>0&&b.windowBits<16&&(b.windowBits+=16),this.err=0,this.msg="",this.ended=!1,this.chunks=[],this.strm=new k,this.strm.avail_out=0;var c=g.deflateInit2(this.strm,b.level,b.method,b.windowBits,b.memLevel,b.strategy);if(c!==n)throw new Error(j[c]);b.header&&g.deflateSetHeader(this.strm,b.header) +};s.prototype.push=function(a,b){var c,d,e=this.strm,f=this.options.chunkSize;if(this.ended)return!1;d=b===~~b?b:b===!0?m:l,e.input="string"==typeof a?i.string2buf(a):a,e.next_in=0,e.avail_in=e.input.length;do{if(0===e.avail_out&&(e.output=new h.Buf8(f),e.next_out=0,e.avail_out=f),c=g.deflate(e,d),c!==o&&c!==n)return this.onEnd(c),this.ended=!0,!1;(0===e.avail_out||0===e.avail_in&&d===m)&&this.onData("string"===this.options.to?i.buf2binstring(h.shrinkBuf(e.output,e.next_out)):h.shrinkBuf(e.output,e.next_out))}while((e.avail_in>0||0===e.avail_out)&&c!==o);return d===m?(c=g.deflateEnd(this.strm),this.onEnd(c),this.ended=!0,c===n):!0},s.prototype.onData=function(a){this.chunks.push(a)},s.prototype.onEnd=function(a){a===n&&(this.result="string"===this.options.to?this.chunks.join(""):h.flattenChunks(this.chunks)),this.chunks=[],this.err=a,this.msg=this.strm.msg},c.Deflate=s,c.deflate=d,c.deflateRaw=e,c.gzip=f},{"./utils/common":27,"./utils/strings":28,"./zlib/deflate.js":32,"./zlib/messages":37,"./zlib/zstream":39}],26:[function(a,b,c){"use strict";function d(a,b){var c=new m(b);if(c.push(a,!0),c.err)throw c.msg;return c.result}function e(a,b){return b=b||{},b.raw=!0,d(a,b)}var f=a("./zlib/inflate.js"),g=a("./utils/common"),h=a("./utils/strings"),i=a("./zlib/constants"),j=a("./zlib/messages"),k=a("./zlib/zstream"),l=a("./zlib/gzheader"),m=function(a){this.options=g.assign({chunkSize:16384,windowBits:0,to:""},a||{});var b=this.options;b.raw&&b.windowBits>=0&&b.windowBits<16&&(b.windowBits=-b.windowBits,0===b.windowBits&&(b.windowBits=-15)),!(b.windowBits>=0&&b.windowBits<16)||a&&a.windowBits||(b.windowBits+=32),b.windowBits>15&&b.windowBits<48&&0===(15&b.windowBits)&&(b.windowBits|=15),this.err=0,this.msg="",this.ended=!1,this.chunks=[],this.strm=new k,this.strm.avail_out=0;var c=f.inflateInit2(this.strm,b.windowBits);if(c!==i.Z_OK)throw new Error(j[c]);this.header=new l,f.inflateGetHeader(this.strm,this.header)};m.prototype.push=function(a,b){var c,d,e,j,k,l=this.strm,m=this.options.chunkSize;if(this.ended)return!1;d=b===~~b?b:b===!0?i.Z_FINISH:i.Z_NO_FLUSH,l.input="string"==typeof a?h.binstring2buf(a):a,l.next_in=0,l.avail_in=l.input.length;do{if(0===l.avail_out&&(l.output=new g.Buf8(m),l.next_out=0,l.avail_out=m),c=f.inflate(l,i.Z_NO_FLUSH),c!==i.Z_STREAM_END&&c!==i.Z_OK)return this.onEnd(c),this.ended=!0,!1;l.next_out&&(0===l.avail_out||c===i.Z_STREAM_END||0===l.avail_in&&d===i.Z_FINISH)&&("string"===this.options.to?(e=h.utf8border(l.output,l.next_out),j=l.next_out-e,k=h.buf2string(l.output,e),l.next_out=j,l.avail_out=m-j,j&&g.arraySet(l.output,l.output,e,j,0),this.onData(k)):this.onData(g.shrinkBuf(l.output,l.next_out)))}while(l.avail_in>0&&c!==i.Z_STREAM_END);return c===i.Z_STREAM_END&&(d=i.Z_FINISH),d===i.Z_FINISH?(c=f.inflateEnd(this.strm),this.onEnd(c),this.ended=!0,c===i.Z_OK):!0},m.prototype.onData=function(a){this.chunks.push(a)},m.prototype.onEnd=function(a){a===i.Z_OK&&(this.result="string"===this.options.to?this.chunks.join(""):g.flattenChunks(this.chunks)),this.chunks=[],this.err=a,this.msg=this.strm.msg},c.Inflate=m,c.inflate=d,c.inflateRaw=e,c.ungzip=d},{"./utils/common":27,"./utils/strings":28,"./zlib/constants":30,"./zlib/gzheader":33,"./zlib/inflate.js":35,"./zlib/messages":37,"./zlib/zstream":39}],27:[function(a,b,c){"use strict";var d="undefined"!=typeof Uint8Array&&"undefined"!=typeof Uint16Array&&"undefined"!=typeof Int32Array;c.assign=function(a){for(var b=Array.prototype.slice.call(arguments,1);b.length;){var c=b.shift();if(c){if("object"!=typeof c)throw new TypeError(c+"must be non-object");for(var d in c)c.hasOwnProperty(d)&&(a[d]=c[d])}}return a},c.shrinkBuf=function(a,b){return a.length===b?a:a.subarray?a.subarray(0,b):(a.length=b,a)};var e={arraySet:function(a,b,c,d,e){if(b.subarray&&a.subarray)return void a.set(b.subarray(c,c+d),e);for(var f=0;d>f;f++)a[e+f]=b[c+f]},flattenChunks:function(a){var b,c,d,e,f,g;for(d=0,b=0,c=a.length;c>b;b++)d+=a[b].length;for(g=new Uint8Array(d),e=0,b=0,c=a.length;c>b;b++)f=a[b],g.set(f,e),e+=f.length;return g}},f={arraySet:function(a,b,c,d,e){for(var f=0;d>f;f++)a[e+f]=b[c+f]},flattenChunks:function(a){return[].concat.apply([],a)}};c.setTyped=function(a){a?(c.Buf8=Uint8Array,c.Buf16=Uint16Array,c.Buf32=Int32Array,c.assign(c,e)):(c.Buf8=Array,c.Buf16=Array,c.Buf32=Array,c.assign(c,f))},c.setTyped(d)},{}],28:[function(a,b,c){"use strict";function d(a,b){if(65537>b&&(a.subarray&&g||!a.subarray&&f))return String.fromCharCode.apply(null,e.shrinkBuf(a,b));for(var c="",d=0;b>d;d++)c+=String.fromCharCode(a[d]);return c}var e=a("./common"),f=!0,g=!0;try{String.fromCharCode.apply(null,[0])}catch(h){f=!1}try{String.fromCharCode.apply(null,new Uint8Array(1))}catch(h){g=!1}for(var i=new e.Buf8(256),j=0;256>j;j++)i[j]=j>=252?6:j>=248?5:j>=240?4:j>=224?3:j>=192?2:1;i[254]=i[254]=1,c.string2buf=function(a){var b,c,d,f,g,h=a.length,i=0;for(f=0;h>f;f++)c=a.charCodeAt(f),55296===(64512&c)&&h>f+1&&(d=a.charCodeAt(f+1),56320===(64512&d)&&(c=65536+(c-55296<<10)+(d-56320),f++)),i+=128>c?1:2048>c?2:65536>c?3:4;for(b=new e.Buf8(i),g=0,f=0;i>g;f++)c=a.charCodeAt(f),55296===(64512&c)&&h>f+1&&(d=a.charCodeAt(f+1),56320===(64512&d)&&(c=65536+(c-55296<<10)+(d-56320),f++)),128>c?b[g++]=c:2048>c?(b[g++]=192|c>>>6,b[g++]=128|63&c):65536>c?(b[g++]=224|c>>>12,b[g++]=128|c>>>6&63,b[g++]=128|63&c):(b[g++]=240|c>>>18,b[g++]=128|c>>>12&63,b[g++]=128|c>>>6&63,b[g++]=128|63&c);return b},c.buf2binstring=function(a){return d(a,a.length)},c.binstring2buf=function(a){for(var b=new e.Buf8(a.length),c=0,d=b.length;d>c;c++)b[c]=a.charCodeAt(c);return b},c.buf2string=function(a,b){var c,e,f,g,h=b||a.length,j=new Array(2*h);for(e=0,c=0;h>c;)if(f=a[c++],128>f)j[e++]=f;else if(g=i[f],g>4)j[e++]=65533,c+=g-1;else{for(f&=2===g?31:3===g?15:7;g>1&&h>c;)f=f<<6|63&a[c++],g--;g>1?j[e++]=65533:65536>f?j[e++]=f:(f-=65536,j[e++]=55296|f>>10&1023,j[e++]=56320|1023&f)}return d(j,e)},c.utf8border=function(a,b){var c;for(b=b||a.length,b>a.length&&(b=a.length),c=b-1;c>=0&&128===(192&a[c]);)c--;return 0>c?b:0===c?b:c+i[a[c]]>b?c:b}},{"./common":27}],29:[function(a,b){"use strict";function c(a,b,c,d){for(var e=65535&a|0,f=a>>>16&65535|0,g=0;0!==c;){g=c>2e3?2e3:c,c-=g;do e=e+b[d++]|0,f=f+e|0;while(--g);e%=65521,f%=65521}return e|f<<16|0}b.exports=c},{}],30:[function(a,b){b.exports={Z_NO_FLUSH:0,Z_PARTIAL_FLUSH:1,Z_SYNC_FLUSH:2,Z_FULL_FLUSH:3,Z_FINISH:4,Z_BLOCK:5,Z_TREES:6,Z_OK:0,Z_STREAM_END:1,Z_NEED_DICT:2,Z_ERRNO:-1,Z_STREAM_ERROR:-2,Z_DATA_ERROR:-3,Z_BUF_ERROR:-5,Z_NO_COMPRESSION:0,Z_BEST_SPEED:1,Z_BEST_COMPRESSION:9,Z_DEFAULT_COMPRESSION:-1,Z_FILTERED:1,Z_HUFFMAN_ONLY:2,Z_RLE:3,Z_FIXED:4,Z_DEFAULT_STRATEGY:0,Z_BINARY:0,Z_TEXT:1,Z_UNKNOWN:2,Z_DEFLATED:8}},{}],31:[function(a,b){"use strict";function c(){for(var a,b=[],c=0;256>c;c++){a=c;for(var d=0;8>d;d++)a=1&a?3988292384^a>>>1:a>>>1;b[c]=a}return b}function d(a,b,c,d){var f=e,g=d+c;a=-1^a;for(var h=d;g>h;h++)a=a>>>8^f[255&(a^b[h])];return-1^a}var e=c();b.exports=d},{}],32:[function(a,b,c){"use strict";function d(a,b){return a.msg=G[b],b}function e(a){return(a<<1)-(a>4?9:0)}function f(a){for(var b=a.length;--b>=0;)a[b]=0}function g(a){var b=a.state,c=b.pending;c>a.avail_out&&(c=a.avail_out),0!==c&&(C.arraySet(a.output,b.pending_buf,b.pending_out,c,a.next_out),a.next_out+=c,b.pending_out+=c,a.total_out+=c,a.avail_out-=c,b.pending-=c,0===b.pending&&(b.pending_out=0))}function h(a,b){D._tr_flush_block(a,a.block_start>=0?a.block_start:-1,a.strstart-a.block_start,b),a.block_start=a.strstart,g(a.strm)}function i(a,b){a.pending_buf[a.pending++]=b}function j(a,b){a.pending_buf[a.pending++]=b>>>8&255,a.pending_buf[a.pending++]=255&b}function k(a,b,c,d){var e=a.avail_in;return e>d&&(e=d),0===e?0:(a.avail_in-=e,C.arraySet(b,a.input,a.next_in,e,c),1===a.state.wrap?a.adler=E(a.adler,b,e,c):2===a.state.wrap&&(a.adler=F(a.adler,b,e,c)),a.next_in+=e,a.total_in+=e,e)}function l(a,b){var c,d,e=a.max_chain_length,f=a.strstart,g=a.prev_length,h=a.nice_match,i=a.strstart>a.w_size-jb?a.strstart-(a.w_size-jb):0,j=a.window,k=a.w_mask,l=a.prev,m=a.strstart+ib,n=j[f+g-1],o=j[f+g];a.prev_length>=a.good_match&&(e>>=2),h>a.lookahead&&(h=a.lookahead);do if(c=b,j[c+g]===o&&j[c+g-1]===n&&j[c]===j[f]&&j[++c]===j[f+1]){f+=2,c++;do;while(j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&m>f);if(d=ib-(m-f),f=m-ib,d>g){if(a.match_start=b,g=d,d>=h)break;n=j[f+g-1],o=j[f+g]}}while((b=l[b&k])>i&&0!==--e);return g<=a.lookahead?g:a.lookahead}function m(a){var b,c,d,e,f,g=a.w_size;do{if(e=a.window_size-a.lookahead-a.strstart,a.strstart>=g+(g-jb)){C.arraySet(a.window,a.window,g,g,0),a.match_start-=g,a.strstart-=g,a.block_start-=g,c=a.hash_size,b=c;do d=a.head[--b],a.head[b]=d>=g?d-g:0;while(--c);c=g,b=c;do d=a.prev[--b],a.prev[b]=d>=g?d-g:0;while(--c);e+=g}if(0===a.strm.avail_in)break;if(c=k(a.strm,a.window,a.strstart+a.lookahead,e),a.lookahead+=c,a.lookahead+a.insert>=hb)for(f=a.strstart-a.insert,a.ins_h=a.window[f],a.ins_h=(a.ins_h<<a.hash_shift^a.window[f+1])&a.hash_mask;a.insert&&(a.ins_h=(a.ins_h<<a.hash_shift^a.window[f+hb-1])&a.hash_mask,a.prev[f&a.w_mask]=a.head[a.ins_h],a.head[a.ins_h]=f,f++,a.insert--,!(a.lookahead+a.insert<hb)););}while(a.lookahead<jb&&0!==a.strm.avail_in)}function n(a,b){var c=65535;for(c>a.pending_buf_size-5&&(c=a.pending_buf_size-5);;){if(a.lookahead<=1){if(m(a),0===a.lookahead&&b===H)return sb;if(0===a.lookahead)break}a.strstart+=a.lookahead,a.lookahead=0;var d=a.block_start+c;if((0===a.strstart||a.strstart>=d)&&(a.lookahead=a.strstart-d,a.strstart=d,h(a,!1),0===a.strm.avail_out))return sb;if(a.strstart-a.block_start>=a.w_size-jb&&(h(a,!1),0===a.strm.avail_out))return sb}return a.insert=0,b===K?(h(a,!0),0===a.strm.avail_out?ub:vb):a.strstart>a.block_start&&(h(a,!1),0===a.strm.avail_out)?sb:sb}function o(a,b){for(var c,d;;){if(a.lookahead<jb){if(m(a),a.lookahead<jb&&b===H)return sb;if(0===a.lookahead)break}if(c=0,a.lookahead>=hb&&(a.ins_h=(a.ins_h<<a.hash_shift^a.window[a.strstart+hb-1])&a.hash_mask,c=a.prev[a.strstart&a.w_mask]=a.head[a.ins_h],a.head[a.ins_h]=a.strstart),0!==c&&a.strstart-c<=a.w_size-jb&&(a.match_length=l(a,c)),a.match_length>=hb)if(d=D._tr_tally(a,a.strstart-a.match_start,a.match_length-hb),a.lookahead-=a.match_length,a.match_length<=a.max_lazy_match&&a.lookahead>=hb){a.match_length--;do a.strstart++,a.ins_h=(a.ins_h<<a.hash_shift^a.window[a.strstart+hb-1])&a.hash_mask,c=a.prev[a.strstart&a.w_mask]=a.head[a.ins_h],a.head[a.ins_h]=a.strstart;while(0!==--a.match_length);a.strstart++}else a.strstart+=a.match_length,a.match_length=0,a.ins_h=a.window[a.strstart],a.ins_h=(a.ins_h<<a.hash_shift^a.window[a.strstart+1])&a.hash_mask;else d=D._tr_tally(a,0,a.window[a.strstart]),a.lookahead--,a.strstart++;if(d&&(h(a,!1),0===a.strm.avail_out))return sb}return a.insert=a.strstart<hb-1?a.strstart:hb-1,b===K?(h(a,!0),0===a.strm.avail_out?ub:vb):a.last_lit&&(h(a,!1),0===a.strm.avail_out)?sb:tb}function p(a,b){for(var c,d,e;;){if(a.lookahead<jb){if(m(a),a.lookahead<jb&&b===H)return sb;if(0===a.lookahead)break}if(c=0,a.lookahead>=hb&&(a.ins_h=(a.ins_h<<a.hash_shift^a.window[a.strstart+hb-1])&a.hash_mask,c=a.prev[a.strstart&a.w_mask]=a.head[a.ins_h],a.head[a.ins_h]=a.strstart),a.prev_length=a.match_length,a.prev_match=a.match_start,a.match_length=hb-1,0!==c&&a.prev_length<a.max_lazy_match&&a.strstart-c<=a.w_size-jb&&(a.match_length=l(a,c),a.match_length<=5&&(a.strategy===S||a.match_length===hb&&a.strstart-a.match_start>4096)&&(a.match_length=hb-1)),a.prev_length>=hb&&a.match_length<=a.prev_length){e=a.strstart+a.lookahead-hb,d=D._tr_tally(a,a.strstart-1-a.prev_match,a.prev_length-hb),a.lookahead-=a.prev_length-1,a.prev_length-=2;do++a.strstart<=e&&(a.ins_h=(a.ins_h<<a.hash_shift^a.window[a.strstart+hb-1])&a.hash_mask,c=a.prev[a.strstart&a.w_mask]=a.head[a.ins_h],a.head[a.ins_h]=a.strstart);while(0!==--a.prev_length);if(a.match_available=0,a.match_length=hb-1,a.strstart++,d&&(h(a,!1),0===a.strm.avail_out))return sb}else if(a.match_available){if(d=D._tr_tally(a,0,a.window[a.strstart-1]),d&&h(a,!1),a.strstart++,a.lookahead--,0===a.strm.avail_out)return sb}else a.match_available=1,a.strstart++,a.lookahead--}return a.match_available&&(d=D._tr_tally(a,0,a.window[a.strstart-1]),a.match_available=0),a.insert=a.strstart<hb-1?a.strstart:hb-1,b===K?(h(a,!0),0===a.strm.avail_out?ub:vb):a.last_lit&&(h(a,!1),0===a.strm.avail_out)?sb:tb}function q(a,b){for(var c,d,e,f,g=a.window;;){if(a.lookahead<=ib){if(m(a),a.lookahead<=ib&&b===H)return sb;if(0===a.lookahead)break}if(a.match_length=0,a.lookahead>=hb&&a.strstart>0&&(e=a.strstart-1,d=g[e],d===g[++e]&&d===g[++e]&&d===g[++e])){f=a.strstart+ib;do;while(d===g[++e]&&d===g[++e]&&d===g[++e]&&d===g[++e]&&d===g[++e]&&d===g[++e]&&d===g[++e]&&d===g[++e]&&f>e);a.match_length=ib-(f-e),a.match_length>a.lookahead&&(a.match_length=a.lookahead)}if(a.match_length>=hb?(c=D._tr_tally(a,1,a.match_length-hb),a.lookahead-=a.match_length,a.strstart+=a.match_length,a.match_length=0):(c=D._tr_tally(a,0,a.window[a.strstart]),a.lookahead--,a.strstart++),c&&(h(a,!1),0===a.strm.avail_out))return sb}return a.insert=0,b===K?(h(a,!0),0===a.strm.avail_out?ub:vb):a.last_lit&&(h(a,!1),0===a.strm.avail_out)?sb:tb}function r(a,b){for(var c;;){if(0===a.lookahead&&(m(a),0===a.lookahead)){if(b===H)return sb;break}if(a.match_length=0,c=D._tr_tally(a,0,a.window[a.strstart]),a.lookahead--,a.strstart++,c&&(h(a,!1),0===a.strm.avail_out))return sb}return a.insert=0,b===K?(h(a,!0),0===a.strm.avail_out?ub:vb):a.last_lit&&(h(a,!1),0===a.strm.avail_out)?sb:tb}function s(a){a.window_size=2*a.w_size,f(a.head),a.max_lazy_match=B[a.level].max_lazy,a.good_match=B[a.level].good_length,a.nice_match=B[a.level].nice_length,a.max_chain_length=B[a.level].max_chain,a.strstart=0,a.block_start=0,a.lookahead=0,a.insert=0,a.match_length=a.prev_length=hb-1,a.match_available=0,a.ins_h=0}function t(){this.strm=null,this.status=0,this.pending_buf=null,this.pending_buf_size=0,this.pending_out=0,this.pending=0,this.wrap=0,this.gzhead=null,this.gzindex=0,this.method=Y,this.last_flush=-1,this.w_size=0,this.w_bits=0,this.w_mask=0,this.window=null,this.window_size=0,this.prev=null,this.head=null,this.ins_h=0,this.hash_size=0,this.hash_bits=0,this.hash_mask=0,this.hash_shift=0,this.block_start=0,this.match_length=0,this.prev_match=0,this.match_available=0,this.strstart=0,this.match_start=0,this.lookahead=0,this.prev_length=0,this.max_chain_length=0,this.max_lazy_match=0,this.level=0,this.strategy=0,this.good_match=0,this.nice_match=0,this.dyn_ltree=new C.Buf16(2*fb),this.dyn_dtree=new C.Buf16(2*(2*db+1)),this.bl_tree=new C.Buf16(2*(2*eb+1)),f(this.dyn_ltree),f(this.dyn_dtree),f(this.bl_tree),this.l_desc=null,this.d_desc=null,this.bl_desc=null,this.bl_count=new C.Buf16(gb+1),this.heap=new C.Buf16(2*cb+1),f(this.heap),this.heap_len=0,this.heap_max=0,this.depth=new C.Buf16(2*cb+1),f(this.depth),this.l_buf=0,this.lit_bufsize=0,this.last_lit=0,this.d_buf=0,this.opt_len=0,this.static_len=0,this.matches=0,this.insert=0,this.bi_buf=0,this.bi_valid=0}function u(a){var b;return a&&a.state?(a.total_in=a.total_out=0,a.data_type=X,b=a.state,b.pending=0,b.pending_out=0,b.wrap<0&&(b.wrap=-b.wrap),b.status=b.wrap?lb:qb,a.adler=2===b.wrap?0:1,b.last_flush=H,D._tr_init(b),M):d(a,O)}function v(a){var b=u(a);return b===M&&s(a.state),b}function w(a,b){return a&&a.state?2!==a.state.wrap?O:(a.state.gzhead=b,M):O}function x(a,b,c,e,f,g){if(!a)return O;var h=1;if(b===R&&(b=6),0>e?(h=0,e=-e):e>15&&(h=2,e-=16),1>f||f>Z||c!==Y||8>e||e>15||0>b||b>9||0>g||g>V)return d(a,O);8===e&&(e=9);var i=new t;return a.state=i,i.strm=a,i.wrap=h,i.gzhead=null,i.w_bits=e,i.w_size=1<<i.w_bits,i.w_mask=i.w_size-1,i.hash_bits=f+7,i.hash_size=1<<i.hash_bits,i.hash_mask=i.hash_size-1,i.hash_shift=~~((i.hash_bits+hb-1)/hb),i.window=new C.Buf8(2*i.w_size),i.head=new C.Buf16(i.hash_size),i.prev=new C.Buf16(i.w_size),i.lit_bufsize=1<<f+6,i.pending_buf_size=4*i.lit_bufsize,i.pending_buf=new C.Buf8(i.pending_buf_size),i.d_buf=i.lit_bufsize>>1,i.l_buf=3*i.lit_bufsize,i.level=b,i.strategy=g,i.method=c,v(a)}function y(a,b){return x(a,b,Y,$,_,W)}function z(a,b){var c,h,k,l;if(!a||!a.state||b>L||0>b)return a?d(a,O):O;if(h=a.state,!a.output||!a.input&&0!==a.avail_in||h.status===rb&&b!==K)return d(a,0===a.avail_out?Q:O);if(h.strm=a,c=h.last_flush,h.last_flush=b,h.status===lb)if(2===h.wrap)a.adler=0,i(h,31),i(h,139),i(h,8),h.gzhead?(i(h,(h.gzhead.text?1:0)+(h.gzhead.hcrc?2:0)+(h.gzhead.extra?4:0)+(h.gzhead.name?8:0)+(h.gzhead.comment?16:0)),i(h,255&h.gzhead.time),i(h,h.gzhead.time>>8&255),i(h,h.gzhead.time>>16&255),i(h,h.gzhead.time>>24&255),i(h,9===h.level?2:h.strategy>=T||h.level<2?4:0),i(h,255&h.gzhead.os),h.gzhead.extra&&h.gzhead.extra.length&&(i(h,255&h.gzhead.extra.length),i(h,h.gzhead.extra.length>>8&255)),h.gzhead.hcrc&&(a.adler=F(a.adler,h.pending_buf,h.pending,0)),h.gzindex=0,h.status=mb):(i(h,0),i(h,0),i(h,0),i(h,0),i(h,0),i(h,9===h.level?2:h.strategy>=T||h.level<2?4:0),i(h,wb),h.status=qb);else{var m=Y+(h.w_bits-8<<4)<<8,n=-1;n=h.strategy>=T||h.level<2?0:h.level<6?1:6===h.level?2:3,m|=n<<6,0!==h.strstart&&(m|=kb),m+=31-m%31,h.status=qb,j(h,m),0!==h.strstart&&(j(h,a.adler>>>16),j(h,65535&a.adler)),a.adler=1}if(h.status===mb)if(h.gzhead.extra){for(k=h.pending;h.gzindex<(65535&h.gzhead.extra.length)&&(h.pending!==h.pending_buf_size||(h.gzhead.hcrc&&h.pending>k&&(a.adler=F(a.adler,h.pending_buf,h.pending-k,k)),g(a),k=h.pending,h.pending!==h.pending_buf_size));)i(h,255&h.gzhead.extra[h.gzindex]),h.gzindex++;h.gzhead.hcrc&&h.pending>k&&(a.adler=F(a.adler,h.pending_buf,h.pending-k,k)),h.gzindex===h.gzhead.extra.length&&(h.gzindex=0,h.status=nb)}else h.status=nb;if(h.status===nb)if(h.gzhead.name){k=h.pending;do{if(h.pending===h.pending_buf_size&&(h.gzhead.hcrc&&h.pending>k&&(a.adler=F(a.adler,h.pending_buf,h.pending-k,k)),g(a),k=h.pending,h.pending===h.pending_buf_size)){l=1;break}l=h.gzindex<h.gzhead.name.length?255&h.gzhead.name.charCodeAt(h.gzindex++):0,i(h,l)}while(0!==l);h.gzhead.hcrc&&h.pending>k&&(a.adler=F(a.adler,h.pending_buf,h.pending-k,k)),0===l&&(h.gzindex=0,h.status=ob)}else h.status=ob;if(h.status===ob)if(h.gzhead.comment){k=h.pending;do{if(h.pending===h.pending_buf_size&&(h.gzhead.hcrc&&h.pending>k&&(a.adler=F(a.adler,h.pending_buf,h.pending-k,k)),g(a),k=h.pending,h.pending===h.pending_buf_size)){l=1;break}l=h.gzindex<h.gzhead.comment.length?255&h.gzhead.comment.charCodeAt(h.gzindex++):0,i(h,l)}while(0!==l);h.gzhead.hcrc&&h.pending>k&&(a.adler=F(a.adler,h.pending_buf,h.pending-k,k)),0===l&&(h.status=pb)}else h.status=pb;if(h.status===pb&&(h.gzhead.hcrc?(h.pending+2>h.pending_buf_size&&g(a),h.pending+2<=h.pending_buf_size&&(i(h,255&a.adler),i(h,a.adler>>8&255),a.adler=0,h.status=qb)):h.status=qb),0!==h.pending){if(g(a),0===a.avail_out)return h.last_flush=-1,M}else if(0===a.avail_in&&e(b)<=e(c)&&b!==K)return d(a,Q);if(h.status===rb&&0!==a.avail_in)return d(a,Q);if(0!==a.avail_in||0!==h.lookahead||b!==H&&h.status!==rb){var o=h.strategy===T?r(h,b):h.strategy===U?q(h,b):B[h.level].func(h,b);if((o===ub||o===vb)&&(h.status=rb),o===sb||o===ub)return 0===a.avail_out&&(h.last_flush=-1),M;if(o===tb&&(b===I?D._tr_align(h):b!==L&&(D._tr_stored_block(h,0,0,!1),b===J&&(f(h.head),0===h.lookahead&&(h.strstart=0,h.block_start=0,h.insert=0))),g(a),0===a.avail_out))return h.last_flush=-1,M}return b!==K?M:h.wrap<=0?N:(2===h.wrap?(i(h,255&a.adler),i(h,a.adler>>8&255),i(h,a.adler>>16&255),i(h,a.adler>>24&255),i(h,255&a.total_in),i(h,a.total_in>>8&255),i(h,a.total_in>>16&255),i(h,a.total_in>>24&255)):(j(h,a.adler>>>16),j(h,65535&a.adler)),g(a),h.wrap>0&&(h.wrap=-h.wrap),0!==h.pending?M:N)}function A(a){var b;return a&&a.state?(b=a.state.status,b!==lb&&b!==mb&&b!==nb&&b!==ob&&b!==pb&&b!==qb&&b!==rb?d(a,O):(a.state=null,b===qb?d(a,P):M)):O}var B,C=a("../utils/common"),D=a("./trees"),E=a("./adler32"),F=a("./crc32"),G=a("./messages"),H=0,I=1,J=3,K=4,L=5,M=0,N=1,O=-2,P=-3,Q=-5,R=-1,S=1,T=2,U=3,V=4,W=0,X=2,Y=8,Z=9,$=15,_=8,ab=29,bb=256,cb=bb+1+ab,db=30,eb=19,fb=2*cb+1,gb=15,hb=3,ib=258,jb=ib+hb+1,kb=32,lb=42,mb=69,nb=73,ob=91,pb=103,qb=113,rb=666,sb=1,tb=2,ub=3,vb=4,wb=3,xb=function(a,b,c,d,e){this.good_length=a,this.max_lazy=b,this.nice_length=c,this.max_chain=d,this.func=e};B=[new xb(0,0,0,0,n),new xb(4,4,8,4,o),new xb(4,5,16,8,o),new xb(4,6,32,32,o),new xb(4,4,16,16,p),new xb(8,16,32,32,p),new xb(8,16,128,128,p),new xb(8,32,128,256,p),new xb(32,128,258,1024,p),new xb(32,258,258,4096,p)],c.deflateInit=y,c.deflateInit2=x,c.deflateReset=v,c.deflateResetKeep=u,c.deflateSetHeader=w,c.deflate=z,c.deflateEnd=A,c.deflateInfo="pako deflate (from Nodeca project)"},{"../utils/common":27,"./adler32":29,"./crc32":31,"./messages":37,"./trees":38}],33:[function(a,b){"use strict";function c(){this.text=0,this.time=0,this.xflags=0,this.os=0,this.extra=null,this.extra_len=0,this.name="",this.comment="",this.hcrc=0,this.done=!1}b.exports=c},{}],34:[function(a,b){"use strict";var c=30,d=12;b.exports=function(a,b){var e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C;e=a.state,f=a.next_in,B=a.input,g=f+(a.avail_in-5),h=a.next_out,C=a.output,i=h-(b-a.avail_out),j=h+(a.avail_out-257),k=e.dmax,l=e.wsize,m=e.whave,n=e.wnext,o=e.window,p=e.hold,q=e.bits,r=e.lencode,s=e.distcode,t=(1<<e.lenbits)-1,u=(1<<e.distbits)-1;a:do{15>q&&(p+=B[f++]<<q,q+=8,p+=B[f++]<<q,q+=8),v=r[p&t];b:for(;;){if(w=v>>>24,p>>>=w,q-=w,w=v>>>16&255,0===w)C[h++]=65535&v;else{if(!(16&w)){if(0===(64&w)){v=r[(65535&v)+(p&(1<<w)-1)];continue b}if(32&w){e.mode=d;break a}a.msg="invalid literal/length code",e.mode=c;break a}x=65535&v,w&=15,w&&(w>q&&(p+=B[f++]<<q,q+=8),x+=p&(1<<w)-1,p>>>=w,q-=w),15>q&&(p+=B[f++]<<q,q+=8,p+=B[f++]<<q,q+=8),v=s[p&u];c:for(;;){if(w=v>>>24,p>>>=w,q-=w,w=v>>>16&255,!(16&w)){if(0===(64&w)){v=s[(65535&v)+(p&(1<<w)-1)];continue c}a.msg="invalid distance code",e.mode=c;break a}if(y=65535&v,w&=15,w>q&&(p+=B[f++]<<q,q+=8,w>q&&(p+=B[f++]<<q,q+=8)),y+=p&(1<<w)-1,y>k){a.msg="invalid distance too far back",e.mode=c;break a}if(p>>>=w,q-=w,w=h-i,y>w){if(w=y-w,w>m&&e.sane){a.msg="invalid distance too far back",e.mode=c;break a}if(z=0,A=o,0===n){if(z+=l-w,x>w){x-=w;do C[h++]=o[z++];while(--w);z=h-y,A=C}}else if(w>n){if(z+=l+n-w,w-=n,x>w){x-=w;do C[h++]=o[z++];while(--w);if(z=0,x>n){w=n,x-=w;do C[h++]=o[z++];while(--w);z=h-y,A=C}}}else if(z+=n-w,x>w){x-=w;do C[h++]=o[z++];while(--w);z=h-y,A=C}for(;x>2;)C[h++]=A[z++],C[h++]=A[z++],C[h++]=A[z++],x-=3;x&&(C[h++]=A[z++],x>1&&(C[h++]=A[z++]))}else{z=h-y;do C[h++]=C[z++],C[h++]=C[z++],C[h++]=C[z++],x-=3;while(x>2);x&&(C[h++]=C[z++],x>1&&(C[h++]=C[z++]))}break}}break}}while(g>f&&j>h);x=q>>3,f-=x,q-=x<<3,p&=(1<<q)-1,a.next_in=f,a.next_out=h,a.avail_in=g>f?5+(g-f):5-(f-g),a.avail_out=j>h?257+(j-h):257-(h-j),e.hold=p,e.bits=q}},{}],35:[function(a,b,c){"use strict";function d(a){return(a>>>24&255)+(a>>>8&65280)+((65280&a)<<8)+((255&a)<<24)}function e(){this.mode=0,this.last=!1,this.wrap=0,this.havedict=!1,this.flags=0,this.dmax=0,this.check=0,this.total=0,this.head=null,this.wbits=0,this.wsize=0,this.whave=0,this.wnext=0,this.window=null,this.hold=0,this.bits=0,this.length=0,this.offset=0,this.extra=0,this.lencode=null,this.distcode=null,this.lenbits=0,this.distbits=0,this.ncode=0,this.nlen=0,this.ndist=0,this.have=0,this.next=null,this.lens=new r.Buf16(320),this.work=new r.Buf16(288),this.lendyn=null,this.distdyn=null,this.sane=0,this.back=0,this.was=0}function f(a){var b;return a&&a.state?(b=a.state,a.total_in=a.total_out=b.total=0,a.msg="",b.wrap&&(a.adler=1&b.wrap),b.mode=K,b.last=0,b.havedict=0,b.dmax=32768,b.head=null,b.hold=0,b.bits=0,b.lencode=b.lendyn=new r.Buf32(ob),b.distcode=b.distdyn=new r.Buf32(pb),b.sane=1,b.back=-1,C):F}function g(a){var b;return a&&a.state?(b=a.state,b.wsize=0,b.whave=0,b.wnext=0,f(a)):F}function h(a,b){var c,d;return a&&a.state?(d=a.state,0>b?(c=0,b=-b):(c=(b>>4)+1,48>b&&(b&=15)),b&&(8>b||b>15)?F:(null!==d.window&&d.wbits!==b&&(d.window=null),d.wrap=c,d.wbits=b,g(a))):F}function i(a,b){var c,d;return a?(d=new e,a.state=d,d.window=null,c=h(a,b),c!==C&&(a.state=null),c):F}function j(a){return i(a,rb)}function k(a){if(sb){var b;for(p=new r.Buf32(512),q=new r.Buf32(32),b=0;144>b;)a.lens[b++]=8;for(;256>b;)a.lens[b++]=9;for(;280>b;)a.lens[b++]=7;for(;288>b;)a.lens[b++]=8;for(v(x,a.lens,0,288,p,0,a.work,{bits:9}),b=0;32>b;)a.lens[b++]=5;v(y,a.lens,0,32,q,0,a.work,{bits:5}),sb=!1}a.lencode=p,a.lenbits=9,a.distcode=q,a.distbits=5}function l(a,b,c,d){var e,f=a.state;return null===f.window&&(f.wsize=1<<f.wbits,f.wnext=0,f.whave=0,f.window=new r.Buf8(f.wsize)),d>=f.wsize?(r.arraySet(f.window,b,c-f.wsize,f.wsize,0),f.wnext=0,f.whave=f.wsize):(e=f.wsize-f.wnext,e>d&&(e=d),r.arraySet(f.window,b,c-d,e,f.wnext),d-=e,d?(r.arraySet(f.window,b,c-d,d,0),f.wnext=d,f.whave=f.wsize):(f.wnext+=e,f.wnext===f.wsize&&(f.wnext=0),f.whave<f.wsize&&(f.whave+=e))),0}function m(a,b){var c,e,f,g,h,i,j,m,n,o,p,q,ob,pb,qb,rb,sb,tb,ub,vb,wb,xb,yb,zb,Ab=0,Bb=new r.Buf8(4),Cb=[16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15];if(!a||!a.state||!a.output||!a.input&&0!==a.avail_in)return F;c=a.state,c.mode===V&&(c.mode=W),h=a.next_out,f=a.output,j=a.avail_out,g=a.next_in,e=a.input,i=a.avail_in,m=c.hold,n=c.bits,o=i,p=j,xb=C;a:for(;;)switch(c.mode){case K:if(0===c.wrap){c.mode=W;break}for(;16>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(2&c.wrap&&35615===m){c.check=0,Bb[0]=255&m,Bb[1]=m>>>8&255,c.check=t(c.check,Bb,2,0),m=0,n=0,c.mode=L;break}if(c.flags=0,c.head&&(c.head.done=!1),!(1&c.wrap)||(((255&m)<<8)+(m>>8))%31){a.msg="incorrect header check",c.mode=lb;break}if((15&m)!==J){a.msg="unknown compression method",c.mode=lb;break}if(m>>>=4,n-=4,wb=(15&m)+8,0===c.wbits)c.wbits=wb;else if(wb>c.wbits){a.msg="invalid window size",c.mode=lb;break}c.dmax=1<<wb,a.adler=c.check=1,c.mode=512&m?T:V,m=0,n=0;break;case L:for(;16>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(c.flags=m,(255&c.flags)!==J){a.msg="unknown compression method",c.mode=lb;break}if(57344&c.flags){a.msg="unknown header flags set",c.mode=lb;break}c.head&&(c.head.text=m>>8&1),512&c.flags&&(Bb[0]=255&m,Bb[1]=m>>>8&255,c.check=t(c.check,Bb,2,0)),m=0,n=0,c.mode=M;case M:for(;32>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}c.head&&(c.head.time=m),512&c.flags&&(Bb[0]=255&m,Bb[1]=m>>>8&255,Bb[2]=m>>>16&255,Bb[3]=m>>>24&255,c.check=t(c.check,Bb,4,0)),m=0,n=0,c.mode=N;case N:for(;16>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}c.head&&(c.head.xflags=255&m,c.head.os=m>>8),512&c.flags&&(Bb[0]=255&m,Bb[1]=m>>>8&255,c.check=t(c.check,Bb,2,0)),m=0,n=0,c.mode=O;case O:if(1024&c.flags){for(;16>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}c.length=m,c.head&&(c.head.extra_len=m),512&c.flags&&(Bb[0]=255&m,Bb[1]=m>>>8&255,c.check=t(c.check,Bb,2,0)),m=0,n=0}else c.head&&(c.head.extra=null);c.mode=P;case P:if(1024&c.flags&&(q=c.length,q>i&&(q=i),q&&(c.head&&(wb=c.head.extra_len-c.length,c.head.extra||(c.head.extra=new Array(c.head.extra_len)),r.arraySet(c.head.extra,e,g,q,wb)),512&c.flags&&(c.check=t(c.check,e,q,g)),i-=q,g+=q,c.length-=q),c.length))break a;c.length=0,c.mode=Q;case Q:if(2048&c.flags){if(0===i)break a;q=0;do wb=e[g+q++],c.head&&wb&&c.length<65536&&(c.head.name+=String.fromCharCode(wb));while(wb&&i>q);if(512&c.flags&&(c.check=t(c.check,e,q,g)),i-=q,g+=q,wb)break a}else c.head&&(c.head.name=null);c.length=0,c.mode=R;case R:if(4096&c.flags){if(0===i)break a;q=0;do wb=e[g+q++],c.head&&wb&&c.length<65536&&(c.head.comment+=String.fromCharCode(wb));while(wb&&i>q);if(512&c.flags&&(c.check=t(c.check,e,q,g)),i-=q,g+=q,wb)break a}else c.head&&(c.head.comment=null);c.mode=S;case S:if(512&c.flags){for(;16>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(m!==(65535&c.check)){a.msg="header crc mismatch",c.mode=lb;break}m=0,n=0}c.head&&(c.head.hcrc=c.flags>>9&1,c.head.done=!0),a.adler=c.check=0,c.mode=V;break;case T:for(;32>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}a.adler=c.check=d(m),m=0,n=0,c.mode=U;case U:if(0===c.havedict)return a.next_out=h,a.avail_out=j,a.next_in=g,a.avail_in=i,c.hold=m,c.bits=n,E;a.adler=c.check=1,c.mode=V;case V:if(b===A||b===B)break a;case W:if(c.last){m>>>=7&n,n-=7&n,c.mode=ib;break}for(;3>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}switch(c.last=1&m,m>>>=1,n-=1,3&m){case 0:c.mode=X;break;case 1:if(k(c),c.mode=bb,b===B){m>>>=2,n-=2;break a}break;case 2:c.mode=$;break;case 3:a.msg="invalid block type",c.mode=lb}m>>>=2,n-=2;break;case X:for(m>>>=7&n,n-=7&n;32>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if((65535&m)!==(m>>>16^65535)){a.msg="invalid stored block lengths",c.mode=lb;break}if(c.length=65535&m,m=0,n=0,c.mode=Y,b===B)break a;case Y:c.mode=Z;case Z:if(q=c.length){if(q>i&&(q=i),q>j&&(q=j),0===q)break a;r.arraySet(f,e,g,q,h),i-=q,g+=q,j-=q,h+=q,c.length-=q;break}c.mode=V;break;case $:for(;14>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(c.nlen=(31&m)+257,m>>>=5,n-=5,c.ndist=(31&m)+1,m>>>=5,n-=5,c.ncode=(15&m)+4,m>>>=4,n-=4,c.nlen>286||c.ndist>30){a.msg="too many length or distance symbols",c.mode=lb;break}c.have=0,c.mode=_;case _:for(;c.have<c.ncode;){for(;3>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}c.lens[Cb[c.have++]]=7&m,m>>>=3,n-=3}for(;c.have<19;)c.lens[Cb[c.have++]]=0;if(c.lencode=c.lendyn,c.lenbits=7,yb={bits:c.lenbits},xb=v(w,c.lens,0,19,c.lencode,0,c.work,yb),c.lenbits=yb.bits,xb){a.msg="invalid code lengths set",c.mode=lb;break}c.have=0,c.mode=ab;case ab:for(;c.have<c.nlen+c.ndist;){for(;Ab=c.lencode[m&(1<<c.lenbits)-1],qb=Ab>>>24,rb=Ab>>>16&255,sb=65535&Ab,!(n>=qb);){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(16>sb)m>>>=qb,n-=qb,c.lens[c.have++]=sb;else{if(16===sb){for(zb=qb+2;zb>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(m>>>=qb,n-=qb,0===c.have){a.msg="invalid bit length repeat",c.mode=lb;break}wb=c.lens[c.have-1],q=3+(3&m),m>>>=2,n-=2}else if(17===sb){for(zb=qb+3;zb>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}m>>>=qb,n-=qb,wb=0,q=3+(7&m),m>>>=3,n-=3}else{for(zb=qb+7;zb>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}m>>>=qb,n-=qb,wb=0,q=11+(127&m),m>>>=7,n-=7}if(c.have+q>c.nlen+c.ndist){a.msg="invalid bit length repeat",c.mode=lb;break}for(;q--;)c.lens[c.have++]=wb}}if(c.mode===lb)break;if(0===c.lens[256]){a.msg="invalid code -- missing end-of-block",c.mode=lb;break}if(c.lenbits=9,yb={bits:c.lenbits},xb=v(x,c.lens,0,c.nlen,c.lencode,0,c.work,yb),c.lenbits=yb.bits,xb){a.msg="invalid literal/lengths set",c.mode=lb;break}if(c.distbits=6,c.distcode=c.distdyn,yb={bits:c.distbits},xb=v(y,c.lens,c.nlen,c.ndist,c.distcode,0,c.work,yb),c.distbits=yb.bits,xb){a.msg="invalid distances set",c.mode=lb;break}if(c.mode=bb,b===B)break a;case bb:c.mode=cb;case cb:if(i>=6&&j>=258){a.next_out=h,a.avail_out=j,a.next_in=g,a.avail_in=i,c.hold=m,c.bits=n,u(a,p),h=a.next_out,f=a.output,j=a.avail_out,g=a.next_in,e=a.input,i=a.avail_in,m=c.hold,n=c.bits,c.mode===V&&(c.back=-1);break}for(c.back=0;Ab=c.lencode[m&(1<<c.lenbits)-1],qb=Ab>>>24,rb=Ab>>>16&255,sb=65535&Ab,!(n>=qb);){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(rb&&0===(240&rb)){for(tb=qb,ub=rb,vb=sb;Ab=c.lencode[vb+((m&(1<<tb+ub)-1)>>tb)],qb=Ab>>>24,rb=Ab>>>16&255,sb=65535&Ab,!(n>=tb+qb);){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}m>>>=tb,n-=tb,c.back+=tb}if(m>>>=qb,n-=qb,c.back+=qb,c.length=sb,0===rb){c.mode=hb;break}if(32&rb){c.back=-1,c.mode=V;break}if(64&rb){a.msg="invalid literal/length code",c.mode=lb;break}c.extra=15&rb,c.mode=db;case db:if(c.extra){for(zb=c.extra;zb>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}c.length+=m&(1<<c.extra)-1,m>>>=c.extra,n-=c.extra,c.back+=c.extra}c.was=c.length,c.mode=eb;case eb:for(;Ab=c.distcode[m&(1<<c.distbits)-1],qb=Ab>>>24,rb=Ab>>>16&255,sb=65535&Ab,!(n>=qb);){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(0===(240&rb)){for(tb=qb,ub=rb,vb=sb;Ab=c.distcode[vb+((m&(1<<tb+ub)-1)>>tb)],qb=Ab>>>24,rb=Ab>>>16&255,sb=65535&Ab,!(n>=tb+qb);){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}m>>>=tb,n-=tb,c.back+=tb}if(m>>>=qb,n-=qb,c.back+=qb,64&rb){a.msg="invalid distance code",c.mode=lb;break}c.offset=sb,c.extra=15&rb,c.mode=fb;case fb:if(c.extra){for(zb=c.extra;zb>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}c.offset+=m&(1<<c.extra)-1,m>>>=c.extra,n-=c.extra,c.back+=c.extra}if(c.offset>c.dmax){a.msg="invalid distance too far back",c.mode=lb;break}c.mode=gb;case gb:if(0===j)break a; +if(q=p-j,c.offset>q){if(q=c.offset-q,q>c.whave&&c.sane){a.msg="invalid distance too far back",c.mode=lb;break}q>c.wnext?(q-=c.wnext,ob=c.wsize-q):ob=c.wnext-q,q>c.length&&(q=c.length),pb=c.window}else pb=f,ob=h-c.offset,q=c.length;q>j&&(q=j),j-=q,c.length-=q;do f[h++]=pb[ob++];while(--q);0===c.length&&(c.mode=cb);break;case hb:if(0===j)break a;f[h++]=c.length,j--,c.mode=cb;break;case ib:if(c.wrap){for(;32>n;){if(0===i)break a;i--,m|=e[g++]<<n,n+=8}if(p-=j,a.total_out+=p,c.total+=p,p&&(a.adler=c.check=c.flags?t(c.check,f,p,h-p):s(c.check,f,p,h-p)),p=j,(c.flags?m:d(m))!==c.check){a.msg="incorrect data check",c.mode=lb;break}m=0,n=0}c.mode=jb;case jb:if(c.wrap&&c.flags){for(;32>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(m!==(4294967295&c.total)){a.msg="incorrect length check",c.mode=lb;break}m=0,n=0}c.mode=kb;case kb:xb=D;break a;case lb:xb=G;break a;case mb:return H;case nb:default:return F}return a.next_out=h,a.avail_out=j,a.next_in=g,a.avail_in=i,c.hold=m,c.bits=n,(c.wsize||p!==a.avail_out&&c.mode<lb&&(c.mode<ib||b!==z))&&l(a,a.output,a.next_out,p-a.avail_out)?(c.mode=mb,H):(o-=a.avail_in,p-=a.avail_out,a.total_in+=o,a.total_out+=p,c.total+=p,c.wrap&&p&&(a.adler=c.check=c.flags?t(c.check,f,p,a.next_out-p):s(c.check,f,p,a.next_out-p)),a.data_type=c.bits+(c.last?64:0)+(c.mode===V?128:0)+(c.mode===bb||c.mode===Y?256:0),(0===o&&0===p||b===z)&&xb===C&&(xb=I),xb)}function n(a){if(!a||!a.state)return F;var b=a.state;return b.window&&(b.window=null),a.state=null,C}function o(a,b){var c;return a&&a.state?(c=a.state,0===(2&c.wrap)?F:(c.head=b,b.done=!1,C)):F}var p,q,r=a("../utils/common"),s=a("./adler32"),t=a("./crc32"),u=a("./inffast"),v=a("./inftrees"),w=0,x=1,y=2,z=4,A=5,B=6,C=0,D=1,E=2,F=-2,G=-3,H=-4,I=-5,J=8,K=1,L=2,M=3,N=4,O=5,P=6,Q=7,R=8,S=9,T=10,U=11,V=12,W=13,X=14,Y=15,Z=16,$=17,_=18,ab=19,bb=20,cb=21,db=22,eb=23,fb=24,gb=25,hb=26,ib=27,jb=28,kb=29,lb=30,mb=31,nb=32,ob=852,pb=592,qb=15,rb=qb,sb=!0;c.inflateReset=g,c.inflateReset2=h,c.inflateResetKeep=f,c.inflateInit=j,c.inflateInit2=i,c.inflate=m,c.inflateEnd=n,c.inflateGetHeader=o,c.inflateInfo="pako inflate (from Nodeca project)"},{"../utils/common":27,"./adler32":29,"./crc32":31,"./inffast":34,"./inftrees":36}],36:[function(a,b){"use strict";var c=a("../utils/common"),d=15,e=852,f=592,g=0,h=1,i=2,j=[3,4,5,6,7,8,9,10,11,13,15,17,19,23,27,31,35,43,51,59,67,83,99,115,131,163,195,227,258,0,0],k=[16,16,16,16,16,16,16,16,17,17,17,17,18,18,18,18,19,19,19,19,20,20,20,20,21,21,21,21,16,72,78],l=[1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193,257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577,0,0],m=[16,16,16,16,17,17,18,18,19,19,20,20,21,21,22,22,23,23,24,24,25,25,26,26,27,27,28,28,29,29,64,64];b.exports=function(a,b,n,o,p,q,r,s){var t,u,v,w,x,y,z,A,B,C=s.bits,D=0,E=0,F=0,G=0,H=0,I=0,J=0,K=0,L=0,M=0,N=null,O=0,P=new c.Buf16(d+1),Q=new c.Buf16(d+1),R=null,S=0;for(D=0;d>=D;D++)P[D]=0;for(E=0;o>E;E++)P[b[n+E]]++;for(H=C,G=d;G>=1&&0===P[G];G--);if(H>G&&(H=G),0===G)return p[q++]=20971520,p[q++]=20971520,s.bits=1,0;for(F=1;G>F&&0===P[F];F++);for(F>H&&(H=F),K=1,D=1;d>=D;D++)if(K<<=1,K-=P[D],0>K)return-1;if(K>0&&(a===g||1!==G))return-1;for(Q[1]=0,D=1;d>D;D++)Q[D+1]=Q[D]+P[D];for(E=0;o>E;E++)0!==b[n+E]&&(r[Q[b[n+E]]++]=E);if(a===g?(N=R=r,y=19):a===h?(N=j,O-=257,R=k,S-=257,y=256):(N=l,R=m,y=-1),M=0,E=0,D=F,x=q,I=H,J=0,v=-1,L=1<<H,w=L-1,a===h&&L>e||a===i&&L>f)return 1;for(var T=0;;){T++,z=D-J,r[E]<y?(A=0,B=r[E]):r[E]>y?(A=R[S+r[E]],B=N[O+r[E]]):(A=96,B=0),t=1<<D-J,u=1<<I,F=u;do u-=t,p[x+(M>>J)+u]=z<<24|A<<16|B|0;while(0!==u);for(t=1<<D-1;M&t;)t>>=1;if(0!==t?(M&=t-1,M+=t):M=0,E++,0===--P[D]){if(D===G)break;D=b[n+r[E]]}if(D>H&&(M&w)!==v){for(0===J&&(J=H),x+=F,I=D-J,K=1<<I;G>I+J&&(K-=P[I+J],!(0>=K));)I++,K<<=1;if(L+=1<<I,a===h&&L>e||a===i&&L>f)return 1;v=M&w,p[v]=H<<24|I<<16|x-q|0}}return 0!==M&&(p[x+M]=D-J<<24|64<<16|0),s.bits=H,0}},{"../utils/common":27}],37:[function(a,b){"use strict";b.exports={2:"need dictionary",1:"stream end",0:"","-1":"file error","-2":"stream error","-3":"data error","-4":"insufficient memory","-5":"buffer error","-6":"incompatible version"}},{}],38:[function(a,b,c){"use strict";function d(a){for(var b=a.length;--b>=0;)a[b]=0}function e(a){return 256>a?gb[a]:gb[256+(a>>>7)]}function f(a,b){a.pending_buf[a.pending++]=255&b,a.pending_buf[a.pending++]=b>>>8&255}function g(a,b,c){a.bi_valid>V-c?(a.bi_buf|=b<<a.bi_valid&65535,f(a,a.bi_buf),a.bi_buf=b>>V-a.bi_valid,a.bi_valid+=c-V):(a.bi_buf|=b<<a.bi_valid&65535,a.bi_valid+=c)}function h(a,b,c){g(a,c[2*b],c[2*b+1])}function i(a,b){var c=0;do c|=1&a,a>>>=1,c<<=1;while(--b>0);return c>>>1}function j(a){16===a.bi_valid?(f(a,a.bi_buf),a.bi_buf=0,a.bi_valid=0):a.bi_valid>=8&&(a.pending_buf[a.pending++]=255&a.bi_buf,a.bi_buf>>=8,a.bi_valid-=8)}function k(a,b){var c,d,e,f,g,h,i=b.dyn_tree,j=b.max_code,k=b.stat_desc.static_tree,l=b.stat_desc.has_stree,m=b.stat_desc.extra_bits,n=b.stat_desc.extra_base,o=b.stat_desc.max_length,p=0;for(f=0;U>=f;f++)a.bl_count[f]=0;for(i[2*a.heap[a.heap_max]+1]=0,c=a.heap_max+1;T>c;c++)d=a.heap[c],f=i[2*i[2*d+1]+1]+1,f>o&&(f=o,p++),i[2*d+1]=f,d>j||(a.bl_count[f]++,g=0,d>=n&&(g=m[d-n]),h=i[2*d],a.opt_len+=h*(f+g),l&&(a.static_len+=h*(k[2*d+1]+g)));if(0!==p){do{for(f=o-1;0===a.bl_count[f];)f--;a.bl_count[f]--,a.bl_count[f+1]+=2,a.bl_count[o]--,p-=2}while(p>0);for(f=o;0!==f;f--)for(d=a.bl_count[f];0!==d;)e=a.heap[--c],e>j||(i[2*e+1]!==f&&(a.opt_len+=(f-i[2*e+1])*i[2*e],i[2*e+1]=f),d--)}}function l(a,b,c){var d,e,f=new Array(U+1),g=0;for(d=1;U>=d;d++)f[d]=g=g+c[d-1]<<1;for(e=0;b>=e;e++){var h=a[2*e+1];0!==h&&(a[2*e]=i(f[h]++,h))}}function m(){var a,b,c,d,e,f=new Array(U+1);for(c=0,d=0;O-1>d;d++)for(ib[d]=c,a=0;a<1<<_[d];a++)hb[c++]=d;for(hb[c-1]=d,e=0,d=0;16>d;d++)for(jb[d]=e,a=0;a<1<<ab[d];a++)gb[e++]=d;for(e>>=7;R>d;d++)for(jb[d]=e<<7,a=0;a<1<<ab[d]-7;a++)gb[256+e++]=d;for(b=0;U>=b;b++)f[b]=0;for(a=0;143>=a;)eb[2*a+1]=8,a++,f[8]++;for(;255>=a;)eb[2*a+1]=9,a++,f[9]++;for(;279>=a;)eb[2*a+1]=7,a++,f[7]++;for(;287>=a;)eb[2*a+1]=8,a++,f[8]++;for(l(eb,Q+1,f),a=0;R>a;a++)fb[2*a+1]=5,fb[2*a]=i(a,5);kb=new nb(eb,_,P+1,Q,U),lb=new nb(fb,ab,0,R,U),mb=new nb(new Array(0),bb,0,S,W)}function n(a){var b;for(b=0;Q>b;b++)a.dyn_ltree[2*b]=0;for(b=0;R>b;b++)a.dyn_dtree[2*b]=0;for(b=0;S>b;b++)a.bl_tree[2*b]=0;a.dyn_ltree[2*X]=1,a.opt_len=a.static_len=0,a.last_lit=a.matches=0}function o(a){a.bi_valid>8?f(a,a.bi_buf):a.bi_valid>0&&(a.pending_buf[a.pending++]=a.bi_buf),a.bi_buf=0,a.bi_valid=0}function p(a,b,c,d){o(a),d&&(f(a,c),f(a,~c)),E.arraySet(a.pending_buf,a.window,b,c,a.pending),a.pending+=c}function q(a,b,c,d){var e=2*b,f=2*c;return a[e]<a[f]||a[e]===a[f]&&d[b]<=d[c]}function r(a,b,c){for(var d=a.heap[c],e=c<<1;e<=a.heap_len&&(e<a.heap_len&&q(b,a.heap[e+1],a.heap[e],a.depth)&&e++,!q(b,d,a.heap[e],a.depth));)a.heap[c]=a.heap[e],c=e,e<<=1;a.heap[c]=d}function s(a,b,c){var d,f,i,j,k=0;if(0!==a.last_lit)do d=a.pending_buf[a.d_buf+2*k]<<8|a.pending_buf[a.d_buf+2*k+1],f=a.pending_buf[a.l_buf+k],k++,0===d?h(a,f,b):(i=hb[f],h(a,i+P+1,b),j=_[i],0!==j&&(f-=ib[i],g(a,f,j)),d--,i=e(d),h(a,i,c),j=ab[i],0!==j&&(d-=jb[i],g(a,d,j)));while(k<a.last_lit);h(a,X,b)}function t(a,b){var c,d,e,f=b.dyn_tree,g=b.stat_desc.static_tree,h=b.stat_desc.has_stree,i=b.stat_desc.elems,j=-1;for(a.heap_len=0,a.heap_max=T,c=0;i>c;c++)0!==f[2*c]?(a.heap[++a.heap_len]=j=c,a.depth[c]=0):f[2*c+1]=0;for(;a.heap_len<2;)e=a.heap[++a.heap_len]=2>j?++j:0,f[2*e]=1,a.depth[e]=0,a.opt_len--,h&&(a.static_len-=g[2*e+1]);for(b.max_code=j,c=a.heap_len>>1;c>=1;c--)r(a,f,c);e=i;do c=a.heap[1],a.heap[1]=a.heap[a.heap_len--],r(a,f,1),d=a.heap[1],a.heap[--a.heap_max]=c,a.heap[--a.heap_max]=d,f[2*e]=f[2*c]+f[2*d],a.depth[e]=(a.depth[c]>=a.depth[d]?a.depth[c]:a.depth[d])+1,f[2*c+1]=f[2*d+1]=e,a.heap[1]=e++,r(a,f,1);while(a.heap_len>=2);a.heap[--a.heap_max]=a.heap[1],k(a,b),l(f,j,a.bl_count)}function u(a,b,c){var d,e,f=-1,g=b[1],h=0,i=7,j=4;for(0===g&&(i=138,j=3),b[2*(c+1)+1]=65535,d=0;c>=d;d++)e=g,g=b[2*(d+1)+1],++h<i&&e===g||(j>h?a.bl_tree[2*e]+=h:0!==e?(e!==f&&a.bl_tree[2*e]++,a.bl_tree[2*Y]++):10>=h?a.bl_tree[2*Z]++:a.bl_tree[2*$]++,h=0,f=e,0===g?(i=138,j=3):e===g?(i=6,j=3):(i=7,j=4))}function v(a,b,c){var d,e,f=-1,i=b[1],j=0,k=7,l=4;for(0===i&&(k=138,l=3),d=0;c>=d;d++)if(e=i,i=b[2*(d+1)+1],!(++j<k&&e===i)){if(l>j){do h(a,e,a.bl_tree);while(0!==--j)}else 0!==e?(e!==f&&(h(a,e,a.bl_tree),j--),h(a,Y,a.bl_tree),g(a,j-3,2)):10>=j?(h(a,Z,a.bl_tree),g(a,j-3,3)):(h(a,$,a.bl_tree),g(a,j-11,7));j=0,f=e,0===i?(k=138,l=3):e===i?(k=6,l=3):(k=7,l=4)}}function w(a){var b;for(u(a,a.dyn_ltree,a.l_desc.max_code),u(a,a.dyn_dtree,a.d_desc.max_code),t(a,a.bl_desc),b=S-1;b>=3&&0===a.bl_tree[2*cb[b]+1];b--);return a.opt_len+=3*(b+1)+5+5+4,b}function x(a,b,c,d){var e;for(g(a,b-257,5),g(a,c-1,5),g(a,d-4,4),e=0;d>e;e++)g(a,a.bl_tree[2*cb[e]+1],3);v(a,a.dyn_ltree,b-1),v(a,a.dyn_dtree,c-1)}function y(a){var b,c=4093624447;for(b=0;31>=b;b++,c>>>=1)if(1&c&&0!==a.dyn_ltree[2*b])return G;if(0!==a.dyn_ltree[18]||0!==a.dyn_ltree[20]||0!==a.dyn_ltree[26])return H;for(b=32;P>b;b++)if(0!==a.dyn_ltree[2*b])return H;return G}function z(a){pb||(m(),pb=!0),a.l_desc=new ob(a.dyn_ltree,kb),a.d_desc=new ob(a.dyn_dtree,lb),a.bl_desc=new ob(a.bl_tree,mb),a.bi_buf=0,a.bi_valid=0,n(a)}function A(a,b,c,d){g(a,(J<<1)+(d?1:0),3),p(a,b,c,!0)}function B(a){g(a,K<<1,3),h(a,X,eb),j(a)}function C(a,b,c,d){var e,f,h=0;a.level>0?(a.strm.data_type===I&&(a.strm.data_type=y(a)),t(a,a.l_desc),t(a,a.d_desc),h=w(a),e=a.opt_len+3+7>>>3,f=a.static_len+3+7>>>3,e>=f&&(e=f)):e=f=c+5,e>=c+4&&-1!==b?A(a,b,c,d):a.strategy===F||f===e?(g(a,(K<<1)+(d?1:0),3),s(a,eb,fb)):(g(a,(L<<1)+(d?1:0),3),x(a,a.l_desc.max_code+1,a.d_desc.max_code+1,h+1),s(a,a.dyn_ltree,a.dyn_dtree)),n(a),d&&o(a)}function D(a,b,c){return a.pending_buf[a.d_buf+2*a.last_lit]=b>>>8&255,a.pending_buf[a.d_buf+2*a.last_lit+1]=255&b,a.pending_buf[a.l_buf+a.last_lit]=255&c,a.last_lit++,0===b?a.dyn_ltree[2*c]++:(a.matches++,b--,a.dyn_ltree[2*(hb[c]+P+1)]++,a.dyn_dtree[2*e(b)]++),a.last_lit===a.lit_bufsize-1}var E=a("../utils/common"),F=4,G=0,H=1,I=2,J=0,K=1,L=2,M=3,N=258,O=29,P=256,Q=P+1+O,R=30,S=19,T=2*Q+1,U=15,V=16,W=7,X=256,Y=16,Z=17,$=18,_=[0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0],ab=[0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13],bb=[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7],cb=[16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15],db=512,eb=new Array(2*(Q+2));d(eb);var fb=new Array(2*R);d(fb);var gb=new Array(db);d(gb);var hb=new Array(N-M+1);d(hb);var ib=new Array(O);d(ib);var jb=new Array(R);d(jb);var kb,lb,mb,nb=function(a,b,c,d,e){this.static_tree=a,this.extra_bits=b,this.extra_base=c,this.elems=d,this.max_length=e,this.has_stree=a&&a.length},ob=function(a,b){this.dyn_tree=a,this.max_code=0,this.stat_desc=b},pb=!1;c._tr_init=z,c._tr_stored_block=A,c._tr_flush_block=C,c._tr_tally=D,c._tr_align=B},{"../utils/common":27}],39:[function(a,b){"use strict";function c(){this.input=null,this.next_in=0,this.avail_in=0,this.total_in=0,this.output=null,this.next_out=0,this.avail_out=0,this.total_out=0,this.msg="",this.state=null,this.data_type=2,this.adler=0}b.exports=c},{}]},{},[9])(9)}); \ No newline at end of file From 838a22de648bcaf71cd2ebaf87324b1b482a15e8 Mon Sep 17 00:00:00 2001 From: Scott Lahteine <sourcetree@thinkyhead.com> Date: Fri, 27 Feb 2015 21:08:09 -0800 Subject: [PATCH 35/41] Fix switch value method, make app global --- Marlin/configurator/js/configurator.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Marlin/configurator/js/configurator.js b/Marlin/configurator/js/configurator.js index 47d3d3db68..81dacd4cae 100644 --- a/Marlin/configurator/js/configurator.js +++ b/Marlin/configurator/js/configurator.js @@ -128,7 +128,7 @@ $.fn.extend({ }); // The app is a singleton -var configuratorApp = (function(){ +window.configuratorApp = (function(){ // private variables and functions go here var self, @@ -717,7 +717,7 @@ var configuratorApp = (function(){ this.log(result,2); - return inf.type == 'switch' ? result[inf.val_i] != '//' : result[inf.val_i]; + return (inf.type == 'switch') ? (result[inf.val_i] === undefined || result[inf.val_i].trim() != '//') : result[inf.val_i]; }, /** @@ -1106,6 +1106,6 @@ var configuratorApp = (function(){ })(); // Typically the app would be in its own file, but this would be here -configuratorApp.init(); +window.configuratorApp.init(); }); From f994729999b9512693be15a16097fa21410031ba Mon Sep 17 00:00:00 2001 From: Scott Lahteine <sourcetree@thinkyhead.com> Date: Sat, 28 Feb 2015 22:40:20 -0800 Subject: [PATCH 36/41] Parse and use dependent groups - Parse #if, #ifdef, etc. for rules to enable fields --- Marlin/configurator/css/configurator.css | 4 + Marlin/configurator/index.html | 2 +- Marlin/configurator/js/configurator.js | 276 +++++++++++++++++------ 3 files changed, 214 insertions(+), 68 deletions(-) diff --git a/Marlin/configurator/css/configurator.css b/Marlin/configurator/css/configurator.css index 645907f0a8..a0874507ed 100644 --- a/Marlin/configurator/css/configurator.css +++ b/Marlin/configurator/css/configurator.css @@ -91,6 +91,8 @@ label { margin-right: -450px; text-align: right; } +label.blocked { color: #AAA; } + 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"].enabler, input[type="radio"].enabler { margin-left: 1em; } @@ -308,3 +310,5 @@ a.download-all { margin: 9px 2em 0; color: #449; border-color: #449; } .disclose { display: none; } } + +/*.blocked { display: none; }*/ diff --git a/Marlin/configurator/index.html b/Marlin/configurator/index.html index aad6736e21..a804e7c740 100644 --- a/Marlin/configurator/index.html +++ b/Marlin/configurator/index.html @@ -26,7 +26,7 @@ <div id="tooltip"></div> - <label>Drop Files Here:</label><input type="file" id="file-upload" /> + <label>Drop Files:</label><input type="file" id="file-upload" /> <label id="tipson"><input type="checkbox" checked /> ?</label> <a href="" class="download-all">Download Zip</a> diff --git a/Marlin/configurator/js/configurator.js b/Marlin/configurator/js/configurator.js index 81dacd4cae..1405bea202 100644 --- a/Marlin/configurator/js/configurator.js +++ b/Marlin/configurator/js/configurator.js @@ -142,8 +142,10 @@ window.configuratorApp = (function(){ $tooltip = $('#tooltip'), $cfg = $('#config_text'), $adv = $('#config_adv_text'), $config = $cfg.find('pre'), $config_adv = $adv.find('pre'), + define_info = {}, define_list = [[],[]], define_section = {}, + dependentGroups = {}, boards_list = {}, therms_list = {}, total_config_lines, @@ -321,7 +323,7 @@ window.configuratorApp = (function(){ /** * Init the thermistors array from the Configuration.h file */ - initThermistorsFromText: function(txt) { + initThermistorList: function(txt) { // Get all the thermistors and save them into an object var r, s, findDef = new RegExp('(//.*\n)+\\s+(#define[ \\t]+TEMP_SENSOR_0)', 'g'); r = findDef.exec(txt); @@ -334,7 +336,7 @@ window.configuratorApp = (function(){ /** * Get all the unique define names */ - updateDefinesFromText: function(index, txt) { + initDefineList: function(index, txt) { var section = 'hidden', leave_out_defines = ['CONFIGURATION_H', 'CONFIGURATION_ADV_H'], define_sect = {}, @@ -343,7 +345,7 @@ window.configuratorApp = (function(){ var name = r[2]; if (r[1] == '@section') section = name; - else if ($.inArray(name, leave_out_defines) < 0 && !(name in define_sect)) + else if ($.inArray(name, leave_out_defines) < 0 && !(name in define_section) && !(name in define_sect)) define_sect[name] = section; } define_list[index] = Object.keys(define_sect); @@ -351,22 +353,101 @@ window.configuratorApp = (function(){ this.log(define_list[index], 2); }, + /** + * Get all condition blocks and their line ranges. + * Conditions may control multiple line-ranges + * across both config files. + */ + initDependentGroups: function() { + var findDef = /^[ \t]*#(ifn?def|if|else|endif)[ \t]*(.*)([ \t]*\/\/[^\n]+)?$/gm, + leave_out_defines = ['CONFIGURATION_H', 'CONFIGURATION_ADV_H']; + $.each([$config, $config_adv], function(i, $v) { + var ifStack = []; + var r, txt = $v.text(); + while((r = findDef.exec(txt)) !== null) { + var lineNum = txt.substr(0, r.index).lineCount(); + var code = r[2].replace(/[ \t]*\/\/.*$/, ''); + switch(r[1]) { + case 'if': + var code = code + .replace(/([A-Z][A-Z0-9_]+)/g, 'self.defineValue("$1")') + .replace(/defined[ \t]*\(?[ \t]*self.defineValue\(("[A-Z][A-Z0-9_]+")\)[ \t]*\)?/g, 'self.defineIsEnabled($1)'); + ifStack.push(['('+code+')', lineNum]); // #if starts on next line + self.log("push if " + code, 4); + break; + case 'ifdef': + if ($.inArray(code, leave_out_defines) < 0) { + ifStack.push(['self.defineIsEnabled("' + code + '")', lineNum]); + self.log("push ifdef " + code, 4); + } + else { + ifStack.push(0); + } + break; + case 'ifndef': + if ($.inArray(code, leave_out_defines) < 0) { + ifStack.push(['!self.defineIsEnabled("' + code + '")', lineNum]); + self.log("push ifndef " + code, 4); + } + else { + ifStack.push(0); + } + break; + case 'else': + case 'endif': + var c = ifStack.pop(); + if (c) { + var cond = c[0], line = c[1]; + self.log("pop " + c[0], 4); + if (dependentGroups[cond] === undefined) dependentGroups[cond] = []; + dependentGroups[cond].push({adv:i,start:line,end:lineNum}); + if (r[1] == 'else') { + // Reverse the condition + cond = (cond.indexOf('!') === 0) ? cond.substr(1) : ('!'+cond); + ifStack.push([cond, lineNum]); + self.log("push " + cond, 4); + } + } + else { + if (r[1] == 'else') ifStack.push(0); + } + break; + } + } + }); // text blobs loop + }, + + /** + * Init all the defineInfo structures after reload + * The "enabled" field may need an update for newly-loaded dependencies + */ + initDefineInfo: function() { + $.each(define_list, function(e,def_list){ + var adv = e == 1; + $.each(def_list, function(i,name) { + define_info[name] = self.getDefineInfo(name, adv); + }); + }); + }, + /** * Create fields for any defines that have none */ - createFieldsForDefines: function(adv) { - var e = adv ? 1 : 0, n = 0; - var fail_list = []; + createFieldsForDefines: function(e) { + var n = 0, fail_list = []; $.each(define_list[e], function(i,name) { var section = define_section[name]; if (section != 'hidden' && !$('#'+name).length) { - var inf = self.getDefineInfo(name, adv); + var inf = define_info[name]; if (inf) { var $ff = $('#'+section), $newfield, + avail = eval(inf.enabled), $newlabel = $('<label>',{for:name,class:'added'}).text(name.toLabel()); + if (!avail) $newlabel.addClass('blocked'); + // if (!(++n % 3)) $newlabel.addClass('newline'); @@ -376,7 +457,8 @@ window.configuratorApp = (function(){ if (inf.type == 'list') { for (var i=0; i<inf.size; i++) { var fieldname = i > 0 ? name+'-'+i : name; - $newfield = $('<input>',{type:'text',size:6,maxlength:10,id:fieldname,name:fieldname,class:'subitem added'}).prop({defineInfo:inf}); + $newfield = $('<input>',{type:'text',size:6,maxlength:10,id:fieldname,name:fieldname,class:'subitem added',disabled:!avail}); + if (!avail) $newfield.addClass('blocked'); $ff.append($newfield); } } @@ -396,7 +478,8 @@ window.configuratorApp = (function(){ else { $newfield = inf.type == 'switch' ? $('<input>',{type:'checkbox'}) : $('<input>',{type:'text',size:10,maxlength:40}); } - $newfield.attr({id:name,name:name,class:'added'}).prop({defineInfo:inf}); + $newfield.attr({id:name,name:name,class:'added',disabled:!avail}); + if (!avail) $newfield.addClass('blocked'); // Add the new field to the form $ff.append($newfield); } @@ -442,7 +525,7 @@ window.configuratorApp = (function(){ if (has_boards) { $config.text(txt); total_config_lines = txt.lineCount(); - // this.initThermistorsFromText(txt); + // this.initThermistorList(txt); init_index = 0; has_config = true; if (has_config_adv) @@ -466,19 +549,24 @@ window.configuratorApp = (function(){ } break; } - // When a config file loads defines might change + // When a config file loads defines need update if (init_index != null) { var adv = init_index == 1; + // Purge old fields from the form, clear the define list this.purgeAddedFields(init_index); - this.updateDefinesFromText(init_index, txt); + // Build the define_list + this.initDefineList(init_index, txt); // TODO: Find sequential names and group them // Allows related settings to occupy one line in the form // this.refreshSequentialDefines(); - // TODO: Get dependent groups (#ifdef's) from text - // Allows parent to hide/show or disable/enable dependent fields! - // this.refreshDependentGroups(); // (from all config text) - this.createFieldsForDefines(adv); - this.refreshConfigForm(init_index); // TODO: <-- hide dependent fields + // Build the dependent defines list + this.initDependentGroups(); // all config text + // Get define_info for all known defines + this.initDefineInfo(); // all config text + // Create new fields + this.createFieldsForDefines(init_index); // create new fields + // Init the fields, set values, etc + this.refreshConfigForm(init_index); this.activateDownloadLink(adv); } this.setMessage(err @@ -595,25 +683,65 @@ window.configuratorApp = (function(){ // Refresh the motherboard menu with new options $('#MOTHERBOARD').html('').addOptions(boards_list); - // Init all existing fields, getting define info for any that need it + // Init all existing fields, getting define info for those that need it // refreshing the options and updating their current values $.each(define_list[init_index], function() { - if ($('#'+this).length) - self.initField(this,init_index==1); + if ($('#'+this).length) { + self.initField(this); + self.initFieldValue(this); + } else self.log(this + " is not on the page yet.", 2); }); + + // Set enabled state based on dependencies + // this.enableForDependentConditions(); + }, + + /** + * Enable / disable fields based on condition tests + */ + refreshDependentFields: function() { + // Simplest way is to go through all define_info + // and run a test on all fields that have one. + // + // Each define_info caches its enable test as code. + // + // The fields that act as switches for these dependencies + // are not currently modified, but they will soon be. + // + // Once all conditions have been gathered into define_info + // the conditions can be scraped for define names. + // + // Those named fields will be given a .change action to + // check and update enabled state for the field. + // + $.each(define_list, function(e,def_list){ + $.each(def_list, function() { + var inf = define_info[this]; + if (inf && inf.enabled != 'true') { + var $elm = $('#'+this), ena = eval(inf.enabled); + // Make any switch toggle also + $('#'+this+'-switch').attr('disabled', !ena); + var alreadyEnabled = inf.type == 'switch' || self.defineIsEnabled(this); + $elm.attr('disabled', !(ena && alreadyEnabled)); + ena ? $elm.removeClass('blocked') : $elm.addClass('blocked'); + // Dim label for unavailable element + var $lbl = $elm.prev('label'); + if ($lbl.length) + ena ? $lbl.removeClass('blocked') : $lbl.addClass('blocked'); + } + }); + }); }, /** - * Get the defineInfo for a field on the form - * Make it responsive, add a tooltip + * Make the field responsive, add optional tooltip, enabler box */ - initField: function(name, adv) { + initField: function(name) { this.log("initField:"+name,4); - var $elm = $('#'+name), elm = $elm[0], inf = elm.defineInfo; - if (inf == null) - inf = elm.defineInfo = this.getDefineInfo(name, adv); + var $elm = $('#'+name), inf = define_info[name]; + $elm[0].defineInfo = inf; // Create a tooltip on the label if there is one if (inf.tooltip) { @@ -672,16 +800,16 @@ window.configuratorApp = (function(){ .change(self.handleSwitch) ); } - - // Set the field's initial value from the define - this.setFieldFromDefine(name); }, /** * Handle any value field being changed * this = the field */ - handleChange: function() { self.updateDefineFromField(this.id); }, + handleChange: function() { + self.updateDefineFromField(this.id); + self.refreshDependentFields(); + }, /** * Handle a switch checkbox being changed @@ -690,7 +818,7 @@ window.configuratorApp = (function(){ handleSwitch: function() { var $elm = $(this), name = $elm[0].id.replace(/-.+/,''), - inf = $('#'+name)[0].defineInfo, + inf = define_info[name], on = $elm.prop('checked') || false; self.setDefineEnabled(name, on); @@ -711,9 +839,10 @@ window.configuratorApp = (function(){ */ defineValue: function(name) { this.log('defineValue:'+name,4); - var inf = $('#'+name)[0].defineInfo; + var inf = define_info[name]; if (inf == null) return 'n/a'; - var result = inf.regex.exec($(inf.field).text()); + // var result = inf.regex.exec($(inf.field).text()); + var result = inf.regex.exec(inf.line); this.log(result,2); @@ -725,13 +854,14 @@ window.configuratorApp = (function(){ */ defineIsEnabled: function(name) { this.log('defineIsEnabled:'+name,4); - var inf = $('#'+name)[0].defineInfo; + var inf = define_info[name]; if (inf == null) return false; - var result = inf.regex.exec($(inf.field).text()); + // var result = inf.regex.exec($(inf.field).text()); + var result = inf.regex.exec(inf.line); this.log(result,2); - var on = result !== null ? result[1].trim() != '//' : true; + var on = result[1] != null ? result[1].trim() != '//' : true; this.log(name + ' = ' + on, 2); return on; @@ -742,7 +872,7 @@ window.configuratorApp = (function(){ */ setDefineEnabled: function(name, val) { this.log('setDefineEnabled:'+name,4); - var inf = $('#'+name)[0].defineInfo; + var inf = define_info[name]; if (inf) { var slash = val ? '' : '//'; var newline = inf.line @@ -761,7 +891,7 @@ window.configuratorApp = (function(){ // Drop the suffix on sub-fields name = name.replace(/-\d+$/, ''); - var $elm = $('#'+name), inf = $elm[0].defineInfo; + var $elm = $('#'+name), inf = define_info[name]; if (inf == null) return; var isCheck = $elm.attr('type') == 'checkbox', @@ -797,7 +927,7 @@ window.configuratorApp = (function(){ */ setDefineLine: function(name, newline) { this.log('setDefineLine:'+name+'\n'+newline,4); - var inf = $('#'+name)[0].defineInfo; + var inf = define_info[name]; var $c = $(inf.field), txt = $c.text(); var hilite_token = '[HIGHLIGHTER-TOKEN]'; @@ -820,7 +950,7 @@ window.configuratorApp = (function(){ */ scrollToDefine: function(name, always) { this.log('scrollToDefine:'+name,4); - var inf = $('#'+name)[0].defineInfo, $c = $(inf.field); + var inf = define_info[name], $c = $(inf.field); // Scroll to the altered text if it isn't visible var halfHeight = $c.height()/2, scrollHeight = $c.prop('scrollHeight'), @@ -836,14 +966,14 @@ window.configuratorApp = (function(){ /** * Set a form field to the current #define value in the config text */ - setFieldFromDefine: function(name) { - var $elm = $('#'+name), inf = $elm[0].defineInfo, + initFieldValue: function(name) { + var $elm = $('#'+name), inf = define_info[name], val = this.defineValue(name); - this.log('setFieldFromDefine:' + name + ' to ' + val, 2); + this.log('initFieldValue:' + name + ' to ' + val, 2); // If the item has a checkbox then set enabled state too - var $cb = $('#'+name+'-switch'), on = true; + var $cb = $('#'+name+'-switch'), avail = eval(inf.enabled), on = true; if ($cb.length) { on = self.defineIsEnabled(name); $cb.prop('checked', on); @@ -854,13 +984,19 @@ window.configuratorApp = (function(){ var $e = i > 0 ? $('#'+name+'-'+i) : $elm; $e.val(v.trim()); $e.attr('disabled', !on); + avail ? $e.removeClass('blocked') : $e.addClass('blocked'); }); } else { if (inf.type == 'toggle') val = val == inf.options[1]; $elm.attr('type') == 'checkbox' ? $elm.prop('checked', val) : $elm.val(''+val); $elm.attr('disabled', !on); // enable/disable the form field (could also dim it) + avail ? $elm.removeClass('blocked') : $elm.addClass('blocked'); } + + // set label color + var $lbl = $elm.prev('label'); + avail ? $lbl.removeClass('blocked') : $lbl.addClass('blocked'); }, /** @@ -873,17 +1009,6 @@ window.configuratorApp = (function(){ define_list[index] = []; }, - /** - * Update #define information for one of the config files - */ - refreshDefineInfo: function(adv) { - if (adv === undefined) adv = false; - $('[name]').each(function() { - var inf = this.defineInfo; - if (inf && adv == inf.adv) this.defineInfo = self.getDefineInfo(this.id, adv); - }); - }, - /** * Get information about a #define from configuration file text: * @@ -909,9 +1034,9 @@ window.configuratorApp = (function(){ val_i: 1, type: 'switch', line: result[0], // whole line - pre: result[1] === undefined ? '' : result[1].replace('//',''), + pre: result[1] == null ? '' : result[1].replace('//',''), define: result[2], - post: result[3] === undefined ? '' : result[3] + post: result[3] == null ? '' : result[3] }); info.regex = new RegExp('([ \\t]*//)?([ \\t]*' + info.define.regEsc() + info.post.regEsc() + ')', 'm'); info.repl = new RegExp('([ \\t]*)(\/\/)?([ \\t]*' + info.define.regEsc() + info.post.regEsc() + ')', 'm'); @@ -924,10 +1049,10 @@ window.configuratorApp = (function(){ $.extend(info, { type: 'list', line: result[0], - pre: result[1] === undefined ? '' : result[1].replace('//',''), + pre: result[1] == null ? '' : result[1].replace('//',''), define: result[2], size: result[3].split(',').length, - post: result[4] === undefined ? '' : result[4] + post: result[4] == null ? '' : result[4] }); info.regex = new RegExp('([ \\t]*//)?[ \\t]*' + info.define.regEsc() + '\{([^\}]*)\}' + info.post.regEsc(), 'm'); info.repl = new RegExp('(([ \\t]*//)?[ \\t]*' + info.define.regEsc() + '\{)[^\}]*(\}' + info.post.regEsc() + ')', 'm'); @@ -940,9 +1065,9 @@ window.configuratorApp = (function(){ $.extend(info, { type: 'quoted', line: result[0], - pre: result[1] === undefined ? '' : result[1].replace('//',''), + pre: result[1] == null ? '' : result[1].replace('//',''), define: result[2], - post: result[4] === undefined ? '' : result[4] + post: result[4] == null ? '' : result[4] }); info.regex = new RegExp('([ \\t]*//)?[ \\t]*' + info.define.regEsc() + '"([^"]*)"' + info.post.regEsc(), 'm'); info.repl = new RegExp('(([ \\t]*//)?[ \\t]*' + info.define.regEsc() + '")[^"]*("' + info.post.regEsc() + ')', 'm'); @@ -955,9 +1080,9 @@ window.configuratorApp = (function(){ $.extend(info, { type: 'plain', line: result[0], - pre: result[1] === undefined ? '' : result[1].replace('//',''), + pre: result[1] == null ? '' : result[1].replace('//',''), define: result[2], - post: result[4] === undefined ? '' : result[4] + post: result[4] == null ? '' : result[4] }); if (result[3].match(/false|true/)) { info.type = 'toggle'; @@ -1005,19 +1130,36 @@ window.configuratorApp = (function(){ } } - // Add .tooltip and .lineNum properties to the info findDef = new RegExp('^'+name); // Strip the name from the tooltip + var lineNum = this.getLineNumberOfText(info.line, txt); + + // See if this define is enabled conditionally + var enable_cond = ''; + var adv_index = adv ? 1 : 0; + $.each(dependentGroups, function(cond,dat){ + $.each(dat, function(i,o){ + if (o.adv == adv_index && lineNum > o.start && lineNum < o.end) { + // self.log(name + " is in range " + o.start + "-" + o.end, 2); + // if this setting is in a range, conditions are added + if (enable_cond != '') enable_cond += ' && '; + enable_cond += '(' + cond + ')'; + } + }); + }); + $.extend(info, { tooltip: '<strong>'+name+'</strong> '+tooltip.trim().replace(findDef,'').toHTML(), - lineNum: this.getLineNumberOfText(info.line, txt), - switchable: (info.type != 'switch' && info.line.match(/^[ \t]*\/\//)) || false // Disabled? Mark as "switchable" + lineNum: lineNum, + switchable: (info.type != 'switch' && info.line.match(/^[ \t]*\/\//)) || false, // Disabled? Mark as "switchable" + enabled: enable_cond ? enable_cond : 'true' }); + } else info = null; - this.log(info,2); + this.log(info, 2); return info; }, From 2eeb241b422a5e3bb9a4e16910e72289fc9e45f5 Mon Sep 17 00:00:00 2001 From: Scott Lahteine <sourcetree@thinkyhead.com> Date: Mon, 2 Mar 2015 01:45:53 -0800 Subject: [PATCH 37/41] Find fields that group together - Do field grouping - Tweak configurations for better grouping --- Marlin/configurator/config/Configuration.h | 18 +- .../configurator/config/Configuration_adv.h | 3 + Marlin/configurator/css/configurator.css | 41 +++- Marlin/configurator/js/configurator.js | 176 +++++++++++++++--- 4 files changed, 194 insertions(+), 44 deletions(-) diff --git a/Marlin/configurator/config/Configuration.h b/Marlin/configurator/config/Configuration.h index 76d20326b4..253567fc95 100644 --- a/Marlin/configurator/config/Configuration.h +++ b/Marlin/configurator/config/Configuration.h @@ -393,12 +393,12 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of // @section machine // Travel limits after homing (units are in mm) -#define X_MAX_POS 205 #define X_MIN_POS 0 -#define Y_MAX_POS 205 #define Y_MIN_POS 0 -#define Z_MAX_POS 200 #define Z_MIN_POS 0 +#define X_MAX_POS 205 +#define Y_MAX_POS 205 +#define Z_MAX_POS 200 // @section hidden @@ -535,12 +535,14 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of //#define MANUAL_HOME_POSITIONS // If defined, MANUAL_*_HOME_POS below will be used //#define BED_CENTER_AT_0_0 // If defined, the center of the bed is at (X=0, Y=0) -//Manual homing switch locations: +// Manual homing switch locations: // For deltabots this means top and center of the Cartesian print volume. -#define MANUAL_X_HOME_POS 0 -#define MANUAL_Y_HOME_POS 0 -#define MANUAL_Z_HOME_POS 0 -//#define MANUAL_Z_HOME_POS 402 // For delta: Distance between nozzle and print surface after homing. +#ifdef MANUAL_HOME_POSITIONS + #define MANUAL_X_HOME_POS 0 + #define MANUAL_Y_HOME_POS 0 + #define MANUAL_Z_HOME_POS 0 + //#define MANUAL_Z_HOME_POS 402 // For delta: Distance between nozzle and print surface after homing. +#endif // @section movement diff --git a/Marlin/configurator/config/Configuration_adv.h b/Marlin/configurator/config/Configuration_adv.h index 1c118904aa..a8ce587684 100644 --- a/Marlin/configurator/config/Configuration_adv.h +++ b/Marlin/configurator/config/Configuration_adv.h @@ -100,6 +100,9 @@ #define ENDSTOPS_ONLY_FOR_HOMING // If defined the endstops will only be used for homing +// @section hidden + + //// AUTOSET LOCATIONS OF LIMIT SWITCHES //// Added by ZetaPhoenix 09-15-2012 #ifdef MANUAL_HOME_POSITIONS // Use manual limit switch locations diff --git a/Marlin/configurator/css/configurator.css b/Marlin/configurator/css/configurator.css index a0874507ed..b660a78d14 100644 --- a/Marlin/configurator/css/configurator.css +++ b/Marlin/configurator/css/configurator.css @@ -91,7 +91,19 @@ label { margin-right: -450px; text-align: right; } -label.blocked { color: #AAA; } +label.blocked, span.label.blocked { color: #AAA; } + +span.label { + display: block; + float: left; + margin: 11px -2.5em 0 1em; + padding-right: 3em; + font-style: italic; + color: #444; + } +label+span.label { + margin-left: 0; + } input[type="text"], select { margin: 0.75em 0 0; } input[type="checkbox"], input[type="radio"], input[type="file"] { margin: 1em 0 0; } @@ -104,10 +116,10 @@ input:disabled { color: #BBB; } input[type="text"].added { width: 20em; } label.added { - width: 275px; /* label area */ + width: 265px; /* label area */ height: 1em; - padding: 10px 360px 10px 1em; - margin-right: -350px; + padding: 10px 370px 10px 1em; + margin-right: -360px; text-align: right; } @@ -297,6 +309,16 @@ a.download, a.download-all { } a.download-all { margin: 9px 2em 0; color: #449; border-color: #449; } +input[type="text"].one_of_2 { max-width: 15%; } +input[type="text"].one_of_3 { max-width: 10%; } +input[type="text"].one_of_4 { max-width: 7%; } + +select.one_of_2 { max-width: 15%; } +select.one_of_3 { max-width: 10%; } +select.one_of_4 { max-width: 14%; } +select.one_of_4+span.label+select.one_of_4+span.label { clear: both; margin-left: 265px; padding-left: 1.75em; } +select.one_of_4+span.label+select.one_of_4+span.label+select.one_of_4+span.label { clear: none; margin-left: 1em; padding-left: 0; } + @media all and (min-width: 1140px) { #main { max-width: 10000px; } @@ -309,6 +331,15 @@ a.download-all { margin: 9px 2em 0; color: #449; border-color: #449; } .disclose { display: none; } + input[type="text"].one_of_2 { max-width: 15%; } + input[type="text"].one_of_3 { max-width: 9%; } + input[type="text"].one_of_4 { max-width: 8%; } + + select.one_of_2 { max-width: 15%; } + select.one_of_3 { max-width: 10%; } + select.one_of_4 { max-width: 16%; } + } -/*.blocked { display: none; }*/ +/*span.label.blocked, .blocked { display: none; }*/ + diff --git a/Marlin/configurator/js/configurator.js b/Marlin/configurator/js/configurator.js index 1405bea202..dc911f8c64 100644 --- a/Marlin/configurator/js/configurator.js +++ b/Marlin/configurator/js/configurator.js @@ -86,7 +86,7 @@ String.prototype.zeroPad = function(len) { return this.prePad(len, '0'); }; String.prototype.toHTML = function() { return jQuery('<div>').text(this).html(); }; String.prototype.regEsc = function() { return this.replace(/[.?*+^$[\]\\(){}|-]/g, "\\$&"); } String.prototype.lineCount = function() { var len = this.split(/\r?\n|\r/).length; return len > 0 ? len - 1 : 0; }; -String.prototype.toLabel = function() { return this.replace(/_/g, ' ').toTitleCase(); } +String.prototype.toLabel = function() { return this.replace(/[\[\]]/g, '').replace(/_/g, ' ').toTitleCase(); } String.prototype.toTitleCase = function() { return this.replace(/([A-Z])(\w+)/gi, function(m,p1,p2) { return p1.toUpperCase() + p2.toLowerCase(); }); } Number.prototype.limit = function(m1, m2) { if (m2 == null) return this > m1 ? m1 : this; @@ -124,6 +124,10 @@ $.fn.extend({ .attr('unselectable', 'on') .css('user-select', 'none') .on('selectstart', false); + }, + unblock: function(on) { + on ? this.removeClass('blocked') : this.addClass('blocked'); + return this; } }); @@ -144,6 +148,7 @@ window.configuratorApp = (function(){ $config = $cfg.find('pre'), $config_adv = $adv.find('pre'), define_info = {}, define_list = [[],[]], + define_groups = [{},{}], define_section = {}, dependentGroups = {}, boards_list = {}, @@ -353,18 +358,94 @@ window.configuratorApp = (function(){ this.log(define_list[index], 2); }, + /** + * Find the defines in one of the configs that are just variants. + * Group them together for form-building and other uses. + */ + refreshDefineGroups: function(index) { + var findDef = /^(|.*_)(([XYZE](MAX|MIN))|(E[0-3]|[XYZE01234])|MAX|MIN|(bed)?K[pid])(_.*|)$/; + var match_prev, patt, title, nameList, groups = {}, match_section; + $.each(define_list[index], function() { + if (match_prev) { + if (match_prev.exec(this) && define_section[this] == match_section) { + nameList.push(this); + } + else { + if (nameList.length > 1) { + $.each(nameList, function(){ + groups[this] = { + pattern: patt, + title: title, + count: nameList.length + }; + }); + } + match_prev = null; + } + } + if (!match_prev) { + var r = findDef.exec(this); + if (r != null) { + switch(r[2]) { + case '0': + patt = '([0123])'; + title = 'N'; + break; + case 'X': + patt = '([XYZE])'; + title = 'AXIS'; + break; + case 'E0': + patt = 'E([0-3])'; + title = 'E'; + break; + case 'bedKp': + patt = 'bed(K[pid])'; + title = 'BED_PID'; + break; + case 'Kp': + patt = '(K[pid])'; + title = 'PID'; + break; + case 'MAX': + case 'MIN': + patt = '(MAX|MIN)'; + title = ''; + break; + case 'XMIN': + case 'XMAX': + patt = '([XYZ])'+r[4]; + title = 'XYZ_'+r[4]; + break; + default: + patt = null; + break; + } + if (patt) { + patt = '^' + r[1] + patt + r[7] + '$'; + title = r[1] + title + r[7]; + match_prev = new RegExp(patt); + match_section = define_section[this]; + nameList = [ this ]; + } + } + } + }); + define_groups[index] = groups; + }, + /** * Get all condition blocks and their line ranges. * Conditions may control multiple line-ranges * across both config files. */ initDependentGroups: function() { - var findDef = /^[ \t]*#(ifn?def|if|else|endif)[ \t]*(.*)([ \t]*\/\/[^\n]+)?$/gm, + var findBlock = /^[ \t]*#(ifn?def|if|else|endif)[ \t]*(.*)([ \t]*\/\/[^\n]+)?$/gm, leave_out_defines = ['CONFIGURATION_H', 'CONFIGURATION_ADV_H']; $.each([$config, $config_adv], function(i, $v) { var ifStack = []; var r, txt = $v.text(); - while((r = findDef.exec(txt)) !== null) { + while((r = findBlock.exec(txt)) !== null) { var lineNum = txt.substr(0, r.index).lineCount(); var code = r[2].replace(/[ \t]*\/\/.*$/, ''); switch(r[1]) { @@ -431,34 +512,67 @@ window.configuratorApp = (function(){ }, /** - * Create fields for any defines that have none + * Create fields for defines in a config that have none + * Use define_groups data to group fields together */ - createFieldsForDefines: function(e) { + createFieldsForDefines: function(index) { var n = 0, fail_list = []; - $.each(define_list[e], function(i,name) { + var grouping = false, group_pattern, group_regex, subitem, group_section, group_class; + $.each(define_list[index], function(i,name) { var section = define_section[name]; if (section != 'hidden' && !$('#'+name).length) { var inf = define_info[name]; if (inf) { + var label_text = name, sublabel; + + // Is this field in a sequence? + // Then see if it's the second or after + var group = define_groups[index]; + if (grouping) { + if (name in group && group_pattern == group[name].pattern && group_section == section) { + subitem = true; + sublabel = group_regex.exec(name)[1]; + } + else + grouping = false; + } + // Start grouping? + if (!grouping && name in group) { + grouping = true; + subitem = false; + var grp = group[name]; + group_pattern = grp.pattern; + group_class = 'one_of_' + grp.count; + label_text = grp.title; + group_regex = new RegExp(group_pattern); + group_section = section; + sublabel = group_regex.exec(name)[1]; + } + var $ff = $('#'+section), $newfield, - avail = eval(inf.enabled), - $newlabel = $('<label>',{for:name,class:'added'}).text(name.toLabel()); + avail = eval(inf.enabled); - if (!avail) $newlabel.addClass('blocked'); + if (!(grouping && subitem)) { - // if (!(++n % 3)) - $newlabel.addClass('newline'); + var $newlabel = $('<label>',{for:name,class:'added'}).text(label_text.toLabel()); - $ff.append($newlabel); + $newlabel.unblock(avail); + + // if (!(++n % 3)) + $newlabel.addClass('newline'); + + $ff.append($newlabel); + + } // Multiple fields? if (inf.type == 'list') { for (var i=0; i<inf.size; i++) { var fieldname = i > 0 ? name+'-'+i : name; - $newfield = $('<input>',{type:'text',size:6,maxlength:10,id:fieldname,name:fieldname,class:'subitem added',disabled:!avail}); - if (!avail) $newfield.addClass('blocked'); + $newfield = $('<input>',{type:'text',size:6,maxlength:10,id:fieldname,name:fieldname,class:'subitem added',disabled:!avail}).unblock(avail); + if (grouping) $newfield.addClass(group_class); $ff.append($newfield); } } @@ -478,8 +592,12 @@ window.configuratorApp = (function(){ else { $newfield = inf.type == 'switch' ? $('<input>',{type:'checkbox'}) : $('<input>',{type:'text',size:10,maxlength:40}); } - $newfield.attr({id:name,name:name,class:'added',disabled:!avail}); - if (!avail) $newfield.addClass('blocked'); + $newfield.attr({id:name,name:name,class:'added',disabled:!avail}).unblock(avail); + if (grouping) { + $newfield.addClass(group_class); + if (sublabel) + $ff.append($('<span class="label"/>').text(sublabel.toTitleCase()).unblock(avail)); + } // Add the new field to the form $ff.append($newfield); } @@ -558,7 +676,7 @@ window.configuratorApp = (function(){ this.initDefineList(init_index, txt); // TODO: Find sequential names and group them // Allows related settings to occupy one line in the form - // this.refreshSequentialDefines(); + this.refreshDefineGroups(init_index); // Build the dependent defines list this.initDependentGroups(); // all config text // Get define_info for all known defines @@ -721,15 +839,13 @@ window.configuratorApp = (function(){ var inf = define_info[this]; if (inf && inf.enabled != 'true') { var $elm = $('#'+this), ena = eval(inf.enabled); + var isEnabled = (inf.type == 'switch') || self.defineIsEnabled(this); // Make any switch toggle also $('#'+this+'-switch').attr('disabled', !ena); - var alreadyEnabled = inf.type == 'switch' || self.defineIsEnabled(this); - $elm.attr('disabled', !(ena && alreadyEnabled)); - ena ? $elm.removeClass('blocked') : $elm.addClass('blocked'); + $elm.attr('disabled', !(ena && isEnabled)).unblock(ena); + //self.log("Setting " + this + " to " + (ena && isEnabled ? 'enabled' : 'disabled')); // Dim label for unavailable element - var $lbl = $elm.prev('label'); - if ($lbl.length) - ena ? $lbl.removeClass('blocked') : $lbl.addClass('blocked'); + $elm.prevAll('label, span.label').filter(':first').unblock(ena); } }); }); @@ -745,7 +861,8 @@ window.configuratorApp = (function(){ // Create a tooltip on the label if there is one if (inf.tooltip) { - var $tipme = $elm.prev('label'); + // previous label or + var $tipme = $elm.prevAll('label, span.label').filter(':first'); if ($tipme.length) { $tipme.unbind('mouseenter mouseleave'); $tipme.hover( @@ -972,7 +1089,7 @@ window.configuratorApp = (function(){ this.log('initFieldValue:' + name + ' to ' + val, 2); - // If the item has a checkbox then set enabled state too + // If the item is switchable then set enabled state too var $cb = $('#'+name+'-switch'), avail = eval(inf.enabled), on = true; if ($cb.length) { on = self.defineIsEnabled(name); @@ -983,20 +1100,17 @@ window.configuratorApp = (function(){ $.each(val.split(','),function(i,v){ var $e = i > 0 ? $('#'+name+'-'+i) : $elm; $e.val(v.trim()); - $e.attr('disabled', !on); - avail ? $e.removeClass('blocked') : $e.addClass('blocked'); + $e.attr('disabled', !(on && avail)).unblock(avail); }); } else { if (inf.type == 'toggle') val = val == inf.options[1]; $elm.attr('type') == 'checkbox' ? $elm.prop('checked', val) : $elm.val(''+val); - $elm.attr('disabled', !on); // enable/disable the form field (could also dim it) - avail ? $elm.removeClass('blocked') : $elm.addClass('blocked'); + $elm.attr('disabled', !(on && avail)).unblock(avail); // enable/disable the form field (could also dim it) } // set label color - var $lbl = $elm.prev('label'); - avail ? $lbl.removeClass('blocked') : $lbl.addClass('blocked'); + $elm.prevAll('label, span.label').filter(':first').unblock(avail); }, /** From f2710e11d1ea9ba9f0feaf7d67066836f990e425 Mon Sep 17 00:00:00 2001 From: Scott Lahteine <sourcetree@thinkyhead.com> Date: Mon, 2 Mar 2015 05:23:36 -0800 Subject: [PATCH 38/41] Optimize initial loading, code cleanup --- Marlin/configurator/css/configurator.css | 13 +- Marlin/configurator/js/configurator.js | 230 ++++++++++++----------- 2 files changed, 122 insertions(+), 121 deletions(-) diff --git a/Marlin/configurator/css/configurator.css b/Marlin/configurator/css/configurator.css index b660a78d14..88332075fb 100644 --- a/Marlin/configurator/css/configurator.css +++ b/Marlin/configurator/css/configurator.css @@ -91,17 +91,16 @@ label { margin-right: -450px; text-align: right; } -label.blocked, span.label.blocked { color: #AAA; } +label.blocked, label.added.blocked, label.added.blocked.sublabel { color: #AAA; } -span.label { - display: block; - float: left; +label.added.sublabel { + width: auto; margin: 11px -2.5em 0 1em; - padding-right: 3em; + padding: 0 3em 0 0; font-style: italic; color: #444; } -label+span.label { +label+label.added.sublabel { margin-left: 0; } @@ -341,5 +340,5 @@ select.one_of_4+span.label+select.one_of_4+span.label+select.one_of_4+span.label } -/*span.label.blocked, .blocked { display: none; }*/ +/*label.blocked, .blocked { display: none; }*/ diff --git a/Marlin/configurator/js/configurator.js b/Marlin/configurator/js/configurator.js index dc911f8c64..f14255ab28 100644 --- a/Marlin/configurator/js/configurator.js +++ b/Marlin/configurator/js/configurator.js @@ -146,6 +146,8 @@ window.configuratorApp = (function(){ $tooltip = $('#tooltip'), $cfg = $('#config_text'), $adv = $('#config_adv_text'), $config = $cfg.find('pre'), $config_adv = $adv.find('pre'), + config_file_list = [ boards_file, config_file, config_adv_file ], + config_list = [ $config, $config_adv ], define_info = {}, define_list = [[],[]], define_groups = [{},{}], @@ -199,10 +201,9 @@ window.configuratorApp = (function(){ // Read boards.h, Configuration.h, Configuration_adv.h var ajax_count = 0, success_count = 0; var loaded_items = {}; - var config_files = [boards_file, config_file, config_adv_file]; var isGithub = config.type == 'github'; var rateLimit = 0; - $.each(config_files, function(i,fname){ + $.each(config_file_list, function(i,fname){ var url = config_path(fname); $.ajax({ url: url, @@ -215,7 +216,7 @@ window.configuratorApp = (function(){ if (req.status == 200) { if (typeof req.responseText === 'string') { var txt = req.responseText; - loaded_items[fname] = function(){ self.fileLoaded(fname, txt); }; + loaded_items[fname] = function(){ self.fileLoaded(fname, txt, true); }; success_count++; // self.setMessage('The request for "'+fname+'" may be malformed.', 'error'); } @@ -236,13 +237,13 @@ window.configuratorApp = (function(){ timeLeft: Math.floor(txt.meta['X-RateLimit-Reset'] - Date.now()/1000), }; } - loaded_items[fname] = function(){ self.fileLoaded(fname, isGithub ? atob(txt.data.content.replace(/\s/g, '')) : txt); }; + loaded_items[fname] = function(){ self.fileLoaded(fname, isGithub ? atob(txt.data.content.replace(/\s/g, '')) : txt, true); }; success_count++; } }, complete: function() { ajax_count++; - if (ajax_count >= config_files.length) { + if (ajax_count >= config_file_list.length) { // If not all files loaded set an error if (success_count < ajax_count) self.setMessage('Unable to load configurations. Try the upload field.', 'error'); @@ -260,7 +261,7 @@ window.configuratorApp = (function(){ } } // Post-process all the loaded files - $.each(config_files, function(){ if (loaded_items[this]) loaded_items[this](); }); + $.each(config_file_list, function(){ if (loaded_items[this]) loaded_items[this](); }); } } }); @@ -270,9 +271,9 @@ window.configuratorApp = (function(){ /** * Make a download link visible and active */ - activateDownloadLink: function(adv) { - var $c = adv ? $config_adv : $config, txt = $c.text(); - var filename = (adv ? config_adv_file : config_file); + activateDownloadLink: function(cindex) { + var filename = config_file_list[cindex+1]; + var $c = config_list[cindex], txt = $c.text(); $c.prevAll('.download:first') .unbind('mouseover click') .mouseover(function() { @@ -303,8 +304,7 @@ window.configuratorApp = (function(){ .click(function(){ var $button = $(this); var zip = new JSZip(); - zip.file(config_file, $config.text()); - zip.file(config_adv_file, $config_adv.text()); + for (var e in [0,1]) zip.file(config_file_list[e+1], config_list[e].text()); var zipped = zip.generate({type:'blob'}); saveAs(zipped, $button.attr('download')); return false; @@ -341,10 +341,11 @@ window.configuratorApp = (function(){ /** * Get all the unique define names */ - initDefineList: function(index, txt) { + initDefineList: function(cindex) { var section = 'hidden', leave_out_defines = ['CONFIGURATION_H', 'CONFIGURATION_ADV_H'], define_sect = {}, + txt = config_list[cindex].text(), r, findDef = new RegExp('(@section|#define)[ \\t]+(\\w+)', 'gm'); while((r = findDef.exec(txt)) !== null) { var name = r[2]; @@ -353,27 +354,27 @@ window.configuratorApp = (function(){ else if ($.inArray(name, leave_out_defines) < 0 && !(name in define_section) && !(name in define_sect)) define_sect[name] = section; } - define_list[index] = Object.keys(define_sect); + define_list[cindex] = Object.keys(define_sect); $.extend(define_section, define_sect); - this.log(define_list[index], 2); + this.log(define_list[cindex], 2); }, /** * Find the defines in one of the configs that are just variants. * Group them together for form-building and other uses. */ - refreshDefineGroups: function(index) { + refreshDefineGroups: function(cindex) { var findDef = /^(|.*_)(([XYZE](MAX|MIN))|(E[0-3]|[XYZE01234])|MAX|MIN|(bed)?K[pid])(_.*|)$/; var match_prev, patt, title, nameList, groups = {}, match_section; - $.each(define_list[index], function() { + $.each(define_list[cindex], function(i, name) { if (match_prev) { - if (match_prev.exec(this) && define_section[this] == match_section) { - nameList.push(this); + if (match_prev.exec(name) && define_section[name] == match_section) { + nameList.push(name); } else { if (nameList.length > 1) { - $.each(nameList, function(){ - groups[this] = { + $.each(nameList, function(i,n){ + groups[n] = { pattern: patt, title: title, count: nameList.length @@ -384,7 +385,7 @@ window.configuratorApp = (function(){ } } if (!match_prev) { - var r = findDef.exec(this); + var r = findDef.exec(name); if (r != null) { switch(r[2]) { case '0': @@ -425,13 +426,13 @@ window.configuratorApp = (function(){ patt = '^' + r[1] + patt + r[7] + '$'; title = r[1] + title + r[7]; match_prev = new RegExp(patt); - match_section = define_section[this]; - nameList = [ this ]; + match_section = define_section[name]; + nameList = [ name ]; } } } }); - define_groups[index] = groups; + define_groups[cindex] = groups; }, /** @@ -442,7 +443,7 @@ window.configuratorApp = (function(){ initDependentGroups: function() { var findBlock = /^[ \t]*#(ifn?def|if|else|endif)[ \t]*(.*)([ \t]*\/\/[^\n]+)?$/gm, leave_out_defines = ['CONFIGURATION_H', 'CONFIGURATION_ADV_H']; - $.each([$config, $config_adv], function(i, $v) { + $.each(config_list, function(i, $v) { var ifStack = []; var r, txt = $v.text(); while((r = findBlock.exec(txt)) !== null) { @@ -481,7 +482,7 @@ window.configuratorApp = (function(){ var cond = c[0], line = c[1]; self.log("pop " + c[0], 4); if (dependentGroups[cond] === undefined) dependentGroups[cond] = []; - dependentGroups[cond].push({adv:i,start:line,end:lineNum}); + dependentGroups[cond].push({cindex:i,start:line,end:lineNum}); if (r[1] == 'else') { // Reverse the condition cond = (cond.indexOf('!') === 0) ? cond.substr(1) : ('!'+cond); @@ -504,9 +505,8 @@ window.configuratorApp = (function(){ */ initDefineInfo: function() { $.each(define_list, function(e,def_list){ - var adv = e == 1; - $.each(def_list, function(i,name) { - define_info[name] = self.getDefineInfo(name, adv); + $.each(def_list, function(i, name) { + define_info[name] = self.getDefineInfo(name, e); }); }); }, @@ -515,10 +515,12 @@ window.configuratorApp = (function(){ * Create fields for defines in a config that have none * Use define_groups data to group fields together */ - createFieldsForDefines: function(index) { - var n = 0, fail_list = []; - var grouping = false, group_pattern, group_regex, subitem, group_section, group_class; - $.each(define_list[index], function(i,name) { + createFieldsForDefines: function(cindex) { + // var n = 0; + var grouping = false, group = define_groups[cindex], + g_pattern, g_regex, g_subitem, g_section, g_class, + fail_list = []; + $.each(define_list[cindex], function(i, name) { var section = define_section[name]; if (section != 'hidden' && !$('#'+name).length) { var inf = define_info[name]; @@ -529,11 +531,10 @@ window.configuratorApp = (function(){ // Is this field in a sequence? // Then see if it's the second or after - var group = define_groups[index]; if (grouping) { - if (name in group && group_pattern == group[name].pattern && group_section == section) { - subitem = true; - sublabel = group_regex.exec(name)[1]; + if (name in group && g_pattern == group[name].pattern && g_section == section) { + g_subitem = true; + sublabel = g_regex.exec(name)[1]; } else grouping = false; @@ -541,20 +542,20 @@ window.configuratorApp = (function(){ // Start grouping? if (!grouping && name in group) { grouping = true; - subitem = false; + g_subitem = false; var grp = group[name]; - group_pattern = grp.pattern; - group_class = 'one_of_' + grp.count; + g_pattern = grp.pattern; + g_class = 'one_of_' + grp.count; label_text = grp.title; - group_regex = new RegExp(group_pattern); - group_section = section; - sublabel = group_regex.exec(name)[1]; + g_regex = new RegExp(g_pattern); + g_section = section; + sublabel = g_regex.exec(name)[1]; } var $ff = $('#'+section), $newfield, avail = eval(inf.enabled); - if (!(grouping && subitem)) { + if (!(grouping && g_subitem)) { var $newlabel = $('<label>',{for:name,class:'added'}).text(label_text.toLabel()); @@ -572,7 +573,7 @@ window.configuratorApp = (function(){ for (var i=0; i<inf.size; i++) { var fieldname = i > 0 ? name+'-'+i : name; $newfield = $('<input>',{type:'text',size:6,maxlength:10,id:fieldname,name:fieldname,class:'subitem added',disabled:!avail}).unblock(avail); - if (grouping) $newfield.addClass(group_class); + if (grouping) $newfield.addClass(g_class); $ff.append($newfield); } } @@ -594,9 +595,9 @@ window.configuratorApp = (function(){ } $newfield.attr({id:name,name:name,class:'added',disabled:!avail}).unblock(avail); if (grouping) { - $newfield.addClass(group_class); + $newfield.addClass(g_class); if (sublabel) - $ff.append($('<span class="label"/>').text(sublabel.toTitleCase()).unblock(avail)); + $ff.append($('<label>',{class:'added sublabel',for:name}).text(sublabel.toTitleCase()).unblock(avail)); } // Add the new field to the form $ff.append($newfield); @@ -606,7 +607,7 @@ window.configuratorApp = (function(){ fail_list.push(name); } }); - if (fail_list) this.log('Unable to parse:\n' + fail_list.join('\n'), 2); + if (fail_list.length) this.log('Unable to parse:\n' + fail_list.join('\n'), 2); }, /** @@ -615,24 +616,18 @@ window.configuratorApp = (function(){ handleFileLoad: function(txt, $uploader) { txt += ''; var filename = $uploader.val().replace(/.*[\/\\](.*)$/, '$1'); - switch(filename) { - case boards_file: - case config_file: - case config_adv_file: - this.fileLoaded(filename, txt); - break; - default: - this.setMessage("Can't parse '"+filename+"'!"); - break; - } + if ($.inArray(filename, config_file_list)) + this.fileLoaded(filename, txt); + else + this.setMessage("Can't parse '"+filename+"'!"); }, /** * Process a file after it's been successfully loaded */ - fileLoaded: function(filename, txt) { + fileLoaded: function(filename, txt, wait) { this.log("fileLoaded:"+filename,4); - var err, init_index; + var err, cindex; switch(filename) { case boards_file: this.initBoardsFromText(txt); @@ -644,10 +639,12 @@ window.configuratorApp = (function(){ $config.text(txt); total_config_lines = txt.lineCount(); // this.initThermistorList(txt); - init_index = 0; + if (!wait) cindex = 0; has_config = true; - if (has_config_adv) + if (has_config_adv) { this.activateDownloadAllLink(); + if (wait) cindex = 2; + } } else { err = boards_file; @@ -657,10 +654,12 @@ window.configuratorApp = (function(){ if (has_config) { $config_adv.text(txt); total_config_adv_lines = txt.lineCount(); - init_index = 1; + if (!wait) cindex = 1; has_config_adv = true; - if (has_config) + if (has_config) { this.activateDownloadAllLink(); + if (wait) cindex = 2; + } } else { err = config_file; @@ -668,31 +667,38 @@ window.configuratorApp = (function(){ break; } // When a config file loads defines need update - if (init_index != null) { - var adv = init_index == 1; - // Purge old fields from the form, clear the define list - this.purgeAddedFields(init_index); - // Build the define_list - this.initDefineList(init_index, txt); - // TODO: Find sequential names and group them - // Allows related settings to occupy one line in the form - this.refreshDefineGroups(init_index); - // Build the dependent defines list - this.initDependentGroups(); // all config text - // Get define_info for all known defines - this.initDefineInfo(); // all config text - // Create new fields - this.createFieldsForDefines(init_index); // create new fields - // Init the fields, set values, etc - this.refreshConfigForm(init_index); - this.activateDownloadLink(adv); - } + if (cindex != null) this.prepareConfigData(cindex); + this.setMessage(err ? 'Please upload a "' + boards_file + '" file first!' : '"' + filename + '" loaded successfully.', err ? 'error' : 'message' ); }, + prepareConfigData: function(cindex) { + var inds = (cindex == 2) ? [ 0, 1 ] : [ cindex ]; + $.each(inds, function(i,e){ + // Purge old fields from the form, clear the define list + self.purgeAddedFields(e); + // Build the define_list + self.initDefineList(e); + // TODO: Find sequential names and group them + // Allows related settings to occupy one line in the form + self.refreshDefineGroups(e); + }); + // Build the dependent defines list + this.initDependentGroups(); // all config text + // Get define_info for all known defines + this.initDefineInfo(); // all config text + $.each(inds, function(i,e){ + // Create new fields + self.createFieldsForDefines(e); // create new fields + // Init the fields, set values, etc + self.refreshConfigForm(e); + self.activateDownloadLink(e); + }); + }, + /** * Add initial enhancements to the existing form */ @@ -782,7 +788,7 @@ window.configuratorApp = (function(){ /** * Update all fields on the form after loading a configuration */ - refreshConfigForm: function(init_index) { + refreshConfigForm: function(cindex) { /** * Any manually-created form elements will remain @@ -803,13 +809,13 @@ window.configuratorApp = (function(){ // Init all existing fields, getting define info for those that need it // refreshing the options and updating their current values - $.each(define_list[init_index], function() { - if ($('#'+this).length) { - self.initField(this); - self.initFieldValue(this); + $.each(define_list[cindex], function(i, name) { + if ($('#'+name).length) { + self.initField(name); + self.initFieldValue(name); } else - self.log(this + " is not on the page yet.", 2); + self.log(name + " is not on the page yet.", 2); }); // Set enabled state based on dependencies @@ -835,24 +841,23 @@ window.configuratorApp = (function(){ // check and update enabled state for the field. // $.each(define_list, function(e,def_list){ - $.each(def_list, function() { - var inf = define_info[this]; + $.each(def_list, function(i, name) { + var inf = define_info[name]; if (inf && inf.enabled != 'true') { - var $elm = $('#'+this), ena = eval(inf.enabled); - var isEnabled = (inf.type == 'switch') || self.defineIsEnabled(this); + var $elm = $('#'+name), ena = eval(inf.enabled); + var isEnabled = (inf.type == 'switch') || self.defineIsEnabled(name); // Make any switch toggle also - $('#'+this+'-switch').attr('disabled', !ena); + $('#'+name+'-switch').attr('disabled', !ena); $elm.attr('disabled', !(ena && isEnabled)).unblock(ena); - //self.log("Setting " + this + " to " + (ena && isEnabled ? 'enabled' : 'disabled')); - // Dim label for unavailable element - $elm.prevAll('label, span.label').filter(':first').unblock(ena); + //self.log("Setting " + name + " to " + (ena && isEnabled ? 'enabled' : 'disabled')); + $('label[for="'+name+'"]').unblock(ena); } }); }); }, /** - * Make the field responsive, add optional tooltip, enabler box + * Make a field responsive, tooltip its label(s), add enabler if needed */ initField: function(name) { this.log("initField:"+name,4); @@ -861,8 +866,8 @@ window.configuratorApp = (function(){ // Create a tooltip on the label if there is one if (inf.tooltip) { - // previous label or - var $tipme = $elm.prevAll('label, span.label').filter(':first'); + // label for the item + var $tipme = $('label[for="'+name+'"]'); if ($tipme.length) { $tipme.unbind('mouseenter mouseleave'); $tipme.hover( @@ -1071,7 +1076,7 @@ window.configuratorApp = (function(){ // Scroll to the altered text if it isn't visible var halfHeight = $c.height()/2, scrollHeight = $c.prop('scrollHeight'), - lineHeight = scrollHeight/(inf.adv ? total_config_adv_lines : total_config_lines), + lineHeight = scrollHeight/[total_config_lines, total_config_adv_lines][inf.cindex], textScrollY = (inf.lineNum * lineHeight - halfHeight).limit(0, scrollHeight - 1); if (always || Math.abs($c.prop('scrollTop') - textScrollY) > halfHeight) { @@ -1109,18 +1114,17 @@ window.configuratorApp = (function(){ $elm.attr('disabled', !(on && avail)).unblock(avail); // enable/disable the form field (could also dim it) } - // set label color - $elm.prevAll('label, span.label').filter(':first').unblock(avail); + $('label[for="'+name+'"]').unblock(avail); }, /** * Purge added fields and all their define info */ - purgeAddedFields: function(index) { - $.each(define_list[index], function(){ - $('#'+this + ",[id^='"+this+"-'],label[for='"+this+"']").filter('.added').remove(); + purgeAddedFields: function(cindex) { + $.each(define_list[cindex], function(i, name){ + $('#'+name + ",[id^='"+name+"-'],label[for='"+name+"']").filter('.added').remove(); }); - define_list[index] = []; + define_list[cindex] = []; }, /** @@ -1133,16 +1137,15 @@ window.configuratorApp = (function(){ * - Gather nearby comments to be used as tooltips. * - Look for JSON in nearby comments to use as select options. */ - getDefineInfo: function(name, adv) { - if (adv === undefined) adv = false; + getDefineInfo: function(name, cindex) { + if (cindex === undefined) cindex = 0; this.log('getDefineInfo:'+name,4); - var $c = adv ? $config_adv : $config, - txt = $c.text(); + var $c = config_list[cindex], txt = $c.text(); // a switch line with no value var findDef = new RegExp('^([ \\t]*//)?([ \\t]*#define[ \\t]+' + name + ')([ \\t]*/[*/].*)?$', 'm'), result = findDef.exec(txt), - info = { type:0, adv:adv, field:$c[0], val_i: 2 }; + info = { type:0, cindex:cindex, field:$c[0], val_i: 2 }; if (result !== null) { $.extend(info, { val_i: 1, @@ -1250,10 +1253,9 @@ window.configuratorApp = (function(){ // See if this define is enabled conditionally var enable_cond = ''; - var adv_index = adv ? 1 : 0; $.each(dependentGroups, function(cond,dat){ $.each(dat, function(i,o){ - if (o.adv == adv_index && lineNum > o.start && lineNum < o.end) { + if (o.cindex == cindex && lineNum > o.start && lineNum < o.end) { // self.log(name + " is in range " + o.start + "-" + o.end, 2); // if this setting is in a range, conditions are added if (enable_cond != '') enable_cond += ' && '; From 1149c24b86535d564c984a02eadf5ea70670bf8e Mon Sep 17 00:00:00 2001 From: Scott Lahteine <sourcetree@thinkyhead.com> Date: Fri, 6 Mar 2015 08:48:53 -0800 Subject: [PATCH 39/41] More grouping, cleanup, start on overrides --- Marlin/configurator/config/Configuration.h | 2 +- Marlin/configurator/index.html | 3 - Marlin/configurator/js/configurator.js | 285 ++++++++++++--------- 3 files changed, 166 insertions(+), 124 deletions(-) diff --git a/Marlin/configurator/config/Configuration.h b/Marlin/configurator/config/Configuration.h index 253567fc95..272a0eb66d 100644 --- a/Marlin/configurator/config/Configuration.h +++ b/Marlin/configurator/config/Configuration.h @@ -347,7 +347,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of // @section machine // For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1 -// :{0:'Active Low',1:'Active High'} +// :{0:'Low',1:'High'} #define X_ENABLE_ON 0 #define Y_ENABLE_ON 0 #define Z_ENABLE_ON 0 diff --git a/Marlin/configurator/index.html b/Marlin/configurator/index.html index a804e7c740..93d2ae553f 100644 --- a/Marlin/configurator/index.html +++ b/Marlin/configurator/index.html @@ -65,9 +65,6 @@ <label class="newline">Temp Sensor 2:</label><select name="TEMP_SENSOR_2"></select> <label class="newline">Bed Temp Sensor:</label><select name="TEMP_SENSOR_BED"></select> - <label class="newline">Redundant Sensor:</label> - <input name="TEMP_SENSOR_1_AS_REDUNDANT" type="checkbox" value="1" checked /> - <label>Max Diff:</label> <input name="MAX_REDUNDANT_TEMP_SENSOR_DIFF" type="text" size="3" maxlength="2" /> diff --git a/Marlin/configurator/js/configurator.js b/Marlin/configurator/js/configurator.js index f14255ab28..ff41fa39c0 100644 --- a/Marlin/configurator/js/configurator.js +++ b/Marlin/configurator/js/configurator.js @@ -85,7 +85,9 @@ String.prototype.prePad = function(len, chr) { return len ? this.lpad(len, chr) String.prototype.zeroPad = function(len) { return this.prePad(len, '0'); }; String.prototype.toHTML = function() { return jQuery('<div>').text(this).html(); }; String.prototype.regEsc = function() { return this.replace(/[.?*+^$[\]\\(){}|-]/g, "\\$&"); } -String.prototype.lineCount = function() { var len = this.split(/\r?\n|\r/).length; return len > 0 ? len - 1 : 0; }; +String.prototype.lineCount = function(ind) { var len = (ind === undefined ? this : this.substr(0,ind*1)).split(/\r?\n|\r/).length; return len > 0 ? len - 1 : 0; }; +String.prototype.line = function(num) { var arr = this.split(/\r?\n|\r/); return num < arr.length ? arr[1*num] : ''; }; +String.prototype.replaceLine = function(num,txt) { var arr = this.split(/\r?\n|\r/); if (num < arr.length) { arr[num] = txt; return arr.join('\n'); } else return this; } String.prototype.toLabel = function() { return this.replace(/[\[\]]/g, '').replace(/_/g, ' ').toTitleCase(); } String.prototype.toTitleCase = function() { return this.replace(/([A-Z])(\w+)/gi, function(m,p1,p2) { return p1.toUpperCase() + p2.toLowerCase(); }); } Number.prototype.limit = function(m1, m2) { @@ -148,11 +150,12 @@ window.configuratorApp = (function(){ $config = $cfg.find('pre'), $config_adv = $adv.find('pre'), config_file_list = [ boards_file, config_file, config_adv_file ], config_list = [ $config, $config_adv ], - define_info = {}, - define_list = [[],[]], - define_groups = [{},{}], - define_section = {}, - dependentGroups = {}, + define_info = {}, // info for all defines, by name + define_list = [[],[]], // arrays with all define names + define_occur = [{},{}], // lines where defines occur in each file + define_groups = [{},{}], // similarly-named defines that group in the form + define_section = {}, // the section of each define + dependent_groups = {}, boards_list = {}, therms_list = {}, total_config_lines, @@ -339,32 +342,62 @@ window.configuratorApp = (function(){ }, /** - * Get all the unique define names + * Get all the unique define names, building lists that will be used + * when gathering info about each define. + * + * define_list[c][j] : Define names in each config (in order of occurrence) + * define_section[name] : Section where define should appear in the form + * define_occur[c][name][i] : Lines in each config where the same define occurs + * .cindex Config file index + * .lineNum Line number of the occurrence + * .line The occurrence line */ initDefineList: function(cindex) { var section = 'hidden', leave_out_defines = ['CONFIGURATION_H', 'CONFIGURATION_ADV_H'], define_sect = {}, + occ_list = {}, txt = config_list[cindex].text(), - r, findDef = new RegExp('(@section|#define)[ \\t]+(\\w+)', 'gm'); + r, findDef = new RegExp('^.*(@section|#define)[ \\t]+(\\w+).*$', 'gm'); while((r = findDef.exec(txt)) !== null) { var name = r[2]; - if (r[1] == '@section') + if (r[1] == '@section') { section = name; - else if ($.inArray(name, leave_out_defines) < 0 && !(name in define_section) && !(name in define_sect)) - define_sect[name] = section; + } + else if ($.inArray(name, leave_out_defines) < 0) { + var lineNum = txt.lineCount(r.index), + inst = { cindex:cindex, lineNum:lineNum, line:r[0] }, + in_sect = (name in define_sect); + if (!in_sect) { + occ_list[name] = [ inst ]; + } + if (!(name in define_section) && !in_sect) { + define_sect[name] = section; // new first-time define + } + else { + occ_list[name].push(inst); + } + } } define_list[cindex] = Object.keys(define_sect); + define_occur[cindex] = occ_list; $.extend(define_section, define_sect); this.log(define_list[cindex], 2); + this.log(occ_list, 2); + this.log(define_sect, 2); }, /** * Find the defines in one of the configs that are just variants. * Group them together for form-building and other uses. + * + * define_groups[c][name] + * .pattern regexp matching items in the group + * .title title substitution + * .count number of items in the group */ refreshDefineGroups: function(cindex) { - var findDef = /^(|.*_)(([XYZE](MAX|MIN))|(E[0-3]|[XYZE01234])|MAX|MIN|(bed)?K[pid])(_.*|)$/; + var findDef = /^(|.*_)(([XYZE](MAX|MIN))|(E[0-3]|[XYZE01234])|MAX|MIN|(bed)?K[pid]|HOTEND|HPB|JAPAN|WESTERN|LEFT|RIGHT|BACK|FRONT|[XYZ]_POINT)(_.*|)$/i; var match_prev, patt, title, nameList, groups = {}, match_section; $.each(define_list[cindex], function(i, name) { if (match_prev) { @@ -387,7 +420,8 @@ window.configuratorApp = (function(){ if (!match_prev) { var r = findDef.exec(name); if (r != null) { - switch(r[2]) { + title = ''; + switch(r[2].toUpperCase()) { case '0': patt = '([0123])'; title = 'N'; @@ -400,18 +434,31 @@ window.configuratorApp = (function(){ patt = 'E([0-3])'; title = 'E'; break; - case 'bedKp': + case 'BEDKP': patt = 'bed(K[pid])'; title = 'BED_PID'; break; - case 'Kp': + case 'KP': patt = '(K[pid])'; title = 'PID'; break; + case 'LEFT': + case 'RIGHT': + case 'BACK': + case 'FRONT': + patt = '([LRBF])(EFT|IGHT|ACK|RONT)'; + break; case 'MAX': case 'MIN': patt = '(MAX|MIN)'; - title = ''; + break; + case 'HOTEND': + case 'HPB': + patt = '(HOTEND|HPB)'; + break; + case 'JAPAN': + case 'WESTERN': + patt = '(JAPAN|WESTERN)'; break; case 'XMIN': case 'XMAX': @@ -425,7 +472,7 @@ window.configuratorApp = (function(){ if (patt) { patt = '^' + r[1] + patt + r[7] + '$'; title = r[1] + title + r[7]; - match_prev = new RegExp(patt); + match_prev = new RegExp(patt, 'i'); match_section = define_section[name]; nameList = [ name ]; } @@ -433,21 +480,29 @@ window.configuratorApp = (function(){ } }); define_groups[cindex] = groups; + this.log(define_groups[cindex], 2); }, /** - * Get all condition blocks and their line ranges. - * Conditions may control multiple line-ranges - * across both config files. + * Get all conditional blocks and their line ranges + * and store them in the dependent_groups list. + * + * dependent_groups[condition][i] + * + * .cindex config file index + * .start starting line + * .end ending line + * */ initDependentGroups: function() { var findBlock = /^[ \t]*#(ifn?def|if|else|endif)[ \t]*(.*)([ \t]*\/\/[^\n]+)?$/gm, leave_out_defines = ['CONFIGURATION_H', 'CONFIGURATION_ADV_H']; + dependent_groups = {}; $.each(config_list, function(i, $v) { var ifStack = []; var r, txt = $v.text(); while((r = findBlock.exec(txt)) !== null) { - var lineNum = txt.substr(0, r.index).lineCount(); + var lineNum = txt.lineCount(r.index); var code = r[2].replace(/[ \t]*\/\/.*$/, ''); switch(r[1]) { case 'if': @@ -481,8 +536,8 @@ window.configuratorApp = (function(){ if (c) { var cond = c[0], line = c[1]; self.log("pop " + c[0], 4); - if (dependentGroups[cond] === undefined) dependentGroups[cond] = []; - dependentGroups[cond].push({cindex:i,start:line,end:lineNum}); + if (dependent_groups[cond] === undefined) dependent_groups[cond] = []; + dependent_groups[cond].push({cindex:i,start:line,end:lineNum}); if (r[1] == 'else') { // Reverse the condition cond = (cond.indexOf('!') === 0) ? cond.substr(1) : ('!'+cond); @@ -544,11 +599,11 @@ window.configuratorApp = (function(){ grouping = true; g_subitem = false; var grp = group[name]; - g_pattern = grp.pattern; - g_class = 'one_of_' + grp.count; - label_text = grp.title; - g_regex = new RegExp(g_pattern); g_section = section; + g_class = 'one_of_' + grp.count; + g_pattern = grp.pattern; + g_regex = new RegExp(g_pattern, 'i'); + label_text = grp.title; sublabel = g_regex.exec(name)[1]; } @@ -596,8 +651,9 @@ window.configuratorApp = (function(){ $newfield.attr({id:name,name:name,class:'added',disabled:!avail}).unblock(avail); if (grouping) { $newfield.addClass(g_class); - if (sublabel) + if (sublabel) { $ff.append($('<label>',{class:'added sublabel',for:name}).text(sublabel.toTitleCase()).unblock(avail)); + } } // Add the new field to the form $ff.append($newfield); @@ -823,33 +879,18 @@ window.configuratorApp = (function(){ }, /** - * Enable / disable fields based on condition tests + * Enable / disable fields in dependent groups + * based on their dependencies. */ refreshDependentFields: function() { - // Simplest way is to go through all define_info - // and run a test on all fields that have one. - // - // Each define_info caches its enable test as code. - // - // The fields that act as switches for these dependencies - // are not currently modified, but they will soon be. - // - // Once all conditions have been gathered into define_info - // the conditions can be scraped for define names. - // - // Those named fields will be given a .change action to - // check and update enabled state for the field. - // $.each(define_list, function(e,def_list){ $.each(def_list, function(i, name) { var inf = define_info[name]; if (inf && inf.enabled != 'true') { var $elm = $('#'+name), ena = eval(inf.enabled); var isEnabled = (inf.type == 'switch') || self.defineIsEnabled(name); - // Make any switch toggle also $('#'+name+'-switch').attr('disabled', !ena); $elm.attr('disabled', !(ena && isEnabled)).unblock(ena); - //self.log("Setting " + name + " to " + (ena && isEnabled ? 'enabled' : 'disabled')); $('label[for="'+name+'"]').unblock(ena); } }); @@ -873,10 +914,10 @@ window.configuratorApp = (function(){ $tipme.hover( function() { if ($('#tipson input').prop('checked')) { - var pos = $tipme.position(); + var pos = $tipme.position(), px = $tipme.width()/2; $tooltip.html(inf.tooltip) .append('<span>') - .css({bottom:($tooltip.parent().outerHeight()-pos.top)+'px',left:(pos.left+70)+'px'}) + .css({bottom:($tooltip.parent().outerHeight()-pos.top+10)+'px',left:(pos.left+px)+'px'}) .show(); if (hover_timer) { clearTimeout(hover_timer); @@ -957,33 +998,31 @@ window.configuratorApp = (function(){ }, /** - * Get the current value of a #define (from the config text) + * Get the current value of a #define */ defineValue: function(name) { this.log('defineValue:'+name,4); var inf = define_info[name]; if (inf == null) return 'n/a'; - // var result = inf.regex.exec($(inf.field).text()); - var result = inf.regex.exec(inf.line); + var r = inf.regex.exec(inf.line), val = r[inf.val_i]; - this.log(result,2); + this.log(r,2); - return (inf.type == 'switch') ? (result[inf.val_i] === undefined || result[inf.val_i].trim() != '//') : result[inf.val_i]; + return (inf.type == 'switch') ? (val === undefined || val.trim() != '//') : val; }, /** - * Get the current enabled state of a #define (from the config text) + * Get the current enabled state of a #define */ defineIsEnabled: function(name) { this.log('defineIsEnabled:'+name,4); var inf = define_info[name]; if (inf == null) return false; - // var result = inf.regex.exec($(inf.field).text()); - var result = inf.regex.exec(inf.line); + var r = inf.regex.exec(inf.line); - this.log(result,2); + this.log(r,2); - var on = result[1] != null ? result[1].trim() != '//' : true; + var on = r[1] != null ? r[1].trim() != '//' : true; this.log(name + ' = ' + on, 2); return on; @@ -1054,7 +1093,7 @@ window.configuratorApp = (function(){ var hilite_token = '[HIGHLIGHTER-TOKEN]'; - txt = txt.replace(inf.line, hilite_token + newline); + txt = txt.replaceLine(inf.lineNum, hilite_token + newline); // for override line and lineNum would be changed inf.line = newline; // Convert txt into HTML before storing @@ -1131,82 +1170,84 @@ window.configuratorApp = (function(){ * Get information about a #define from configuration file text: * * - Pre-examine the #define for its prefix, value position, suffix, etc. - * - Construct RegExp's for the #define to quickly find (and replace) values. + * - Construct RegExp's for the #define to find and replace values. * - Store the existing #define line as a fast key to finding it later. - * - Determine the line number of the #define so it can be scrolled to. + * - Determine the line number of the #define * - Gather nearby comments to be used as tooltips. - * - Look for JSON in nearby comments to use as select options. + * - Look for JSON in nearby comments for use as select options. + * + * define_info[name] + * .type type of define: switch, list, quoted, plain, or toggle + * .size the number of items in a "list" type + * .options select options, if any + * .cindex config index + * .field pre containing the config text (config_list[cindex][0]) + * .line the full line from the config text + * .pre any text preceding #define + * .define the "#define NAME" text (may have leading spaces) + * .post the text following the "#define NAME val" part + * .regex regexp to get the value from the line + * .repl regexp to replace the value in the line + * .val_i the value's index in the .regex result */ getDefineInfo: function(name, cindex) { if (cindex === undefined) cindex = 0; this.log('getDefineInfo:'+name,4); - var $c = config_list[cindex], txt = $c.text(); + var $c = config_list[cindex], txt = $c.text(), + info = { type:0, cindex:cindex, field:$c[0], val_i:2 }, post; // a switch line with no value - var findDef = new RegExp('^([ \\t]*//)?([ \\t]*#define[ \\t]+' + name + ')([ \\t]*/[*/].*)?$', 'm'), - result = findDef.exec(txt), - info = { type:0, cindex:cindex, field:$c[0], val_i: 2 }; - if (result !== null) { + var find = new RegExp('^([ \\t]*//)?([ \\t]*#define[ \\t]+' + name + ')([ \\t]*(/[*/].*)?)$', 'm'), + r = find.exec(txt); + if (r !== null) { + post = r[3] == null ? '' : r[3]; $.extend(info, { - val_i: 1, - type: 'switch', - line: result[0], // whole line - pre: result[1] == null ? '' : result[1].replace('//',''), - define: result[2], - post: result[3] == null ? '' : result[3] + type: 'switch', + val_i: 1, + regex: new RegExp('([ \\t]*//)?([ \\t]*' + r[2].regEsc() + post.regEsc() + ')', 'm'), + repl: new RegExp('([ \\t]*)(\/\/)?([ \\t]*' + r[2].regEsc() + post.regEsc() + ')', 'm') }); - info.regex = new RegExp('([ \\t]*//)?([ \\t]*' + info.define.regEsc() + info.post.regEsc() + ')', 'm'); - info.repl = new RegExp('([ \\t]*)(\/\/)?([ \\t]*' + info.define.regEsc() + info.post.regEsc() + ')', 'm'); } else { // a define with curly braces - findDef = new RegExp('^(.*//)?(.*#define[ \\t]+' + name + '[ \\t]+)(\{[^\}]*\})([ \\t]*/[*/].*)?$', 'm'); - result = findDef.exec(txt); - if (result !== null) { + find = new RegExp('^(.*//)?(.*#define[ \\t]+' + name + '[ \\t]+)(\{[^\}]*\})([ \\t]*(/[*/].*)?)$', 'm'); + r = find.exec(txt); + if (r !== null) { + post = r[4] == null ? '' : r[4]; $.extend(info, { - type: 'list', - line: result[0], - pre: result[1] == null ? '' : result[1].replace('//',''), - define: result[2], - size: result[3].split(',').length, - post: result[4] == null ? '' : result[4] + type: 'list', + size: r[3].split(',').length, + regex: new RegExp('([ \\t]*//)?[ \\t]*' + r[2].regEsc() + '\{([^\}]*)\}' + post.regEsc(), 'm'), + repl: new RegExp('(([ \\t]*//)?[ \\t]*' + r[2].regEsc() + '\{)[^\}]*(\}' + post.regEsc() + ')', 'm') }); - info.regex = new RegExp('([ \\t]*//)?[ \\t]*' + info.define.regEsc() + '\{([^\}]*)\}' + info.post.regEsc(), 'm'); - info.repl = new RegExp('(([ \\t]*//)?[ \\t]*' + info.define.regEsc() + '\{)[^\}]*(\}' + info.post.regEsc() + ')', 'm'); } else { // a define with quotes - findDef = new RegExp('^(.*//)?(.*#define[ \\t]+' + name + '[ \\t]+)("[^"]*")([ \\t]*/[*/].*)?$', 'm'); - result = findDef.exec(txt); - if (result !== null) { + find = new RegExp('^(.*//)?(.*#define[ \\t]+' + name + '[ \\t]+)("[^"]*")([ \\t]*(/[*/].*)?)$', 'm'); + r = find.exec(txt); + if (r !== null) { + post = r[4] == null ? '' : r[4]; $.extend(info, { - type: 'quoted', - line: result[0], - pre: result[1] == null ? '' : result[1].replace('//',''), - define: result[2], - post: result[4] == null ? '' : result[4] + type: 'quoted', + regex: new RegExp('([ \\t]*//)?[ \\t]*' + r[2].regEsc() + '"([^"]*)"' + post.regEsc(), 'm'), + repl: new RegExp('(([ \\t]*//)?[ \\t]*' + r[2].regEsc() + '")[^"]*("' + post.regEsc() + ')', 'm') }); - info.regex = new RegExp('([ \\t]*//)?[ \\t]*' + info.define.regEsc() + '"([^"]*)"' + info.post.regEsc(), 'm'); - info.repl = new RegExp('(([ \\t]*//)?[ \\t]*' + info.define.regEsc() + '")[^"]*("' + info.post.regEsc() + ')', 'm'); } else { // a define with no quotes - findDef = new RegExp('^([ \\t]*//)?([ \\t]*#define[ \\t]+' + name + '[ \\t]+)(\\S*)([ \\t]*/[*/].*)?$', 'm'); - result = findDef.exec(txt); - if (result !== null) { + find = new RegExp('^([ \\t]*//)?([ \\t]*#define[ \\t]+' + name + '[ \\t]+)(\\S*)([ \\t]*(/[*/].*)?)$', 'm'); + r = find.exec(txt); + if (r !== null) { + post = r[4] == null ? '' : r[4]; $.extend(info, { - type: 'plain', - line: result[0], - pre: result[1] == null ? '' : result[1].replace('//',''), - define: result[2], - post: result[4] == null ? '' : result[4] + type: 'plain', + regex: new RegExp('([ \\t]*//)?[ \\t]*' + r[2].regEsc() + '(\\S*)' + post.regEsc(), 'm'), + repl: new RegExp('(([ \\t]*//)?[ \\t]*' + r[2].regEsc() + ')\\S*(' + post.regEsc() + ')', 'm') }); - if (result[3].match(/false|true/)) { + if (r[3].match(/false|true/)) { info.type = 'toggle'; info.options = ['false','true']; } - info.regex = new RegExp('([ \\t]*//)?[ \\t]*' + info.define.regEsc() + '(\\S*)' + info.post.regEsc(), 'm'); - info.repl = new RegExp('(([ \\t]*//)?[ \\t]*' + info.define.regEsc() + ')\\S*(' + info.post.regEsc() + ')', 'm'); } } } @@ -1214,19 +1255,25 @@ window.configuratorApp = (function(){ // Success? if (info.type) { + $.extend(info, { + line: r[0], + pre: r[1] == null ? '' : r[1].replace('//',''), + define: r[2], + post: post + }); // Get the end-of-line comment, if there is one var tooltip = '', eoltip = ''; - findDef = new RegExp('.*#define[ \\t].*/[/*]+[ \\t]*(.*)'); - if (info.line.search(findDef) >= 0) - eoltip = tooltip = info.line.replace(findDef, '$1'); + find = new RegExp('.*#define[ \\t].*/[/*]+[ \\t]*(.*)'); + if (info.line.search(find) >= 0) + eoltip = tooltip = info.line.replace(find, '$1'); // Get all the comments immediately before the item - var r, s; - findDef = new RegExp('(([ \\t]*(//|#)[^\n]+\n){1,4})' + info.line.regEsc(), 'g'); - if (r = findDef.exec(txt)) { + var s; + find = new RegExp('(([ \\t]*(//|#)[^\n]+\n){1,4})' + info.line.regEsc(), 'g'); + if (r = find.exec(txt)) { // Get the text of the found comments - findDef = new RegExp('^[ \\t]*//+[ \\t]*(.*)[ \\t]*$', 'gm'); - while((s = findDef.exec(r[1])) !== null) { + find = new RegExp('^[ \\t]*//+[ \\t]*(.*)[ \\t]*$', 'gm'); + while((s = find.exec(r[1])) !== null) { var tip = s[1].replace(/[ \\t]*(={5,}|(#define[ \\t]+.*|@section[ \\t]+\w+))[ \\t]*/g, ''); if (tip.length) { if (tip.match(/^#define[ \\t]/) != null) tooltip = eoltip; @@ -1248,16 +1295,14 @@ window.configuratorApp = (function(){ } // Add .tooltip and .lineNum properties to the info - findDef = new RegExp('^'+name); // Strip the name from the tooltip + find = new RegExp('^'+name); // Strip the name from the tooltip var lineNum = this.getLineNumberOfText(info.line, txt); // See if this define is enabled conditionally var enable_cond = ''; - $.each(dependentGroups, function(cond,dat){ + $.each(dependent_groups, function(cond,dat){ $.each(dat, function(i,o){ if (o.cindex == cindex && lineNum > o.start && lineNum < o.end) { - // self.log(name + " is in range " + o.start + "-" + o.end, 2); - // if this setting is in a range, conditions are added if (enable_cond != '') enable_cond += ' && '; enable_cond += '(' + cond + ')'; } @@ -1265,7 +1310,7 @@ window.configuratorApp = (function(){ }); $.extend(info, { - tooltip: '<strong>'+name+'</strong> '+tooltip.trim().replace(findDef,'').toHTML(), + tooltip: '<strong>'+name+'</strong> '+tooltip.trim().replace(find,'').toHTML(), lineNum: lineNum, switchable: (info.type != 'switch' && info.line.match(/^[ \t]*\/\//)) || false, // Disabled? Mark as "switchable" enabled: enable_cond ? enable_cond : 'true' @@ -1285,7 +1330,7 @@ window.configuratorApp = (function(){ */ getLineNumberOfText: function(line, txt) { var pos = txt.indexOf(line); - return (pos < 0) ? pos : txt.substr(0, pos).lineCount(); + return (pos < 0) ? pos : txt.lineCount(pos); }, /** From 0f3b7d5575d6fa17ddf56b8ec5d6b51d3490dbee Mon Sep 17 00:00:00 2001 From: Scott Lahteine <sourcetree@thinkyhead.com> Date: Sat, 7 Mar 2015 01:07:40 -0800 Subject: [PATCH 40/41] Update annotated configurations - Also update base configs --- Marlin/Configuration.h | 27 ++-- Marlin/Configuration_adv.h | 4 +- Marlin/configurator/config/Configuration.h | 146 ++++++++++-------- .../configurator/config/Configuration_adv.h | 5 + 4 files changed, 101 insertions(+), 81 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index f3723de18c..91e1ecf713 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -346,13 +346,14 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of #define DISABLE_E false // For all extruders #define DISABLE_INACTIVE_EXTRUDER true //disable only inactive extruders and keep active extruder enabled +// Invert the stepper direction. Change (or reverse the motor connector) if an axis goes the wrong way. #define INVERT_X_DIR true // for Mendel set to false, for Orca set to true #define INVERT_Y_DIR false // for Mendel set to true, for Orca set to false #define INVERT_Z_DIR true // for Mendel set to false, for Orca set to true -#define INVERT_E0_DIR false // for direct drive extruder v9 set to true, for geared extruder set to false -#define INVERT_E1_DIR false // for direct drive extruder v9 set to true, for geared extruder set to false -#define INVERT_E2_DIR false // for direct drive extruder v9 set to true, for geared extruder set to false -#define INVERT_E3_DIR false // for direct drive extruder v9 set to true, for geared extruder set to false +#define INVERT_E0_DIR false // Direct drive extruder v9: true. Geared extruder: false +#define INVERT_E1_DIR false // Direct drive extruder v9: true. Geared extruder: false +#define INVERT_E2_DIR false // Direct drive extruder v9: true. Geared extruder: false +#define INVERT_E3_DIR false // Direct drive extruder v9: true. Geared extruder: false // ENDSTOP SETTINGS: // Sets direction of endstops when homing; 1=MAX, -1=MIN @@ -364,12 +365,12 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of #define max_software_endstops true // If true, axis won't move to coordinates greater than the defined lengths below. // Travel limits after homing (units are in mm) -#define X_MAX_POS 205 #define X_MIN_POS 0 -#define Y_MAX_POS 205 #define Y_MIN_POS 0 -#define Z_MAX_POS 200 #define Z_MIN_POS 0 +#define X_MAX_POS 205 +#define Y_MAX_POS 205 +#define Z_MAX_POS 200 #define X_MAX_LENGTH (X_MAX_POS - X_MIN_POS) #define Y_MAX_LENGTH (Y_MAX_POS - Y_MIN_POS) @@ -475,12 +476,14 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of //#define MANUAL_HOME_POSITIONS // If defined, MANUAL_*_HOME_POS below will be used //#define BED_CENTER_AT_0_0 // If defined, the center of the bed is at (X=0, Y=0) -//Manual homing switch locations: +// Manual homing switch locations: // For deltabots this means top and center of the Cartesian print volume. -#define MANUAL_X_HOME_POS 0 -#define MANUAL_Y_HOME_POS 0 -#define MANUAL_Z_HOME_POS 0 -//#define MANUAL_Z_HOME_POS 402 // For delta: Distance between nozzle and print surface after homing. +#ifdef MANUAL_HOME_POSITIONS + #define MANUAL_X_HOME_POS 0 + #define MANUAL_Y_HOME_POS 0 + #define MANUAL_Z_HOME_POS 0 + //#define MANUAL_Z_HOME_POS 402 // For delta: Distance between nozzle and print surface after homing. +#endif //// MOVEMENT SETTINGS #define NUM_AXIS 4 // The axis order in all axis related arrays is X, Y, Z, E diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index f2b3124415..32cabbd5fa 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -285,8 +285,8 @@ //=========================================================================== #define ENCODER_RATE_MULTIPLIER // If defined, certain menu edit operations automatically multiply the steps when the encoder is moved quickly -#define ENCODER_10X_STEPS_PER_SEC 75 // If the encoder steps per sec exceed this value, multiple the steps moved by ten to quickly advance the value -#define ENCODER_100X_STEPS_PER_SEC 160 // If the encoder steps per sec exceed this value, multiple the steps moved by 100 to really quickly advance the value +#define ENCODER_10X_STEPS_PER_SEC 75 // If the encoder steps per sec exceeds this value, multiply steps moved x10 to quickly advance the value +#define ENCODER_100X_STEPS_PER_SEC 160 // If the encoder steps per sec exceeds this value, multiply steps moved x100 to really quickly advance the value //#define ENCODER_RATE_MULTIPLIER_DEBUG // If defined, output the encoder steps per second value //#define CHDK 4 //Pin for triggering CHDK to take a picture see how to use it here http://captain-slow.dk/2014/03/09/3d-printing-timelapses/ diff --git a/Marlin/configurator/config/Configuration.h b/Marlin/configurator/config/Configuration.h index 272a0eb66d..ddfbe01749 100644 --- a/Marlin/configurator/config/Configuration.h +++ b/Marlin/configurator/config/Configuration.h @@ -8,7 +8,7 @@ //=========================================================================== /* Here are some standard links for getting your machine calibrated: - * http://reprap.org/wiki/Calibration + * http://reprap.org/wiki/Calibration * http://youtu.be/wAL9d7FgInk * http://calculator.josefprusa.cz * http://reprap.org/wiki/Triffid_Hunter%27s_Calibration_Guide @@ -127,10 +127,15 @@ Here are some standard links for getting your machine calibrated: // 1010 is Pt1000 with 1k pullup (non standard) // 147 is Pt100 with 4k7 pullup // 110 is Pt100 with 1k pullup (non standard) -// :{ 0: "Not used", 4: "10k !! do not use for a hotend. Bad resolution at high temp. !!", 1: "100k / 4.7k - EPCOS", 51: "100k / 1k - EPCOS", 6: "100k / 4.7k EPCOS - Not as accurate as Table 1", 5: "100K / 4.7k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", 7: "100k / 4.7k Honeywell 135-104LAG-J01", 71: "100k / 4.7k Honeywell 135-104LAF-J01", 8: "100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT", 9: "100k / 4.7k GE Sensing AL03006-58.2K-97-G1", 10: "100k / 4.7k RS 198-961", 11: "100k / 4.7k beta 3950 1%", 12: "100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT (calibrated for Makibox hot bed)", 13: "100k Hisens 3950 1% up to 300°C for hotend 'Simple ONE ' & hotend 'All In ONE'", 60: "100k Maker's Tool Works Kapton Bed Thermistor beta=3950", 55: "100k / 1k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", 2: "200k / 4.7k - ATC Semitec 204GT-2", 52: "200k / 1k - ATC Semitec 204GT-2", '-2': "Thermocouple + MAX6675 (only for sensor 0)", '-1': "Thermocouple + AD595", 3: "Mendel-parts / 4.7k", 1047: "Pt1000 / 4.7k", 1010: "Pt1000 / 1k (non standard)", 20: "PT100 (Ultimainboard V2.x)", 147: "Pt100 / 4.7k", 110: "Pt100 / 1k (non-standard)" } +// 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below. +// Use it for Testing or Development purposes. NEVER for production machine. +// #define DUMMY_THERMISTOR_998_VALUE 25 +// #define DUMMY_THERMISTOR_999_VALUE 100 +// :{ 0: "Not used", 4: "10k !! do not use for a hotend. Bad resolution at high temp. !!", 1: "100k / 4.7k - EPCOS", 51: "100k / 1k - EPCOS", 6: "100k / 4.7k EPCOS - Not as accurate as Table 1", 5: "100K / 4.7k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", 7: "100k / 4.7k Honeywell 135-104LAG-J01", 71: "100k / 4.7k Honeywell 135-104LAF-J01", 8: "100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT", 9: "100k / 4.7k GE Sensing AL03006-58.2K-97-G1", 10: "100k / 4.7k RS 198-961", 11: "100k / 4.7k beta 3950 1%", 12: "100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT (calibrated for Makibox hot bed)", 13: "100k Hisens 3950 1% up to 300°C for hotend 'Simple ONE ' & hotend 'All In ONE'", 60: "100k Maker's Tool Works Kapton Bed Thermistor beta=3950", 55: "100k / 1k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", 2: "200k / 4.7k - ATC Semitec 204GT-2", 52: "200k / 1k - ATC Semitec 204GT-2", '-2': "Thermocouple + MAX6675 (only for sensor 0)", '-1': "Thermocouple + AD595", 3: "Mendel-parts / 4.7k", 1047: "Pt1000 / 4.7k", 1010: "Pt1000 / 1k (non standard)", 20: "PT100 (Ultimainboard V2.x)", 147: "Pt100 / 4.7k", 110: "Pt100 / 1k (non-standard)", 998: "Dummy 1", 999: "Dummy 2" } #define TEMP_SENSOR_0 -1 #define TEMP_SENSOR_1 -1 #define TEMP_SENSOR_2 0 +#define TEMP_SENSOR_3 0 #define TEMP_SENSOR_BED 0 // This makes temp sensor 1 a redundant sensor for sensor 0. If the temperatures difference between these sensors is to high the print will be aborted. @@ -148,6 +153,7 @@ Here are some standard links for getting your machine calibrated: #define HEATER_0_MINTEMP 5 #define HEATER_1_MINTEMP 5 #define HEATER_2_MINTEMP 5 +#define HEATER_3_MINTEMP 5 #define BED_MINTEMP 5 // When temperature exceeds max temp, your heater will be switched off. @@ -156,6 +162,7 @@ Here are some standard links for getting your machine calibrated: #define HEATER_0_MAXTEMP 275 #define HEATER_1_MAXTEMP 275 #define HEATER_2_MAXTEMP 275 +#define HEATER_3_MAXTEMP 275 #define BED_MAXTEMP 150 // If your bed has low resistance e.g. .6 ohm and throws the fuse you can duty cycle it to reduce the @@ -300,9 +307,12 @@ your extruder heater takes 2 minutes to hit the target on heating. // @section machine -// Uncomment the following line to enable CoreXY kinematics +// Uncomment this option to enable CoreXY kinematics // #define COREXY +// Enable this option for Toshiba steppers +// #define CONFIG_STEPPERS_TOSHIBA + // @section homing // coarse Endstop Settings @@ -337,13 +347,6 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of //#define DISABLE_MAX_ENDSTOPS //#define DISABLE_MIN_ENDSTOPS -// @section hidden - -// Disable max endstops for compatibility with endstop checking routine -#if defined(COREXY) && !defined(DISABLE_MAX_ENDSTOPS) - #define DISABLE_MAX_ENDSTOPS -#endif - // @section machine // For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1 @@ -366,17 +369,17 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of // @section machine // Invert the stepper direction. Change (or reverse the motor connector) if an axis goes the wrong way. -#define INVERT_X_DIR true // Mendel: false -#define INVERT_Y_DIR false // Mendel: true -#define INVERT_Z_DIR true // Mendel: false +#define INVERT_X_DIR true // for Mendel set to false, for Orca set to true +#define INVERT_Y_DIR false // for Mendel set to true, for Orca set to false +#define INVERT_Z_DIR true // for Mendel set to false, for Orca set to true // @section extruder // For direct drive extruder v9 set to true, for geared extruder set to false. -#define INVERT_E0_DIR false -#define INVERT_E1_DIR false -#define INVERT_E2_DIR false -#define INVERT_E3_DIR false +#define INVERT_E0_DIR false // Direct drive extruder v9: true. Geared extruder: false +#define INVERT_E1_DIR false // Direct drive extruder v9: true. Geared extruder: false +#define INVERT_E2_DIR false // Direct drive extruder v9: true. Geared extruder: false +#define INVERT_E3_DIR false // Direct drive extruder v9: true. Geared extruder: false // @section homing @@ -418,40 +421,38 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of #ifdef ENABLE_AUTO_BED_LEVELING -// There are 2 different ways to pick the X and Y locations to probe: - -// - "grid" mode -// Probe every point in a rectangular grid -// You must specify the rectangle, and the density of sample points -// This mode is preferred because there are more measurements. -// It used to be called ACCURATE_BED_LEVELING but "grid" is more descriptive - -// - "3-point" mode -// Probe 3 arbitrary points on the bed (that aren't colinear) -// You must specify the X & Y coordinates of all 3 points + // There are 2 different ways to specify probing locations + // + // - "grid" mode + // Probe several points in a rectangular grid. + // You specify the rectangle and the density of sample points. + // This mode is preferred because there are more measurements. + // + // - "3-point" mode + // Probe 3 arbitrary points on the bed (that aren't colinear) + // You specify the XY coordinates of all 3 points. + // Enable this to sample the bed in a grid (least squares solution) + // Note: this feature generates 10KB extra code size #define AUTO_BED_LEVELING_GRID - // with AUTO_BED_LEVELING_GRID, the bed is sampled in a - // AUTO_BED_LEVELING_GRID_POINTSxAUTO_BED_LEVELING_GRID_POINTS grid - // and least squares solution is calculated - // Note: this feature occupies 10'206 byte + #ifdef AUTO_BED_LEVELING_GRID - // set the rectangle in which to probe + // The edges of the rectangle in which to probe #define LEFT_PROBE_BED_POSITION 15 #define RIGHT_PROBE_BED_POSITION 170 - #define BACK_PROBE_BED_POSITION 180 #define FRONT_PROBE_BED_POSITION 20 + #define BACK_PROBE_BED_POSITION 170 - // set the number of grid points per dimension - // I wouldn't see a reason to go above 3 (=9 probing points on the bed) + // Set the number of grid points per dimension + // You probably don't need more than 3 (squared=9) #define AUTO_BED_LEVELING_GRID_POINTS 2 - #else // not AUTO_BED_LEVELING_GRID - // with no grid, just probe 3 arbitrary points. A simple cross-product - // is used to esimate the plane of the print bed + #else // !AUTO_BED_LEVELING_GRID + // Arbitrary points to probe. A simple cross-product + // is used to estimate the plane of the bed. #define ABL_PROBE_PT_1_X 15 #define ABL_PROBE_PT_1_Y 180 #define ABL_PROBE_PT_2_X 15 @@ -462,11 +463,11 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of #endif // AUTO_BED_LEVELING_GRID - // these are the offsets to the probe relative to the extruder tip (Hotend - Probe) + // Offsets to the probe relative to the extruder tip (Hotend - Probe) // X and Y offsets must be integers - #define X_PROBE_OFFSET_FROM_EXTRUDER -25 - #define Y_PROBE_OFFSET_FROM_EXTRUDER -29 - #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35 + #define X_PROBE_OFFSET_FROM_EXTRUDER -25 // -left +right + #define Y_PROBE_OFFSET_FROM_EXTRUDER -29 // -front +behind + #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35 // -below (always!) #define Z_RAISE_BEFORE_HOMING 4 // (in mm) Raise Z before homing (G28) for Probe Clearance. // Be sure you have this distance over your Z_MAX_POS in case @@ -503,29 +504,6 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of #endif - #ifdef AUTO_BED_LEVELING_GRID // Check if Probe_Offset * Grid Points is greater than Probing Range - #if X_PROBE_OFFSET_FROM_EXTRUDER < 0 - #if (-(X_PROBE_OFFSET_FROM_EXTRUDER * (AUTO_BED_LEVELING_GRID_POINTS-1)) >= (RIGHT_PROBE_BED_POSITION - LEFT_PROBE_BED_POSITION)) - #error "The X axis probing range is not enough to fit all the points defined in AUTO_BED_LEVELING_GRID_POINTS" - #endif - #else - #if ((X_PROBE_OFFSET_FROM_EXTRUDER * (AUTO_BED_LEVELING_GRID_POINTS-1)) >= (RIGHT_PROBE_BED_POSITION - LEFT_PROBE_BED_POSITION)) - #error "The X axis probing range is not enough to fit all the points defined in AUTO_BED_LEVELING_GRID_POINTS" - #endif - #endif - #if Y_PROBE_OFFSET_FROM_EXTRUDER < 0 - #if (-(Y_PROBE_OFFSET_FROM_EXTRUDER * (AUTO_BED_LEVELING_GRID_POINTS-1)) >= (BACK_PROBE_BED_POSITION - FRONT_PROBE_BED_POSITION)) - #error "The Y axis probing range is not enough to fit all the points defined in AUTO_BED_LEVELING_GRID_POINTS" - #endif - #else - #if ((Y_PROBE_OFFSET_FROM_EXTRUDER * (AUTO_BED_LEVELING_GRID_POINTS-1)) >= (BACK_PROBE_BED_POSITION - FRONT_PROBE_BED_POSITION)) - #error "The Y axis probing range is not enough to fit all the points defined in AUTO_BED_LEVELING_GRID_POINTS" - #endif - #endif - - - #endif - #endif // ENABLE_AUTO_BED_LEVELING @@ -609,9 +587,13 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of #define ABS_PREHEAT_HPB_TEMP 100 #define ABS_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255 +//==============================LCD and SD support============================= // @section lcd -//LCD and SD support +// Define your display language below. Replace (en) with your language code and uncomment. +// en, pl, fr, de, es, ru, it, pt, pt-br, fi, an, nl, ca, eu +// See also language.h +//#define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en) // Character based displays can have different extended charsets. #define DISPLAY_CHARSET_HD44780_JAPAN // "ääööüüß23°" @@ -629,10 +611,20 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of //#define LCD_FEEDBACK_FREQUENCY_HZ 1000 // this is the tone frequency the buzzer plays when on UI feedback. ie Screen Click //#define LCD_FEEDBACK_FREQUENCY_DURATION_MS 100 // the duration the buzzer plays the UI feedback sound. ie Screen Click +// PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3) +// http://reprap.org/wiki/PanelOne +//#define PANEL_ONE + // The MaKr3d Makr-Panel with graphic controller and SD support // http://reprap.org/wiki/MaKr3d_MaKrPanel //#define MAKRPANEL +// The Panucatt Devices Viki 2.0 and mini Viki with Graphic LCD +// http://panucatt.com +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +//#define VIKI2 +//#define miniVIKI + // The RepRapDiscount Smart Controller (white PCB) // http://reprap.org/wiki/RepRapDiscount_Smart_Controller //#define REPRAP_DISCOUNT_SMART_CONTROLLER @@ -668,6 +660,26 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of #define DEFAULT_LCD_CONTRAST 17 #endif +#if defined(miniVIKI) || defined(VIKI2) + #define ULTRA_LCD //general LCD support, also 16x2 + #define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family) + #define ULTIMAKERCONTROLLER //as available from the Ultimaker online store. + + #ifdef miniVIKI + #define DEFAULT_LCD_CONTRAST 95 + #else + #define DEFAULT_LCD_CONTRAST 40 + #endif + + #define ENCODER_PULSES_PER_STEP 4 + #define ENCODER_STEPS_PER_MENU_ITEM 1 +#endif + +#if defined (PANEL_ONE) + #define SDSUPPORT + #define ULTIMAKERCONTROLLER +#endif + #if defined (REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) #define DOGLCD #define U8GLIB_ST7920 diff --git a/Marlin/configurator/config/Configuration_adv.h b/Marlin/configurator/config/Configuration_adv.h index a8ce587684..00722c142f 100644 --- a/Marlin/configurator/config/Configuration_adv.h +++ b/Marlin/configurator/config/Configuration_adv.h @@ -312,6 +312,11 @@ //=============================Additional Features=========================== //=========================================================================== +#define ENCODER_RATE_MULTIPLIER // If defined, certain menu edit operations automatically multiply the steps when the encoder is moved quickly +#define ENCODER_10X_STEPS_PER_SEC 75 // If the encoder steps per sec exceed this value, multiple the steps moved by ten to quickly advance the value +#define ENCODER_100X_STEPS_PER_SEC 160 // If the encoder steps per sec exceed this value, multiple the steps moved by 100 to really quickly advance the value +//#define ENCODER_RATE_MULTIPLIER_DEBUG // If defined, output the encoder steps per second value + //#define CHDK 4 //Pin for triggering CHDK to take a picture see how to use it here http://captain-slow.dk/2014/03/09/3d-printing-timelapses/ #define CHDK_DELAY 50 //How long in ms the pin should stay HIGH before going LOW again From 978dadf8064dfa576bef37463094a6b095658381 Mon Sep 17 00:00:00 2001 From: Scott Lahteine <sourcetree@thinkyhead.com> Date: Sun, 8 Mar 2015 21:54:17 -0700 Subject: [PATCH 41/41] Base64 decode AJAX-fetched text properly --- Marlin/configurator/js/configurator.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/configurator/js/configurator.js b/Marlin/configurator/js/configurator.js index ff41fa39c0..b9c6636d28 100644 --- a/Marlin/configurator/js/configurator.js +++ b/Marlin/configurator/js/configurator.js @@ -240,7 +240,7 @@ window.configuratorApp = (function(){ timeLeft: Math.floor(txt.meta['X-RateLimit-Reset'] - Date.now()/1000), }; } - loaded_items[fname] = function(){ self.fileLoaded(fname, isGithub ? atob(txt.data.content.replace(/\s/g, '')) : txt, true); }; + loaded_items[fname] = function(){ self.fileLoaded(fname, isGithub ? decodeURIComponent(escape(atob(txt.data.content))) : txt, true); }; success_count++; } },