Vertabreaker
3874f4a097
Geeetech A30 / GTM32 support ( #16071 )
2019-12-01 21:25:45 -06:00
George Fu
cf1e19d167
Fysetc S6 support ( #15850 )
2019-11-26 16:15:03 -06:00
thisiskeithb
f786cc5145
Revert default BTT STM32F103 environment ( #16006 )
2019-11-26 04:28:13 -06:00
madmattco
049e8d5963
Add VAKE / VAKE403D support ( #15631 )
2019-11-26 04:00:59 -06:00
Scott Lahteine
8f09d2e790
Add STM32F103RE_bigtree to Auto Build
2019-11-22 16:47:31 -06:00
Gustavo Alvarez
b2a275891c
Support RET6 in BTT SKR Mini ( #15957 )
2019-11-21 05:09:01 -06:00
Daniel Negut
a3229b30ec
Add Zonestar/Anet LCD for SKR mini E3 ( #15931 )
2019-11-20 00:06:26 -06:00
thisiskeithb
0f57818f2d
Support 512K "RCT6" in BTT SKR Mini ( #15890 )
2019-11-15 02:51:26 -06:00
Robby Candra
fcfde7c2f5
Only assign CS/RX/TX on extra axes with SPI/UART ( #15886 )
2019-11-13 02:03:34 -06:00
Scott Lahteine
7010f92c4b
Board-based LCD delays
2019-11-09 22:33:38 -06:00
ellensp
f088c6a850
Add MKS_GEN_L_V2 controller support ( #15793 )
2019-11-04 16:31:27 -06:00
Aurawin
b09b469dd5
Add BIQU TANGO V1 support ( #15682 )
2019-10-28 18:21:59 -05:00
Scott Lahteine
9e8021d6a4
Fix pins debug of CS/MS pins
2019-10-26 18:46:39 -05:00
Scott Lahteine
f8ad15fde8
Rename BOARD_STM32F4 to fix use with MB()
2019-10-25 18:12:29 -05:00
InsanityAutomation
82fb046013
Allow suicide pin inverting ( #15586 )
2019-10-24 14:07:28 -05:00
Scott Lahteine
3949d246df
Fix ESP32 name conflict
2019-10-15 17:13:07 -05:00
Jason Smith
53abfdc2c3
Fix BLTOUCH and FAN PWM conflicts on SKR E3 boards ( #15547 )
2019-10-15 14:18:46 -05:00
Piotr
fe4c69b64a
Poll *all* enabled endstop pins ( #15525 )
2019-10-15 13:28:04 -05:00
chzj333
d04561805b
Support for BTT SKR Mini E3 v1.2 ( #15476 )
2019-10-07 15:45:11 -05:00
Tanguy Pruvot
43d6e9fa43
STM32F103.. reorganization, SKR mini fix ( #15398 )
2019-09-29 02:04:53 -05:00
Scott Lahteine
d5a34afa56
Undefine pins only in debug list
2019-09-18 11:53:42 -05:00
Scott Lahteine
ce74e4b3e4
Undefine… redux
2019-09-18 00:28:26 -05:00
Scott Lahteine
34d521234d
Undefine pins to reduce warnings
2019-09-17 23:34:14 -05:00
J.C. Nelson
896162b722
Add pins for Lerdge X and K. ( #15271 )
2019-09-15 15:23:04 -05:00
Giuliano Zaro
c96844fae2
[SAMD51] Remove RuRamps4D ( #15264 )
2019-09-15 14:17:20 -05:00
Scott Lahteine
75efa3cdac
Reorganize HAL ( #14832 )
2019-09-02 19:49:58 -05:00
Scott Lahteine
8196ced2de
Leave LCD_PINS_Dn defined for other uses
...
Fix #14998
2019-08-29 00:57:20 -05:00
ETE-Design
4be98221f6
ADIMLab Granty pins/config ( #14919 )
2019-08-21 05:33:17 -05:00
MaukCC
8664b8e97b
Adding HMS434 machine ( #14931 )
2019-08-20 03:40:48 -05:00
Scott Lahteine
5c6e82743e
Followup to STM32F407
2019-08-20 03:11:34 -05:00
chzj333
0b47558a09
New board STM32F407 ( #14994 )
2019-08-20 03:05:12 -05:00
Marcio Teixeira
274934ad81
Add LULZBOT_TOUCH_UI ( #14967 )
2019-08-16 18:34:13 -05:00
Timothy Hoogland
a67830bf67
TH3D EZBoard is LPC1769 ( #14936 )
2019-08-13 00:03:42 -05:00
Scott Lahteine
a0d782e46e
STM32F7xx is gone
2019-08-06 04:58:58 -05:00
Scott Lahteine
9ac348ef7b
SDPOWER => SDPOWER_PIN
2019-08-02 02:24:15 -05:00
Tim Moore
3765e67434
Dreammaker Overlord pins ( #14791 )
2019-07-31 21:15:36 -05:00
pinchies
d98b9d54f1
JGAurora A5S & A1 touch support ( #14768 )
2019-07-30 17:08:11 -05:00
thisiskeithb
e8e81d3609
Fix MKS Robin Lite pins include ( #14755 )
2019-07-28 14:56:05 -05:00
Giuliano Zaro
290466578f
Adafruit Grand Central M4 ( #14749 )
2019-07-28 14:48:29 -05:00
Eric Ptak
59e97e5e52
FYSETC Cheetah 1.2 ( #14723 )
2019-07-27 21:21:54 -05:00
thisiskeithb
d74efd9d46
MKS Robin Lite/Lite2 Board Support ( #14729 )
2019-07-27 04:43:37 -05:00
Msq001
6920b7fe91
BigTreeTech SKR E3 DIP ( #14638 )
2019-07-18 05:43:49 -05:00
Tanguy Pruvot
45bde333d5
Initial Longer3D LK1/2 (Alfawise U20/U20+/U30) support ( #14597 )
2019-07-14 18:05:24 -05:00
Jeonghwan Noh
475ccfad62
Oscar (by Thinknthings of Korea) board support ( #14574 )
2019-07-14 15:36:03 -05:00
Scott Lahteine
948c3f580b
Clean up some LCD conditions
2019-07-11 06:11:19 -05:00
thisiskeithb
42be684e69
Wanhao Duplicator i3 Mini support ( #14559 )
2019-07-11 04:36:51 -05:00
Scott Lahteine
340d827dc1
Fix mega/ subfolder pins
...
Followup to #14573
2019-07-11 02:59:02 -05:00
Scott Lahteine
7de605c5c3
Move pins files to subfolders #14573
2019-07-11 02:32:24 -05:00
Ludy
a7bb1fc322
Fix Dual X,Y,Z UART pins in relation to TMC2208/9 ( #14554 )
2019-07-09 22:52:48 -05:00
gmarsh
ab99a80793
GMARSH X6 board support ( #14550 )
2019-07-09 00:30:08 -05:00
Msq001
439e28783b
BigTree SKR Pro V1.1 board support ( #14523 )
2019-07-06 21:52:17 -05:00
thisiskeithb
10a71e332d
Biqu SKR 1.1 => BigTree SKR 1.1 ( #14514 )
2019-07-05 20:57:08 -05:00
Tim Moore
eb6dec03bd
Simplify power supply naming logic ( #14488 )
...
Co-Authored-By: Tim Moore <tim.moore@lightbend.com>
Co-Authored-By: AnHardt <github@kitelab.de>
2019-07-05 01:58:34 -05:00
Scott Lahteine
0f79fb9821
Generic stop pins (presume one endstop per axis end)
2019-07-02 20:30:26 -05:00
thisiskeithb
c6f74ba887
TH3D EZBoard v1.0 ( #14473 )
2019-07-02 03:12:32 -05:00
Msq001
c9be936d4a
BigTreeTech SKR Mini E3 ( #14457 )
2019-07-01 07:06:25 -05:00
Scott Lahteine
4d5a1984e2
Simplified fan handling code
2019-06-28 18:50:32 -05:00
Scott Lahteine
93cd66ac11
Tweaky change from (C) to (c)
2019-06-27 23:58:16 -05:00
Scott Lahteine
7e16835c83
Use LCD conditionals in pins files ( #14428 )
2019-06-27 22:14:43 -05:00
thisiskeithb
8b63e3701f
MKS Robin Nano board support ( #14363 )
2019-06-27 21:33:41 -05:00
thisiskeithb
cd302f9464
Add MKS SGen-L Board ( #14411 )
2019-06-26 04:17:06 -05:00
Eric Ptak
8934b32f1b
Fysetc AIO II / Cheetah STM32F1 ( #14407 )
2019-06-26 00:40:29 -05:00
thisiskeithb
a4aa3621c0
MKS Robin Mini Board Support ( #14366 )
2019-06-24 03:42:22 -05:00
thisiskeithb
71b2700c3c
Anycubic Trigorilla 1.4 Rev. 1.1 ( #14357 )
2019-06-22 17:53:45 -05:00
pinchies
3021097888
Add JGAurora A5S and A1 (STM32F103ZET6) ( #14291 )
...
- Now compiles and works correctly with changes to HAL timers and watchdog.
- Does NOT include awesome work on touch screen function.
- Does have working LCD and SD-based EEPROM.
2019-06-15 14:28:22 -05:00
Aliaksei Kvitsinski
648a91bce8
Support for Z-Bold board ( #14024 )
2019-06-13 03:21:18 -05:00
yangwenxiong
b0a4ea79b8
BigTreeTech SKR Mini v1.1 ( #14041 )
2019-06-10 21:10:51 -05:00
Scott Lahteine
fa3b5fb059
Uppercase pins filename
2019-06-05 21:41:58 -05:00
InsanityAutomation
bbcb61e042
Initial Commit - Add board
2019-06-03 23:49:19 -04:00
Scott Lahteine
81cee05476
Update some env in pins.h
2019-05-25 23:17:50 -05:00
Laurent
df75a606ff
Support MKS SGen board ( #13694 )
2019-04-15 17:03:10 -05:00
InsanityAutomation
ba31d39f6d
Azteeg X5 Mini support ( #13425 )
2019-04-08 23:10:45 -05:00
Alexander Gavrilenko
3c47e1b4d1
Support Black STM32F407VET6 with RAMPS-like shield ( #13524 )
2019-04-05 15:30:19 -05:00
Scott Lahteine
49cf92dc36
Extended condition macros ( #13419 )
...
Allow `ENABLED`, `DISABLED`, `PIN_EXISTS`, and `BUTTON_EXISTS` to take multiple arguments. Also add:
- Alias `ANY(...)` for `!DISABLED(...)`
- Alias `ANY_PIN(...)` for `PIN_EXISTS(a) || PIN_EXISTS(b) ...`
- Alias `EITHER(A,B)` for `ANY(...)`
- Alias `ALL(...)` and `BOTH(A,B)` for `ENABLED(...)`
- `NONE(...)` for `DISABLED(...)`
2019-03-16 23:43:06 -05:00
Anthony Rich
7640b328df
Support for Tronxy X5S 2e ( #13297 )
2019-03-03 07:41:05 -06:00
Scott Lahteine
99d0022fae
Drop the Z_MIN_PROBE_ENDSTOP option ( #13276 )
2019-03-01 00:27:45 -06:00
Msq001
f8a39919fa
Add Bigtree SKR 1.3 board ( #13267 )
...
Co-Authored-By: Msq001 <msq001@users.noreply.github.com>
2019-02-26 21:30:00 -06:00
Bob Kuhn
ddbe4cfa20
Printrboard G2 support ( #13116 )
2019-02-26 21:03:13 -06:00
Scott Lahteine
15aa932aa6
HAL for Linux ( #13146 )
2019-02-22 19:09:10 -06:00
Scott Lahteine
0feeef2604
Update copyright in headers
2019-02-12 15:30:11 -06:00
Psycho
3c88cac2e9
Velleman Vertex Delta pins ( #13072 )
2019-02-04 00:15:08 -06:00
Scott Lahteine
159d7eefda
New boards entry for the A20M
2019-01-28 21:08:20 -06:00
lanserge
c2cf8ffa82
Add support for Arduino DUE Shield Kit ( #12950 )
2019-01-19 23:43:32 -06:00
chrisly42
99e5e8362f
Rapide Lite 200 config, pins_RL200 RUMBA clone ( #12848 )
2019-01-19 20:19:14 -06:00
Bob Kuhn
d08f27e27b
Add support for STEVAL 3DP001V1 ( #12894 )
2019-01-15 18:59:36 -06:00
Chris Barr
1d33784bf9
Add RUMBA32 Board ( #12856 )
2019-01-10 19:34:31 -06:00
Ludy
74c47803f7
Add VORON printer ( #12705 )
2019-01-03 06:27:03 -06:00
Scott Lahteine
371d9a1acf
Fix line-endings, formatting, whitespace
...
Followup to #12770
2018-12-30 15:38:20 -06:00
Alain Martel
44ed34475b
Add MKS BASE 1.4 pins ( #12770 )
2018-12-30 10:40:22 -06:00
Msq001
f8c5d31864
Bugfix 2.0.x add motherboard pins define ( #12689 )
...
- `pins_BIQU_B300_V1.0.h` defines pins for B300, as found in the BIQU Thunder 3D printer.
- `pins_BIQU_SKR_V1.1.h` defines pins for bigtree/BIQU SKR V1.1 motherboard.
2018-12-27 10:52:35 -06:00
Ludy
f7127c44f8
Wanhao Duplicator i3 Plus pins create ( #12701 )
2018-12-20 17:30:36 -06:00
jmz52
33abb86b7e
Add support for MKS Robin board ( #12650 )
...
Implement initial support for MKS Robin (STM32F103ZET6) board.
Custom build script is used to generate encrypted firmware compatible with original MSK Robin bootloader (i.e. safe firmware update from SD card and possibility to go back to original close-source firmware).
2018-12-20 17:23:27 -06:00
Ludy
97de9d54a5
Fix broken pins file include ( #12617 )
2018-12-09 19:06:03 -06:00
InsanityAutomation
dec721c52b
Add Formbot Raptor2 and Raise3D pins ( #12532 )
...
* Add Formbot Raptor2 board
* Add Raise3D Rumba board
2018-11-25 19:56:06 -06:00
Scott Lahteine
edfd106bc5
Rejigger Filament Runout class ( #12428 )
2018-11-14 11:45:57 -06:00
Ryan
052d102ded
UltiMachine Archim 1 support ( #12404 )
2018-11-14 00:27:39 -06:00
InsanityAutomation
ad60f0691c
Add Creality3D RAMPS pins definitions ( #12229 )
2018-10-26 16:09:04 -05:00
Karl Andersson
4eb798dbdc
Add support for Arm'ed (STM32F4) board ( #12147 )
2018-10-19 14:50:52 -05:00
Andy Shaw
870bfd08f5
usb and sdcard sharing improvements
...
* Add traceback after watchdog timeout
Add the cpability to perform a traceback following a watchdog timeout.
* Enhanced hardware SPI
Allow use of either SSP0 or SSP1.
Ensure that no data is left in I/O buffers after calls to enable sharing of SSP hardware.
* Make flash emulation of eeprom the default
Make use of flash for eeprom storage the default. This means that usage of eeprom will not cause USB drive mount/unmount operations.
* Allow sharing of SD card
SD card I/O operations from the USB stack take place in idle loop, rather than at interrupt time. Allowing sharing of the SPI bus.
New configuration options to allow usage of the SD card to be specified.
* Fix problem with hardware SPI pins
2018-10-14 18:43:48 +01:00
Scott Lahteine
1407afad73
Move SENSITIVE_PINS to its own file
2018-10-11 01:10:11 -05:00
Scott Lahteine
45e738876a
Add stepper MS3 support
...
Co-Authored-By: TheLongAndOnly <thelongandonly@users.noreply.github.com>
2018-10-11 01:10:11 -05:00
Scott Lahteine
0fcdfdeed6
Followup to #12017
2018-10-06 13:23:58 -05:00
Phr3d13
acac2adfc8
Add support for MeCreator2 ( #12017 )
2018-10-06 12:26:49 -05:00
Scott Lahteine
1358bd9319
Make MAX_EXTRUDERS always 6
2018-10-03 11:32:19 -05:00
Scott Lahteine
348004c34f
STM32F7 HAL using the official STM32 Arduino Core ( #11750 )
2018-10-03 03:26:07 -05:00
Mitch Roote
d016b572e3
[2.0.x] Add pin configuration for Fysetc F6 ( #11932 )
2018-09-27 19:20:19 -04:00
InsanityAutomation
cb9dc56630
Add GT2560 v3 support ( #11914 )
2018-09-27 15:13:15 -04:00
InsanityAutomation
1104054d73
2.0 IDEX Independent z offset and other fixes ( #11862 )
...
* Add Formbot Raptor board
Co-Authored-By: InsanityAutomation <insanityautomation@users.noreply.github.com>
* Add a second Z probe Z offset
Co-Authored-By: InsanityAutomation <insanityautomation@users.noreply.github.com>
* Modify method to utilize live adjustment of hotend z offset
Should probably move config option to babystepping and rename as it may now apply to all multiextruder systems
* Move config item and catchup other code to current method
2018-09-24 09:40:48 -05:00
Scott Lahteine
1718eff54a
Code changes supporting up to 6 extruders
2018-09-16 22:32:53 -05:00
Holger Müller
1a6f2b29b8
Add support for Triple-Z steppers/endstops
2018-09-16 00:35:58 -05:00
Scott Lahteine
8584d3697d
Fix servo count define conflict
...
`MAX_SERVOS` => `NUM_SERVO_PLUGS`
2018-09-11 16:20:31 -05:00
Roxy-3D
fe4fc2883b
Add support for Formbot T-Rex3
2018-09-06 09:41:59 -05:00
Scott Lahteine
3e81745e81
Fix issues, make optional
2018-08-29 17:58:02 -05:00
Ilya Bukhonin
7ecb8b4af5
[2.0.x] Teensy 3.1 and 3.2 support ( #11460 )
2018-08-27 21:49:49 -05:00
Pablo Crespo
409a0632af
[2.0.x] Add Morpheus Board support ( #11651 )
2018-08-27 21:28:03 -05:00
Chris Pepper
b71c2b8651
[2.0.x] Update LPC176x tests, fix clean script ( #11617 )
2018-08-24 18:53:24 -05:00
Michael Triffon
f8c52c9c29
Azteeg X5 Mini WiFi support ( #11601 )
2018-08-21 23:58:26 -05:00
Roxy-3D
62ce937540
Update pins.h to include the Formbot board
2018-08-20 16:44:54 -05:00
Greg Nutt
a1a5367380
Smoothieboard V1.0/1.1 and A5984 support
2018-08-09 23:03:17 -05:00
Scott Lahteine
9bae413901
Add Bigtreetech/BIQU KFB 2.0 board ( #11446 )
2018-08-03 18:14:26 -05:00
Dave Johnson
8a24ff94d1
AT90USB1286 PIO cleanup and optimization ( #11230 )
...
-normalize `env` and `board` to lowercase naming convention.
-make board `name` follow descriptive convention.
-implement `-fsingle-precision-constant` compile optimization per https://github.com/MarlinFirmware/Marlin/pull/11178#issuecomment-401673901
-fix typo in 5DPRINT entry.
2018-07-26 05:58:28 -05:00
Lee Olivares
094e6d81a5
Add Einstart-S support ( #11219 )
...
Indeed the HAL does not need to be mucked around with to expose ATmega2560 pins not available as numbers on the MEGA board, I'll need to update the wiki with that tidbit and a reference to the pin-mapping comment in `fastio_1280.h`.
2018-07-26 05:52:22 -05:00
Bo Herrmannsen
67b205fd45
Add support for board RuRAMPS4D v1.3 ( #11363 )
2018-07-25 19:32:27 -05:00
Simon Jouet
e2aeda61ed
HAL for Espressif ESP32 Wifi
2018-06-13 19:33:35 -05:00
Scott Lahteine
88314b8910
CREALITY_ENDER is long gone
...
As noted in #10965
2018-06-08 19:53:21 -05:00
Axel
ae322e0c54
[2.0.x] Add GTM32 Pro VB support ( #10898 )
2018-05-31 00:11:38 -05:00
Scott Lahteine
d259070980
Clean up trailing spaces from vim, etc.
2018-05-31 00:09:41 -05:00
Axel
bbd09a99f1
32 bit boards classification cleanup ( #10818 )
...
- Ordering and match classification between `boards.h` and `pins.h`
- Check `pins.h` environments
2018-05-22 21:20:24 -05:00
Bob Kuhn
62e2987488
add AT90USB support & add items to popup menu ( #10779 )
2018-05-19 17:39:26 -05:00
Bob-the-Kuhn
00dfaae8df
[2.0.x] Platformio - automate build & environment selection ( #10503 )
2018-04-26 02:42:06 -05:00
Scott Lahteine
2be5fe5ddf
Split TRIGORILLA into 1.3 and 1.4
2018-04-20 16:12:25 -05:00
Scott Lahteine
80e29492c6
TRIGORILLA => TRIGORILLA_13
2018-04-20 16:12:25 -05:00
Scott Lahteine
4f184ba5da
[2.0.x] Add BOARD_MKS_BASE_15 with digital micro-stepping ( #10454 )
...
* Add BOARD_MKS_BASE_15 with digital micro-stepping
* Rename MKS_13 to MKS_GEN_13
2018-04-18 22:58:43 -05:00
Karl Andersson
428c54f2ad
[2.0.x] HAL for STM32F4 ( #10434 )
2018-04-17 17:33:29 -05:00
Chris Pepper
cc6d41e1d3
Use a macro for HAL header redirection ( #10380 )
2018-04-12 20:25:08 -05:00
Lenbok
0e8242180d
Chamber temperature monitoring and auto fan control.
...
This is an initial cut for feedback, updated for 2.0.x.
Chamber temperature is currently reported along with hot end and bed
temperatures to serial. The format is just like that used for hot end
and bed temperatures, but using 'C' prefix. As there is no heater,
target is always 0. Is this appropriate, is there a better way to report
chamber temperatures?
Chamber temperatures are not reported on the LCD in any way.
When auto chamber fan is enabled, it currently just uses the same
temperature threshold as the other auto controlled fans.
As the chamber temperature is not connected to any heater, it doesn't
undergo mintemp/maxtemp monitoring. This would need to change in the
future if chamber heating became a feature.
2018-04-06 23:09:06 -05:00
Marcio Teixeira
9356cf648f
Added support for Einsy Retro
...
http://reprap.org/wiki/EinsyRetro
2018-04-06 19:48:46 -05:00
Scott Lahteine
4a23069de9
Fix Ender 4 / CR-8 compilation
...
- Assign 243 (like EFB) as Ender-4/CR-8 board ID
- Add to `Makefile`
- Add to `pins.h`
2018-04-01 18:22:06 -05:00
Scott Lahteine
374ea49be9
Revert marlinAnalogInputToDigitalPin
2018-03-14 00:18:40 -05:00
Scott Lahteine
18de11c1ea
Followup to auto-assign of dual axis CS pins
2018-03-12 07:19:56 -05:00
Scott Lahteine
d385b9aac7
Auto-assign CS pins for X2, Y2, Z2 ( #10057 )
...
Fixes #9211
2018-03-11 08:56:13 -05:00
Scott Lahteine
6d7f4f84e2
Add board MKS_BASE_HEROIC ( #9926 )
...
Followup to #9008
- Don't define micro-stepping pins for boards that lack them.
- Allow setting of 128 microsteps with `M350`.
2018-03-03 23:14:52 -06:00
Scott Lahteine
c471389afb
Add Einsy Rambo pins ( #9850 )
2018-02-28 04:16:12 -06:00
Scott Lahteine
3e384b60ce
Malyan M200 fix E0_AUTO_FAN_PIN ( #9580 )
...
Fixes #8794
2018-02-10 20:04:09 -06:00
Scott Lahteine
4aff6c1c32
Tronxy X5S pins and configuration
2018-02-10 15:07:04 -06:00
Scott Lahteine
c0dd9ef9f2
Support for AnyCubic TriGorilla board ( #9551 )
2018-02-09 05:41:52 -06:00
Thomas Moore
93af0365e8
[2.0.x] Add support for Cohesion3D ReMix and Mini ( #9512 )
...
* Add support for Cohesion3D ReMix and Mini
* Two separate pins files for pedantic reasons
2018-02-08 03:14:39 -06:00
Alexey Shvetsov
da3a0d619c
Add Selena Compact board ( #9407 )
...
5-axis, high performance, powerful board with Smoothieware opensource firmware. Designed for 3D printer, Laser cutter or CNC mill. Five changed independent drivers on board. Two extruders 3d printer support.
2018-02-04 03:15:09 -06:00
Scott Lahteine
582d073de1
Patch up digital microstepping and SPI CS pins
2018-01-22 01:27:11 -06:00
Scott Lahteine
f4e4c7a7c8
Merge pull request #9188 from thinkyhead/bf2_creality_ender
...
[2.0.x] Add Creality Ender config/board
2018-01-15 04:33:09 -06:00
