Scott Lahteine
bb33a26e62
Apply const to axis args
2017-12-11 00:20:29 -06:00
Scott Lahteine
da2eaa6b09
Use array refs where possible
2017-12-11 00:20:29 -06:00
Scott Lahteine
08d9aeff41
Update current position in M852
2017-12-10 23:05:34 -06:00
Scott Lahteine
aa1b4eded6
Have M420 report a changed position
2017-12-10 23:05:34 -06:00
Scott Lahteine
684692091e
Sync and report changed position
2017-12-10 23:05:34 -06:00
Scott Lahteine
ccca1ade2d
Always report position on config load/reset
2017-12-10 23:05:33 -06:00
Scott Lahteine
dc9e469c4c
Tweak M114 detail
2017-12-10 19:15:37 -06:00
Scott Lahteine
8385cddd8d
Followup to #8705
2017-12-08 03:48:24 -06:00
Scott Lahteine
44800e9899
PROBE_DOUBLE_TOUCH => MULTIPLE_PROBING
2017-12-07 16:46:06 -06:00
Scott Lahteine
6310a00d7e
feed_factor => inverse_secs
2017-12-06 23:02:37 -06:00
Scott Lahteine
909fac6d90
Update commentary on M48
2017-12-06 22:50:13 -06:00
Scott Lahteine
3b30cc90f1
Clean on trigger instead of split_first_move flag
2017-12-06 21:43:26 -06:00
Scott Lahteine
5d01a2f467
Move temperature reporting to Temperature class
2017-12-06 21:12:55 -06:00
Scott Lahteine
6e197d4a42
Fix M503 S parameter
2017-12-06 21:12:55 -06:00
AnHardt
b19846aca1
Don't split first_move while homing or probing
...
While homing or probing it might be bad if the stop/trobe triggers during the first part and the second is still in the buffer.
2017-12-06 14:56:37 +01:00
revilor
b1f3dfab28
Fix for #8669 ( #8677 )
2017-12-05 19:40:57 -06:00
Scott Lahteine
44d2c5ef88
Fix M49 console hang
2017-12-03 03:36:12 -06:00
Unknown
2e295759f2
[1.1.x] Report SERIAL_XON_XOFF in M115
...
-Report SERIAL_XON_XOFF in Extended Capabilites M115 report for hosts
-Remove outdated 256 size limitation from comments on RX_BUFFER_SIZE defines
config updates
-Update error checking conditions
2017-12-02 21:02:02 -08:00
Scott Lahteine
077fed1d88
Fix a homing comment
2017-12-02 20:57:35 -06:00
Scott Lahteine
8b7c274db5
Comment/cleanup motion code
2017-12-02 01:42:37 -06:00
Scott Lahteine
7bed539fdb
Fix missing return values in G33_auto_tune
2017-12-02 01:06:14 -06:00
Scott Lahteine
172ce67344
New feature: BED_SKEW_CORRECTION
2017-12-01 19:43:32 -06:00
Scott Lahteine
8f462b5717
Add Planner::set_filament_size for 2.0.x parity
2017-11-30 16:52:19 -06:00
Scott Lahteine
68c1f05aeb
Cleanups/changes to led control menu
2017-11-30 00:04:43 -06:00
Tannoo
e25567a5dd
New feature: LED_CONTROL_MENU
2017-11-29 20:57:38 -06:00
Scott Lahteine
d786fb99e2
Add an option to segment leveled moves
2017-11-29 16:58:15 -06:00
Scott Lahteine
fd50f452ff
Whitespace cleanup
2017-11-28 17:49:25 -06:00
Scott Lahteine
6eedb64777
Merge pull request #8586 from AnHardt/1_Fix_WDTO_during_long_DELTA_moves
...
[1.1.x] Fix WDTO during long delta moves
2017-11-28 17:27:08 -06:00
Scott Lahteine
46776de90b
Fix M290 boolval bug
...
Fix #8577
2017-11-28 17:25:14 -06:00
AnHardt
f1757f30cb
Fix Watchdog time out during long lasting DELTA moves
...
During long lasting moves of a delta machine neither the temperatures are maintained nor buttons checked nor ... .
The fix is to call 'manage_heater()' and 'idle()' every now and then in the loop where the move is segmented.
The code is abot the same as in G2_G3 wher we had the same problem with too large circles lasting too long.
Fixing #7510
2017-11-28 17:10:18 +01:00
Scott Lahteine
ddab1533c5
Simplify midpos calculation
2017-11-27 14:01:42 -06:00
Scott Lahteine
915c4b9ce2
Make MBL work more like PROBE_MANUALLY
2017-11-27 00:09:23 -06:00
Scott Lahteine
26a40373fc
Adjustments to blocking moves
2017-11-25 23:32:53 -06:00
Scott Lahteine
6b9e7defac
M211 output in current workspace
2017-11-25 20:47:36 -06:00
Scott Lahteine
737cee4b8c
Syntax tweaks
2017-11-25 18:15:16 -06:00
Scott Lahteine
2060ba3556
M290 report on change, P0 to leave Probe Z Offset unchanged
2017-11-25 16:51:00 -06:00
Scott Lahteine
e56ead5e1c
Followup to G33 patch
2017-11-25 16:01:55 -06:00
LVD-AC
8b9e68c32d
[1.1.x] G33 probe error handing
2017-11-25 15:44:30 -06:00
Scott Lahteine
b2d3fffe74
Patches for M290, M851
2017-11-25 14:10:49 -06:00
Thomas Moore
ecf19344f6
Initialize mixing virtual tools to behave like standard a multi-extruder setup ( #6853 )
...
* Initialize mixing virtual tools to behave like standard a multi-extruder setup
* Update Marlin_main.cpp
* Update Marlin_main.cpp
2017-11-24 18:06:32 -06:00
Scott Lahteine
adee17847c
Fix #8540
...
Does it?
2017-11-24 17:05:42 -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
Roxy-3D
8282d732c1
Make G26 work with all mesh leveling.
...
Example Configuration.h files are not updated yet. You need to cross
your settings over to the default Configuration.h file in the \Marlin
directory. (UBL_G26_MESH_VALIDATION enablement has moved to a new
location in the file.)
2017-11-23 21:41:27 -06:00
Scott Lahteine
ed6a5ff7e5
Merge pull request #8524 from GMagician/1.1.x-tool-change-bad-behaviour-fix
...
[1.1.x] Tool change bad behaviour fix
2017-11-22 20:23:02 -06:00
Scott Lahteine
99b71c1dde
Move lcd_map_control to UBL
...
For parity with bugfix-2.0.x
2017-11-22 18:45:55 -06:00
Scott Lahteine
73ddc762c8
Fix up LCD init / charset
2017-11-22 18:07:03 -06:00
GMagician
7a5b3a1e6a
[1.1.x] Tool change bad behaviour fix
...
Just aligned with version 2.0. Here bug was not present
2017-11-22 23:51:07 +01:00
Scott Lahteine
e2568d7589
Fix delta_safe_distance_from_top
2017-11-22 14:11:04 -06:00
Scott Lahteine
0b1d754e7d
Fix G42
2017-11-22 14:11:04 -06:00
Scott Lahteine
bbc2ee6da1
Don't re-init graphical LCD after boot screen
...
Followup to 13a3fb1acc
2017-11-21 18:21:50 -06:00
GMagician
b96ceb4256
[1.1.x] tool change bad behaviours
...
This PR will address two issues reported in #8492 . Just one is left because I don't know if it is an issue or not
1) when no home is done ("no_move" is set) tool change should never move X & Y because... I don't know where I am...only Z should be adjusted to avoid bed collision if other nozzle is lower than current.
2) Since no move no bed level matrix should be applied
When SWITCHING_NOZZLE is enabled and system is homed there are two movements to go to destination, but first can move Z to older position and then crash on the bed
2017-11-20 16:39:32 -06:00
Bob-the-Kuhn
12b018e619
Merge pull request #8487 from Bob-the-Kuhn/M43-compatibility-1.1.x
...
[1.1.x] M43 end pin correction/compatibility
2017-11-19 11:01:10 -06:00
Bob-the-Kuhn
9b80e1e04a
change to L for end pin for M43 Toggle command
2017-11-18 13:48:53 -06:00
Scott Lahteine
bf6a1816b4
Display volumetric ratio in terms of E mm
2017-11-18 07:03:18 -06:00
Scott Lahteine
622d100c30
No retroactive changes with M851 Z
2017-11-18 03:37:07 -06:00
Thomas Moore
97c19de8b9
Fix PlatformIO dependencies
2017-11-16 15:16:21 -06:00
Scott Lahteine
4e19c59ab3
Miscellaneous cleanup
2017-11-16 01:18:05 -06:00
Scott Lahteine
d3b8f30818
Fix M32 P subroutine handling
2017-11-15 01:09:06 -06:00
Scott Lahteine
95590adf07
Make sure leveled[] is enabled for use
2017-11-14 02:12:20 -06:00
Scott Lahteine
90c7d28055
Extrudrboard support for Printrboard Rev.F
2017-11-13 15:47:03 -06:00
Scott Lahteine
8b684637bc
Merge pull request #8397 from RowanMeara/rm-M428-1.1.x
...
[1.1.x] Fix M428
2017-11-13 15:11:36 -06:00
Rowan Meara
d2df00bfca
[1.1.x] Fix compilation warnings ( #8395 )
...
* Fix up Travis CI and compile warnings/errors
* No ULTRA_LCD with REPRAP_DISCOUNT_SMART_CONTROLLER
* No point in setting all the endstop plugs
2017-11-13 04:18:19 -06:00
Scott Lahteine
25ec0fecfa
Apply native workspace fixes to G92, G53-59
2017-11-13 01:53:44 -06:00
RowanMeara
227b96b28b
Fix M428
...
This fixes the old implementation of M428 which was broken, did not
match the website, and made no sense.
2017-11-13 01:34:43 -06:00
Scott Lahteine
aa616cd410
No leveling data in M114 without leveling
2017-11-12 23:06:16 -06:00
Scott Lahteine
5926159890
Fix report_current_position
...
Thanks @RowanMeara!
2017-11-12 22:57:57 -06:00
Scott Lahteine
5cc87abb3a
Merge pull request #8381 from thinkyhead/bf1_native_followup
...
[1.1] Remove offsets from soft endstops, tool change
2017-11-11 23:13:40 -06:00
Scott Lahteine
355dfed437
Coding standard patch of M290
2017-11-11 22:16:13 -06:00
Scott Lahteine
802ae73b13
Turn off laser power pin when PWM goes to 0
2017-11-11 22:02:19 -06:00
Scott Lahteine
549c814e8d
Remove offsets from soft endstops, tool change
2017-11-11 21:28:32 -06:00
Scott Lahteine
564fbc8dec
M290 constrain patch
2017-11-11 20:50:16 -06:00
Scott Lahteine
df44bcc5ae
Use do_blocking_move_to where possible
2017-11-10 20:37:41 -06:00
Scott Lahteine
3293823642
Add pre-calculated planner.e_factor
2017-11-10 20:09:59 -06:00
Scott Lahteine
24b302c001
Fix cold/lengthy extrusion handling
2017-11-10 20:09:59 -06:00
Thomas Moore
4714fb8fcb
Normalize load/unload length in M600
2017-11-10 19:59:26 -06:00
Scott Lahteine
b0ff3a4c6d
Cleanup around updatePID
2017-11-10 19:17:46 -06:00
LVD-AC
8ce9306b27
PROBE_SELECTED etc.
2017-11-10 19:17:45 -06:00
Scott Lahteine
b6b4bf0959
Merge pull request #8345 from tcm0116/1.1.x-delta_height
...
[1.1.x] Add delta_height variable in lieu of using home_offset
2017-11-09 01:19:48 -06:00
Thomas Moore
658e1ebe5a
Add delta_height variable in lieu of using home_offset
2017-11-08 23:21:02 -06:00
Scott Lahteine
54963cc898
Fix _manual_goto_xy on kinematic systems
2017-11-08 23:18:55 -06:00
Scott Lahteine
ad879a1f90
Clarify some motion code
2017-11-08 23:18:55 -06:00
Scott Lahteine
2559745f54
Tweaks to core motion code
2017-11-08 20:08:20 -06:00
Scott Lahteine
87b655e59e
Fix gcode_get_destination E axis
2017-11-08 12:50:40 -06:00
Roxy-3D
6ee4ba6932
We need motion even with !HAS_MESH ( #8330 )
...
Thank You MagoKimbra !
2017-11-08 09:58:18 -06:00
Scott Lahteine
1d0739d6d1
Patch G33 misuse of PROBE_MANUALLY
2017-11-07 22:28:54 -06:00
Scott Lahteine
5fe15c7f10
Patch abuse of sprintf_P in G33
2017-11-07 17:35:32 -06:00
Scott Lahteine
abb15bc30a
Followup patch for G92
2017-11-07 13:08:38 -06:00
Scott Lahteine
e4466b55b5
Fix G92 for native workspace
2017-11-07 12:27:05 -06:00
Scott Lahteine
26ebeadfaa
Eliminate some compiler warnings
2017-11-06 22:41:27 -06:00
Scott Lahteine
30e4b85587
Fix M118 parameters, with strict guideline
2017-11-06 22:41:27 -06:00
Scott Lahteine
44edffa0a9
Fix SLOW_PWM_HEATERS, issues already patched in 2.0.x
2017-11-06 22:40:44 -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
efc1029226
Update bilinear for native workspace
2017-11-06 17:03:34 -06:00
Scott Lahteine
1b09733e7c
Fix FWRETRACT un-hop
2017-11-05 18:33:10 -06:00
Scott Lahteine
8ab368559a
Implement CNC_COORDINATE_SYSTEMS
2017-11-04 22:30:23 -05:00
Scott Lahteine
91abf07087
Cleanup and fix G33
2017-11-04 22:30:23 -05:00
Scott Lahteine
64f077fd2a
Remove I2CPEM workspace offset
2017-11-04 22:00:45 -05:00
Scott Lahteine
f9f0ee0f21
Update G2/G3 Workspace Planes
2017-11-04 14:35:25 -05:00
Scott Lahteine
640526f0c8
Operate in Native Machine Space
2017-11-03 22:40:30 -05:00
AnHardt
13a3fb1acc
Some cleanup around 'lcd_bootscreen()' and 'lcd_kill_screen()'
...
Move 'lcd_bootscreen()' from `lcd_init()` to 'setup()' where it is cexecute exactly once. Saves 'bool show_bootscreen'.
Move the call of 'lcd_custom_bootscreen()' to the begin of 'lcd_bootscreen()'.
Move the delays into the related functions.
Move the picture loop around 'lcd_kill_screen()' into the function.
2017-11-03 12:16:42 +01:00
Scott Lahteine
343dd1c0b8
Remove G33 trailing whitespace
2017-11-03 04:06:38 -05: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
jmdearras
3e9504d306
Fix case light "off" function ( #8205 )
...
* Fix case light "off" function
It would only turn the light off if brightness was 255
* Update Marlin_main.cpp
2017-11-01 21:17:23 -05:00
Scott Lahteine
4bf0e15653
Allow asterisks in G-Code commands
...
Addressing #6655
2017-10-31 21:14:56 -05:00
GMagician
15be1cb9a9
[1.1.x] Fix NO_MOTION_BEFORE_HOMING unwanted behaviour ( #8177 )
...
* [1.1.x] Fix NO_MOTION_BEFORE_HOMING unwanted behaviour
NO_MOTION_BEFORE_HOMING should prevent XYZ movements only when homing is not done.
E axes should be allowed
* Update Marlin_main.cpp
* Update Marlin_main.cpp
* Update Marlin_main.cpp
2017-10-30 22:50:50 -05:00
Scott Lahteine
893092ff7f
Kinematic clamp_to_software_endstops
2017-10-30 16:24:45 -05:00
Scott Lahteine
46ed54cd8e
Include time scale in some planner vars
2017-10-29 18:48:14 -05:00
Scott Lahteine
daa85f71e1
Merge pull request #8123 from thinkyhead/bf1_dual_xyz_endstops
...
[1.1.x] Dual endstops XYZ
2017-10-29 04:36:09 -05:00
Scott Lahteine
318c419f77
Implement support for Dual X and Y endstops
2017-10-29 03:49:45 -05:00
LVD-AC
77cf42588f
(1.1.x) serious bug G33
2017-10-29 00:22:55 +02: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
Scott Lahteine
2296d98845
Tweak neopixel self-test
2017-10-26 22:46:11 -05:00
Scott Lahteine
6569b9ba56
Fix FWRETRACT logic, apply common sense
2017-10-26 22:36:41 -05:00
Scott Lahteine
355ebec92d
Fix position sync in M600 pause/resume
2017-10-24 14:41:54 -05:00
Roxy-3D
e9bc9a2ab4
change to better (more clear) names ( #8049 )
...
set_destination_to_current() changed to set_destination_from_current()
set_current_to_destination() changed to set_current_from_destination()
2017-10-21 10:58:17 -05:00
tweichselbaumer
fa44130734
Add M290 babystepping ( #8014 )
...
* Add M290 babystepping
* Allow `Z` for `M290`
* fix spacing
* Support BABYSTEP_XY in M290
* Not just Z
* Extend M290 for BABYSTEP_ZPROBE_OFFSET
* tweak
2017-10-21 03:58:53 -05:00
Luc Van Daele
2a88a3fd33
boolval revised ( #8017 )
2017-10-18 14:19:01 -05:00
studiodyne
e04902f589
Add EXTRA_FAN_SPEED feature
2017-10-16 02:32:30 -05:00
Scott Lahteine
d63d08ef8b
Merge pull request #7948 from gallynero/patch-1
...
Enable change feedrate in delta
2017-10-15 16:28:45 -05:00
Scott Lahteine
5c2ff6ed19
Add Capability BUILD_PERCENT
2017-10-15 03:01:36 -05:00
Scott Lahteine
5f708d47ce
Add LCD_SET_PROGRESS_MANUALLY
2017-10-15 02:21:09 -05:00
Scott Lahteine
060d16d26b
Split the software endstop capability by axis.
...
Based on #7975 and #7979
2017-10-14 17:14:08 -05:00
Scott Lahteine
b8ddae61e2
ubl_state no longer needed
2017-10-14 02:39:13 -05:00
Scott Lahteine
b07a2aa23c
Add HAS_MESH conditional
2017-10-14 02:39:12 -05:00
Scott Lahteine
88857e8028
Move fade_scaling_factor_for_z to Planner
2017-10-14 02:10:46 -05:00
Scott Lahteine
8e808fcadc
General cleanup, apply const
2017-10-13 16:13:36 -05:00
Scott Lahteine
da93a272a0
Move leveling_is_active to a macro
2017-10-13 16:11:27 -05:00
gallynero
94228d4522
Enable change feedrate in delta
...
Enable change the relative feedrate on a printing job in delta machines with UBL
2017-10-12 01:55:51 +02: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
jmdearras
c7e0a49c94
Add some new LCD displays
...
- Original CR-10
- MKS Mini Display
2017-10-09 17:39:03 -05:00
LVD-AC
355cba4aa7
Fixes for G33
2017-10-06 15:52:53 -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
4c34b3ad9c
Stop redundant E4_IS_TMC2130 current control
2017-10-02 23:10:34 -05:00
Scott Lahteine
1b8b5c4b06
Make prepare_move_to_destination_dualx a full move function
2017-10-02 23:10:18 -05:00
Scott Lahteine
4e19ff75b6
XON/XOFF corrections, tweaks, formatting, etc.
2017-10-02 03:52:42 -05:00
Scott Lahteine
f365448338
Merge pull request #7811 from thinkyhead/bf1_fix_resume_print
...
[1.1.x] Fix broken M600 resume_print
2017-10-01 22:54:34 -05:00
GMagician
33d28c24bf
Implementing [FR] #7548
...
Added new configuration to inhibit XYZ movements when home is not done
2017-10-01 21:02:42 -05:00
MasterPIC
40a4a716e1
Fix filament change bug in resume_print
...
Expected behaviour: while (auto)extruding the new filament, the nozzle should not move. It should move (from filament replacement position to printing position) only after the user has confirmed the successful filament replacement and extrusion.
Actual behaviour: while (auto)extruding the new filament, the nozzle moves from filament replacement position back to printing position.
So the extrusion step is mixed with the movement required to go back to the printing position.
The provided code seems to be working but probably a better fix is required.
2017-10-01 18:42:29 -05:00
Scott Lahteine
802f147686
Remove some excess whitepsace
2017-10-01 18:25:04 -05:00
Scott Lahteine
80a0f935a1
Fix G10-G11 by adding a synchronize
...
Based on #7792 by @tcm0116
2017-09-30 17:46:31 -05:00
Scott Lahteine
9bbc2df217
General code cleanup, spacing
2017-09-24 16:52:41 -05:00
Luc Van Daele
74d430cb97
matrix names update ( #7697 )
...
* matrix names update
* symplified names
* new angle normalization
* ABC
* axis
* least squares
* recalc_delta_settings
* endstop_adj
* 0p
* bug
2017-09-24 01:45:31 -05:00
Scott Lahteine
0afd25a010
Fix caselight compile issues
2017-09-23 22:00:44 -05:00
Scott Lahteine
367e1b54ba
Merge pull request #7591 from thinkyhead/bf1_misc_patches
...
M111: no args reports current flags
2017-08-31 15:19:29 -05:00
Scott Lahteine
8a184a526a
Marlin: Patch G33, allow M111 to give status
2017-08-31 14:35:00 -05:00
Scott Lahteine
898f48e331
CNC workspace planes for G5
...
According to LinuxCNC, G5 should throw an error if the current plane mode isn't XY.
2017-08-31 14:29:29 -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
GMagician
0067bb2840
Addressing #7552
...
When M405 is used it changes 'volumetric_multiplier[FILAMENT_SENSOR_EXTRUDER_NUM]' value. When M406 disables M405 it leaves the value unchanged.
This PR applies 'calculate_volumetric_multipliers' in M406 instead of resetting it to 1.0 because M200 may not be compatible with M405 hence I'm sure to restore anyway with correct value.
2017-08-25 03:23:16 -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
Scott Lahteine
e337df2e98
Miscellaneous tweaks to serial outputs, code cleanups
2017-08-23 18:32:58 -05:00
