MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
9,408 Commits 1 Branch 0 Tags 96 MiB
ddfddae4f4
Commit Graph

1023 Commits

Author SHA1 Message Date
Scott Lahteine
794f8f1329 Update K1 => PID_K1 2017-12-05 19:59:01 -06:00
Scott Lahteine
d8582b7506 Bring configurations up to date 2017-12-02 21:42:36 -06:00
dot-bob
7f656b867f Example configuration files for the Wanhao Duplicator 6 for bugfix-1.1.x (#8614) 
* Add default configuration files for the Wanhao Duplicator 6.

* Update Configuration.h
 2017-12-02 21:31:14 -06:00
Scott Lahteine
a8d83aec89 Add SKEW_CORRECTION to example configs 2017-12-01 19:43:31 -06:00
Roxy-3D
9f7405b3f0
Restore correct gMax 1.5+ G26 values 2017-11-30 18:11:01 -06:00
Scott Lahteine
1f770bb103 Config updates, spacing mainly 2017-11-29 20:57:38 -06:00
Tannoo
e25567a5dd New feature: LED_CONTROL_MENU 2017-11-29 20:57:38 -06:00
Scott Lahteine
80929c2637 Apply SEGMENT_LEVELED_MOVES to example configs 2017-11-29 16:58:16 -06:00
Scott Lahteine
fd50f452ff Whitespace cleanup 2017-11-28 17:49:25 -06:00
Scott Lahteine
51d09bb9c9 Tweak BLOCK_BUFFER_SIZE config 2017-11-26 17:33:33 -06:00
Scott Lahteine
941ffea81c Fix Micromake C1 config 2017-11-25 18:42:42 -06:00
Scott Lahteine
b5c5b175f1 Dont use Z_MIN_PROBE_ENDSTOP for DELTA 2017-11-24 18:28:27 -06:00
Scott Lahteine
c0190eff00 Adapt MESH_EDIT_GFX_OVERLAY for 1.1.x 2017-11-24 15:54:02 -06:00
Scott Lahteine
4e445f2c55 Keep Micromake C1 name on LCD? 2017-11-24 13:18:34 -06:00
Scott Lahteine
9da817eae0 Make LCD_LANGUAGE consistent in all configs 2017-11-24 13:18:34 -06:00
Rob Power
f8e30f49d7 Add NanoDLP Z movement synchronization option 
Implemented synchronization message output for NanoDLP printers (nanodlp.com).
If optional feature is enabled in `Configuration_adv.h`, Marlin will ouput "Z_move_comp" string to serial after completing any G0/G1 Z-axis movements. This feature patched on previous versions(1.0) is used by NanoDLP to synchronize Z-axis movement with projector exposure in DLP stereolithography printers.
 2017-11-24 00:32:03 -06:00
Scott Lahteine
e5b43d48ee Apply G26 for meshes to all configs 2017-11-23 21:41:27 -06:00
Scott Lahteine
b8c65078fc NEOPIXEL_RGBW_LED => NEOPIXEL_LED 2017-11-23 16:41:04 -06:00
Scott Lahteine
2511e869e2
Update Configuration.h 2017-11-16 23:18:55 -06:00
Steven Gotthardt
7efffc1548 Update Anet A8 default values from my Anet A8 experience 2017-11-14 10:47:30 -07:00
Scott Lahteine
8d06cf7b84 Add M114_DETAIL to Configuration_adv.h 2017-11-14 00:06:35 -06:00
Scott Lahteine
069ec3f9a9 Move Filament Width Sensor to Configuration_adv.h 2017-11-13 21:06:40 -06:00
Scott Lahteine
56035e9965 Move mesh test options under G26 option 2017-11-13 21:06:40 -06:00
Roxy-3D
c9f88297b8
Provide more clearance for BL-Touch probe 2017-11-12 13:09:10 -06:00
LVD-AC
8ce9306b27 PROBE_SELECTED etc. 2017-11-10 19:17:45 -06:00
Scott Lahteine
7535c21894 Remove some trailing white-space 2017-11-10 03:38:58 -06:00
Roxy-3D
8327667988
Correct gMax 1.5+ nozzle size to the right number 
Also...   Doing a 'Direct Commit' to see if that is 'acceptable' for small changes like this.   I want to look at the commit history and see how the logs handle this type of change.
 2017-11-09 20:00:55 -06:00
Scott Lahteine
513f25d42c Remove redundant dual stepper driver entries 2017-11-08 20:26:54 -06:00
Roxy-3D
677d490b5c
Add defaults for basic extrusion to Configuration.h files (#8331) 2017-11-08 11:02:47 -06:00
Rowan Meara
094bebcc2d [1.1.x] Update Thermal Protection Documentation (#8282) 
* Fix thermal protection documentation.

Even before the recent thermal protection changes, the documentation of
the thermal protection feature in the config files did not match the
implementation.  I fixed the documentation and reconciled the M303
implementation with the documentation.

* Applied documentation changes to sample config files

* Renamed hysteresis to watch_temp_increase

* Added gcodes back into documentation.
 2017-11-07 15:52:28 -06:00
Roxy-3D
12151e62ee
Fix G26's circle drawing... (#8291) 
* Fix G26's circle drawing...

This mostly catches the bugfix-v1.1.x branch up to bugfix-v2.0.0

I'll have to do something similar to get bugfix-v2.0.0 caught up to
bugfix-v1.1.x

* only use planner.leveling_active if appropriate
 2017-11-06 18:26:47 -06:00
Scott Lahteine
bb111b928b Add CNC_COORDINATE_SYSTEMS to configs 2017-11-04 22:30:23 -05:00
Jan Macháček
0c4e9980fb Fix probes configuration url 2017-11-03 14:42:02 +01:00
Luc Van Daele
0e4b6b373d [1.1.x] G33 magic numbers (#8173) 
* [1.1.x] G33 magic numbers

* oops

* comments

* oops

* warning

* better comment section

* remarks

* extra grids
 2017-11-03 03:35:53 -05:00
Scott Lahteine
4fb3ce4739 Support for SilverGate Board 2017-10-31 15:26:27 -05:00
Scott Lahteine
393ceb28fc The plural of 'axis' is 'axes' 2017-10-30 14:49:51 -05:00
Scott Lahteine
5837f067cf Tweak to QUICK_HOME comment 2017-10-29 23:50:02 -05:00
Scott Lahteine
7e1232269a Add Dual Steppers / Endstops to configs 2017-10-29 03:49:45 -05:00
Scott Lahteine
62d52d62dc Cleanup for DIGIPOTS settings 2017-10-29 03:49:32 -05:00
Scott Lahteine
a979c428ee Revert default BABYSTEP_MULTIPLICATOR to 1 2017-10-27 19:42:51 -05:00
Scott Lahteine
410aa0716d Concise SD_REPRINT_LAST_SELECTED_FILE description 2017-10-27 00:10:04 -05:00
Scott Lahteine
445a7f65cd Clean up trailing whitespace 2017-10-27 00:02:35 -05:00
Luc Van Daele
e64cfb13b8 (1.1.x) auto tune calibration parameters (#8031) 
* auto tune calibration parameters

* solve warnings

* Tweaks to formatting

* review Thinkyhead

* Error
 2017-10-26 23:49:20 -05:00
Roxy-3D
2e746f2b8b Initial conflict resolution of SD_REPRINT_LAST_SELECTED_FILE (#8104) 
* Initial conflict resolution

All previous items resolved:
- Use of ELAPSED() on timer code
- Switch to use of defer_return_to_status=true as much as possible
- Update & Clean Up of Max7219 routines

* Resolve non-SD case in ultralcd.cpp
 2017-10-26 11:44:55 -05:00
Scott Lahteine
8bb1e91afd More specific M100 description 2017-10-25 16:11:09 -05:00
Scott Lahteine
a12d1b21b5 Merge pull request #8048 from madmo/mks-mini-gt2560 
[1.1.x] Add MKS MINI 12864 support to GT2560
 2017-10-25 01:13:07 -05:00
Scott Lahteine
ec9d7b639d Encourage users to re-examine their configs 2017-10-24 18:33:31 -05:00
Scott Lahteine
1c97c1582c Move UBL_SAVE_ACTIVE_ON_M500 to Configuration.h 2017-10-24 18:25:50 -05:00
Scott Lahteine
f06f4b40b8 Apply physical limits to mesh bounds 2017-10-24 16:49:00 -05:00
Scott Lahteine
39a545b3f8 Patch up some verbiage in configs 2017-10-22 17:14:50 -05:00
Moritz Bitsch
b22c87183f Add MKS MINI 12864 support for GT2560 2017-10-21 13:05:21 +02:00
MetalSearch
9b3f27f02a Fix:EndStops doesn't working with BOARD_RAMPS_14_EFB on Micromake C1 (#8041) 
[1.1.x] Fix EndStops don't work with BOARD_RAMPS_14_EFB on Micromake C1
 2017-10-21 00:24:22 -05:00
Scott Lahteine
a7398a0459 Prevent SDCARD_SORT_ALPHA from exploding 2017-10-20 19:14:11 -05:00
Scott Lahteine
91c5c2538a Add SCROLL_LONG_FILENAMES advanced option 
Based on #7637 by @marcio-ao
 2017-10-20 19:14:10 -05:00
Thomas Moore
84470f6b2a Update UBL mesh boundaries to accomidate beds centered at 0, 0 (#8011) 2017-10-18 10:03:00 -05:00
studiodyne
e04902f589 Add EXTRA_FAN_SPEED feature 2017-10-16 02:32:30 -05:00
Scott Lahteine
5f708d47ce Add LCD_SET_PROGRESS_MANUALLY 2017-10-15 02:21:09 -05:00
Scott Lahteine
3b4b9c6d68 Unaccented French for Character Display 2017-10-14 20:17:29 -05:00
MetalSearch
8df47d76c7 Add control board MAKEBOARD Mini 
+Add French language without accent for japanese LCD
 2017-10-14 20:10:03 -05:00
Scott Lahteine
e05af35678 Add MIN_SOFTWARE_ENDSTOP_[XYZ] to example configs 2017-10-14 17:14:19 -05:00
Slawomir Ciunczyk
167058b61f Different NEOPIXEL types 
Changes to support NEOPIXEL LED strips
- Support for different NEOPIXEL as defined in Adafruit_NeoPixel.h
- ability to setup startup brightness
- ability to define sequential/non-sequential transition of color change during heating-up
- additional parameter to M150 P<brightness>
 2017-10-10 01:58:40 -05:00
Scott Lahteine
f835245ee1 Merge pull request #7908 from thinkyhead/bf1_goodbye_legacy_advance 
[1.1.x] Remove legacy ADVANCE feature
 2017-10-10 00:31:39 -05:00
jmdearras
c7e0a49c94 Add some new LCD displays 
- Original CR-10
- MKS Mini Display
 2017-10-09 17:39:03 -05:00
Scott Lahteine
ae256576e1 Bring configs into parity with 2.0.x 2017-10-09 17:38:39 -05:00
Scott Lahteine
cbfcce09fa Remove legacy ADVANCE feature 2017-10-09 04:27:45 -05:00
Scott Lahteine
7999249a5c Set TEMP_SENSOR_0 to 1 in CR-10 example config 
As pointed out in #7692 by @totalitarian
 2017-10-06 14:29:00 -05:00
Scott Lahteine
a47c5c093d Merge pull request #7459 from ejtagle/xon-xoff-sdxfer 
[1.1.x] XON/XOFF serial handshake (for faster transfers to SD)
 2017-10-02 23:52:41 -05:00
Scott Lahteine
94caabf89a Add XON/XOFF options to example configs 2017-10-02 03:52:41 -05:00
GMagician
8ab426c3a4 Updated all examples configurations 
Forgot to update examples configurations. Done now
 2017-10-01 21:04:12 -05:00
Scott Lahteine
2efd5b119d Add USER_SCRIPT_RETURN option 2017-09-27 11:23:34 -05:00
Scott Lahteine
e37a1ded0d Increase BABYSTEP_MULTIPLICATOR to 100 
Ideally, it should be calculated based on Z steps per unit so that each
babystep corresponds to around 0.025mm. Smaller than this is largely
insignificant for typical layer heights.
 2017-09-27 00:14:26 -05:00
Scott Lahteine
c1cc79176c Full-featured Creality configs 2017-09-24 16:52:42 -05:00
Scott Lahteine
f25dccd6d1 Disable BABYSTEP_XY by default in all configs 2017-09-24 16:52:42 -05:00
Scott Lahteine
cd09a83cfa Add size note to SDSORT_LIMIT 2017-09-24 16:52:41 -05:00
Scott Lahteine
9d4d53e2fd Update links to old wiki page 2017-09-23 22:06:45 -05:00
Scott Lahteine
00896f1713 Fix LEVEL_BED_CORNERS (No leveling required) 2017-09-23 22:00:45 -05:00
Marcio Teixeira
d69c5317df Added option for graphical overlay for Z-offset 2017-08-31 14:21:39 -06:00
Scott Lahteine
5851c2d36f MAX7219 followup (#7564) 
* Add MAX7219_DEBUG to Travis CI testing

* Tweak config and use standard pin naming for MAX7219_DEBUG

* MAX7219: Apply coding standards, use macros, etc.

* Make code work...
 2017-08-31 11:44:43 -05:00
Scott Lahteine
52073f21c5 Merge pull request #7556 from thinkyhead/bf1_slovak_language 
Slovak UTF-8 translation
 2017-08-27 21:05:53 -05:00
Scott Lahteine
321f98f867 Fix servo delay in Folgertech config 2017-08-27 20:53:27 -05:00
Roxy-3D
3f0b38ed5d Add Max7219 LED Matrix Debug Support (#7563) 
* Add Max7219 LED Matrix Debug Support

The Max7219 8x8 LED Matrix's are very helpful for debugging new code.
And for that matter, just trying to maximize printer settings without
causing stuttering.

The displays are very inexpensive (under $2.00 with shipping) and
provide a lot of help when trying to debug complicated code.

* Try to keep Makefile up to date.
 2017-08-25 17:03:07 -05:00
Scott Lahteine
2b12093589 Merge pull request #7532 from thinkyhead/bf1_fan_mux_vben 
New feature: Part-Cooling Fan Multiplexer
 2017-08-25 03:16:40 -05:00
Michal Holes
54d48130f3 Slovak UTF-8 translation 
Slovak UTF-8 translation
 2017-08-23 19:14:35 -05:00
Scott Lahteine
11a724d8fc Sanguinololu example configuration 2017-08-23 18:32:59 -05:00
Vben
c0409b85e7 New feature: Part-Cooling Fan Multiplexer 2017-08-18 15:59:04 -05:00
Vben
4817b39d98 Added new feature for AutoParking Extruder (APE) 2017-08-16 17:33:11 -05:00
Scott Lahteine
385f1bb9e5 Merge pull request #7504 from thinkyhead/bf1_servo_delays 
Individual servo delays
 2017-08-16 16:05:22 -05:00
Scott Lahteine
a1878cd1c0 Add "Level Corners" menu option 2017-08-16 02:54:33 -05:00
GMagician
e9c72978c7 Implement SERVO_DELAY as array 
This modify give SERVO_DELAY x servo basis
 2017-08-15 00:28:47 -05:00
Scott Lahteine
35d5a7bdff Tweak CR-10 config/pins 2017-08-11 15:55:31 -05:00
Frederik Kemner
25a11cd485 Use bed size and inset instead of travel limits to define mesh area\n\nAs proposed in #7435 (#7480) 2017-08-10 16:53:04 -05:00
Jozsef Kiraly
97c21e9007 Support for Geeetech GT2560 Rev.A/Rev.A+ 2017-08-06 00:42:54 -05:00
richarddeweerd
b370906031 Example config for Geeetech I3 Pro X with GT2560 controller 2017-08-05 03:48:52 -05:00
Scott Lahteine
804818b4d9 Bring configs up to date 2017-08-05 03:48:52 -05:00
benlye
24af9e1bf4 Make audible user script feedback optional 
Add a parameter to enable/disable audible user script feedback
 2017-08-04 17:24:10 +01:00
teemuatlut
936d00dda8 Implement probing delay for piezo sensors 2017-07-29 21:46:40 -05:00
Scott Lahteine
423b0f3a1e Replace MIN_RETRACT with MIN_AUTORETRACT, MAX_AUTORETRACT 2017-07-27 04:14:29 -05:00
Scott Lahteine
51864fd365 Add bed size as a configuration option 2017-07-26 23:04:54 -05:00
Scott Lahteine
dc7c95e07b Remove @ section fwretract 2017-07-26 22:46:16 -05:00
C. Scott Ananian
890e7a16a9 Add support for Printrbot Neopixel RGBW strip. 
Connected as described at http://printrbot.com/shop/led-strip/

Based on patch by Kelly Anderson <kelly@xilka.com> at
http://www.xilka.com/printrbot/marlin/1.1.4/20170707/
 2017-07-22 16:07:55 -05:00
Scott Lahteine
a059e95463 Bring Infitary i3 config up to date 2017-07-21 20:49:19 -05:00
Scott Lahteine
8a3bc6be4d Improve FWRETRACT config options and commentary 
Add more details as requested in #7198
 2017-07-20 22:57:50 -05:00
LVD-AC
4bc79ec877 Updates for G33-LCD interface 2017-07-07 05:00:59 -05:00
Scott Lahteine
186580b55f Arrange example configurations by vendor 2017-07-07 04:48:23 -05:00
Scott Lahteine
6be369f3ea Add some config names to AUTHOR 2017-07-07 04:46:33 -05:00
Scott Lahteine
7fc31a7940 Merge pull request #7258 from thinkyhead/bf_cleanups_jbrazio 
Add support for BQ heated bed kit with Hephestos 2
 2017-07-07 04:11:07 -05:00
João Brázio
2065591daf Add support for BQ heated bed kit with Hephestos 2 2017-07-07 03:10:38 -05:00
essgcee
61be28133d Support for Creality CR-10 
Creality board is a Melzi / Sanguinololu variant, but using different pins for LCD control (and maybe other minor variations)
 2017-07-06 23:08:10 -05:00
Scott Lahteine
f713f25fa5 Clean up excess whitespace 2017-07-06 21:24:30 -05:00
Scott Lahteine
fc9ce65095 Add BUSY_WHILE_HEATING for hosts that need it 2017-07-06 16:28:57 -05:00
Scott Lahteine
cca1cca3a5 Merge pull request #7237 from thinkyhead/bf_cz_mapper 
UTF-8 mapper for Czech
 2017-07-04 16:45:13 -05:00
Scott Lahteine
a2babb532d Merge pull request #7217 from benlye/add-kill-action 
Add configurable action command to send when printer is killed
 2017-07-04 16:44:08 -05:00
Petr Zahradník
8c34233452 UTF-8 mapper for Czech 2017-07-04 15:51:23 -05:00
Ben Lye
c28749a567 Add kill action 
Sends pre-defined string as action command when printer is kill.
 2017-07-03 23:45:19 +01:00
LVD-AC
567941e341 Fix for issues #6997 and #7152 
Probing with the effector in the printing area, but an eccentric probe (e.g. allen key) outside it but still touching the bed gives meaninfull information for calibration. Since calibration is most accurate when probing as close to the towers as possible the testing was way to restrictive hence this fix.
 2017-07-03 02:53:49 -05:00
Scott Lahteine
69297b2d7b Make all EEPROM optimization options available 2017-07-02 20:47:03 -05:00
Scott Lahteine
232a10410d LCD_FOR_MELZI 2017-07-01 22:32:20 -05:00
Scott Lahteine
dcec7178d1 Expose DISABLE_M503 option as a test option 2017-07-01 21:31:28 -05:00
Tom
1ff7d10c80 Add configuration for Infitary M508 (i3 clone) 
Based on Infitary's own firmware settings.
 2017-07-01 20:04:08 -05:00
Scott Lahteine
406ef69702 Move Anet A8 config to subfolder 2017-06-28 16:58:57 -05:00
Scott Lahteine
379926961c Add Anet A6 config, edit Anet A8 config 2017-06-28 16:58:57 -05:00
Scott Lahteine
5b03f23fa2 Bring configurations up to date, fix some comments 2017-06-28 16:41:49 -05:00
Scott Lahteine
f4246dc8ff Merge pull request #7165 from thinkyhead/bf_parser_shorthand 
Use parser.seenval, add shorthand functions
 2017-06-27 18:57:48 -05:00
Scott Lahteine
941943c167 Apply const, spacing, etc. 2017-06-27 05:23:49 -05:00
Scott Lahteine
5b11b33854 Add support for Průša MK2 Multiplexer 2017-06-27 04:55:30 -05:00
Scott Lahteine
a4a587a897 Fix spelling of Průša 2017-06-27 04:46:46 -05:00
Bob-the-Kuhn
9651d01e1a Add Skynet/ANET A10 support 2017-06-24 19:07:03 -05:00
Scott Lahteine
eb314373bb Config spacing & consistency, group custom LCDs 2017-06-24 14:33:40 -05:00
Scott Lahteine
afbc6e3e2f Update DELTA/SCARA config comments 2017-06-24 12:47:17 -05:00
Paweł Stawicki
1e47c17b46 Fix: set digipot mcp4018 Vrefmax to 1.666V 2017-06-24 12:35:34 -05:00
Scott Lahteine
80a232419d CNC workspace planes and 'P' argument for G2/G3 2017-06-23 14:53:03 -05:00
Bob-the-Kuhn
325f09ea6c Add link to custom LiquidCrystal library by F. Malpartida 2017-06-22 13:07:08 -05:00
Scott Lahteine
42f7f9e013 Merge pull request #7060 from bgort/i2cpefix 
I2C Position Encoders Example Configs
 2017-06-19 01:08:42 -05:00
Jim Brown
3d043976f7 Add option to disallow filament change without homing first 2017-06-16 13:32:17 -05:00
Brian
40bb0cbf7a example configurations, etc. 2017-06-14 18:04:28 -04:00
dot-bob
0bc66bf22c PCA9632 PWM color LED support 
Add support for the PCA9632 PWM color LED driver used on the Ultimaker 2 and Wanhao Duplicator 6.
 2017-06-12 01:09:24 -05:00
Scott Lahteine
07f8da36d2 CL-260 configs 2017-06-11 19:40:13 -05:00
Bob-the-Kuhn
1c107b3949 delete problem line 2017-06-09 11:53:36 -05:00
Scott Lahteine
1419126721 Merge pull request #6965 from thinkyhead/bf_save_more_sram 
Use createChar_P to save SRAM in bootscreen
 2017-06-07 17:34:19 -05:00
Scott Lahteine
e556ab1dff Find three-point leveling points on Delta 2017-06-07 16:07:38 -05:00
Scott Lahteine
e1c5a43247 Cleanup stepper current control config options 2017-06-07 16:07:38 -05:00
Brian
dd071a4a65 Enable AUTO_REPORT_TEMPERATURES by default 2017-06-07 02:52:35 -04:00
bgort
8db1197c9b Enable extended capabilities report by default (#6969) 
Ref #5139
 2017-06-07 02:36:34 -04:00
Roxy-3D
0dd0033b33 Save up to 94 bytes of RAM on 20x4 LCD Display machines (#6964) 
* Save up to 94 bytes of RAM on 20x4 LCD Display machines

Moved the custom screen characters out of RAM into Program Memory.  With
SD-Card support and the Progress Bar enabled, this saves 94 bytes of RAM
memory.

This was tested using the example_configurations/FolgerTech-i3-2020
files.  So a couple small changes to those files snuck into this Pull
Request.

Probably...  We can find similar savings in the Graphics LCD code it we
comb through it.   And if so...  That is the place we really need to
save RAM memory!

* Tidy up white space and indentation
 2017-06-05 17:02:00 -05:00
Scott Lahteine
e4937b0285 Cleanup of spacing and formatting 2017-06-04 11:31:43 -05:00
Scott Lahteine
90ccac4bcf Clean up after recent commits 2017-06-02 23:45:52 -05:00
guntherv73
4288c4fb4f Configurations for Malyan M150 2017-06-01 19:26:29 -05:00
Scott Lahteine
1919cb0d1e Config cleanups 2017-06-01 19:26:16 -05:00
Bob-the-Kuhn
9657e7d3ee copied file changes from PR #5685 
==============================

Configuration_adv.h changes

==============================

add "live" LCD update

==============================

P & S version

==============================

final (hopefully) tested version

==============================

update M115 capabilities print

==============================

Menu changes portion of the requested changes

==============================

changed USEABLE_HARDWARE_PWM from a function to a series of macros

==============================

changes per review
 2017-05-31 13:22:38 -05:00
Tannoo
74d6dee920 User Command (Script) Menu 
The menu (commands / scripts) is configurable in `Configuration_adv.h`.

- Added conditionals.
- Changed script handling.
- Slimmed and working!
- Added Status message.
- Returning to lcd status screen now!
- Example Configs Updated.
- Cleanups by @thinkyhead
 2017-05-30 02:33:57 -05:00