Marcio Teixeira
8e23e9b16c
Fix FIX_MOUNTED_PROBE compile error ( #14393 )
2019-06-25 04:55:29 -05:00
Tanguy Pruvot
07dac315a9
Up-to-date STM32F1 README ( #14386 )
2019-06-24 03:44:26 -05:00
thisiskeithb
a4aa3621c0
MKS Robin Mini Board Support ( #14366 )
2019-06-24 03:42:22 -05:00
Scott Lahteine
cf762d2c73
Fix enqueueing bug
2019-06-23 23:02:07 -05:00
BigIronGuru
12d21e642f
Update G34 for non-BLTouch probes ( #14380 )
2019-06-23 20:55:43 -05:00
BigIronGuru
5986194c36
Fix G28 with non-BLTouch probes ( #14381 )
2019-06-23 20:53:05 -05:00
InsanityAutomation
aa0383a83b
Enhance IDEX toolchange auto-return w/ no park, full control ( #14117 )
2019-06-23 20:00:48 -05:00
Scott Lahteine
3d9d72e8db
Include order, spacing, etc.
2019-06-23 04:02:52 -05:00
mikeshub
1b1a4677f5
Fix LCD.h compilation error ( #14377 )
2019-06-22 21:08:30 -05:00
sjasonsmith
07b41a8c3f
Include SOLENOID_PROBE in leveling report ( #14344 )
2019-06-22 17:54:37 -05:00
thisiskeithb
71b2700c3c
Anycubic Trigorilla 1.4 Rev. 1.1 ( #14357 )
2019-06-22 17:53:45 -05:00
BigIronGuru
f5afaaef5b
Fix probe.cpp warning ( #14367 )
2019-06-22 17:27:33 -05:00
BigIronGuru
def4bb987d
Reset, stow BLTouch before mode change ( #14368 )
2019-06-22 17:26:02 -05:00
Scott Lahteine
78557076ff
Add planner.synchronize to UBL G29
2019-06-22 17:23:29 -05:00
BigIronGuru
6578aa4e1b
Apply minimum timing to BLTouch commands ( #14369 )
2019-06-22 17:20:19 -05:00
teemuatlut
2247bf1ba5
Add missing dedge init for TMC2209 ( #14370 )
2019-06-22 17:00:15 -05:00
mikeshub
1db7013e3b
Fix and improve PID loops ( #14373 )
...
- Windup guarding was missing. The kludge in place of windup guard is removed. D term filter calculations are simplified to require fewer `float` calculations. Sign change for D term output to make debugging output clearer.
- Use "no overshoot" for bed PID tuning.
2019-06-22 16:52:56 -05:00
Scott Lahteine
17778d1c2a
Fix M916-918 subcommands
2019-06-22 16:18:42 -05:00
Tanguy Pruvot
be69ec5b32
Fix PLR/M43 warnings ( #14333 )
2019-06-22 00:48:47 -05:00
BigIronGuru
9c83135d40
Only home Z at the end of G34 ( #14353 )
2019-06-22 00:43:33 -05:00
InsanityAutomation
5df051fdee
Fix Start SD Print bug ( #14354 )
...
Followup to the G-code parser injection update.
2019-06-22 00:37:21 -05:00
LinFor
0f6f5132c1
Fix variable conflict in ok_to_send ( #14351 )
2019-06-21 19:04:30 -05:00
MrMabulous
c41b005f33
Add Extra Probing option, discarding outliers ( #14338 )
2019-06-21 19:02:26 -05:00
BigIronGuru
8f99d45045
Fix BLTOUCH deploy/stow in HS mode ( #14352 )
2019-06-21 18:55:27 -05:00
Tobias Frost
eeaef2410a
Support DGUS Display with DWIN OS ( #13253 )
2019-06-21 04:47:23 -05:00
Scott Lahteine
bb0bcbaec0
Suppress compiler warning
2019-06-21 02:20:40 -05:00
Tanguy Pruvot
52383633e7
STM32F1: M43 PINS_DEBUGGING ( #14072 )
2019-06-21 01:20:17 -05:00
Karl Andersson
81d550754a
Fix "UNUSED" redefined warning on HAL_STM32 ( #14342 )
2019-06-21 00:48:10 -05:00
Karl Andersson
4b365552db
Fix Marduino SBI/CBI redefine ( #14341 )
2019-06-21 00:46:23 -05:00
InsanityAutomation
a9acd2f497
G34 configurable angle limit ( #14321 )
2019-06-20 21:18:36 -05:00
Scott Lahteine
a31cb910f5
Tweak some config spacing
2019-06-20 21:08:47 -05:00
Marcio Teixeira
49ea1c635a
Fix missing dependencies ( #14339 )
2019-06-20 16:37:20 -05:00
Scott Lahteine
4df4c47994
Add TMC2209 support ( #14249 )
2019-06-20 15:47:50 -05:00
Tanguy Pruvot
ed0c70f0a0
SKRmini followup - Fysetc config updates ( #14327 )
2019-06-20 05:49:27 -05:00
Scott Lahteine
dd06017f64
Bring configs up to date
2019-06-19 01:03:51 -05:00
Scott Lahteine
9131b11944
Games in Info menu, if enabled
2019-06-19 00:03:32 -05:00
Scott Lahteine
4c872a01f2
G-code queue singleton, front injection ( #14236 )
2019-06-19 00:00:19 -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
Tanguy Pruvot
391250b04f
STM32F1: Don't toggle EEPROM SPI SS ( #14299 )
2019-06-18 06:48:20 -05:00
Giuliano Zaro
27d30c1be8
Update Italian language ( #14302 )
2019-06-18 06:45:34 -05:00
Scott Lahteine
3f6424076b
Update M524 description
2019-06-18 05:04:55 -05:00
Scott Lahteine
cf3631226b
Document G-code M290
2019-06-18 04:53:31 -05:00
Scott Lahteine
c12b6ba760
Add Dagoma F5 to Makefile
2019-06-18 04:40:00 -05:00
3DSmitty
5b13abcacb
Fix SPI_SD Outside of HAL_STM32F1 ( #14306 )
2019-06-18 02:38:18 -05:00
Bob Kuhn
089d12df16
Fix duplicate board IDs ( #14310 )
2019-06-18 02:26:13 -05:00
Ludy
2290b269dc
Unused variable ( #14301 )
2019-06-18 00:15:41 -05:00
Scott Lahteine
6b2d42434c
Wrap main menu external declarations
2019-06-17 21:44:56 -05:00
Scott Lahteine
aacb904e1f
Adjust some config comments
2019-06-17 20:22:07 -05:00
Scott Lahteine
651f3eeed0
Clean up trailing whitespace
2019-06-17 20:22:07 -05:00
Ludy
35aabd1834
Fix Spindle/Laser compile error ( #14312 )
2019-06-17 18:38:43 -05:00
Scott Lahteine
21f377d94a
STM32F1: various small changes ( #14313 )
...
- init the led pin as output (like other HALs)
- reduce sdio dma priority to normal.. highest is never the best...
- allow fsmc only on compatible STM32F1 (like HAL fsmc)
- fsmc: remove an useless C style cast
2019-06-17 17:48:50 -05:00
sensei73
ce5f94c8f4
Fix Touch-MI sanity checks ( #14316 )
2019-06-17 17:46:14 -05:00
Tanguy Pruvot
287df7a61f
STM32F1: various small changes
...
- init the led pin as output (like other HALs)
- reduce sdio dma priority to normal.. highest is never the best...
- allow fsmc only on compatible STM32F1 (like HAL fsmc)
- fsmc: remove an useless C style cast
2019-06-17 10:27:30 +02:00
3DSmitty
66d51272af
Fix SPI, SD for BIGTREETECH SKR Mini ( #14287 )
2019-06-15 18:12:05 -05:00
Scott Lahteine
903863dcb6
Suppress some warnings
2019-06-15 17:47:59 -05:00
Scott Lahteine
eb1c9113c2
Try to init SD with no detect pin
2019-06-15 15:36:48 -05:00
Scott Lahteine
9a56a88200
Use OUT_WRITE in SPI pin init
2019-06-15 15:36:43 -05:00
Scott Lahteine
24c23b60fa
Use lambda, fix wrap pointer
2019-06-15 15:36:42 -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
Ludy
6fb3db1633
Update German language ( #14294 )
2019-06-15 14:26:14 -05:00
Scott Lahteine
a17f057daa
Fix word wrapping on select screens
2019-06-15 14:06:23 -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
Scott Lahteine
26de051e92
HAL SPI pin init cleanup
2019-06-14 20:17:25 -05:00
Scott Lahteine
50c9b33ed7
!ENABLED => DISABLED
2019-06-14 00:44:49 -05:00
teemuatlut
29afd11cbf
Updates for TMC2660 init ( #14245 )
2019-06-13 23:16:10 -05:00
Scott Lahteine
dfdbd1e75f
Use TEST macro where possible
2019-06-13 20:59:12 -05:00
teemuatlut
12a270fd29
Fix TMC5160 and TMC2160 PWMCONF init
2019-06-13 20:57:12 -05:00
Scott Lahteine
fc73a8b004
Add AXIS_HAS_SQUARE_WAVE shorthand
2019-06-13 20:57:12 -05:00
mb300sd
bf8bfb5c66
Add Coolant Control M7/M8/M9 ( #10745 )
2019-06-13 18:43:11 -05:00
Aliaksei Kvitsinski
648a91bce8
Support for Z-Bold board ( #14024 )
2019-06-13 03:21:18 -05:00
MastS
18904c42f6
Fysetc LCD backlight timeout ( #14265 )
2019-06-12 21:59:39 -05:00
Scott Lahteine
bc2ff9b41f
Fix M605 bugs
...
Fixes #14191
2019-06-12 20:01:08 -05:00
Scott Lahteine
f7792c0192
Group manual move options
2019-06-12 19:49:18 -05:00
Tanguy Pruvot
7d1eafc80a
STM32F1: C++14 for static_assert, etc. ( #14278 )
2019-06-12 18:44:32 -05:00
Msq001
26e7e33698
Fix bug in STM32F1 WRITE macro ( #14275 )
2019-06-12 06:30:24 -05:00
Scott Lahteine
04715e04ee
Minor M100 cleanup
2019-06-12 06:14:40 -05:00
Scott Lahteine
356410dcfc
Move crc16 function to libs
2019-06-12 06:14:39 -05:00
Scott Lahteine
2a96d4e23a
Move number-to-string functions to libs
2019-06-11 07:51:47 -05:00
Scott Lahteine
1ef95013f0
Update Marlin.cpp includes, defines
2019-06-11 07:30:51 -05:00
Kaushik Vemparala
c88d9ae282
Option to leave heaters set on SD abort ( #14251 )
2019-06-10 23:57:55 -05:00
Tanguy Pruvot
8cf5504a34
Redundant but faster recovery.enabled test ( #14175 )
2019-06-10 23:33:35 -05:00
Tanguy Pruvot
c3e5225531
Add SPI EEPROM to STM32F1 ( #14239 )
2019-06-10 23:30:23 -05:00
felixstorm
9439fab7fd
Fix ESP32 servos, platformio.ini, etc. ( #14247 )
2019-06-10 23:22:19 -05:00
yangwenxiong
b0a4ea79b8
BigTreeTech SKR Mini v1.1 ( #14041 )
2019-06-10 21:10:51 -05:00
Robby Candra
f30b89953d
runout.distance_mm LCD edit item ( #14066 )
2019-06-10 20:18:06 -05:00
mikeshub
a3f034b95e
FFCP updates. Update XY soft endstops on tool_change ( #14125 )
2019-06-10 18:01:42 -05:00
InsanityAutomation
b7eeb5b13b
Move BLTouch options to adv config ( #14131 )
...
Plus other BLTouch and menu enhancements.
2019-06-10 17:46:42 -05:00
Scott Lahteine
0ca2073625
ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED => SD_ABORT_ON_ENDSTOP_HIT
2019-06-10 17:28:35 -05:00
thisiskeithb
662e7da8a4
Fix USE_BIG_EDIT_FONT bug ( #14252 )
2019-06-09 19:37:14 -05:00
teemuatlut
cccc51ee0e
TMC Square Wave Stepping mode ( #14195 )
2019-06-09 05:08:05 -05:00
Scott Lahteine
80ce0d2bdb
Whitespace cleanup
2019-06-08 06:40:44 -05:00
Scott Lahteine
455f0de817
Undefine sanity check tests when done
2019-06-08 06:29:28 -05:00
Robby Candra
7e07a3888b
Fix PLR Z bug affecting Cartesians ( #14230 )
2019-06-08 05:27:58 -05:00
Robby Candra
5ca8d51e12
Ability to insert G-code in front of queue ( #14229 )
2019-06-08 05:23:53 -05:00
BigIronGuru
293018f76c
Apply needed BLTouch patch ( #14233 )
2019-06-07 21:43:20 -05:00
Scott Lahteine
ffb76b75d7
fix TMC2208 boot loop with SW UART ( #14135 )
...
Need stepper .begin() before calling susbequent .push()
2019-06-07 07:27:10 -05:00
InsanityAutomation
4138b1f9ae
Option to disable Case Light brightness control ( #14165 )
2019-06-07 07:23:42 -05:00
Tanguy Pruvot
764f0d9c1c
STM32F1: Servo "soft" PWM via timer interrupt ( #14187 )
2019-06-07 07:11:48 -05:00
InsanityAutomation
66e22d9f5a
ExtUI Heated Chamber support ( #14198 )
2019-06-07 07:08:41 -05:00
Scott Lahteine
9206c0e869
Use limit switch overrides
2019-06-05 22:27:06 -05:00
Scott Lahteine
34d2801bbe
Rename pins file (2)
2019-06-05 21:41:58 -05:00
Scott Lahteine
fa3b5fb059
Uppercase pins filename
2019-06-05 21:41:58 -05:00
Scott Lahteine
858b2fa21a
Fix thermistor table
2019-06-05 21:39:39 -05:00
InsanityAutomation
f6ec00d776
Update thermistor and working config
2019-06-04 20:25:00 -04:00
InsanityAutomation
bbcb61e042
Initial Commit - Add board
2019-06-03 23:49:19 -04:00
Tanguy Pruvot
e4260a41cb
Fix a DEBUG_LEVELING_FEATURE string copy ( #14200 )
2019-05-31 18:52:11 -05:00
Ryan
9d9030a39c
Fix Archim1 SD card ( #14184 )
2019-05-30 19:58:38 -05:00
InsanityAutomation
123e58d9c3
Heated Chamber for Graphical LCD ( #14190 )
2019-05-30 18:31:50 -05:00
Scott Lahteine
93ab16c6e4
Remove old mixing ISR comment
2019-05-30 17:05:16 -05:00
Scott Lahteine
6572848d7f
Fix stepper timing bug
2019-05-30 16:58:53 -05:00
Bob Kuhn
688b54d66a
DUE USB composite device field corrections ( #14185 )
2019-05-30 16:26:48 -05:00
InsanityAutomation
f889cc6ea6
ExtUI parity with SPI LCDs ( #14172 )
2019-05-30 16:24:13 -05:00
Scott Lahteine
07021c85c8
Tweak timer16_Sequence_t
2019-05-30 16:09:37 -05:00
Roman Moravčík
d70929f7c0
Update Slovak language ( #14179 )
2019-05-30 15:57:14 -05:00
Tanguy Pruvot
e3a468f2cd
STM32F1: FSMC only on chips with 100/144 pins ( #14180 )
2019-05-30 15:51:02 -05:00
Ludy
8e8e48f900
Fix links in templates, gcode.h ( #14160 )
2019-05-28 21:39:55 -05:00
InsanityAutomation
34ae76025e
Clear Pausing message after M600 park ( #14171 )
2019-05-28 21:36:14 -05:00
Ludy
bd494a6bd6
Update defines for patched temperature macros ( #14161 )
2019-05-28 17:43:31 -05:00
doggyfan
e09d8811c1
Apply grace period to thermistor failure testing ( #14167 )
2019-05-28 15:36:03 -05:00
InsanityAutomation
0f04ba016f
Adjust tool offset menus ( #14153 )
2019-05-27 21:29:08 -05:00
teemuatlut
bf4a0db97f
TMC LCD followup ( #14134 )
2019-05-27 21:24:20 -05:00
Minims
32afe1d102
Fix TOOLCHANGE_ZRAISE warning ( #14156 )
2019-05-27 19:51:29 -05:00
Robby Candra
5515f88452
Clarify SD longname string size ( #14148 )
2019-05-27 19:50:48 -05:00
Tanguy Pruvot
5f42d3a8b4
BLTouch French updates ( #14137 )
2019-05-27 01:02:35 -05:00
Scott Lahteine
d3bb5b69ba
Apply NOLESS/NOMORE
2019-05-26 20:55:00 -05:00
Scott Lahteine
b315157053
Apply const to mcp4728
2019-05-26 20:54:24 -05:00
Scott Lahteine
3c179bbd47
Simpler G28 home axis conditions
2019-05-26 16:26:55 -05:00
Scott Lahteine
352734494b
Reduce some M43 strings
2019-05-26 16:21:28 -05:00
Scott Lahteine
b14cc0d7c5
Remove extra gcode. prefix
2019-05-26 16:18:45 -05:00
Scott Lahteine
c6d39319de
Fix some whitespace
2019-05-26 16:18:43 -05:00
InsanityAutomation
212860f090
Always change to Tool 0 on G29 ( #14146 )
2019-05-26 14:53:21 -05:00
Giuliano Zaro
7b838f31be
DUE HAL cleanup ( #14126 )
2019-05-26 14:51:32 -05:00
Chris
36a0376c36
fix TMC2208 boot loop with SW UART
...
Need stepper .begin() before calling susbequent .push()
2019-05-26 13:07:12 +02:00
Robby Candra
df7733425c
Shorten pause message for 4 line LCD ( #14097 )
2019-05-26 02:33:52 -05:00
Scott Lahteine
605ec0a478
Fix thermistor table warning
2019-05-26 01:30:20 -05:00
doggyfan
90121047d9
Fix thermal protection with user thermistor ( #14130 )
2019-05-25 23:37:08 -05:00
Scott Lahteine
81cee05476
Update some env in pins.h
2019-05-25 23:17:50 -05:00
Scott Lahteine
47fd74a98d
Clean up fast_pwm.cpp
2019-05-25 23:05:01 -05:00
Scott Lahteine
49229d97db
Consistent _useTimerX tests
2019-05-25 23:05:01 -05:00
Scott Lahteine
8924389dfc
Tweak servo µs macros
2019-05-25 22:33:51 -05:00
InsanityAutomation
49e83dd7c8
BLTouch V3.1 changes ( #14104 )
2019-05-25 21:56:47 -05:00
Scott Lahteine
14fe41f6b2
Update Z probe offset comment
2019-05-25 19:41:15 -05:00
Scott Lahteine
f8bede6b5e
Fix some HAL includes
2019-05-25 19:20:17 -05:00
Bryan
0ef5d667b6
Fixed M43 parameter bug ( #14099 )
2019-05-25 18:23:25 -05:00
teemuatlut
1c86fbc60b
TMC updates, capture LCD changes ( #14074 )
2019-05-25 18:22:12 -05:00
felixstorm
74f44783ac
ESP32 servo support ( #14109 )
2019-05-25 18:12:24 -05:00
felixstorm
bc5a1fe562
Various fixes for ESP32 ( #14102 )
2019-05-25 17:06:00 -05:00
Giuliano Zaro
e1bf34bdc9
Ruramps4d typo fix ( #14096 )
2019-05-25 16:41:08 -05:00
Scott Lahteine
7cce6b8d68
Bring configs up to date (MANUAL_FEEDRATE)
2019-05-25 16:31:13 -05:00
Scott Lahteine
44caf70917
Improve editing, fix some small value editing
2019-05-25 15:29:00 -05:00
Scott Lahteine
612eaa87bd
Fix "back" items in some sub-menus
2019-05-25 15:28:52 -05:00
Scott Lahteine
c5dc2e5a71
Update advanced BLTouch menu items
2019-05-25 15:26:25 -05:00
Scott Lahteine
48d1bd29cb
Shift m before compare to 0
2019-05-25 15:22:15 -05:00
InsanityAutomation
9f69fbe5ee
Move some menu items ( #14118 )
2019-05-25 15:16:00 -05:00
Scott Lahteine
fc52c43a26
Some documentation updates
2019-05-24 16:30:44 -05:00
Tanguy Pruvot
24b1818245
Secure STM32F1 servo code and M280 detach ( #14085 )
2019-05-22 16:57:19 -05:00
Scott Lahteine
a49919396a
LPC1768 MarlinServo => libServo
2019-05-22 16:54:52 -05:00
Scott Lahteine
2b5046659a
Tweak Marlin headers, comments
2019-05-22 16:54:52 -05:00
Scott Lahteine
cc862a8213
Replace some functions with lambdas
2019-05-22 16:54:35 -05:00
Ludy
fafd73a3af
Update copyright in headers ( #14092 )
2019-05-22 16:24:13 -05:00
Giuliano Zaro
2298923a9b
Update Italian language ( #14095 )
2019-05-22 16:23:41 -05:00
Ludy
41f61a12b8
Update German language ( #14093 )
2019-05-22 16:23:16 -05:00
doggyfan
594f6b14be
Limit user thermistor to 999, fix thermistor table macro ( #14080 )
2019-05-21 21:31:05 -05:00
Giuliano Zaro
a74aad3b4a
Clean up HALs / FastIO ( #14082 )
2019-05-21 18:28:12 -05:00
Scott Lahteine
4ef364a073
Sanity check probe offsets must be integers
2019-05-21 17:16:21 -05:00
Scott Lahteine
cfca07852a
Backlash linker error workaround
...
Fix #14045
2019-05-20 21:52:56 -05:00
Scott Lahteine
aeec9ef76b
Update backlash code
2019-05-20 21:34:08 -05:00
Scott Lahteine
7b4c3bd92a
Fix call to synchronize in lcd_pause_job
2019-05-19 15:51:45 -05:00
Scott Lahteine
9bf65eacaa
Remove old adv config heading
2019-05-19 15:24:01 -05:00
Pavel4e5
3cd19a8ec0
Improve Zonestar keypad responsiveness ( #14056 )
2019-05-18 20:52:55 -05:00
Tanguy Pruvot
402f1f7307
STM32F1: STM32_HIGH_DENSITY is auto defined in HAL ( #14057 )
...
- Fix the `fsmc` and `sdio` units which required hard defines for use.
2019-05-18 20:45:22 -05:00
Tanguy Pruvot
87e7193259
Fix M226 sign warning (for most platforms) ( #14049 )
2019-05-18 16:15:48 -05:00
Tanguy Pruvot
256f810df2
Add open-drain output mode to STM32F1 FastIO ( #14050 )
...
- This mode is often used/preferred to drive printer boards' MOSFETs.
- Can generally boost the allowed output power (for hotbed,nozzle and fans).
2019-05-18 16:12:00 -05:00
Bob Kuhn
1dad6e754b
Neopixel background LED option ( #14025 )
2019-05-18 02:36:37 -05:00
InsanityAutomation
84ac5b360b
Fix ExtUI mesh functions ( #14027 )
2019-05-17 20:37:23 -05:00
Scott Lahteine
9b5f9dda0e
Update analog pins labels
2019-05-17 20:22:25 -05:00
FanDjango
85fb33a060
BLTOUCH tweaks, new v3.1 command ( #14015 )
2019-05-17 19:10:18 -05:00
GUEST.it
62ef54cb81
UBL: Log and display G29 progress ( #14036 )
2019-05-17 19:02:21 -05:00
GUEST.it
7907eec04c
Fix power loss recovery with SINGLENOZZLE ( #14033 )
2019-05-17 18:47:15 -05:00
Scott Lahteine
efe651e749
Add THERMISTOR_NAME for 1000
2019-05-17 18:26:53 -05:00
Scott Lahteine
0b056970c6
Fix file.open in STM32 eeprom emu
2019-05-17 18:26:53 -05:00
InsanityAutomation
06f3273531
Fix DELTA pulse wait bug ( #14028 )
2019-05-17 16:16:56 -05:00
Marcio Teixeira
7ccbcf2eaa
Fix TMC EEPROM regression ( #14008 )
...
Partially undo 15357af
to ensure TMC code is initialized in the proper order.
2019-05-16 20:38:03 -05:00
Marcio Teixeira
9558962d59
Fix DUE HAL SW SPI compile error ( #14005 )
2019-05-16 20:36:19 -05:00
InsanityAutomation
07afe69cee
Fix some bad AZTEEG_X5_MINI pins ( #14011 )
2019-05-16 20:33:00 -05:00
Chris Pepper
451ea996c9
[LPC176x] Fix switch fallthrough
2019-05-15 10:35:26 +01:00
Tanguy Pruvot
d7b0369e39
STM32: Fix SD EEPROM emulation conflict ( #14012 )
2019-05-15 02:42:10 -05:00
Scott Lahteine
785c01f2bc
Use US spelling of 'behavior'
2019-05-15 01:49:17 -05:00
Sam Lane
7f1e0c5670
Update EXTRA_LINADV_K with Marlin bit macros ( #13993 )
2019-05-15 01:07:07 -05:00
Bob Kuhn
48bd8899bd
Cohesion 3D Remix: Onboard SD card, Fysetc LCD ( #13991 )
2019-05-15 00:59:57 -05:00
FanDjango
dcaefc68a5
BLTouch.init should not deploy ( #13988 )
...
Low or unknown probe clearance on init (even at powerup) is a risk and therefore, a deploy should be avoided because dragging the pin is possible: A deploy goes into alarm if it can't extend fully and then the subsequent stow will fail.
2019-05-14 23:55:11 -05:00
Tanguy Pruvot
8075893352
STM32: fix sdcard filename conversion
2019-05-12 04:26:21 +02:00
chai-md
940ff8e7c8
Improve LV8729 stepping ( #13776 )
2019-05-11 19:02:19 -05:00
InsanityAutomation
991ee7552b
Restore menu edit to 32bit value ( #13976 )
2019-05-11 18:44:35 -05:00
Tanguy Pruvot
93dd097b1c
Use E2END, if defined, for STM32F1 (SD) ( #13981 )
2019-05-11 18:22:31 -05:00
InsanityAutomation
5108e4b6aa
Cleaner EEPROM auto init ( #13975 )
2019-05-11 16:54:03 -05:00
Bob Kuhn
456a0ee76b
Improve Due SW SPI, Fysetc sanity checks, &c. ( #13939 )
2019-05-11 16:51:39 -05:00
Robby Candra
7b78a20fb7
Fix: Debug Memory Dump size ( #13957 )
...
* Fix Memory Dump size
* Fix Compile error on Memory Dump
2019-05-11 11:44:39 -05:00
Scott Lahteine
a613bcad2d
Fix some spelling
2019-05-10 20:39:19 -05:00
Tanguy Pruvot
62b36d1b98
Fix STM32 timer warnings ( #13946 )
2019-05-10 20:00:21 -05:00
Giuliano Zaro
f22c9a1ae1
Fix G-code parser with MMU2 ( #13951 )
2019-05-10 19:57:15 -05:00
Marcio Teixeira
746c38f4be
Fix HAL_DUE multiple define error with graphical LCD ( #13971 )
2019-05-10 19:52:43 -05:00
Bob Kuhn
75eca5c4f8
Fysetc pins updates for RAMPS and SKR 1.3 ( #13963 )
2019-05-10 19:29:28 -05:00
Marcio Teixeira
227f29090d
Add heater timeouts to ExtUI ( #13970 )
...
- Add local UI methods to get heater timeout state.
- Add methods to resume timed-out heaters.
- Re-enable heaters on UI temperature request.
- Make `ExtUI` show a dialog box if pause needs a button press after reheat.
2019-05-10 15:56:13 -05:00
Bob Kuhn
fa3739aa23
M100: LPC1768 and DUE compatibility ( #13962 )
2019-05-09 21:57:44 -05:00
InsanityAutomation
3f758d9e00
Fix some edit items for 16-bit encoder ( #13948 )
2019-05-09 18:28:47 -05:00
ManuelMcLure
51acbb2201
Prevent HOST_PROMPT_SUPPORT compile error ( #13943 )
2019-05-09 11:48:31 -05:00
Scott Lahteine
ad4ffa1d2f
Use C++ language supported 'nullptr' ( #13944 )
2019-05-09 11:45:55 -05:00
Tanguy Pruvot
e53d7e5517
STM32: ADC warning fix ( #13933 )
2019-05-09 00:33:38 -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
Giuliano Zaro
40aff7e1f2
Remove extra MMU (non-12V) code ( #13938 )
...
`check_version` in state -5 should not be needed since it has already been called in state -4 and the tested build nr is only updated in state -4.
2019-05-07 21:02:08 -05:00
Tanguy Pruvot
11adcf1ce3
Add'l PLR options, AVR strstr_P compat ( #13880 )
2019-05-07 20:38:40 -05:00
InsanityAutomation
5dcb25664f
Option to Auto-Initialize EEPROM ( #13935 )
2019-05-07 16:30:31 -05:00
Ludy
a504366138
Fix probe fan compiling error ( #13930 )
2019-05-07 14:14:12 -05:00
Tanguy Pruvot
24e956d168
Avoid int8_t underflow on filament runout ( #13895 )
2019-05-07 13:58:10 -05:00
Stephan
483822f3aa
Fix some THERMAL_PROTECTION_CHAMBER issues ( #13678 )
2019-05-06 19:55:01 -05:00
doggyfan
23a8707ef1
Configurable Thermistor ( #13888 )
2019-05-06 18:51:06 -05:00
J.C. Nelson
172abc305b
Malyan M200 core fixes ( #13927 )
2019-05-06 18:07:13 -05:00
Scott Lahteine
a36782ac1d
Define more u8g command macros
2019-05-06 17:26:34 -05:00
Scott Lahteine
f9a50f451d
Serial out cleanup
2019-05-06 17:26:34 -05:00
Scott Lahteine
9853331b34
Fix temp init, loosen ADC grace period
2019-05-05 22:55:03 -05:00
Tanguy Pruvot
a4c24511f7
STM32: Fix Marduino SBI/CBI redefine ( #13912 )
2019-05-05 22:06:30 -05:00
Ludy
c837e9250c
Define tmc variables where needed ( #13918 )
2019-05-05 22:04:47 -05:00
Ludy
f96eaad1ea
Unused variable cleanup ( #13917 )
2019-05-05 22:01:04 -05:00
Ludy
421d526ba7
Update German language ( #13915 )
2019-05-05 22:00:19 -05:00
Giuliano Zaro
b07360f32a
Update Italian language ( #13916 )
2019-05-05 21:59:34 -05:00
Robby Candra
79955f0c89
Fix PLR file delete bug ( #13860 )
2019-05-04 23:30:47 -05:00
ManuelMcLure
09f1b58146
Fix HOST_PROMPT_SUPPORT compile issue ( #13847 )
2019-05-04 22:55:51 -05:00
Giuliano Zaro
e2a77ed881
Bring chamber temp to completion ( #13837 )
2019-05-04 22:51:47 -05:00
Robert Mendon
24177954dd
Add missing AZSMZ Mini SPI pins ( #13824 )
2019-05-04 22:04:01 -05:00
kAdonis
ee73e17c9b
Hide 'vsense' report row if not used ( #13884 )
2019-05-04 22:00:24 -05:00
jmdearras
68004174d9
Fix thermistor 501 name ( #13839 )
2019-05-04 21:40:41 -05:00
Bob Kuhn
c48e6be366
Fysetc panel, RUMBA and ReARM pins, SPI mode 3 ( #13900 )
2019-05-04 17:59:36 -05:00
Chris
fd9d3ae181
Re-Arm 4x TMC2208 stepper improvement ( #13819 )
2019-05-04 17:26:13 -05:00
Tanguy Pruvot
e7b3720b81
Menu edit accel in increments of 25 ( #13850 )
2019-05-04 17:21:58 -05:00
Tanguy Pruvot
7da63fa03f
Fix NOMORE() sign warning in stepper ( #13894 )
2019-05-04 15:59:38 -05:00
Roman Moravčík
6d0ce033c2
Update Slovak language. ( #13840 )
2019-05-04 15:58:01 -05:00
InsanityAutomation
3fcab8dbf1
Option to disable fans during pause ( #13820 )
2019-05-04 15:50:44 -05:00
Chris Pepper
66f7065248
[LPC176x] Update extra script to support Python3 ( #13908 )
2019-05-04 20:52:28 +01:00
Scott Lahteine
2f32a6612d
Clean up Temperature::set_fans_paused
2019-05-04 14:36:59 -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
Robby Candra
0181e57417
Add a minimum Z change option to power-loss recovery ( #13859 )
2019-05-02 22:29:05 -05:00
Robby Candra
c369477cb0
Fix bug: diveToFile breaks M23 ( #13865 )
2019-05-02 15:54:24 -05:00
Tanguy Pruvot
e5438a9a03
settings: store runout sensor on/off ( #13876 )
2019-05-02 00:47:26 -05:00
Scott Lahteine
e7682eea42
Use Arduino.h include wrapper ( #13877 )
2019-05-02 00:45:50 -05:00
Tanguy Pruvot
51d1e0f1dd
Auto-mount the SDIO SD card ( #13879 )
2019-05-02 00:45:21 -05:00
Thomas Moore
ee243e4edf
Fix mixing extruder filament change ( #13803 )
2019-05-01 21:55:58 -05:00
Scott Lahteine
bf54251a10
Finish, improve, clean up FYSETC_MINI_12864 revisions ( #13871 )
2019-05-01 20:05:29 -05:00
Scott Lahteine
9372e2603c
Simpler neopixel comment
2019-05-01 13:55:51 -05:00
Tanguy Pruvot
3272d0db01
Update French language ( #13866 )
2019-05-01 13:00:07 -05:00
Chris Pepper
95beafa9a2
Fix typo
2019-05-01 16:30:21 +01:00
Ludy
408a5f08dc
Update German language ( #13853 )
2019-05-01 01:25:57 -05:00
Tanguy Pruvot
cf3c746029
Improve French language ( #13851 )
2019-05-01 01:12:25 -05:00
Clinton James
2740cc64d8
Add SD Release when no SD_DETECT_PIN exists ( #13857 )
2019-05-01 01:00:21 -05:00
Luu Lac
39ebca6b5f
Fix FYSETC, MINIPANEL, MKS_MINI_12864 display ( #13864 )
2019-05-01 00:37:52 -05:00
Giuliano Zaro
93dcb537ef
Update Italian language ( #13809 )
2019-04-30 20:31:40 -05:00
Roxy-3D
142c8e2fed
Remove redundant Frivolous Game Options
2019-04-28 14:03:53 -05:00
Scott Lahteine
e43afb1a58
Clean up SKR pins
2019-04-27 14:56:12 +02:00
Scott Lahteine
9ccbd382e7
Update Watchdog description
2019-04-27 14:56:12 +02:00
Scott Lahteine
b6279abd30
Better THERMAL_PROTECTION_GRACE_PERIOD
...
See #13783
2019-04-27 14:40:09 +02:00
chai-md
ed9eaa1942
Fix a comment in fwretract.cpp ( #13802 )
2019-04-26 09:36:29 +02:00
InsanityAutomation
610fb46683
Fix some ExtUI issues ( #13799 )
2019-04-26 09:32:01 +02:00
Bob-the-Kuhn
db89fc0304
Revert "bring my copy up to date"
...
This reverts commit 503905c628
.
2019-04-25 17:38:41 -05:00
Bob-the-Kuhn
503905c628
bring my copy up to date
2019-04-25 12:08:49 -05:00
Bob-the-Kuhn
73726d56b3
Merge branch 'bugfix-2.0.x' of https://github.com/MarlinFirmware/Marlin into bugfix-2.0.x
2019-04-25 12:06:01 -05:00
Scott Lahteine
5051909c3c
Update do_select_screen for general use ( #13800 )
2019-04-24 10:13:44 -05:00
Scott Lahteine
63f6ad3fd2
Basic RAMPS SD_DETECT_PIN override
2019-04-23 18:10:21 -05:00
InsanityAutomation
c6632925e3
Force no move on IDEX full control mode ( #13797 )
2019-04-23 15:20:59 -05:00
Giuliano Zaro
e2dd2268e8
Add a Z raise-between-probes to G34 ( #13791 )
2019-04-23 13:40:55 -05:00
Giuliano Zaro
0f9c49ccba
Update Italian language ( #13790 )
2019-04-23 13:36:05 -05:00
Giuliano Zaro
d77ef437db
Fix warning for redefined DEBUG_PRINT_P ( #13789 )
2019-04-23 13:35:02 -05:00
Marcio Teixeira
ca7f6ff287
Fix MSG_En messages for consistency ( #13788 )
2019-04-23 13:31:51 -05:00
Scott Lahteine
6ff81a33c1
Provide JSON values for SOFT_PWM_SCALE
2019-04-22 14:06:14 -05:00
Scott Lahteine
0c4d3e6622
Improve M906 description
2019-04-22 13:48:02 -05:00
Tanguy Pruvot
04ae3ba1fd
Major update to French language ( #13784 )
2019-04-22 13:31:04 -05:00
chai-md
78d7349fd7
Remove extra Z raises in tool change ( #13782 )
2019-04-21 21:06:46 -05:00
Kajetan Rzepecki
875e673a8c
Add HAL-based thermal protection grace period for all heaters ( #13778 )
2019-04-21 20:50:32 -05:00
Bob Kuhn
81ca5a4cd4
Fix and improve FYSETC LCD support ( #13767 )
2019-04-21 20:48:53 -05:00
felixstorm
4e35e6c705
Fix SS pin in ESP32 HW SPI ( #13781 )
2019-04-21 17:15:15 -05:00
felixstorm
4a48b70c0b
Fix (re-)defines in HAL_ESP32 ( #13780 )
2019-04-21 17:14:38 -05:00
Ludy
4228fd3e03
Update German language ( #13769 )
2019-04-20 15:01:56 -05:00
Kajetan Rzepecki
5f70c876ae
Fix _temp_error-related compile error ( #13768 )
2019-04-20 13:57:38 -05:00
Kajetan Rzepecki
ea1ee02b53
Disable hardware PWM on ESP32 I2S expander ( #13762 )
2019-04-20 13:41:17 -05:00
Scott Lahteine
bddb776ddb
Add chamber max-temp check
...
Followup to #13756
2019-04-19 22:18:55 -05:00
Marcio Teixeira
d0c1eee53b
Add extra max-temp safety checks ( #13756 )
2019-04-19 21:37:12 -05:00
Marcio Teixeira
4ac28ba6b3
Add missing file ( #13754 )
2019-04-19 20:20:45 -05:00
jmdearras
b65cb5704d
Fix, improve FYSETC_MINI_12864 support ( #13730 )
2019-04-19 20:11:51 -05:00
Scott Lahteine
69c333ead9
More universal Formbot pins
...
Replace `ROXYs_TRex` with pre-defines of the relevant pins at the configuration level.
2019-04-18 21:09:34 -05:00
Scott Lahteine
0a6835fbea
More robust HAS_LCD_CONTRAST
2019-04-18 21:09:34 -05:00
Marcio Teixeira
2e3d121ac4
Squelch compiler warning ( #13739 )
2019-04-18 13:18:49 -05:00
Kajetan Rzepecki
d83a7924e6
Fix ESP32 TOGGLE() with I2S expander ( #13743 )
2019-04-18 13:15:35 -05:00
Jimmy Wennlund
e6f6ed76c8
Show UBL Activate/Deactivate menu for current state ( #13744 )
2019-04-18 13:13:05 -05:00
Marcio Teixeira
08f21335a6
Fix bad opcode in LIGHTWEIGHT_UI; add 32-bit HAL and Due compatibility ( #13751 )
2019-04-18 13:10:58 -05:00
Kajetan Rzepecki
7c8ee0cd5b
Enable more ADC1 channels (pins 32-39) ( #13742 )
2019-04-18 13:01:24 -05:00
Bob-the-Kuhn
520585c5ed
Merge branch 'bugfix-2.0.x' of https://github.com/MarlinFirmware/Marlin into bugfix-2.0.x
2019-04-17 15:34:29 -05:00
Kajetan Rzepecki
e1acc09c6e
Fix LPC1768 HAL SSD* screen init ( #13741 )
2019-04-17 14:57:50 -05:00
Marcio Teixeira
836435c5ef
Fix action_edit int range bug ( #13737 )
2019-04-17 14:55:31 -05:00
Antonio Pérez
bf28ad4b6c
Fix clear of Z position last digit ( #13731 )
2019-04-17 14:52:20 -05:00
Marcio Teixeira
866e2d41dc
Correct range of LCD axis step editing ( #13727 )
2019-04-16 15:45:31 -05:00
Scott Lahteine
ab8052887f
Add missing MSG_PAUSE_PRINT_INIT_1 for en
2019-04-16 13:54:20 -05:00
petrzjunior
12d340cf2a
Update Czech language ( #13729 )
2019-04-16 13:53:14 -05:00
Robby Candra
e8dc87a2b7
Fix updated Allen Key pause probe logic ( #13723 )
2019-04-16 12:35:58 -05:00
Robby Candra
7ca1fea22b
Option to pause probe deployment only when triggered, for manually-deployed allen-key probe ( #13698 )
2019-04-16 01:32:43 -05:00
Robby Candra
35160dfb7a
Simplify PLR homing when Z homes to max ( #13718 )
2019-04-16 00:17:27 -05:00
Scott Lahteine
92ed9a2bb6
Fix is_M29
...
Followup for #13013
2019-04-15 23:47:06 -05:00
jmdearras
5f49b65c1f
Move LPC SD options to configs, add MKS_MINI_DISPLAY to SKR boards ( #13712 )
2019-04-15 22:55:33 -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
Scott Lahteine
9992c424f5
Patch G92.9 flags
...
Followup to #13703
2019-04-15 20:26:40 -05:00
ManuelMcLure
b1c13bce58
Fix EEPROM_CHITCHAT (and debug_out.h) ( #13716 )
2019-04-15 20:21:26 -05:00
Msq001
455ee23499
Fix, improve Power Loss Recovery ( #13703 )
...
- Save and restore workspace offsets
- Add retract and purge (hidden) options
- Always restore axis relative modes
- Use added `G92.9` to do position restores
2019-04-15 18:53:39 -05:00
Laurent
df75a606ff
Support MKS SGen board ( #13694 )
2019-04-15 17:03:10 -05:00
Kajetan Rzepecki
20dc45bca7
Refactor, fix ESP32 WebSocketSerial ( #13689 )
2019-04-15 16:32:20 -05:00
Roman Moravčík
db373f130c
Update Slovak language ( #13692 )
2019-04-15 16:14:49 -05:00
Kajetan Rzepecki
6fe90f0324
Define I2S pins for ESP32 ( #13714 )
2019-04-15 16:13:59 -05:00
InsanityAutomation
aa0f7afbe6
Fix call to uninitialized PWM pin, heater 2 overlap ( #13674 )
2019-04-15 15:57:34 -05:00
Bob-the-Kuhn
57aaa9110b
Merge branch 'bugfix-2.0.x' of https://github.com/MarlinFirmware/Marlin into bugfix-2.0.x
2019-04-13 21:14:52 -05:00
Scott Lahteine
6a71df2925
Tweak babystep add_steps
2019-04-13 14:14:26 -05:00
Bob-the-Kuhn
9dd4252b39
Merge branch 'bugfix-2.0.x' of https://github.com/MarlinFirmware/Marlin into bugfix-2.0.x
2019-04-12 22:07:12 -05:00
Marcio Teixeira
bdfffee037
Modify Z-offset overlay for clarity ( #13660 )
2019-04-12 15:43:29 -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
62b4265410
Update German language ( #13665 )
2019-04-12 14:48:13 -05:00
Scott Lahteine
b18316dd37
Fix some spacing
2019-04-12 13:35:42 -05:00
Scott Lahteine
f2ba0a5ae7
Tweak some formatting
2019-04-12 13:15:37 -05:00
Scott Lahteine
7e58d33a2e
Update some headers
2019-04-12 13:04:04 -05:00
Giuliano Zaro
64ee064ded
Update Italian language ( #13661 )
2019-04-12 12:22:43 -05:00
Scott Lahteine
14b561f182
Extra AxisEnum values for E0-E5
2019-04-12 12:13:48 -05:00
Robby Candra
9e86fc3831
Require homing to toggle leveling ( #13652 )
2019-04-11 14:09:41 -05:00
Ludy
9fd3e64ba8
Fix compile error with EXTRUDER>1 ( #13651 )
2019-04-11 13:58:50 -05:00
Jamie
509dc283f2
Restore declarations of G53-G59 ( #13654 )
2019-04-11 13:51:05 -05:00
chai-md
2adc37becc
MAGNETIC_SWITCHING_TOOLHEAD ( #13629 )
2019-04-11 13:29:17 -05:00
ManuelMcLure
492883859e
Don't protect unused CS pins ( #13647 )
2019-04-10 21:57:57 -05:00
Scott Lahteine
9898f53361
Fix missing IS_SD_PRINTING
2019-04-10 21:48:16 -05:00
Scott Lahteine
1e59a2ac73
Hide pause/stop unless active printing
2019-04-10 19:46:59 -05:00
Scott Lahteine
ae42206500
Fix SD_REPRINT_LAST_SELECTED_FILE
2019-04-10 17:43:08 -05:00
Scott Lahteine
d72946a8d7
Fix LPC1768 build with no watchdog
...
Fix issue mentioned at https://github.com/MarlinFirmware/Marlin/pull/13587#issuecomment-481737509
2019-04-10 17:34:15 -05:00
Scott Lahteine
cee3b172b9
Fix Marlin splash screen logic ( #13646 )
2019-04-10 17:14:57 -05:00
ANMay-ru
052f2ac352
Fix RURAMPS4D baud rate ( #13644 )
2019-04-10 15:53:21 -05:00
Marcio Teixeira
e6ebd30f60
Fix LCD issue on stepper timeout ( #13630 )
...
- Remove a re-paint of the status screen on stepper timeout, which would cause a garbled LCD with `LIGHTWEIGHT_UI` and could interrupt whatever else the user might be doing in a submenu (such as playing games!)
- Use the helper function to reset stepper timeout.
2019-04-10 15:51:48 -05:00
klcjr89
a8edd4f6d4
Fix Azteeg X5 MINI BOARD_NAME ( #13632 )
...
Co-Authored-By: klcjr89 <klcjr89@users.noreply.github.com>
2019-04-10 15:46:12 -05:00
Scott Lahteine
5018fdacbe
Support FYSETC_MINI_12864_PANEL ( #13365 )
2019-04-09 18:34:29 -05:00
InsanityAutomation
4900c28bf6
Fix IDEX tool-change, and more ( #13614 )
2019-04-09 18:33:40 -05:00
InsanityAutomation
ba31d39f6d
Azteeg X5 Mini support ( #13425 )
2019-04-08 23:10:45 -05:00
Scott Lahteine
9cb5c57b84
Adjustments to ui8tostr_percent
2019-04-08 21:47:50 -05:00
Scott Lahteine
321a5e6580
Fix SD card reselect when scrolled ( #13624 )
...
- Change encoder position to 16-bit integer.
- Fix `SD_REPRINT_LAST_SELECTED_FILE` when the screen is scrolled.
2019-04-08 21:10:41 -05:00
Scott Lahteine
0e3c9e726d
Set default Raptor runout/caselight pins
2019-04-08 18:18:08 -05:00
Scott Lahteine
5e38d70697
Fix M217 report label, general cleanup
2019-04-08 18:18:08 -05:00
Scott Lahteine
fae2b7edc3
Update MMU2 code style
2019-04-08 18:13:42 -05:00
Scott Lahteine
c8a83fb122
SPINDLE_LASER_ENABLE => SPINDLE_LASER_ENA
2019-04-08 18:13:41 -05:00