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

928 commits

Author SHA1 Message Date
Scott Lahteine b2cf253a13 Add RESTORE_LEVELING_AFTER_G28 option 2018-02-23 13:38:54 -06:00
Marcio Teixeira 13176dfe2f Merge remote-tracking branch 'origin/pr-lite-st7920-status' into pr-lite-st7920-status 2018-02-22 08:02:31 -07:00
Marcio Teixeira 716a22498f Changed temp type from uint8_t to int16_t 
- Also deleted old implementation files which had been renamed.
 2018-02-21 10:15:55 -07:00
Scott Lahteine 7d8c6b3f3c
Add 20x4 option for Sainsmart LCD (#9740) 2018-02-21 00:46:25 -06:00
Marcio Teixeira aada1e698f Removed unused configuration options. 2018-02-19 16:14:33 -07:00
Marcio Teixeira c7513eb032 Merge branch 'pr-lite-st7920-status' of github.com:marcio-ao/Marlin into pr-lite-st7920-status 2018-02-19 15:38:13 -07:00
Studiodyne d3ca82d8c2 Support for multiple filament runout sensors 2018-02-19 07:02:50 -06:00
Scott Lahteine ca55f2927a
Pulldown pin mode support (#9701) 
Implemented for LPC1768.
 2018-02-18 19:26:23 -06:00
Scott Lahteine 79272f98fc Proposed changes to ST7920 lightweight status screen 2018-02-18 02:47:31 -06:00
Marcio Teixeira 24eb275b99 Added a light-weight status screen for the ST7920 
- The status screen uses the ST7920 character generator to greatly
  reduce SPI traffic and MCU load when updating the status screen.

- Has been tested with the RepRapDiscount Full Graphics Smart Controller
  but should work with any LCD that uses an ST7920 or fully compatible
  controller.
 2018-02-18 02:29:45 -06:00
Scott Lahteine 08d685c97a Followup to 21e60fd 2018-02-16 02:09:17 -06:00
Roxy-3D 21e60fd3ed
Allow user to control Z-Height correction for off mesh movements (#9661) 2018-02-15 15:07:42 -06:00
Marcio Teixeira 4880ac6533 Added a light-weight status screen for the ST7920 
- The status screen uses the ST7920 character generator to greatly
  reduce SPI traffic and MCU load when updating the status screen.

- Has been tested with the RepRapDiscount Full Graphics Smart Controller
  but should work with any LCD that uses an ST7920 or fully compatible
  controller.
 2018-02-14 14:43:54 -07:00
Scott Lahteine 2ec65051fd Fix serial comment sp. 2018-02-13 22:40:56 -06:00
Scott Lahteine 2014d38e10 NEOPIXEL_BRIGHTNESS parity 2018-02-08 18:55:19 -06:00
Scott Lahteine b5e92f4f90
[2.0.x] Enable / disable PSU automatically (#9503) 2018-02-06 00:22:30 -06:00
Scott Lahteine 16739264d3 Add UltiController v2.1 support 
Add compatibility with the original screen bord from Ultimaker 2 printer (UltiController v2.1 with the PG-2864ALBP I2C display)
 2018-02-05 22:30:03 -06:00
Scott Lahteine 4925f60cff Add MALYAN_LCD to configs 2018-02-04 18:52:44 -06:00
Scott Lahteine 7d6c009104 Add thermistor 15 tuned for JGAurora A5 2018-01-22 01:27:11 -06:00
Scott Lahteine 348b454401 Probe bounds based on bed size 2018-01-22 01:05:11 -06:00
Scott Lahteine 58ed9901d7 Consistent NEOPIXEL_TYPE options 2018-01-21 17:19:38 -06:00
Scott Lahteine fa432508b0 Followup to Ender config 2018-01-15 06:00:21 -06:00
Scott Lahteine 048486390e Bring some configs up to date 2018-01-11 01:10:17 -06:00
Thomas Moore f7efac57b7 Multi-host support 2018-01-10 00:14:47 -06:00
GMagician 5295b4713d [2.0.x] add semitec 104NT-4 (#9119) 
Table is very very similar to old 104-GT2 so I added only the name and recycled old ID
 2018-01-09 16:53:12 -06:00
Scott Lahteine 0b4a46fa6c Bring configs up to date with 1.1.x 2017-12-30 23:28:53 -06:00
Thomas Moore f0a8a1a853 [2.0.x] Use NOZZLE_PARK_FEATURE for ADVANCED_PAUSE_FEATURE (#8866) 
* Use NOZZLE_PARK_FEATURE for ADVANCED_PAUSE_FEATURE
 2017-12-25 01:38:06 -06:00
Scott Lahteine 28fc8741d6 Reduce default jerk. XY by half. Z by 1/4 2017-12-24 19:54:11 -06:00
Even ea1a8d1223 add original RADDS LCD + Controller 
adds setup for the original Radds Display+Controller+SD Card Reader PCB
http://doku.radds.org/dokumentation/lcd-display/
 2017-12-24 19:00:23 -06:00
Dan Delaney b055d8c39c [2.0.x] Adding support for using the MKS_12864OLED with the SSD1306 controller (#8814) 
* Adding support for using the MKS_12864OLED with the SSD1306 controller

* Update comment for correct controller type
 2017-12-16 18:47:04 -06:00
Scott Lahteine 15d05748df Adding support for the Tronxy and Zonestar LCD 2017-12-15 19:13:52 -06:00
Scott Lahteine 69d49a2438 Shorter segments may be better 2017-12-09 06:29:14 -06:00
Scott Lahteine ae663a4198 PROBE_DOUBLE_TOUCH => MULTIPLE_PROBING 2017-12-07 16:44:13 -06:00
Richard Wackerbarth c1184552ac Change K1 to required option PID_K1 2017-12-05 19:59:59 -06:00
Scott Lahteine aa7efb96bf Bring configurations up to date 2017-12-02 21:50:51 -06:00
Scott Lahteine 0154e3480c New feature: BED_SKEW_CORRECTION 2017-12-01 19:39:49 -06:00
Scott Lahteine ef2531558c Add an option to segment leveled moves 2017-11-29 16:57:30 -06:00
Scott Lahteine 5926c9c97b Followup for MESH_EDIT_GFX_OVERLAY 2017-11-24 15:53:25 -06:00
Scott Lahteine 5ce7f23afa Config option G26_MESH_VALIDATION for all meshes 2017-11-23 21:43:23 -06:00
Scott Lahteine 3f0a982b8c Move Filament Width Sensor to Configuration_adv.h 2017-11-13 21:05:57 -06:00
Scott Lahteine b76e173205 Move test extrusion options under G26 2017-11-13 21:05:57 -06:00
Scott Lahteine 81b91b3f9d Clean up some trailing white-space 2017-11-10 02:31:04 -06:00
Roxy-3D 967104e1ce
Default Extrusion Settings were off a few lines in some of the example config files. (#8333) 2017-11-08 11:56:00 -06:00
Roxy-3D ed62c621d7
Fix G26 Circle Drawing. Add Default Extrusion Settings (#8313) 
- Fix G26 Circle Drawing.
- Add default extrusion settings so machine can print lines on print bed
- Yet to be done: Get LCD Menu's to use these settings.
 2017-11-07 17:13:53 -06:00
Scott Lahteine 2c099fd4c2 Update Thermal Protection Documentation 2017-11-07 15:46:44 -06:00
Scott Lahteine d83a9a53e8
Merge pull request #8220 from thinkyhead/bf2_serial_port_-1 
[2.0] Add SERIAL_PORT -1 option for configurators
 2017-11-03 15:25:12 -05:00
Scott Lahteine 93ba72ea83 Add SERIAL_PORT -1, set on SBASE, STM32F103RET6 2017-11-03 15:22:45 -05:00
Scott Lahteine 7e43dd1d23 Fix probes configuration url 
Based on #8241 by @machaj
 2017-11-03 13:35:40 -05:00
android444 9cc1d8e312 [2.0.x] Support for SilverGate Board 2017-10-31 15:27:26 -05:00
Scott Lahteine 34be5d33c0 The plural of 'axis' is 'axes' 2017-10-30 14:21:43 -05:00
Scott Lahteine 7fad26549b Concise SD_REPRINT_LAST_SELECTED_FILE description 2017-10-26 23:33:02 -05:00
Scott Lahteine 46e9eae159 Tweak to M100 config comment 2017-10-26 17:25:44 -05:00
Scott Lahteine 7f55d82fd1 Move UBL_SAVE_ACTIVE_ON_M500 to Configuration.h 2017-10-24 18:26:43 -05:00
Scott Lahteine 580b6e9089 Apply physical limits to mesh bounds 2017-10-24 16:54:07 -05:00
Scott Lahteine 5f87324536 Fix some config verbiage 2017-10-24 14:53:42 -05:00
cdedwards 6296ab2173 Add GFX overlay to UBL mesh edit (#8038) 
* Add GFX overlay to UBL mesh edit

Fixed misplaced HAS_TEMP_BED in dogm_bitmaps.h

rename _lcd_babystep_zoffset_overlay to _lcd_zoffset_overlay_gfx and move it out of BABYSTEP_ZPROBE_OFFSET to we can use it for over things. Add this function into UBL mesh edit screen.

update all Configuration.h to add ENABLE_MESH_EDIT_GFX_OVERLAY

* Add Sanity to UBL  insanity

Need to check for DOGLCD  otherwise error out.
 2017-10-24 14:14:03 -05:00
Roxy-3D 572cf0ec95 UBL able to generate mesh and save and load it on 32-bit platforms (#8015) 
* Get UBL Mesh Generation, Mesh Save & Mesh Load working with 32-Bit platforms

* clean up read_data() and write_data() for non-LPC1768 HAL's

* Get read_data() and write_data() return codes consistent

All HAL's read_data() and write_data() return false if they succeed.

* Get read_data() and write_data() return codes to be consistent

Make read_data() and write_data() return true if an error happens.

* Say UBL is now checked out on machine types in default Configuration.h file.
 2017-10-18 14:00:29 -05:00
Jeffrey Li eeb4611606 Add proper support for the AZSMZ 12864 LCD on a SMART RAMPS 2017-10-16 00:33:07 -07:00
Scott Lahteine 014a83fe09 Merge pull request #7984 from thinkyhead/bf2_micromake_c1 
[2.0.x] Micromake C1 Configurations, Unaccented French
 2017-10-14 21:19:32 -05:00
Scott Lahteine 34a261416f Add unaccented French language 2017-10-14 20:28:12 -05:00
Jeff Eberl b206f70693 Split the software endstop capability by axis. 2017-10-14 18:44:20 -05:00
Slawomir Ciunczyk a11e6a1022 Different NEOPIXEL types 
Same as #7728 but for 2.0.x,
Lot of cleanup and remove references in whole code to other "LED files" than leds.h. Now will be much easier to add next drivers/libraries. e.g. FastLED. But bad news, currently FastLED is suporting only RGB devices (no RGBW)
 2017-10-10 02:17:36 -05:00
Scott Lahteine e9bcb9d048 Add 4 new LCD displays 2017-10-09 15:58:02 -05:00
Scott Lahteine 9fe7f53216 Misc general spacing cleanup 2017-10-06 15:14:01 -05:00
Scott Lahteine 508d764d63 Add serial XON/XOFF handshaking 
From @ejtagle, originally #7459
 2017-10-02 04:12:30 -05:00
Scott Lahteine 90af1fe5ee Implement NO_MOTION_BEFORE_HOMING option 2017-10-01 21:58:50 -05:00
Christopher Pepper bea3ec2724 M355 S0, S1 fixes & faster LCD, SD card 
fix Travis error
 2017-09-27 19:26:00 -05:00
Scott Lahteine 7cd5eb6d42 Update LEVEL_BED_CORNERS config option 2017-09-27 00:48:59 -05:00
Scott Lahteine 4c5be9bb05 Fix a PARKING_EXTRUDER comment 2017-09-27 00:48:58 -05:00
Scott Lahteine 494b0eba2d Config spacing fix 2017-09-27 00:48:47 -05:00
Scott Lahteine f37ed314e0 Friendly layout for Arduino IDE 2017-09-21 16:27:13 -05:00
Scott Lahteine f536c4dccb Move configs 2017-09-06 06:28:30 -05:00
Scott Lahteine e4fcf460e7 Marlin bugfix-2.0.x Version/README 2017-08-31 17:56:08 -05:00
Michal Holes 54d48130f3 Slovak UTF-8 translation 
Slovak UTF-8 translation
 2017-08-23 19:14:35 -05:00
Vben 4817b39d98 Added new feature for AutoParking Extruder (APE) 2017-08-16 17:33:11 -05:00
Scott Lahteine 385f1bb9e5 Merge pull request #7504 from thinkyhead/bf1_servo_delays 
Individual servo delays
 2017-08-16 16:05:22 -05:00
Scott Lahteine a1878cd1c0 Add "Level Corners" menu option 2017-08-16 02:54:33 -05:00
GMagician e9c72978c7 Implement SERVO_DELAY as array 
This modify give SERVO_DELAY x servo basis
 2017-08-15 00:28:47 -05:00
Jozsef Kiraly 97c21e9007 Support for Geeetech GT2560 Rev.A/Rev.A+ 2017-08-06 00:42:54 -05:00
Scott Lahteine 804818b4d9 Bring configs up to date 2017-08-05 03:48:52 -05:00
teemuatlut 936d00dda8 Implement probing delay for piezo sensors 2017-07-29 21:46:40 -05:00
Scott Lahteine 51864fd365 Add bed size as a configuration option 2017-07-26 23:04:54 -05: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 fc9ce65095 Add BUSY_WHILE_HEATING for hosts that need it 2017-07-06 16:28:57 -05:00
Petr Zahradník 8c34233452 UTF-8 mapper for Czech 2017-07-04 15:51:23 -05:00
Scott Lahteine 69297b2d7b Make all EEPROM optimization options available 2017-07-02 20:47:03 -05:00
Scott Lahteine 232a10410d LCD_FOR_MELZI 2017-07-01 22:32:20 -05:00
Scott Lahteine dcec7178d1 Expose DISABLE_M503 option as a test option 2017-07-01 21:31:28 -05:00
Scott Lahteine 5b03f23fa2 Bring configurations up to date, fix some comments 2017-06-28 16:41:49 -05:00
Scott Lahteine 5b11b33854 Add support for Průša MK2 Multiplexer 2017-06-27 04:55:30 -05:00
Scott Lahteine afbc6e3e2f Update DELTA/SCARA config comments 2017-06-24 12:47:17 -05:00
Bob-the-Kuhn 325f09ea6c Add link to custom LiquidCrystal library by F. Malpartida 2017-06-22 13:07:08 -05:00
Scott Lahteine 907cafcbfd Support for two switching extruders 2017-06-19 17:20:59 -05:00
dot-bob 0bc66bf22c PCA9632 PWM color LED support 
Add support for the PCA9632 PWM color LED driver used on the Ultimaker 2 and Wanhao Duplicator 6.
 2017-06-12 01:09:24 -05:00
Bob-the-Kuhn 1c107b3949 delete problem line 2017-06-09 11:53:36 -05:00
Scott Lahteine e556ab1dff Find three-point leveling points on Delta 2017-06-07 16:07:38 -05:00
Scott Lahteine 1919cb0d1e Config cleanups 2017-06-01 19:26:16 -05:00
Roxy-3D 364f8fb613 Update Configuration.h files to better names (#6814) 
Changed UBL_G26_MESH_EDITING to UBL_G26_MESH_VALIDATION
Added UBL_MESH_EDIT_MOVES_Z to prepare for that change (coming next)
 2017-05-21 11:10:22 -05:00
Scott Lahteine 99c4900a98 SPINDLE/LASER config changes 2017-05-17 04:23:06 -05:00
fixoid c2321b1cdd Separate SWITCHING_NOZZLE and SWITCHING_EXTRUDER 2017-05-16 19:25:17 -05:00
Scott Lahteine 1c4ed8b106 Note 5 extruders in config comments 2017-05-07 21:28:54 -05:00
Brian faa270071d Improve BLTOUCH_HEATERS_OFF functionality 
- rename to PROBING_HEATERS_OFF
 - move heater pausing functionality into thermalManager
   - add variables, pause(), ispaused(), other functions
 - add fan pausing functionality -> PROBING_FANS_OFF
 - add probing_pause() wrapper
 - move pausing into do_homing_move() and do_probe_move() to minimize quiet time and so other probe types can benefit
 - example configs
 2017-05-07 16:22:08 -04:00
Scott Lahteine 77769e284f Edit configuration comments 2017-05-05 13:32:31 -05:00
Scott Lahteine da08e11acd Add EXTRAPOLATE_BEYOND_GRID option to bilinear leveling 2017-05-04 00:19:07 -05:00
Scott Lahteine 54751e8557 Put DISTINCT_E_FACTORS adjacent to the affected settings 2017-04-30 15:30:31 -05:00
Scott Lahteine 0dbe4b3e54 Edit configurations to reduce verbosity, arrange logically 2017-04-30 15:30:31 -05:00
Scott Lahteine d7d4378481 Remove inaccurate version description 2017-04-30 14:57:19 -05:00
Scott Lahteine 7db805930a Cleanup configurations 2017-04-28 18:32:39 -05:00
Roxy-3D 4075b95519 Allow BL-Touch users to control heaters during probe event (#6485) 
The Configuration.h file entries for BL-Touch have been updated to:
```cpp
//#define BLTOUCH
//#define BLTOUCH_DELAY 375      // (ms) Enable and increase if needed
//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are
turned off during probe event
```
 2017-04-28 09:19:55 -05:00
Scott Lahteine 959566cf0a Update note about M163 / M164 2017-04-22 16:23:15 -05:00
Scott Lahteine 0e97b3d6d0 Fix some configuration spacing 2017-04-14 22:36:10 -05:00
Scott Lahteine 1bd25fd2b3 Clean up config spacing, section headings, etc. 2017-04-14 19:06:31 -05:00
Scott Lahteine fd2a0784ba Add support for SOLENOID_PROBE 2017-04-14 17:24:36 -05:00
Scott Lahteine dac21ec680 Add support for an RGBW LED 2017-04-11 12:58:55 -05:00
Scott Lahteine e7746ffee4 Extend RGB LED support, adding Printer Events 2017-04-11 12:15:41 -05:00
Scott Lahteine 9343f6a95f Put TOSHIBA with other stepper driver options 2017-04-09 20:52:49 -05:00
Scott Lahteine 1855534f20 Config files cleanup 2017-04-09 06:44:52 -05:00
Scott Lahteine c26a315d0b Additional missed patches 2017-04-09 04:24:23 -05:00
Scott Lahteine c54f6cf23d Updates to support 5 extruders 2017-04-09 03:49:16 -05:00
Scott Lahteine 824f3c1c0d Fix up configuration comments 2017-04-08 18:59:56 -05:00
Scott Lahteine 995ed90248 Clean up Filament Width Sensor comments 2017-04-08 18:59:56 -05:00
Scott Lahteine 2a84122edd Configuration changes to support 5 extruders 2017-04-07 10:46:35 -05:00
Bob-the-Kuhn 3b8926bd09 improved wording, consolidation of info, BLTouch warning 
==============================================

clarified BLTouch calculation & changed comment delimitters/flags

I found it hard to pickout the various sections in this area so I
changed most comments from // style to /** ... */

Made the BLTouch calculation simpler and clarified the units of measure
for the result.

============================================

add changes to example configurations

============================================

add TinyBoy2 to this PR & add BLTouch Delay
 2017-04-06 16:06:01 -05:00
Scott Lahteine d13991ae18 Use same config name for all mesh dimensions 2017-04-06 16:05:59 -05:00
Scott Lahteine c56eec29f0 Configurable delay for BLTouch servo emulation 2017-04-02 11:14:53 -05:00
Scott Lahteine 9e22184936 Add a "manual" option for ABL 2017-03-31 11:50:18 -05:00
Scott Lahteine 81136c1e82 Merge pull request #6177 from thinkyhead/rc_tinyboy 
Support for TinyBoy 2 3D printer (and its OLED display)
 2017-03-31 04:31:47 -05:00
Stefan Brüns 0fe57ad4f5 Add Support TinyBoy2 OLED/Encoder panel 
The OLED is driven by an SSD1306, connected to the board via
I2C, the rotary encoder is connected to 3 GPIO pins.

Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
 2017-03-31 04:05:34 -05:00
Scott Lahteine edbc024d76 Disable UBL_G26_MESH_EDITING by default 2017-03-31 02:20:20 -05:00
Scott Lahteine 5a2abeca78 Merge pull request #6100 from thinkyhead/rc_soft_pwm_dither 
Enhancement of PWM, with dithering
 2017-03-24 04:57:40 -05:00
Stefan Brüns 35a55d5757 SOFT_PWM: Implement dithering if SOFT_PWM_SCALE is 1 or more 
If dithering is enabled, the remainder of the soft_pwm_X duty value at
turnoff time is added to the next cycle. If e.g. the duty is set to 9 and
SCALE is set to 2, the PWM will be active for 8 counts for 3 cycles and
12 counts on each fourth cycle, i.e. the average is 9 cycles.

This compensates the resolution loss at higher scales and allows running
fans with SOFT_PWM with significantly reduced noise.

Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
 2017-03-24 04:13:36 -05:00
Scott Lahteine 783338a0b8 Add UBL_MESH_EDIT_ENABLED to configs 2017-03-24 00:44:55 -05:00
Scott Lahteine e244399766 Additional cleanup of UBL code 2017-03-22 20:51:10 -05:00
Scott Lahteine 2512871a36 Patch configs UBL followup 2017-03-18 12:32:03 -05:00
Scott Lahteine 27b5666e15 Move Allen Key probe definition to the top 2017-03-18 12:27:37 -05:00
Scott Lahteine cf94688925 Univeral Bed Leveling - configuration 2017-03-18 11:35:19 -05:00
Scott Lahteine 0e410c9dfd Software endstop options as simple switches 2017-03-17 06:05:17 -05:00
Scott Lahteine 3e927ff204 Replace MBL Z hacking 2017-03-17 06:05:17 -05:00
Marek Pikuła 6836b94eea Added circle pattern for nozzle cleaning feature 2017-03-06 03:03:00 -06:00
Colin Gilgenbach 48b7e0f8d8 Nozzle Wipe Vertical Zig-Zag 
- Add configuration support for zigzags in either the X or Y axis, for
wipe pads significantly longer in one dimension.
- Add configuration for default number of zig-zag triangles, vs. a
magic number in `Marlin_main.cpp`.
- Update description of auto nozzle wiping to match functionality
 2017-02-25 21:52:43 -06:00
Scott Lahteine e282b72151 Remove non-applicable comment on MANUAL_Z_HOME_POS 2017-02-18 05:14:43 -06:00
esenapaj d38e335272 From "microseconds" to "milliseconds" 
delay() is milliseconds
 2017-01-02 01:19:33 +09:00
Scott Lahteine 5ab7b91615 Comment on filament runout sensor config 2016-12-23 19:50:27 -08:00
Scott Lahteine 78d6d6e076 Merge pull request #5452 from thinkyhead/rc_save_your_mesh 
Save Bed Leveling to EEPROM
 2016-12-15 20:23:01 -08:00
Scott Lahteine 1b2fb2bdc7 ABL_GRID_POINTS_* => ABL_GRID_MAX_POINTS_* 2016-12-15 19:08:41 -08:00
esenapaj 069c6b38dd Remove unnecessary tabs and spaces 2016-12-16 00:21:32 +09:00
Scott Lahteine da6a094424 Sanity-check inverting and pullups for Z probe and Z endstop 
`Z_MIN_ENDSTOP_INVERTING` must match `Z_MIN_PROBE_ENDSTOP_INVERTING`
when using `Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN`.
This is easy to overlook.
 2016-12-08 00:12:19 -08:00
Scott Lahteine aa241c63b3 Include M205 note in configurations 2016-12-07 14:45:44 -06:00
akaJes d7b948610a Experimental bilinear subdivision option 2016-12-05 20:11:24 -06:00
Scott Lahteine 3391c785c6 Support for distinct E factors 2016-12-05 07:26:18 -06:00