diff options
author | Luu Lac <45380455+shitcreek@users.noreply.github.com> | 2021-10-04 05:57:49 +0300 |
---|---|---|
committer | Scott Lahteine <github@thinkyhead.com> | 2021-10-04 07:11:35 +0300 |
commit | 79974f5efd3903e1ae4a6bbc228cd8423aa5147b (patch) | |
tree | 7ade350b905a493b8448bf1784cd67b2775481b8 /_tools | |
parent | ab4ed3a75b8543f70936192c16103f776ad8d6b3 (diff) |
🚸 Revamp Front Page, inner page styles (#394)
Diffstat (limited to '_tools')
-rw-r--r-- | _tools/lin_advance/k-factor.html | 33 | ||||
-rw-r--r-- | _tools/lin_advance/k-factor.js | 99 | ||||
-rw-r--r-- | _tools/u8glib/converter.html | 6 | ||||
-rw-r--r-- | _tools/u8glib/converter2.html | 2 |
4 files changed, 73 insertions, 67 deletions
diff --git a/_tools/lin_advance/k-factor.html b/_tools/lin_advance/k-factor.html index b342e578..1dc130a4 100644 --- a/_tools/lin_advance/k-factor.html +++ b/_tools/lin_advance/k-factor.html @@ -326,18 +326,25 @@ category: [ tools ] <li>Red Lines are Fast Printing Speed</li> <li>Light blue lines are movements</li> </ul> - <h3>Standard Pattern</h3> - <p><img src="/assets/images/features/lin_advance/std_pattern.png" alt="StandardPattern" /></p> - <br /> - <h3>Alternate Pattern with increased Test Line Spacing</h3> - <p><img src="/assets/images/features/lin_advance/alt_pattern.png" alt="AlternatePattern" /></p> - <br /> - <h3>Standard Pattern with Frame</h3> - <p><img src="/assets/images/features/lin_advance/frame_pattern.png" alt="FramePattern" /></p> - <br /> - <h3>45° rotated Alternate Pattern</h3> - <p><img src="/assets/images/features/lin_advance/rot_pattern.png" alt="RotatedPattern" /></p> - </div> + <div class="row"> + <div class="col-sm-6"> + <h3>Standard Pattern</h3> + <img src="/assets/images/features/lin_advance/std_pattern.png" alt="StandardPattern" /> + </div> + <div class="col-sm-6"> + <h3>Standard Pattern with Frame</h3> + <img src="/assets/images/features/lin_advance/frame_pattern.png" alt="FramePattern" /> + </div> + </div> + <div class="row"> + <div class="col-sm-6"> + <h3>Alternate Pattern with increased Test Line Spacing</h3> + <img src="/assets/images/features/lin_advance/alt_pattern.png" alt="AlternatePattern" /> + </div> + <div class="col-sm-6"> + <h3>45° rotated Alternate Pattern</h3> + <img src="/assets/images/features/lin_advance/rot_pattern.png" alt="RotatedPattern" /> + </div> + </div> </div> </div> -} diff --git a/_tools/lin_advance/k-factor.js b/_tools/lin_advance/k-factor.js index 3b6e4787..9620e28c 100644 --- a/_tools/lin_advance/k-factor.js +++ b/_tools/lin_advance/k-factor.js @@ -816,53 +816,53 @@ function toggleRetract() { // sanity checks for pattern / bed size function validateInput() { var testNaN = { - // do not use parseInt or parseFloat for validating, since both - // functions will have special parsing characteristics leading to - // false numeric validation - BEDSIZE_X: $('#BEDSIZE_X').val(), - BEDSIZE_Y: $('#BEDSIZE_Y').val(), - K_START: $('#K_START').val(), - K_END: $('#K_END').val(), - K_STEP: $('#K_STEP').val(), - SPACE_LINE: $('#SPACE_LINE').val(), - SLOW_SPEED: $('#SLOW_SPEED').val(), - FAST_SPEED: $('#FAST_SPEED').val(), - SLOW_LENGTH: $('#SLOW_LENGTH').val(), - FAST_LENGTH: $('#FAST_LENGTH').val(), - FIL_DIA: $('#FIL_DIA').val(), - NOZ_DIA: $('#NOZ_DIA').val(), - NOZ_LIN_R: $('#NOZ_LIN_R').val(), - LAYER_HEIGHT: $('#LAYER_HEIGHT').val(), - FAN_SPEED: $('#FAN_SPEED').val(), - EXTRUSION_MULT: $('#EXTRUSION_MULT').val(), - PRIME_EXT: $('#PRIME_EXT').val(), - OFFSET_Z: $('#OFFSET_Z').val(), - X_JERK: $('#X_JERK').val(), - Y_JERK: $('#Y_JERK').val(), - Z_JERK: $('#Z_JERK').val(), - E_JERK: $('#E_JERK').val(), - NOZZLE_TEMP: $('#NOZZLE_TEMP').val(), - BED_TEMP: $('#BED_TEMP').val(), - MOVE_SPEED: $('#MOVE_SPEED').val(), - RETRACT_SPEED: $('#RETRACT_SPEED').val(), - PRINT_ACCL: $('#PRINT_ACCL').val(), - RETRACTION: $('#RETRACTION').val(), - PRIME_SPEED: $('#PRIME_SPEED').val(), - DWELL_PRIME: $('#DWELL_PRIME').val() - }, - selectShape = $('#SHAPE_BED'), - bedShape = selectShape.val(), - selectDir = $('#DIR_PRINT'), - printDir = selectDir.val(), - usePrime = $('#PRIME').prop('checked'), - useLineNo = $('#LINE_NO').prop('checked'), - sizeY = ((parseFloat(testNaN['K_END']) - parseFloat(testNaN['K_START'])) / parseFloat(testNaN['K_STEP']) * parseFloat(testNaN['SPACE_LINE'])) + 25, // +25 with ref marking - sizeX = (2 * parseFloat(testNaN['SLOW_LENGTH'])) + parseFloat(testNaN['FAST_LENGTH']) + (usePrime ? 10 : 0) + (useLineNo ? 8 : 0), - printDirRad = printDir * Math.PI / 180, - fitWidth = Math.round10(Math.abs(sizeX * Math.cos(printDirRad)) + Math.abs(sizeY * Math.sin(printDirRad)), 0), - fitHeight = Math.round10(Math.abs(sizeX * Math.sin(printDirRad)) + Math.abs(sizeY * Math.cos(printDirRad)), 0), - decimals = getDecimals(parseFloat(testNaN['K_STEP'])), - invalidDiv = 0; + // do not use parseInt or parseFloat for validating, since both + // functions will have special parsing characteristics leading to + // false numeric validation + BEDSIZE_X: $('#BEDSIZE_X').val(), + BEDSIZE_Y: $('#BEDSIZE_Y').val(), + K_START: $('#K_START').val(), + K_END: $('#K_END').val(), + K_STEP: $('#K_STEP').val(), + SPACE_LINE: $('#SPACE_LINE').val(), + SLOW_SPEED: $('#SLOW_SPEED').val(), + FAST_SPEED: $('#FAST_SPEED').val(), + SLOW_LENGTH: $('#SLOW_LENGTH').val(), + FAST_LENGTH: $('#FAST_LENGTH').val(), + FIL_DIA: $('#FIL_DIA').val(), + NOZ_DIA: $('#NOZ_DIA').val(), + NOZ_LIN_R: $('#NOZ_LIN_R').val(), + LAYER_HEIGHT: $('#LAYER_HEIGHT').val(), + FAN_SPEED: $('#FAN_SPEED').val(), + EXTRUSION_MULT: $('#EXTRUSION_MULT').val(), + PRIME_EXT: $('#PRIME_EXT').val(), + OFFSET_Z: $('#OFFSET_Z').val(), + X_JERK: $('#X_JERK').val(), + Y_JERK: $('#Y_JERK').val(), + Z_JERK: $('#Z_JERK').val(), + E_JERK: $('#E_JERK').val(), + NOZZLE_TEMP: $('#NOZZLE_TEMP').val(), + BED_TEMP: $('#BED_TEMP').val(), + MOVE_SPEED: $('#MOVE_SPEED').val(), + RETRACT_SPEED: $('#RETRACT_SPEED').val(), + PRINT_ACCL: $('#PRINT_ACCL').val(), + RETRACTION: $('#RETRACTION').val(), + PRIME_SPEED: $('#PRIME_SPEED').val(), + DWELL_PRIME: $('#DWELL_PRIME').val() + }, + selectShape = $('#SHAPE_BED'), + bedShape = selectShape.val(), + selectDir = $('#DIR_PRINT'), + printDir = selectDir.val(), + usePrime = $('#PRIME').prop('checked'), + useLineNo = $('#LINE_NO').prop('checked'), + sizeY = ((parseFloat(testNaN['K_END']) - parseFloat(testNaN['K_START'])) / parseFloat(testNaN['K_STEP']) * parseFloat(testNaN['SPACE_LINE'])) + 25, // +25 with ref marking + sizeX = (2 * parseFloat(testNaN['SLOW_LENGTH'])) + parseFloat(testNaN['FAST_LENGTH']) + (usePrime ? 10 : 0) + (useLineNo ? 8 : 0), + printDirRad = printDir * Math.PI / 180, + fitWidth = Math.round10(Math.abs(sizeX * Math.cos(printDirRad)) + Math.abs(sizeY * Math.sin(printDirRad)), 0), + fitHeight = Math.round10(Math.abs(sizeX * Math.sin(printDirRad)) + Math.abs(sizeY * Math.cos(printDirRad)), 0), + decimals = getDecimals(parseFloat(testNaN['K_STEP'])), + invalidDiv = 0; // Start clean $('#K_START,#K_END,#K_STEP,#SPACE_LINE,#SLOW_LENGTH,#FAST_LENGTH,#FIL_DIA,#NOZ_DIA,#LAYER_HEIGHT,#EXTRUSION_MULT,#PRIME_EXT,#OFFSET_Z,#NOZ_LIN_R,' @@ -966,12 +966,13 @@ $(window).load(() => { // Get localStorage data var lsSettings = window.localStorage.getItem('LIN_SETTINGS'); - if (lsSettings !== undefined) { + if (lsSettings) { var settings = jQuery.parseJSON(lsSettings); if (!settings['Version'] || settings['Version'] != SETTINGS_VERSION) { window.localStorage.removeItem('LIN_SETTINGS'); alert('Script settings have been updated. Saved settings are reset to default values'); - } else { + } + else { $('#FIL_DIA').val(settings['FILAMENT_DIAMETER']); $('#NOZ_DIA').val(settings['NOZZLE_DIAMETER']); $('#NOZZLE_TEMP').val(settings['NOZZLE_TEMP']); diff --git a/_tools/u8glib/converter.html b/_tools/u8glib/converter.html index 8f32f6a9..5f6c091a 100644 --- a/_tools/u8glib/converter.html +++ b/_tools/u8glib/converter.html @@ -9,10 +9,8 @@ category: [ tools ] <div class="container" role="main"> <div class="row"> <div class="col-lg-12" id="bitmap-converter"> - <h1 class="left13">Bitmap Converter</h1> - <div class="right23"> - <p>Convert image files and data into Marlin Boot Screens and Status Screen Logos for Graphical Displays. Dark colors show up as "on" pixels. Light colors will be transparent.</p> - </div> + <h1>Bitmap Converter</h1> + <p>Convert image files and data into Marlin Boot Screens and Status Screen Logos for Graphical Displays. Dark colors show up as "on" pixels. Light colors will be transparent.</p> <div class="file-selector"> <canvas id="preview-sm" width="32" height="32"></canvas> <canvas id="preview-lg" width="32" height="32"></canvas> diff --git a/_tools/u8glib/converter2.html b/_tools/u8glib/converter2.html index 548c55f5..500fef0e 100644 --- a/_tools/u8glib/converter2.html +++ b/_tools/u8glib/converter2.html @@ -11,7 +11,7 @@ category: [ tools ] <div class="col-lg-12" id="bitmap-converter"> <h1>Bitmap Converter</h1> <p>Convert a JPEG or PNG image file to a <a href="//github.com/olikraus/u8glib">U8Glib</a>-compatible C/C++ array for monochrome graphical LCDs in Marlin 2.0. By default dark colors produce "on" pixels and light colors are transparent.</p> - <p>If this tool doesn't work in your browser, use the server-side tool <a href="//www.digole.com/tools/PicturetoC_Hex_converter.php">at digole.com</a>.</p> + <p>If this tool doesn't work in your browser, use the server-side tool <a href="//www.digole.com/tools/digole-emu.php">at digole.com</a>.</p> <div class="file-selector"> <canvas id="preview-sm" width="32" height="32"></canvas> <canvas id="preview-lg" width="32" height="32"></canvas> |