Commit Graph

855 Commits

Author SHA1 Message Date
DrDitto
55b8547f04 Simplify MKS_MINI_12864 init (move 5ms to u8g seq.) (#15428) 2019-09-30 02:11:58 -05:00
Scott Lahteine
b7a9481e01 [cron] Bump distribution date 2019-09-30 00:00:04 -05:00
Bob Kuhn
178dcd6fd8 SPI chaining with TMCStepper simplified interface (#15179) 2019-09-29 05:47:20 -05:00
Scott Lahteine
50e4545255
Add custom types for position (#15204) 2019-09-29 04:25:39 -05:00
Tanguy Pruvot
43d6e9fa43 STM32F103.. reorganization, SKR mini fix (#15398) 2019-09-29 02:04:53 -05:00
Scott Lahteine
5e9898600b [cron] Bump distribution date 2019-09-29 00:00:07 -05:00
InsanityAutomation
e942b352c6 Fix Photograph Pin Sanity Check (#15406) 2019-09-28 16:18:23 -05:00
Scott Lahteine
1834d86df5 Fix sanity check typos 2019-09-28 15:26:21 -05:00
InsanityAutomation
a6b0223eea Revive and improve DELTA probe bounds, LRFB options (#15372) 2019-09-28 01:19:11 -05:00
Scott Lahteine
f57ce2b40a [cron] Bump distribution date 2019-09-28 00:00:04 -05:00
Scott Lahteine
dc65788511 Shorthand for __VA_ARGS__ 2019-09-27 04:43:34 -05:00
Scott Lahteine
62e4e05a19 [cron] Bump distribution date 2019-09-27 00:00:04 -05:00
Scott Lahteine
661c3cfc99 Fix mesh bounds for MBL 2019-09-25 09:05:46 -05:00
InsanityAutomation
e9cf46a9a5 M851 XY 3 point followup (incomplete) (#15361) 2019-09-25 02:43:41 -05:00
Scott Lahteine
bd6d144cdb [cron] Bump distribution date 2019-09-25 00:00:04 -05:00
InsanityAutomation
df1e51258a Add M851 X Y probe offsets (#15202) 2019-09-24 21:29:21 -05:00
Scott Lahteine
48e2f90304 Improve TMC sanity checks 2019-09-24 17:20:39 -05:00
Scott Lahteine
07eb213046 [cron] Bump distribution date 2019-09-24 00:00:11 -05:00
Scott Lahteine
9e7e8e229c [cron] Bump distribution date 2019-09-23 00:00:08 -05:00
Scott Lahteine
7fc4f7b815 [cron] Bump distribution date 2019-09-21 00:00:13 -05:00
Jason Smith
514223f960 Fix BACKLASH_COMPENSATION compiler issues (#15307) 2019-09-20 00:48:41 -05:00
Scott Lahteine
de78b61d35 [cron] Bump distribution date 2019-09-20 00:00:10 -05:00
InsanityAutomation
6a312fae80 Add before/after dir change delays (#15314) 2019-09-19 23:05:17 -05:00
Scott Lahteine
86e0b9eb05 [cron] Bump distribution date 2019-09-19 00:00:08 -05:00
Scott Lahteine
bcf630d8d1 Clarify a sanity check 2019-09-18 16:43:30 -05:00
Scott Lahteine
356b582a9f [cron] Bump distribution date 2019-09-18 00:00:05 -05:00
Scott Lahteine
b39ab3db37 Sanity-check for SD reprint 2019-09-17 23:34:14 -05:00
Scott Lahteine
c353eaa146
Misc changes from struct refactor (#15289) 2019-09-17 18:16:28 -05:00
Scott Lahteine
282c39e3d0 [cron] Bump distribution date 2019-09-17 00:00:06 -05:00
Scott Lahteine
9c218381c5 [cron] Bump distribution date 2019-09-16 00:00:05 -05:00
Scott Lahteine
20fbb751f1 Tell externals it's Marlin 2019-09-15 03:12:44 -05:00
Scott Lahteine
c4090b1375 [cron] Bump distribution date 2019-09-15 00:00:05 -05:00
Scott Lahteine
465c6d9230
Simpler Allen Key config. Fixes, cleanups from refactor (#15256) 2019-09-14 03:05:10 -05:00
Scott Lahteine
ffb418b226 Move some SD comments 2019-09-14 02:31:47 -05:00
Robby Candra
acd76e8609 Allow odd mm bed sizes (#15258) 2019-09-14 01:26:14 -05:00
Scott Lahteine
bbbfb0015b [cron] Bump distribution date 2019-09-14 00:00:14 -05:00
Scott Lahteine
ae7ae89bb3 [cron] Bump distribution date 2019-09-13 00:00:04 -05:00
Scott Lahteine
7cf1befbec [cron] Bump distribution date 2019-09-12 00:01:23 -05:00
Scott Lahteine
41a3fbceac [cron] Bump distribution date 2019-09-11 00:00:04 -05:00
Scott Lahteine
584c86bed1
More "zero extruders" changes (#15213) 2019-09-10 02:20:49 -05:00
Scott Lahteine
54abf3aeba [cron] Bump distribution date 2019-09-10 00:00:06 -05:00
Scott Lahteine
5949c24afc [cron] Bump distribution date 2019-09-09 00:00:05 -05:00
Luu Lac
8bca3fcf2c Display chamber with HAS_TEMP_CHAMBER (#15194) 2019-09-08 02:20:18 -05:00
Jamie
dbee0e9c54 Analog joystick jogging control (#14648) 2019-09-08 00:55:34 -05:00
Scott Lahteine
94948d3dcb Compact some sanity conditions 2019-09-06 19:03:04 -05:00
Scott Lahteine
ca1a3476cb [cron] Bump distribution date 2019-09-06 00:00:04 -05:00
Scott Lahteine
37d3c7288f [cron] Bump distribution date 2019-09-05 00:00:04 -05:00
Robby Candra
6b05d5d65d Allow TOUCH_BUTTONS to be swapped (#15100) 2019-09-04 13:13:05 -05:00
Scott Lahteine
d9bbe0ff02 [cron] Bump distribution date 2019-09-04 00:00:03 -05:00
Scott Lahteine
75efa3cdac
Reorganize HAL (#14832) 2019-09-02 19:49:58 -05:00
thisiskeithb
cdd5056aba Increase MKS MINI 12864 default contrast (#15139) 2019-09-02 19:40:58 -05:00
Scott Lahteine
b4715b29bb [cron] Bump distribution date 2019-09-02 00:00:04 -05:00
Scott Lahteine
34b73426e5 Apply #ifdef/#ifndef where possible 2019-09-01 23:54:50 -05:00
Jason Smith
be051c890f Fix Z_STEPPER_ALIGN_[XY] sanity error (#15124) 2019-09-01 04:00:20 -05:00
Bob Kuhn
ba91bca1eb TMC SPI daisy chain support (experimental) (#15081) 2019-08-30 17:39:45 -05:00
Scott Lahteine
05ef9b2f55 [cron] Bump distribution date 2019-08-30 14:44:39 -05:00
AlexandrZloy
0ebaea94be Add stallGuard threshold for X2 (#15042) 2019-08-29 00:15:31 -05:00
Scott Lahteine
e1d65b8937 [cron] Bump distribution date 2019-08-29 00:00:03 -05:00
Scott Lahteine
1d8ad7cf71 Safe changes from HAL cleanup 2019-08-28 21:21:47 -05:00
Scott Lahteine
3ac76f0489
Invariant Marlin bootscreen (#15057) 2019-08-28 07:40:18 -05:00
Scott Lahteine
b2a4b6f34e Don't use board url as override 2019-08-28 04:44:40 -05:00
Scott Lahteine
318356b6bc [cron] Bump distribution date 2019-08-26 00:00:07 -05:00
Daniel Callander
155765646e Add warning when trying to use JD with kinematic systems (#15032) 2019-08-25 04:43:53 -05:00
Scott Lahteine
c7825e6719 Contrast over 63 assume 255 max
This is closer to the prior behavior.
2019-08-25 04:31:00 -05:00
Tim Moore
1461ee4d36 Make LCD_CONTRAST_MAX >= _LCD_CONTRAST_INIT (#15046) 2019-08-25 04:25:07 -05:00
Scott Lahteine
9e9e578234 [cron] Bump distribution date 2019-08-25 00:00:03 -05:00
Scott Lahteine
04a9962cb5 Fix: Contrast override in pins files
Move contrast handling to `Conditionals_post.h` so pins files can override the LCD defaults.
2019-08-24 00:58:05 -05:00
Scott Lahteine
8c73017a69 [cron] Bump distribution date 2019-08-24 00:00:04 -05:00
Tanguy Pruvot
e604f76703 Enable contrast via LCD_CONTRAST_INIT (#15006) 2019-08-21 18:56:39 -05:00
Scott Lahteine
f1942f6ec0 [cron] Bump distribution date 2019-08-21 00:00:04 -05:00
Ludy
05995d1fd6 Unify buzz methods as MarlinUI::buzz (#14803) 2019-08-20 02:01:37 -05:00
Scott Lahteine
94397dbdb4 [cron] Bump distribution date 2019-08-19 00:00:07 -05:00
Scott Lahteine
dfcd437486 Base HAS_LCD_CONTRAST on display type 2019-08-18 23:38:12 -05:00
Scott Lahteine
9a3ee3be53 [cron] Bump distribution date 2019-08-18 00:00:04 -05:00
Scott Lahteine
9e49f154d8 [cron] Bump distribution date 2019-08-17 15:47:17 -05:00
Tim Moore
4575978a1f Fix auto power for chamber fan (#14922) 2019-08-16 18:42:24 -05:00
Marcio Teixeira
274934ad81 Add LULZBOT_TOUCH_UI (#14967) 2019-08-16 18:34:13 -05:00
Marcio Teixeira
179d6c4ed1 Add STARTUP_SCRIPT option. M17 parity with M18. (#14953) 2019-08-14 21:05:15 -05:00
Scott Lahteine
24ce8beb48 [cron] Bump distribution date 2019-08-14 00:00:11 -05:00
Ludy
d7172a4558 Cleanup and conditions (#14886) 2019-08-10 19:22:18 -05:00
Ludy
9479ec32f7 Fix Service Menu compile error (#14903) 2019-08-10 00:53:26 -05:00
Scott Lahteine
a6f682d860 [cron] Bump distribution date 2019-08-08 06:39:53 -05:00
teemuatlut
d4974ea719 TMC SPI Endstops and Improved Sensorless Homing (#14044) 2019-08-04 22:22:58 -05:00
Tim Moore
940c59d9da Overlord i2c LCD with LEDs and buzzer (#14801) 2019-08-02 06:19:45 -05:00
Scott Lahteine
9ac348ef7b SDPOWER => SDPOWER_PIN 2019-08-02 02:24:15 -05:00
Scott Lahteine
c1b99c43b6 [cron] Bump distribution date 2019-07-30 05:07:39 -05:00
Scott Lahteine
bc58e678bd More general FSMC display option 2019-07-30 04:25:55 -05:00
rafaljot
e44fccf3d2 Add support for M575 (#14757) 2019-07-30 02:30:00 -05:00
Scott Lahteine
8837cd3b53 [cron] Bump distribution date 2019-07-29 18:46:40 -05:00
Scott Lahteine
e5d73f68c8
HAL folder organization (#14763) 2019-07-28 23:55:24 -05:00
mikeshub
1579091c20 PID loop improvements (#14746)
* Fix macro evaluation in `temperature.cpp`
* Improve bed PID, PID debug output
* Add min PID power define
2019-07-28 15:50:25 -05:00
Giuliano Zaro
290466578f Adafruit Grand Central M4 (#14749) 2019-07-28 14:48:29 -05:00
Ludy
ead6bb267d Add Z3 SanityCheck, revert early sanity change (#14717) 2019-07-24 22:32:49 -05:00
Scott Lahteine
1088846cae Cosmetic updates from 14044 2019-07-24 01:52:36 -05:00
Tim Moore
e5aa453293 Add support for 2 Neopixel strips (#14667) 2019-07-20 23:14:09 -05:00
wookie666
00e2f6da8f Improve magnetic dock switching toolhead (#14663) 2019-07-19 06:07:26 -05:00
Robby Candra
71d8c6f742 Fix LCD sanity check (#14678) 2019-07-19 05:53:36 -05:00
Scott Lahteine
fd2bc3a212 [cron] Bump distribution date 2019-07-19 00:00:09 -05:00
Scott Lahteine
3d153486da Fysetc rename Part 2 2019-07-18 04:36:08 -05:00
Scott Lahteine
5535a047d7 [cron] Bump distribution date 2019-07-16 00:00:08 -05:00
Tanguy Pruvot
bae8d0a4bd DOGM: Avoid white flash on TFT (re)init (#14631)
- Avoid white flash on TFT (re)init. Unlike Graphical LCD, the TFT init color may be full white if the backlight is on during init.

- Add a conditional for delayed backlight init which can be applied to any backlit display.
2019-07-15 17:36:16 -05:00
Scott Lahteine
93bc1b17f9 [cron] Bump distribution date 2019-07-15 00:00:08 -05:00
Scott Lahteine
d4be970c8b Update DOGLCD conditions 2019-07-14 13:10:13 -05:00
Scott Lahteine
2d84bcb4cd Simplify, update LCD sanity-check 2019-07-14 13:09:16 -05:00
Scott Lahteine
eaf1c0954e Update some precompiler tests 2019-07-14 13:09:16 -05:00
Scott Lahteine
a85cd042d8 [cron] Bump distribution date 2019-07-14 00:00:09 -05:00
Scott Lahteine
91bb0f5439 [cron] Bump distribution date 2019-07-13 00:00:09 -05:00
InsanityAutomation
f1eaed7e98 Only init servo pins used for servos (#14589) 2019-07-12 04:30:15 -05:00
Scott Lahteine
89964ec30d [cron] Bump distribution date 2019-07-12 00:00:08 -05:00
Scott Lahteine
948c3f580b Clean up some LCD conditions 2019-07-11 06:11:19 -05:00
Scott Lahteine
e5a5273edb [cron] Bump distribution date 2019-07-11 00:00:10 -05:00
Scott Lahteine
9817976375 [cron] Bump distribution date 2019-07-10 00:00:08 -05:00
gmarsh
ab99a80793 GMARSH X6 board support (#14550) 2019-07-09 00:30:08 -05:00
Scott Lahteine
a2ba0aaaac
HAL include and other adjustments (#14525) 2019-07-08 23:42:29 -05:00
Scott Lahteine
1a349c7522 Add HAS_TMC220x 2019-07-08 23:07:42 -05:00
Scott Lahteine
9821ec2afd Fix SKR Pro pins, STM32F1/4 sanity-check
Co-Authored-By: Msq001 <msq001@users.noreply.github.com>
2019-07-08 23:07:42 -05:00
Scott Lahteine
2b1c2a0db9 [cron] Bump distribution date 2019-07-08 00:00:11 -05:00
Scott Lahteine
e7307af42d [cron] Bump distribution date 2019-07-07 00:09:53 -05:00
Ludy
c0497234b9 SanityCheck Biqu SKR 1.1 => BigTree SKR 1.1 (#14526) 2019-07-06 21:24:10 -05:00
Scott Lahteine
8916acf083 [cron] Bump distribution date 2019-07-06 00:00:09 -05:00
Ludy
a210f80adc Sanity-check for CASE_LIGHT_PIN (#14518) 2019-07-05 20:18:43 -05:00
Scott Lahteine
fe02241044 NONE on combined options 2019-07-05 18:20:24 -05:00
Scott Lahteine
750a16ad38 Fix MIN/MAX function collision with macros 2019-07-05 18:14:02 -05:00
Scott Lahteine
8ff49d6b46 [cron] Bump distribution date 2019-07-05 03:48:50 -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
c6e6365e15 [cron] Bump distribution date 2019-07-04 15:56:02 -05:00
Scott Lahteine
de462f2b8a Revert "Sort out settings.load with SD EEPROM emulation (#14458)"
This reverts commit 108d0df565.
2019-07-03 19:11:30 -05:00
Scott Lahteine
6a2a10a154 Bump distribution date 2019-07-03 03:11:12 -05:00
Scott Lahteine
371969b531 Remove deprecated SCARA option 2019-07-03 02:43:33 -05:00
Scott Lahteine
ce2b4bc20c Conditionals tweak 2019-07-02 20:30:26 -05:00
Scott Lahteine
274809aced Bump distribution date 2019-07-02 05:54:06 -05:00
Tanguy Pruvot
108d0df565 Sort out settings.load with SD EEPROM emulation (#14458) 2019-07-01 09:10:17 -05:00
Aliaksei Kvitsinski
2f932a11b3 Park heads with electromagnet (#14023) 2019-07-01 05:55:23 -05:00
Scott Lahteine
56c4a96180 Bump distribution date 2019-07-01 01:21:31 -05:00
Scott Lahteine
ced30b1054 Update ExtUI sanity checks 2019-07-01 00:50:22 -05:00
Marcio Teixeira
e6cf7860e8 Improve ExtUI, fix compiler errors, warnings (#14441) 2019-06-29 00:23:57 -05:00
Scott Lahteine
e89a47c8b5 Bump distribution date 2019-06-29 00:13:59 -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
d7d80418ae
Singleton for cutting tools (#14429) 2019-06-27 23:06:49 -05:00
Andy Shaw
064177154c Update SD card connection / sharing options (#14325) 2019-06-26 03:55:57 -05:00
Scott Lahteine
98f3a3d5c3 Bump distribution date 2019-06-26 03:15:31 -05:00
MrMabulous
c41b005f33 Add Extra Probing option, discarding outliers (#14338) 2019-06-21 19:02:26 -05:00
Tobias Frost
eeaef2410a Support DGUS Display with DWIN OS (#13253) 2019-06-21 04:47:23 -05:00
Scott Lahteine
4df4c47994
Add TMC2209 support (#14249) 2019-06-20 15:47:50 -05:00
Tanguy Pruvot
75aeb41ab7 SKRmini support for Fysetc Mini Panel (#14319) 2019-06-18 19:34:16 -05:00
InsanityAutomation
bf64dd4db6 Improve G34, M422 (Z alignment) (#14142) 2019-06-18 07:02:18 -05:00
sensei73
ce5f94c8f4 Fix Touch-MI sanity checks (#14316) 2019-06-17 17:46:14 -05:00
Tanguy Pruvot
f2cfa408b7 Touch-MI probe by hotends.fr (#14101)
A simple Z probe using a magnet to deploy a probe. See https://youtu.be/E7Ik9PbKPl0 for the sensor description...
2019-06-14 22:19:48 -05:00
MastS
18904c42f6 Fysetc LCD backlight timeout (#14265) 2019-06-12 21:59:39 -05:00
Scott Lahteine
0ca2073625 ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED => SD_ABORT_ON_ENDSTOP_HIT 2019-06-10 17:28:35 -05:00
Scott Lahteine
455f0de817 Undefine sanity check tests when done 2019-06-08 06:29:28 -05:00
InsanityAutomation
4138b1f9ae Option to disable Case Light brightness control (#14165) 2019-06-07 07:23:42 -05:00
Ludy
bd494a6bd6 Update defines for patched temperature macros (#14161) 2019-05-28 17:43:31 -05:00
Minims
32afe1d102 Fix TOOLCHANGE_ZRAISE warning (#14156) 2019-05-27 19:51:29 -05:00
doggyfan
90121047d9 Fix thermal protection with user thermistor (#14130) 2019-05-25 23:37:08 -05:00
InsanityAutomation
49e83dd7c8 BLTouch V3.1 changes (#14104) 2019-05-25 21:56:47 -05:00
Scott Lahteine
4ef364a073 Sanity check probe offsets must be integers 2019-05-21 17:16:21 -05:00
chai-md
940ff8e7c8 Improve LV8729 stepping (#13776) 2019-05-11 19:02:19 -05:00
Bob Kuhn
456a0ee76b Improve Due SW SPI, Fysetc sanity checks, &c. (#13939) 2019-05-11 16:51:39 -05:00
Scott Lahteine
ad4ffa1d2f
Use C++ language supported 'nullptr' (#13944) 2019-05-09 11:45:55 -05:00
Scott Lahteine
23ec650410 Consolidate Malyan LCD and ExtUI 2019-05-07 21:31:30 -05:00
InsanityAutomation
6811e2921b BLTouch v3 / 3DTouch Interoperability & performance (#13814) 2019-05-07 21:25:54 -05:00
doggyfan
23a8707ef1 Configurable Thermistor (#13888) 2019-05-06 18:51:06 -05:00
Giuliano Zaro
e2a77ed881 Bring chamber temp to completion (#13837) 2019-05-04 22:51:47 -05:00
Marcio Teixeira
15357af67c Backlash cleanup (#13659)
…And save backlash, fil. sensor, ExtUI userdata to EEPROM.
2019-05-03 23:53:15 -05:00
Scott Lahteine
bf54251a10
Finish, improve, clean up FYSETC_MINI_12864 revisions (#13871) 2019-05-01 20:05:29 -05:00
Bob Kuhn
81ca5a4cd4 Fix and improve FYSETC LCD support (#13767) 2019-04-21 20:48:53 -05:00
jmdearras
b65cb5704d Fix, improve FYSETC_MINI_12864 support (#13730) 2019-04-19 20:11:51 -05:00
Scott Lahteine
0a6835fbea More robust HAS_LCD_CONTRAST 2019-04-18 21:09:34 -05:00
Bob Kuhn
9b578ca343 Support FYSETC_MINI_12864 on Re-ARM, RAMPS_FD, MKS SBASE (#13717) 2019-04-15 22:54:11 -05:00
Stephan
84273557f9 Move and update heated chamber settings (#13671)
Co-Authored-By: the-real-orca <stephan.veigl@gmail.com>
2019-04-12 15:38:10 -05:00
Ludy
9fd3e64ba8 Fix compile error with EXTRUDER>1 (#13651) 2019-04-11 13:58:50 -05:00
ManuelMcLure
492883859e Don't protect unused CS pins (#13647) 2019-04-10 21:57:57 -05:00
Scott Lahteine
cee3b172b9
Fix Marlin splash screen logic (#13646) 2019-04-10 17:14:57 -05:00
Scott Lahteine
5018fdacbe
Support FYSETC_MINI_12864_PANEL (#13365) 2019-04-09 18:34:29 -05:00
Scott Lahteine
c8a83fb122 SPINDLE_LASER_ENABLE => SPINDLE_LASER_ENA 2019-04-08 18:13:41 -05:00
Scott Lahteine
9abe9aff56
Confirm before starting SD print (#13616) 2019-04-08 13:44:35 -05:00
Scott Lahteine
240ea1bbb3 Split up games into separate files 2019-04-04 03:06:19 -05:00
Scott Lahteine
5d2c5877f7 DOGM bootscreen cleanup 2019-04-03 18:10:50 -05:00
Robby Candra
46445a5a16 Event G-code for Stop SD Print (#13547)
Co-Authored-By: 7eggert <7eggert@gmx.de>
Co-Authored-By: robbycandra <robbycandra.mail@gmail.com>
2019-04-02 22:09:30 -05:00
Scott Lahteine
8b7c3eec83 Games, for fun (and stress-testing) (#13464) 2019-04-01 17:48:54 -05:00
Chris Pepper
ffc2c2d7c5 Move FAST_PWM_FAN code to HALs (#13491) 2019-03-26 01:03:23 -05:00
Scott Lahteine
b376c7e374 Group DISABLED items 2019-03-17 07:56:35 -05:00
InsanityAutomation
691e5c3bb8 BLTouch V3.0 support (#13406) 2019-03-17 05:57:25 -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
Scott Lahteine
f89b375fb9
Fixes and improvements for PWM pins (#13383) 2019-03-13 06:51:15 -05:00
Scott Lahteine
87162658c4
Fix and improve software endstops (#13386) 2019-03-13 05:48:36 -05:00
Hadrien Jouet
0278ad0a6d Add ESP32 WiFi interface (#11209) 2019-03-13 00:48:08 -05:00
InsanityAutomation
050eac03af Single X Duplication Extension (#13373)
* Multi-nozzle selective duplication
* Use a bit-mask, reduce stepper_indirection.h size
* Tweak the multi-nozzle duplication description
* Use 'S' as a bool in M605
* Add HAS_DUPLICATION_MODE conditional
* Remove '_MODE' from the option name
* M605 in the style of Stacker M280
* Also include direct mask style (P)
2019-03-13 00:42:50 -05:00
Scott Lahteine
51ff5b68fa Clean up fastIO ahead of PWM patch 2019-03-12 20:39:55 -05:00
Scott Lahteine
d94e077901 Apply HAS_HOTEND_OFFSET where needed 2019-03-11 20:58:27 -05:00
7eggert
10c8c034bd Allow both encoder and ADC keypad (#13355) 2019-03-11 18:10:56 -05:00
Scott Lahteine
aa1d587128 Some LCD code cleanup 2019-03-11 05:07:31 -05:00
pinchies
4df9509ead Add support for printers with inverted fan pins (#13362)
Add support for printers with inverted fan pins by adding `#define FAN_INVERTING 1` to `Configuration_adv.h` and modifying the fan write macros.
2019-03-10 20:51:21 -05:00
Reece Kibble
dbead66988 Allows user to set (almost) any PWM frequency (#12638) 2019-03-08 02:15:42 -06:00
3dlabsio
645ca7af7a M141 Heated Chamber, Temperature rework (#12201) 2019-03-07 02:09:39 -06:00
Scott Lahteine
44571775bd Further support for 6 extruders 2019-03-07 01:00:56 -06:00
Tobias Frost
6df51201ae Include EXTENSIBLE_UI in single LCD sanity check (#13306) 2019-03-05 06:33:36 -06:00
Scott Lahteine
fa236e9718 General cleanup ahead of L64XX 2019-03-01 19:58:07 -06:00
Scott Lahteine
2f1e1dcb42 Gradual step towards EXTRUDERS 0 support 2019-03-01 01:51:24 -06:00
Scott Lahteine
99d0022fae
Drop the Z_MIN_PROBE_ENDSTOP option (#13276) 2019-03-01 00:27:45 -06:00
InsanityAutomation
eb4bf93ea4 Add more Babystep options (#13262) 2019-02-27 04:38:56 -06:00
Scott Lahteine
f37df28d17 UBL G29 T current position fix
Counterpart to #12845
2019-02-26 22:25:53 -06:00
Scott Lahteine
808b076000 Update some ABL/UBL conditionals 2019-02-25 16:01:42 -06:00
Scott Lahteine
38363902c7 Fix sanity checks for distinct E factor settings
Reference #13156
2019-02-25 00:20:36 -06:00
kwalters3
5eb82ca6a8 Change SSD1306_OLED_I2C_CONTROLLER to HAS_SSD1306_OLED_I2C (#13223) 2019-02-22 19:08:36 -06:00
Scott Lahteine
631d867dc9 HAL cleanups 2019-02-20 06:27:26 -06:00
LinFor
ba39186364 TMC_DEBUG optimization and improvements (#13135) 2019-02-20 02:22:42 -06:00
Scott Lahteine
d2bdb71c13
Add PHOTO_GCODE option, photo trigger physical move (#13168) 2019-02-14 15:09:35 -06:00
Scott Lahteine
7cf9b93f26 Add HAS_FILAMENT_SENSOR ahead of 12962 2019-02-12 20:13:20 -06:00
revilor
e56c13670d Service interval watchdog (#13105) 2019-02-12 15:58:56 -06:00
InsanityAutomation
7f1b69b0c8 Add HOST_PROMPT_SUPPORT (#13039) 2019-02-12 15:55:47 -06:00
Scott Lahteine
0feeef2604 Update copyright in headers 2019-02-12 15:30:11 -06:00
Scott Lahteine
166e567ab8 Fix HAS_MOTOR_CURRENT_PWM 2019-02-10 05:06:46 -06:00
Scott Lahteine
6de3d34378
M166 Gradients, LCD Menu for 2-channel Mixer (Geeetech A10M/A20M) (#13022) 2019-02-10 04:54:23 -06:00
Marcio Teixeira
e1604198ff G425 — Auto-calibrate Backlash and Nozzle Offsets (#13050) 2019-02-06 17:20:17 -06:00
InsanityAutomation
413e303ad5 More Advanced Pause options (#12984) 2019-02-06 06:39:42 -06:00
teemuatlut
d81342254a Support new TMC drivers (#13026) 2019-02-06 06:33:14 -06:00
Rolf Werum
524c6c10bf MAGNETIC_PARKING_EXTRUDER (#12351) 2019-02-06 06:30:53 -06:00
Scott Lahteine
1bd9a63049 Add HAS_EXTRA_ENDSTOPS macro 2019-02-06 05:10:05 -06:00
Scott Lahteine
10d855cb21 Sanity check USER_GCODE formatting 2019-02-04 06:36:41 -06:00
Marcio Teixeira
5cfc1cdacc Support SWITCHING_NOZZLE with 2 servos (#13054) 2019-02-04 00:19:56 -06:00
Nicolas G
6fb4001b58 Add option to disable fan speed slowing in M303 (#13066) 2019-02-04 00:12:41 -06:00
Mark Zachmann
4d1093b386 Fix init of last_direction_bits (#13067) 2019-02-03 01:29:00 -06:00
revilor
6a57d0b381 Prusa MMU2 (#12967) 2019-01-31 19:10:52 -06:00
teemuatlut
f0503372d9 Revert E_AXIS_N cast (#13055) 2019-01-30 20:55:05 -06:00
InsanityAutomation
48a3502656 Remote streamer improvements (#12982) 2019-01-27 22:43:13 -06:00
Bob Kuhn
2f35747f29 L6470 SPI daisy chain support (#12895) 2019-01-23 19:06:54 -06:00
teemuatlut
e6805582a6 M569 to change stepping mode. Add new TMC section to LCD. (#12884) 2019-01-17 13:17:16 -06:00
mikeshub
7fde8d9d1e Add CreatorPro / Makerbot / QIDI / etc and Mightboard RevE support (#12855)
- Fix a bug in MAXxxxx thermocouple temp reporting.
- Add support for 3-wire HD44780.
- Add support for PCA9533 RGB driver.
- Add configuration examples for FlashForge CreatorPro.
2019-01-14 14:29:55 -06:00
teemuatlut
1a79878dff Remove TMC_Z_CALIBRATION in favor of Z_STEPPER_AUTO_ALIGN 2019-01-12 18:07:28 -06:00
Scott Lahteine
b402040059 Split bed size sanity check into two 2019-01-11 15:49:57 -06:00
jmz52
813a4ea107 Add support for Mks Robin TFT display (#12706)
* Add support for MKS Robin TFT display

- Add support for MKS Robin TFT display and encoder for MKS Robin board.
- Generic 128x64 UI with x2 upscale is used (for now).
- Tested on MKS Robin TFT V2.0 with ST7789V controller.
2019-01-03 10:38:39 -06:00
Giuliano Zaro
54ba44ee37 Fix bad sanitycheck (#12748) 2018-12-30 10:44:15 -06:00
Ludy
cfc5e96b4b Move JD to Config.h (and fix jerk->eeprom bug) (#12720) 2018-12-27 15:29:39 -06:00
Marcio Teixeira
902d5b0f8b Allow ExtUI to use LCD_SET_PROGRESS_MANUALLY (#12628) 2018-12-12 17:21:37 -06:00
Dave Johnson
9a4a463ec4 Sanity-check LIGHTWEIGHT_UI, move comment up (#12630) 2018-12-12 16:59:20 -06:00
Marcio Teixeira
b22716e938 M425 Backlash Correction (#11061) 2018-12-08 14:36:46 -06:00
Scott Lahteine
fa47ce369a Sanity-check for negative steps, feedrate, accel 2018-12-07 19:38:15 -06:00
teemuatlut
50b2fbd031 Trinamic: Split stealthChop, improve driver monitoring, etc. (#12582) 2018-12-07 15:34:21 -06:00
Scott Lahteine
aaf862aef2
Fix angles for disabled EDITABLE_SERVO_ANGLES (#12559) 2018-11-30 12:31:42 -06:00
Jacob Jordan
8be91677df Fix Skew factors (#12555)
- Ensure Skew factors are calculated from test square measurements
2018-11-29 11:39:31 -06:00
Marcio Teixeira
439a3e8463 Improve runout sensor, fix LIGHTWEIGHT_UI screen size (#12544) 2018-11-27 13:45:25 -06:00
Scott Lahteine
fd2998efd5
Revert ADC_KEYPAD direction behavior (#12508) 2018-11-22 06:00:00 -06:00
Scott Lahteine
d29cb09b3e Fix a minor compile warning 2018-11-22 05:35:38 -06:00
Scott Lahteine
c5642a894f
Fix ADC_KEYPAD middle button (#12493) 2018-11-20 21:39:30 -06:00
Ludy
1f93d2bcf7 Fix LCD compile error, etc. (#12472) 2018-11-18 20:39:49 -06:00
Ludy
93e958f695 Fix compile error with ZONESTAR_LCD+NO_LCD_MENUS (#12466) 2018-11-17 21:21:30 -06:00
Scott Lahteine
7ee5894360 Allow float XY probe offsets
Responding to #12383

XY probe offsets should be integers because adding decimal points makes the code larger. But if decimals are very much wanted, this commit removes the old restriction.
2018-11-17 07:44:47 -06:00
Scott Lahteine
d97e31db4c
Optimize Power-Loss Recovery (#12440) 2018-11-16 20:47:07 -06:00
Mateusz Krawczuk
ca21ac6b9b Support two MAX6675 thermocouples (#8686) 2018-11-16 18:20:33 -06:00
Scott Lahteine
d82c350de7
Miscellaneous LCD code renaming, reordering (#12430)
* Move special characters to language.h
* Apply some naming standards
* Clean up menu item draw functions
* Rename some Temperature methods
* UI => ExtUI
2018-11-14 13:13:51 -06:00
Scott Lahteine
ebf585b673 Fix an old sanity check 2018-11-14 01:15:35 -06:00
Scott Lahteine
0ee1a92971
Group status methods, share reset_status with Extensible UI (#12414)
* Group status methods, share reset_status with Extensible UI
* Move common DOGM code to headers
2018-11-13 01:47:45 -06:00
Scott Lahteine
a3923424c7 Clean up LCD width/height determination 2018-11-12 02:37:40 -06:00
Scott Lahteine
a0c795b097
Encapsulate common display code in a singleton (#12395)
* Encapsulate common LCD code in a singleton
* Depend more UBL code on UBL_DEVEL_DEBUGGING
  - Since most users don't need the debugging on at all times, this helps reduce the default build size for UBL by over 2K, a little closer to fitting on 128K boards.
2018-11-11 12:16:24 -06:00
revilor
b60abc7c37 [2.0.x] Macro G-codes (#9365) 2018-11-09 05:25:08 -06:00
Scott Lahteine
4ed6397e5d
More comprehensive NO_LCD_MENUS (#12367) 2018-11-09 00:07:16 -06:00
Scott Lahteine
b169320a03 Clean trailing whitespace 2018-11-07 02:40:18 -06:00
InsanityAutomation
6471a75a22 Combine more tool-change variables (#12137) 2018-11-06 22:22:20 -06:00
Scott Lahteine
e574f01568
More advanced pause tweaks (#12356)
* Followup to LCD_TIMEOUT_TO_STATUS=0
* Make continuous purge screen fit 20x4
* Unify purge message modes
* Preserve last-set pause header mode
2018-11-06 19:25:57 -06:00
Scott Lahteine
427bc64ba1 G28 O respects HOME_AFTER_DEACTIVATE
Addressing #11271
2018-11-05 04:17:37 -06:00
Scott Lahteine
498dfa291e Update and fix CHDK 2018-11-05 04:17:37 -06:00
Scott Lahteine
d5ab4cd22a Provide a default for Z_PROBE_LOW_POINT 2018-11-05 04:17:37 -06:00
KangDroid
82ff7c6542 Add a mesh edit menu for MBL / ABL-Bilinear 2018-11-04 19:07:47 -06:00
Scott Lahteine
44fa7fb18c Cleanups for leveling-related code 2018-11-04 19:07:47 -06:00
Scott Lahteine
cd066bfeba Extend error messages for E factors sanity-checks 2018-11-04 18:42:56 -06:00
Ludy
c10edb0998 Update, correct sanity-checks for up to 6 extruders (#12333) 2018-11-04 18:36:45 -06:00
Scott Lahteine
f5eab912ed
Apply #pragma once, misc cleanup (#12322)
* Apply #pragma once in headers
* Adjust some thermistors formatting
* Misc cleanup and formatting
2018-11-04 02:25:55 -06:00
Scott Lahteine
d1ff22b983 Revive SCARA's home offset (unimplemented) 2018-11-03 06:24:41 -05:00
Scott Lahteine
2c9586be0c Clear up HAS_WORKSPACE_OFFSET meaning 2018-11-03 04:06:37 -05:00
Ludy
5ba6607181 Fix keypad-related compile error (#12306) 2018-11-02 22:29:32 -05:00
Scott Lahteine
3eb9838dca Simplify TMC sanity-checks 2018-11-02 01:15:49 -05:00
Scott Lahteine
31c28d0dd2
Drop pgm_read_*_near and let headers choose (#12301)
- Drop `pgm_read_*_near` and let headers choose.
- Define `USE_EXECUTE_COMMANDS_IMMEDIATE` as a conditional.
- Add `process_subcommands_now` for SRAM-based commands.
2018-11-02 00:42:16 -05:00
Ludy
9f77df2590 Followup to menu refactor. TMC warnings, sanity. (#12288)
- Followup fixes for menu refactor
- Fix TMC sanity checks, unused var warnings
2018-11-01 16:13:33 -05:00
Scott Lahteine
3583e2b449
Followup to Menu Refactor (#12275) 2018-10-30 16:34:45 -05:00
TheLongAndOnly
5536228359 G34 Auto-align multi-stepper Z axis (#11302) 2018-10-29 14:01:36 -05:00
Scott Lahteine
182b1405d9 LCD conditionals in configurations 2018-10-28 15:46:45 -05:00
Scott Lahteine
2bf18950ab Refactor LCD menus 2018-10-28 15:46:45 -05:00
Scott Lahteine
ab8425f1b5
Clean up PROBE_TRIGGERED_WHEN_STOWED_TEST (#12232) 2018-10-26 19:18:20 -05:00
Chris Rigter
3028a620af Add RACK_AND_PINION_PROBE (#12218) 2018-10-26 18:24:24 -05:00
Scott Lahteine
e8031b1152 Add Custom Microstepping options 2018-10-25 11:26:32 -05:00
TheSFReader
a07ac6312f G0 feedrate may be fixed or variable (#12172) 2018-10-25 10:35:16 -05:00
Ludy
a93e9e6e9b Use preheat labels in place of PLA/ABS (#12194) 2018-10-23 15:38:17 -05:00
Scott Lahteine
e229b831fa Customizable preheat labels 2018-10-23 00:57:50 -05:00
Scott Lahteine
b641571098 Replace types.h with millis_t.h 2018-10-20 23:07:12 -05:00
Scott Lahteine
67a3c5a16a
Alternative info screen (Prusa-style) (#12132)
* Fix Z value display
* Add HAS_PRINT_PROGRESS
* Alternative Info Screen option
* Add LCD_INFO_SCREEN_STYLE to example configs
2018-10-18 11:34:52 -05:00
Hannes Brandstätter-Müller
c36773bffb Update the Ender-4 example config (#12131)
- Enable filament change menu
- Enable bed-PID
- Enable s-curve acceleration
- Enable some menu items
- Update from Skorpi's new version
- Fix extruder steps, deactivate nozzle clean feature
2018-10-17 15:49:52 -05:00
InsanityAutomation
3ec3872730 Single Z raise value for all tool-changing / parking (#12090)
* Universal tool-change Z lift
* Add TOOLCHANGE_ZRAISE to example configs
* Park/unpark changes to example configs
* Implement DEBUG_DXC_MODE
2018-10-17 11:11:41 -05:00
Scott Lahteine
8bf596bd4c RETRACT_ZLIFT => RETRACT_ZRAISE 2018-10-16 16:46:40 -05:00
Scott Lahteine
0139762a96 Fix a sanity check 2018-10-16 05:46:33 -05:00
AnHardt
f56968ba0b New Continuous Filament Mixer (#12098) 2018-10-16 03:38:57 -05:00
Scott Lahteine
951b25163e
Extend M217 with configurable park/raise (#12076) 2018-10-13 23:08:20 -05: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
Giuliano Zaro
d43d4e4219 Refactor PRINTER_EVENT_LEDS, apply to M303 (#12038)
Co-Authored-By: Giuliano Zaro <gmagician@users.noreply.github.com>
2018-10-10 21:25:43 -05:00
Scott Lahteine
cf5284cdf2
Add SD Firmware Update capability (#12043)
Co-Authored-By: timoxd7 <timoxd7@users.noreply.github.com>
2018-10-09 20:00:47 -05:00
Marcio Teixeira
906a24fa81 Extensible user interface API (#11193) 2018-10-08 15:44:05 -05:00
InsanityAutomation
ee253991d4 Various fixups for single-nozzle filament swap (#12036) 2018-10-08 15:39:55 -05:00
Scott Lahteine
7db0113b53 Improve E_AXIS_N macro 2018-10-07 18:22:05 -05:00
InsanityAutomation
74cd6cb4fc Single nozzle filament change (#11994) 2018-10-07 17:06:14 -05:00
teemuatlut
c447d75916 Add support for TMC2660 (#11998) 2018-10-06 17:18:10 -05:00
Marcio Teixeira
2067619a26 Add USB_FLASH_DRIVE_SUPPORT 2018-10-04 19:54:12 -05:00
teemuatlut
c3229e1b34 Migrate to a new TMC library (#11943) 2018-10-03 02:48:49 -05:00
Scott Lahteine
ee53f7d813 Revert header reorg. 2018-10-02 22:09:41 -05:00
Scott Lahteine
0dedb3e139
Reorganize some core headers (#11983) 2018-10-02 04:25:46 -05:00
Scott Lahteine
f4c625d3a1 Ensure MIN/MAX overrides 2018-10-01 05:32:55 -05:00
AnoNymous
b30ca652ae Replace MIN# / MAX# with variadic MIN / MAX (#11960) 2018-09-30 04:59:14 -05:00
Scott Lahteine
e2ab78d876 Fix SERIAL_PORT_2 sanity check 2018-09-30 00:24:10 -05:00
Thomas Moore
3286325044 Add TMC2130 sensorless probing 2018-09-29 18:54:14 -05:00
Scott Lahteine
bdc9889d3a Fix a sanity check 2018-09-29 00:24:25 -05:00
Scott Lahteine
5490a664f5
Expose: Homing Validation and Endstop Noise Threshold (#11912) 2018-09-24 21:59:12 -04:00
Scott Lahteine
cee34f7290
Followup for BABYSTEP_HOTEND_Z_OFFSET (#11916) 2018-09-24 21:46:56 -04:00
Scott Lahteine
10590c2f80 Fix some fan conditionals 2018-09-18 21:23:33 -05:00
Scott Lahteine
1718eff54a Code changes supporting up to 6 extruders 2018-09-16 22:32:53 -05:00
Thomas Moore
c437bb08f1 Overhaul of the planner (#11578)
- Move FWRETRACT to the planner
- Combine leveling, skew, etc. in a single modifier method
- Have kinematic and non-kinematic moves call one planner method
2018-09-16 21:24:15 -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
Scott Lahteine
eafd62308e
Use TMC2208Stepper v0.2.5 (#11714) 2018-09-08 20:41:21 -05:00
Kevin
e25d2ae4a2 [2.0.x] SWITCHING_TOOLHEAD (#11623) 2018-09-08 01:43:24 -05:00
Scott Lahteine
b213a89ef5 Sanity-check NOZZLE_PARK_POINT 2018-09-05 06:18:08 -05:00
Scott Lahteine
8e18e48d49
Merge pull request #11610 from Freeviv/bugfix-2.0.x
[2.0.x] Editable servo angles
2018-09-03 03:55:38 -05:00
teemuatlut
49e107cea9 Restrict SW serial to AVR (#11696) 2018-09-01 15:24:44 -05:00
Scott Lahteine
18f1af2dca Fix up Teensy tests, servo sanity 2018-09-01 01:10:20 -05:00
Scott Lahteine
d55f44edba
Printcounter improvements (#11689) 2018-08-31 17:40:39 -05:00
Scott Lahteine
136860e8bb Sanity-check SERVO pin for servo probes 2018-08-31 15:47:47 -05:00
Scott Lahteine
3e81745e81 Fix issues, make optional 2018-08-29 17:58:02 -05:00
Scott Lahteine
d1c9517903 Followup to hotend_offset[Z] patch 2018-08-24 21:32:00 -05:00
Scott Lahteine
acf5ae3083 !ENABLED => DISABLED 2018-08-24 16:36:37 -05:00
Chris Pepper
5573ef62c6 [2.0.x] PersistentStore update followup (#11549) 2018-08-14 17:54:12 -05:00
Dave Johnson
c64199941e Compile only selected PIO environment (#11519) 2018-08-14 03:28:52 -05:00
Scott Lahteine
6964e1a95a Clean up trailing whitespace 2018-08-14 00:55:37 -05:00
Scott Lahteine
b328fb4dc9
Treat TMC2660 like non-TMC (#11508) 2018-08-10 00:30:28 -05:00
Greg Nutt
a1a5367380 Smoothieboard V1.0/1.1 and A5984 support 2018-08-09 23:03:17 -05:00
Scott Lahteine
131d216afa
Fix drivers.h dependency, defer macro evaluation (#11450) 2018-08-03 21:49:04 -05:00
Scott Lahteine
9c62c47579
[2.0.x] Fix Dual X Carriage tool change crash (#11447) 2018-08-03 20:47:29 -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
teemuatlut
fbcdf5eaeb Simplify stepper driver per-axis selection 2018-07-25 02:47:43 -05:00
Scott Lahteine
bf7d0ba859 Assert that XY probe offsets are integers 2018-07-12 22:48:07 -05:00
Scott Lahteine
25e2ca8896 Add Z_CLEARANCE_MULTI_PROBE
Co-Authored-By: nightgryphon <ngryph@gmail.com>
2018-07-12 22:46:34 -05:00
Scott Lahteine
68e6650df7 Remove Quake Fast Inverse SQRT (it isn't faster) 2018-07-04 22:22:10 -05:00
Scott Lahteine
480a3d3d0c Apply sensorless homing requirements only for specified axes 2018-07-03 19:16:09 -05:00
Scott Lahteine
1ea222e6fc Turn off DISABLE_INACTIVE_EXTRUDER with SWITCHING_NOZZLE
Fix #11183
2018-07-02 17:26:53 -05:00
Scott Lahteine
8eaac0dab3
Add delta feedrate scaling (#11153) 2018-06-30 13:44:27 -05:00
Colin Gilgenbach
0fff79c24b Fixes G29_with_retry behavior (#11045)
* Fix G29 (ABL) retry behavior
2018-06-29 20:48:11 -05:00
Scott Lahteine
1b8973eb1c Fix up microsteps conditionals 2018-06-27 23:41:32 -05:00
Scott Lahteine
053438a3aa
Poll all endstops, even when stationary (#11123) 2018-06-27 04:18:57 -04:00
Scott Lahteine
7a84b03796 Use MIN/MAX in post-conditionals 2018-06-20 03:15:19 -05:00