zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity
8403 commits 1 branch 0 tags 156 MiB
Commit graph

6948 commits

Author SHA1 Message Date
Scott Lahteine 4eff18854b Rename options with swap_ prefix 2017-07-27 04:14:29 -05:00
Scott Lahteine 14482d2f2a Strip auto-retract for impossible M(IN|AX)_AUTORETRACT combo 2017-07-27 04:14:29 -05:00
Scott Lahteine 9fc72422e4 Don't let the flow multiplier affect retract/recover length 2017-07-27 04:14:29 -05:00
Scott Lahteine fee696db5d Improve retract() for G10/G11/autoretract 2017-07-27 04:14:29 -05:00
Scott Lahteine 423b0f3a1e Replace MIN_RETRACT with MIN_AUTORETRACT, MAX_AUTORETRACT 2017-07-27 04:14:29 -05:00
Scott Lahteine 51864fd365 Add bed size as a configuration option 2017-07-26 23:04:54 -05:00
Scott Lahteine dc7c95e07b Remove @ section fwretract 2017-07-26 22:46:16 -05:00
Dave Johnson 4718c09c48 Remove extraneous USBCON defines for AT90USB boards 
USBCON is definied by serial.h pullikng in MarlinConfig.h which in turn pulls in Arduino.h.  Defining in later includes has shown to cause compile issues so removing all extraneous calls for and potentially easier future linker troubleshooting.
more USBCON unification
 2017-07-23 16:41:48 -07:00
C. Scott Ananian 890e7a16a9 Add support for Printrbot Neopixel RGBW strip. 
Connected as described at http://printrbot.com/shop/led-strip/

Based on patch by Kelly Anderson <kelly@xilka.com> at
http://www.xilka.com/printrbot/marlin/1.1.4/20170707/
 2017-07-22 16:07:55 -05:00
Scott Lahteine a059e95463 Bring Infitary i3 config up to date 2017-07-21 20:49:19 -05:00
Scott Lahteine d6d6043548 Merge pull request #7338 from thinkyhead/bf_mks_ps_on_pin 
MKS 1.3+: Add pin mapping for PS_ON
 2017-07-21 20:00:26 -05:00
Alexey Shvetsov 851f9f5399 Update Russian translation - Part 1 
Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>
 2017-07-21 19:32:37 -05:00
Scott Lahteine b7a16e4468 Merge pull request #7315 from fixoid/patch-1 
Fixing SWITCHING_EXTRUDER feature to work with HOTENDS > 1
 2017-07-21 19:10:54 -05:00
Alexey Shvetsov f38b8c5bf8 MKS 1.3+: Add pin mapping for PS_ON 
This allows the use of D4 as PS_ON since MKS Gen doesn't have a PS_ON pin. However this effectively allows only 3 servos (instead of 4).

Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>
 2017-07-21 18:50:05 -05:00
Scott Lahteine 8a3bc6be4d Improve FWRETRACT config options and commentary 
Add more details as requested in #7198
 2017-07-20 22:57:50 -05:00
Scott Lahteine b0173ccdb9 Drop extra initializers for vars initialized by EEPROM code 2017-07-20 22:57:49 -05:00
Scott Lahteine 7afafb05b8 Split G10/G11 into separate functions 2017-07-20 02:24:13 -05:00
Scott Lahteine c45798694f Add some more requirements to the G-code list 2017-07-20 02:24:13 -05:00
Scott Lahteine 72de280c1e BARICUDA valve pressure consistently uint8_t 2017-07-20 02:21:40 -05:00
Scott Lahteine 4d98e3f0a7 General cleanup 2017-07-20 02:21:40 -05:00
fixoid e530c67349 Fixing SWITCHING_EXTRUDER feature 2017-07-19 21:15:26 +03:00
Tannoo 2ad3ca5d8a Bugfix (#7310) 2017-07-18 22:55:14 -05:00
Roxy-3D 37a6833d7e Allow the sampled point to be added into the Least Squares Best Fit (#7289) 
Without this...  The LSF won't work because none of the sampled points
in this code block get added.
 2017-07-13 16:33:02 -05:00
C. Scott Ananian a519b093b9 Fix build by replacing qr_solve by least_squares_fit. (#7285) 
This was broken by 9af67e2446.
 2017-07-13 12:02:15 -05:00
Scott Lahteine 0873c667fa Apply coding standards to recent merges 2017-07-13 00:46:16 -05:00
Scott Lahteine 8c2907d10f Fix ABL broken by recent change 2017-07-12 22:56:18 -05:00
Roxy-3D 9af67e2446 Save 7714 bytes of program memory when doing AUTO_BED_LEVELING_LINEAR (#7276) 
We can save more and a pile of RAM by eleminating the eqnBVector and
EqnAMatrix arrays next.
 2017-07-10 19:05:11 -05:00
Scott Lahteine 76e90b93b7 Volatile keyword not needed for parser.seen 2017-07-10 15:38:54 -05:00
Jamie Bainbridge 00e4ced58e Stay in User Menu after command. Add feedback. 
When a user executes a User Menu command, the LCD returns to the main menu. If the user has multiple menu items they want to run, such as one menu item per bed leveling corner, then it's better to stay in the User Menu rather than return to the main menu.

This PR modifies Marlin to stay in the User Menu after a command.
 2017-07-10 13:47:12 -05:00
Scott Lahteine 1066b17457 Merge pull request #7260 from thinkyhead/bf_G33_update_27 
Updates to G33 and its LCD code
 2017-07-10 13:39:36 -05:00
Tannoo e927941c06 Bugfix (#7265) 
Fix compile error when UBL is enabled but there is no LCD Panel.
 2017-07-08 09:44:50 -05:00
Scott Lahteine 68aea9c01d Merge pull request #7261 from thinkyhead/bf_configs_by_vendor 
Arrange more example configs by vendor
 2017-07-07 15:46:22 -05:00
Tannoo aaacef9441 Corrections (#7231) 
20x4 map integration.    Also some minor changes to the UBL Menu layout.     Both 20x4 LCD's and Graphical LCD panels should have similar functionality now.
 2017-07-07 11:05:08 -05:00
LVD-AC 4bc79ec877 Updates for G33-LCD interface 2017-07-07 05:00:59 -05:00
Scott Lahteine 186580b55f Arrange example configurations by vendor 2017-07-07 04:48:23 -05:00
Scott Lahteine 6be369f3ea Add some config names to AUTHOR 2017-07-07 04:46:33 -05:00
Scott Lahteine 7fc31a7940 Merge pull request #7258 from thinkyhead/bf_cleanups_jbrazio 
Add support for BQ heated bed kit with Hephestos 2
 2017-07-07 04:11:07 -05:00
Scott Lahteine 11e376e920 Merge pull request #7256 from thinkyhead/bf_cleanup_july_6 
Assign -1 to LCD_PINS_D4-7 if not defined
 2017-07-07 03:22:47 -05:00
João Brázio 2065591daf Add support for BQ heated bed kit with Hephestos 2 2017-07-07 03:10:38 -05:00
essgcee 61be28133d Support for Creality CR-10 
Creality board is a Melzi / Sanguinololu variant, but using different pins for LCD control (and maybe other minor variations)
 2017-07-06 23:08:10 -05:00
Scott Lahteine 9248a90a4c Assign -1 to LCD_PINS_D4-7 if not defined 2017-07-06 22:47:51 -05:00
Scott Lahteine 5ef1e5ef60 Tweaks for M43 2017-07-06 21:47:50 -05:00
Scott Lahteine c7732db99d Fix: Use of digitalRead, digitalWrite breaks on AT90USB 2017-07-06 21:25:56 -05:00
Scott Lahteine f713f25fa5 Clean up excess whitespace 2017-07-06 21:24:30 -05:00
Scott Lahteine fc9ce65095 Add BUSY_WHILE_HEATING for hosts that need it 2017-07-06 16:28:57 -05:00
Scott Lahteine c6d430670a Clear SHOW_BOOTSCREEN with no LCD 2017-07-06 14:21:27 -05:00
Scott Lahteine 11c589c3ec Fix compile issue with G38 
Fixes #7250
 2017-07-06 14:21:27 -05:00
Scott Lahteine 678914be25 Patch M23 to work around Simplify3D bug 
Addressing #7227
 2017-07-06 14:00:58 -05:00
LVD-AC 3efe4aeef8 Add PROBE_MANUALLY support to G33 2017-07-04 18:06:54 -05:00
Scott Lahteine cca1cca3a5 Merge pull request #7237 from thinkyhead/bf_cz_mapper 
UTF-8 mapper for Czech
 2017-07-04 16:45:13 -05:00
Scott Lahteine a2babb532d Merge pull request #7217 from benlye/add-kill-action 
Add configurable action command to send when printer is killed
 2017-07-04 16:44:08 -05:00
Petr Zahradník 8c34233452 UTF-8 mapper for Czech 2017-07-04 15:51:23 -05:00
Dave Johnson 20f6676d63 DISABLE_[XYZ] compatibility check 
DISABLE_[XYZ] is incompatible with HOME_AFTER_DEACTIVATE and Z_SAFE_HOMING
 2017-07-03 17:23:53 -07:00
Ben Lye c28749a567 Add kill action 
Sends pre-defined string as action command when printer is kill.
 2017-07-03 23:45:19 +01:00
Scott Lahteine df87278fce Add "CAP:PRINT_JOB:1" (M75 / M76 / M77) to M115 output 2017-07-03 15:59:06 -05:00
Scott Lahteine 4be8d7720e Fix spelling of "Chinese" 2017-07-03 15:24:49 -05:00
LVD-AC 567941e341 Fix for issues #6997 and #7152 
Probing with the effector in the printing area, but an eccentric probe (e.g. allen key) outside it but still touching the bed gives meaninfull information for calibration. Since calibration is most accurate when probing as close to the towers as possible the testing was way to restrictive hence this fix.
 2017-07-03 02:53:49 -05:00
Scott Lahteine 57fff2e95e Merge pull request #7219 from thinkyhead/bf_update_git_scripts 
Update Marlin+git helper scripts
 2017-07-03 01:49:27 -05:00
Scott Lahteine 6a3967ee33 Corrections for probe_pt parameters 2017-07-03 01:34:27 -05:00
Scott Lahteine 534bffa7a9 Correct comment on ABL G29 2017-07-03 01:13:07 -05:00
Scott Lahteine e1e1a0c344 Provide a default CUSTOM_BOOTSCREEN_TIMEOUT 2017-07-03 01:13:07 -05:00
Scott Lahteine 69297b2d7b Make all EEPROM optimization options available 2017-07-02 20:47:03 -05:00
Scott Lahteine d609489b22 Drop setup_homepin 2017-07-02 02:27:09 -05:00
Scott Lahteine 167169e1bf Sanity check for a real probe with M48 2017-07-02 02:27:09 -05:00
Scott Lahteine 395a9f59ac Merge pull request #7211 from thinkyhead/bf_lcd_bootscreen 
Use lcd_bootscreen for both
 2017-07-02 02:11:07 -05:00
Scott Lahteine 14663efe0d Merge pull request #7210 from fiveangle/printrboard_revf_cleanup 
Printrboard RevF cleanup
 2017-07-02 01:02:26 -05:00
Scott Lahteine ae5923a3d0 Make lcd_bootscreen common to both 2017-07-02 00:47:36 -05:00
Scott Lahteine 859248433f Patch for gcode debug 2017-07-02 00:47:35 -05:00
Dave Johnson 09c90c2f6c Printrboard RevF Cleanup 
-Update Arduino IDE extension descriptions
-Set default motor currents if not defined in Configuration_adv.h
-Support for MINIPANEL LCD
-Support for choosing internal or panel SD
 2017-07-01 22:33:39 -07:00
Scott Lahteine 232a10410d LCD_FOR_MELZI 2017-07-01 22:32:20 -05:00
Scott Lahteine 76c92a1fab Clean up some trailing spaces 2017-07-01 22:32:20 -05:00
Scott Lahteine cf96109056 Implement the EEPROM_CHITCHAT option 2017-07-01 21:48:18 -05:00
Scott Lahteine dcec7178d1 Expose DISABLE_M503 option as a test option 2017-07-01 21:31:28 -05:00
Scott Lahteine 3e78a01262 Merge pull request #7204 from thinkyhead/bf_update_ubl_lcd 
UBL radar map corrections
 2017-07-01 20:59:03 -05:00
Tom 1ff7d10c80 Add configuration for Infitary M508 (i3 clone) 
Based on Infitary's own firmware settings.
 2017-07-01 20:04:08 -05:00
Scott Lahteine 4cb45c10dd Patch ubl lcd mesh map indentation 2017-07-01 19:47:52 -05:00
Scott Lahteine abd6ba62b4 Some cleanups for ubl lcd mesh map 2017-07-01 19:47:49 -05:00
Scott Lahteine f17bae1f70 Changes for ubl_lcd_map_control patch 2017-07-01 19:47:02 -05:00
Tannoo 8e0f3b7eba UBL radar map corrections 2017-07-01 19:00:44 -05:00
Bob-the-Kuhn fcceed5be6 intermittent Teensy & G26 compile problem 
===============================================

also an issue with ubl_motion.cpp
 2017-07-01 14:41:24 -05:00
Scott Lahteine 30b327d24c Finish the solution for #7166 2017-06-29 15:17:39 -05:00
Scott Lahteine 6c97c5595c Add a sanity check for DELTA_AUTO_CALIBRATION 2017-06-29 15:03:19 -05:00
Bob-the-Kuhn e6e3132f79 make LETTTER_OFF return values that match param indices range 2017-06-29 09:01:58 -05:00
Bob-the-Kuhn bfbf5f8200 correct value_bool() when FASTER_GCODE_PARSER is enabled 
Also corrected compile issue when DEBUG_GCODE_PARSER and
AUTO_BED_LEVELING_UBL are both enabled.
 2017-06-28 19:51:08 -05:00
Scott Lahteine 406ef69702 Move Anet A8 config to subfolder 2017-06-28 16:58:57 -05:00
Scott Lahteine 379926961c Add Anet A6 config, edit Anet A8 config 2017-06-28 16:58:57 -05:00
Scott Lahteine 5b03f23fa2 Bring configurations up to date, fix some comments 2017-06-28 16:41:49 -05:00
Scott Lahteine e3cedfa0ec Fix a compiler warning 2017-06-28 16:41:46 -05:00
Scott Lahteine bb0508b6cf Fix comment in M115 code 2017-06-28 13:08:33 -05:00
Scott Lahteine 85777a56c6 Add A (action) and E (echo) parameters to M118 2017-06-28 02:07:59 -05:00
Scott Lahteine d1e8d4cd9d Merge pull request #7167 from thinkyhead/bf_20x4_lcd_update 
UBL Map Cleanup and LCD display
 2017-06-28 01:20:22 -05:00
Scott Lahteine b492e0878d Changes to reduce and simplify 2017-06-28 01:10:30 -05:00
Ben Lye 98d362c2da Adding M118 command to send text to serial 
Allows the user to send text to the serial console in order to
communicate with a host - sending debuging information or action
commands, for example.  Text must begin with '//' and this is added if
it is not already present at the beginning of the string.
 2017-06-28 00:55:20 -05:00
Tannoo 80abc872f3 Updated to better support the coming "radar" 2017-06-27 22:51:58 -05:00
Tannoo e90cbf5c16 UBL Map Cleanup 2017-06-27 22:51:58 -05:00
Scott Lahteine fc140c4962 Followup for I2C_POSITION_ENCODERS 2017-06-27 20:46:40 -05:00
Scott Lahteine f4246dc8ff Merge pull request #7165 from thinkyhead/bf_parser_shorthand 
Use parser.seenval, add shorthand functions
 2017-06-27 18:57:48 -05:00
Scott Lahteine bd776df8c1 Optimize seen_axis by moving 'X' to index 24 2017-06-27 18:47:11 -05:00
Scott Lahteine 05449cf6ee Add shorthand value accessors to gcode.h 2017-06-27 18:39:41 -05:00
Scott Lahteine 12f092c812 Cleanups to gcode.h, use seenval() 2017-06-27 17:57:00 -05:00
Scott Lahteine 941943c167 Apply const, spacing, etc. 2017-06-27 05:23:49 -05:00
Scott Lahteine 5b11b33854 Add support for Průša MK2 Multiplexer 2017-06-27 04:55:30 -05:00
Scott Lahteine a4a587a897 Fix spelling of Průša 2017-06-27 04:46:46 -05:00
Scott Lahteine ba1706a265 Fix spacing in gcode.cpp 
Followup to #6940
 2017-06-27 04:46:46 -05:00
Scott Lahteine c2c8aafda2 Merge pull request #7157 from thinkyhead/bf_g33_f_parameter 
G33 F and Height bug fix
 2017-06-27 04:36:22 -05:00
Scott Lahteine 627afb29df Merge pull request #7109 from tnw513/fix-italian 
added missing italian translation
 2017-06-27 04:12:30 -05:00
Scott Lahteine f0f9fb7465 Remove line that does nothing 2017-06-27 04:08:50 -05:00
LVD-AC 99592c8458 Update G33: Add F, fix height bug 2017-06-27 04:02:02 -05:00
Ben Lye 31514f453a Fix #ifdef AVR_AT90USB1286_FAMILY in pinsDebug 
Can't compile with PINS_DEBUGING enabled on Atmega1284p because it tries
to enumerate pins 46 and 47 (which don't exist) because `#ifdef
AVR_AT90USB1286_FAMILY ` doesn't work as expected.
 2017-06-27 08:04:40 +01:00
Scott Lahteine 134116b874 Merge pull request #7153 from thinkyhead/bf_czech_update 
Updated Czech language
 2017-06-26 17:34:15 -05:00
Petr Zahradník e80958b631 CZ Translate BLTouch and UBL 
Fixup length
 2017-06-26 16:15:31 -05:00
Scott Lahteine fe7e890b09 Fix issues with ADC_KEYPAD 
Fixes #7150
 2017-06-26 16:08:31 -05:00
dot-bob a1632cfa0a Added option 'H' to G29 P4. 
- Added `H` to set a nozzle height adjustment to surface of the bed.
- Updated G29 P4 comments to reflect changes.
 2017-06-25 17:14:08 -05:00
Scott Lahteine e687782875 Merge pull request #7134 from thinkyhead/bf_skynet_a3_ready 
Add Skynet/ANET A10 support
 2017-06-25 14:35:22 -05:00
dot-bob b3c36c98fd Edit digipot currents via LCD, save to EEPROM 2017-06-25 01:02:36 -05:00
Scott Lahteine 3c7bfe798d Various cleanups ahead of digipot save 2017-06-24 23:56:24 -05:00
Bob-the-Kuhn 9651d01e1a Add Skynet/ANET A10 support 2017-06-24 19:07:03 -05:00
Scott Lahteine eb314373bb Config spacing & consistency, group custom LCDs 2017-06-24 14:33:40 -05:00
Scott Lahteine 6c45fa7dcc Apply #elif in LCD conditionals 2017-06-24 13:56:33 -05:00
Scott Lahteine afbc6e3e2f Update DELTA/SCARA config comments 2017-06-24 12:47:17 -05:00
Paweł Stawicki 1e47c17b46 Fix: set digipot mcp4018 Vrefmax to 1.666V 2017-06-24 12:35:34 -05:00
Scott Lahteine 80a232419d CNC workspace planes and 'P' argument for G2/G3 2017-06-23 14:53:03 -05:00
Scott Lahteine 5fb0d401eb Formatting tweaks 2017-06-23 14:53:02 -05:00
Scott Lahteine ed04d0b6be Label DualXMode enums 2017-06-23 14:53:02 -05:00
Scott Lahteine 786cdea124 Ensure REPRAPWORLD_KEYPAD_MOVE_STEP is defined 2017-06-23 14:53:01 -05:00
Scott Lahteine ee7163fd3a Fix pinsDebug compile errors 2017-06-23 14:53:01 -05:00
Scott Lahteine a9f8e518bf Fix FILAMENT_WIDTH_SENSOR infinite loop issue 
Addressing #6992 and #5851
 2017-06-23 14:53:01 -05:00
Scott Lahteine 254a11b083 Merge pull request #7120 from thinkyhead/bf_sainsmart_link 
Add link to F. Malpartida LiquidCrystal library
 2017-06-22 14:04:23 -05:00
Scott Lahteine aeb6d465a4 Merge pull request #7118 from thinkyhead/bf_french_update 
French update
 2017-06-22 13:10:07 -05:00
Bob-the-Kuhn 325f09ea6c Add link to custom LiquidCrystal library by F. Malpartida 2017-06-22 13:07:08 -05:00
MagoKimbra d26c8cc5c8 fix_planner_refresh_e_positioning (#7103) 
* fix_planner_refresh_e_positioning

* Fix
 2017-06-22 12:59:22 -05:00
Gege2B c7f04fbcc7 French translation 2017-06-22 12:49:23 -05:00
Silvio Didonna 4171520729 added missing italian translation 2017-06-21 11:08:39 +02:00
Bob-the-Kuhn 41bfff14e2 Merge pull request #6991 from Bob-the-Kuhn/Mesh-with-babystepping 
Mesh with BABYSTEP_ZPROBE_OFFSET: add sanity check
 2017-06-20 16:36:22 -05:00
Scott Lahteine 424d0bae8b Merge pull request #7100 from thinkyhead/bf_HAL_prepare 
Apply maths macros and type changes ahead of HAL
 2017-06-20 01:15:23 -05:00
Scott Lahteine 5c59ee4e93 Use current (raw) Z if omitted from G29 WXY or G29 WIJ. 2017-06-20 00:10:52 -05:00
Scott Lahteine 37bc0fce62 Make G29 compatible with M206 Z and G92 Z 
Use the raw position for mesh measurement. Otherwise the `M206` and
`M92` Z offsets will get canceled out by bed leveling. The downside is
`G29` will not compensate for a poorly set small `M206` fudge value.

To elaborate on this issue, imagine you are probing with a Z home
offset of -0.1, meaning when Z homes, -0.1 is the current position,
implying the ideal bed zero for the nozzle is 0.1mm higher than the Z
endstop. Ordinarily when printing, Z would raise 0.1mm higher.

What happens when we probe is that all points are measured with that
-0.1 included. So when bed leveling is enabled the `M206 Z` offset gets
exactly canceled out by the bed readings.
 2017-06-20 00:09:59 -05:00
Scott Lahteine 6c45d0fd81 Apply maths macros and type changes ahead of HAL 2017-06-19 22:57:42 -05:00
Scott Lahteine 8a51e2960c Improve the experience of editing steps_per_mm 2017-06-19 22:17:15 -05:00
Scott Lahteine 725d9d9a56 Fix and improve LCD value editing display 
- Fix: When "100.0" changes to "99.0" the LCD shows "199.0"
- Use 2 rows if needed on character LCD, (allowing longer labels…
Germany, et. al.)
- Known issue: A certain length label combined with a certain value
drawing function could, for example, display 99.0 on 1 line, but 100.0
on two lines. Workaround would be to pass a nominal value size argument.
 2017-06-19 22:17:15 -05:00
Scott Lahteine 499bb85a95 Clean up, put ubl menu itemization closer at hand 2017-06-19 22:17:14 -05:00
Tannoo 90f5f82926 Step-by-Step Menu addition 2017-06-19 20:15:11 -05:00
Scott Lahteine 0c616700f3 Merge pull request #7097 from thinkyhead/bf_dac_percents_fix 
Convert DAC percent to uint8_t
 2017-06-19 17:58:55 -05:00
Florian Heilmann 6dcf42f1a7 Add Z Fade Height to M420 output if it is enabled (#7042) 
* Add Z Fade Height to M420 Output

Echo the z-fade height when M420 is called, if it is enabled.

* Fix Whitespace

* Fix Compiler complaint

* Missing semi-colon
 2017-06-19 17:53:07 -05:00
Bob-the-Kuhn a1c65fd3d5 convert DAC percent to uint8_t 
=====================

add test to Travis
 2017-06-19 17:46:41 -05:00
Scott Lahteine 907cafcbfd Support for two switching extruders 2017-06-19 17:20:59 -05:00
Ross Allan cfcd069501 Fix #5699 - LIN_ADVANCE freeze when ADV_RATE returns 0 2017-06-19 14:02:17 -05:00
Scott Lahteine b8b7ef1902 Merge pull request #7090 from thinkyhead/bf_italian_refix 
Fix Italian language mapper
 2017-06-19 09:27:13 -05:00
Scott Lahteine 42f7f9e013 Merge pull request #7060 from bgort/i2cpefix 
I2C Position Encoders Example Configs
 2017-06-19 01:08:42 -05:00
Scott Lahteine 0b49bddec2 Fix Italian language mapper 2017-06-19 01:01:40 -05:00