Scott Lahteine
c846388a65
Standardize LCD interface code for UBL a little
2017-12-06 21:50:54 -06:00
Scott Lahteine
2fde60da12
Changes for parity with 1.1.x
2017-12-06 21:50:54 -06:00
Scott Lahteine
6040d4080e
Cleanup stepper ISR. Allow cleaning for endstops.
2017-12-06 21:23:37 -06:00
Scott Lahteine
a4e1d83599
Fix M503 S parameter
2017-12-06 21:23:37 -06:00
Scott Lahteine
a3b098b4be
Whitespace clean
2017-12-06 14:02:44 -06:00
AnHardt
a993c5227d
Don't split first_move while homing or probing
...
While homing or probing it might be bad if the stop/trobe triggers during the first part and the second is still in the buffer.
2017-12-06 14:13:05 +01:00
Mateusz Krawczuk
5320906b0b
Update TEMP_BED_PIN in MIGHTYBOARD_REVE
...
Pin K7 number in fastio1280.h is 69, but it's also ADC15 pin.
To get correct value from ADC reading it should be set as 15.
2017-12-06 12:07:20 +01:00
Scott Lahteine
aeb5c623c1
Show "Level Bed Corners" with UBL too
...
Addressing #8676
2017-12-05 21:58:43 -06:00
Scott Lahteine
5fbb2f121e
Remove skew warning that could crash the planner
2017-12-05 20:27:20 -06:00
Richard Wackerbarth
c1184552ac
Change K1 to required option PID_K1
2017-12-05 19:59:59 -06:00
revilor
9e3fbcf35c
fix for #8669 ( #8679 )
...
* fix for #8669
* Update G28.cpp
2017-12-05 19:40:36 -06:00
Scott Lahteine
d8b444c144
Cleanup constextpr in planner.cpp
2017-12-05 18:55:57 -06:00
Scott Lahteine
a2372cfab5
Fix SKEW_CORRECTION without leveling
2017-12-05 18:48:34 -06:00
Scott Lahteine
4d3c3d0b73
Some ST7920 parity with 1.1.x
...
Possibly more should be brought over? Discussion at #8471
2017-12-05 02:22:36 -06:00
Scott Lahteine
3748c28924
Fix MBL G29 without LCD
...
Addressing https://github.com/MarlinFirmware/Marlin/pull/8575#discussion_r154536617
2017-12-05 01:57:45 -06:00
Scott Lahteine
772298257b
Creality pins spacing, MINIPANEL CS pin
2017-12-05 01:57:45 -06:00
Scott Lahteine
b27bc67271
Set initial endstops state
2017-12-05 01:10:31 -06:00
Scott Lahteine
b6ba32ce75
Support for RAMPS Plus (3DYMY)
2017-12-05 00:42:21 -06:00
Scott Lahteine
53694ebaa1
Folllwup to planner splitting
2017-12-04 18:55:23 -06:00
Scott Lahteine
37fff608b0
Merge pull request #8652 from fiveangle/bf2_usbcon_xonxoff
...
[2.0.x] SERIAL_XON_XOFF not supported on USB-native AVR devices
2017-12-04 16:46:18 -06:00
Scott Lahteine
4b612f590c
Split first move to planner for better chaining
2017-12-04 15:27:47 -06:00
Unknown
91b63f6d69
SERIAL_XON_XOFF not supported on USB-native AVR devices
...
User could enable SERIAL_XON_XOFF on USB-native devices and it would not be enabled without warning, but M115 would report the capability as available.
2017-12-04 03:57:01 -08:00
Bob-the-Kuhn
57fac33a74
add explanations
...
1) add explanations as to why software SPIs are selected
2) remove unused flag/option
2017-12-03 20:32:22 -06:00
Bob-the-Kuhn
bb23286383
add README & modify spi_pins.h
...
still trying to fix file name
2017-12-03 20:00:56 -06:00
Scott Lahteine
dd8febca1a
Revert "Merge pull request #8611 from thinkyhead/bf2_planner_split_first"
...
This reverts commit 824980e70e
, reversing
changes made to aa7efb96bf
.
2017-12-03 17:50:19 -06:00
Bob-the-Kuhn
fb44f8e50f
Merge pull request #8616 from hg42/bugfix-2.0.x
...
[2.0.x][LPC1768][FIX] NUM_DIGITAL_PINS was negative, fixes PWM, arduino io functions, M42, M43, M226, probably also Servo, some LCD, soft spi, SoftwareSerial, ... may be others
2017-12-03 14:48:00 -06:00
Bob-the-Kuhn
4c5356f77a
Merge pull request #8622 from hg42/implement-LPC1768-GET_TIMER
...
[2.0.x][LPC1768][fix] Implement GET_TIMER and other GET_xxx, fixes PWM
2017-12-03 14:46:22 -06:00
Harald Gutsche
f5b4e1ef4f
as a workaround enable PWM for any pin, see PR #8622
2017-12-03 20:37:02 +01:00
Scott Lahteine
6e944a413c
Merge pull request #8607 from benlye/patch-1
...
[2.0.x] Fix M49 so that it does not hang the terminal console
2017-12-03 03:41:33 -06:00
Scott Lahteine
967522b95e
Merge pull request #8615 from dot-bob/Duplicator_6-2.0.x
...
[2.0.x] Example configurations for Wanhao Duplicator 6
2017-12-03 03:37:48 -06:00
Scott Lahteine
f4b16a3bac
Update M49.cpp
2017-12-03 03:34:56 -06:00
Scott Lahteine
f9327534f8
Merge pull request #8634 from fiveangle/bf2_report_xonxoff
...
[2.0.x] Report SERIAL_XON_XOFF in M115
2017-12-03 02:18:50 -06:00
Scott Lahteine
da9f140829
Merge pull request #8637 from thinkyhead/bf2_ubl_uses_LSL
...
[2.0.x] Use custom segment length for UBL Cartesian
2017-12-03 01:57:49 -06:00
Scott Lahteine
3a97de52ef
Split first move to planner for better chaining
...
Address #8573 , #8595
2017-12-03 01:27:14 -06:00
Scott Lahteine
24437de591
Use custom segment length for UBL Cartesian
2017-12-03 00:10:54 -06:00
Unknown
4c5ffd2349
[2.0.x] Report SERIAL_XON_XOFF in M115
...
-Report SERIAL_XON_XOFF in Extended Capabilites M115 report for hosts
-Remove outdated 256 size limitation from comments on RX_BUFFER_SIZE defines
-Update error message conditions
2017-12-02 21:08:06 -08:00
Scott Lahteine
aa7efb96bf
Bring configurations up to date
2017-12-02 21:50:51 -06:00
Scott Lahteine
63a91cd37a
Fix a homing comment
2017-12-02 21:02:37 -06:00
Scott Lahteine
8056120195
Rename inverse_mm_s => inverse_secs
2017-12-02 20:28:09 -06:00
Scott Lahteine
23557f8e77
Remove obsolete de_float
2017-12-02 20:23:10 -06:00
Jonathan Barchi
05f8e98c4a
Fix for issue #8629 - mismatch between number of stored and loaded dummy items on non-delta machines. ( #8631 )
2017-12-02 19:04:58 -06:00
Roxy-3D
48fb4e0932
Get Bi-Linear to work with G26
...
More corrections to make that happen...
2017-12-02 14:14:24 -06:00
Roxy-3D
0850b38b45
Get Bi-Linear working with G26
...
G26 uses logic that looks like:
```
ex = _GET_MESH_X(i + 1) - (SIZE_OF_INTERSECTION_CIRCLES - (SIZE_OF_CROSSHAIRS));
```
The Bi-Linear macros need parenthesis to work correctly.
2017-12-02 14:10:30 -06:00
Scott Lahteine
000b3b3117
Comment/cleanup of motion code
2017-12-02 01:09:55 -06:00
Scott Lahteine
046a1ad331
Merge pull request #8625 from tcm0116/2.0.x-G33
...
[2.0.x] Fix missing return values in G33_auto_tune
2017-12-02 00:51:19 -06:00
Thomas Moore
b35c3b5eb8
Fix missing return values in G33_auto_tune
2017-12-01 21:29:16 -06:00
Scott Lahteine
45c2388a58
Apply const to thermal_runaway_protection args
2017-12-01 19:42:44 -06:00
Scott Lahteine
0154e3480c
New feature: BED_SKEW_CORRECTION
2017-12-01 19:39:49 -06:00
Scott Lahteine
082ab8fcab
Add SKEW_CORRECTION to example configs
2017-12-01 19:22:27 -06:00
Unknown
d1f11e9c10
fix missing GET_TIMER (used by PWM for Ex_AUTO_FAN)
2017-12-01 22:28:55 +01:00
Harald Gutsche
dd1b503f64
fix NUM_DIGITAL_PINS being negative for more than 127 digital pins
2017-12-01 07:39:46 +01:00
dot-bob
bd45d0363d
Add default configurations for the Wanhao Duplicator 6.
2017-11-30 23:24:33 -07:00
Scott Lahteine
91fb6231b2
Fix EEPROM V45 header, layout
2017-11-30 22:45:17 -06:00
Roxy-3D
94e6b2976e
Restore correct G26 values for gMax 1.5+ printer
2017-11-30 18:12:17 -06:00
Scott Lahteine
dd3ce40826
Drop Planner::position_float, use int types
2017-11-30 17:43:31 -06:00
Scott Lahteine
ec6ca37ed3
Fix (un)apply_leveling fade bug
2017-11-30 17:25:44 -06:00
Scott Lahteine
a52fec6ac4
Planner class parity with 1.1.x
2017-11-30 15:55:08 -06:00
Ben Lye
1f3ad461bc
Update M49.cpp
...
Fix M49 so that it does not hang the terminal console.
2017-11-30 20:17:44 +00:00
Scott Lahteine
e37dd64548
Apply LEDColor, language fixes
2017-11-29 23:58:12 -06:00
Scott Lahteine
8f90642eea
LED_CONTROL_MENU config changes
2017-11-29 21:02:56 -06:00
Tannoo
cf0f78336b
New Feature: LED_CONTROL_MENU
2017-11-29 21:02:55 -06:00
Scott Lahteine
23e45fa3c4
Apply const to some planner vars
2017-11-29 21:02:55 -06:00
Scott Lahteine
7c61bcb058
Apply SEGMENT_LEVELED_MOVES to example configs
2017-11-29 16:57:31 -06:00
Scott Lahteine
ef2531558c
Add an option to segment leveled moves
2017-11-29 16:57:30 -06:00
Scott Lahteine
285b868e9b
Tweak planner code style
2017-11-29 15:22:18 -06:00
Scott Lahteine
1f2acc33bc
Tweaks for check_axes_activity
2017-11-28 18:41:13 -06:00
Vitaliy Sapyanov
7f88334aa3
Done cleanup and removed duplicates in pins_RuRAMPS4D.h ( #8582 )
...
Remove duplicates, with followup fixes
2017-11-28 18:33:12 -06:00
Scott Lahteine
a8aa43ce2d
Merge pull request #8587 from AnHardt/2_Fix_WDTO_during_long_DELTA_moves
...
[2.0.x] Fix WDTO during long delta moves
2017-11-28 17:29:18 -06:00
Scott Lahteine
4793c34c53
Fix M290 boolval bug
...
Fix #8577
2017-11-28 17:21:33 -06:00
Scott Lahteine
16baa48699
Fix #8579
...
Fan speed code fell into a curly brace
2017-11-28 16:12:14 -06:00
AnHardt
02aa93a6ad
Fix Watchdog time out during long lasting DELTA moves
...
During long lasting moves of a delta machine neither the temperatures are maintained nor buttons checked nor ... .
The fix is to call 'manage_heater()' and 'idle()' every now and then in the loop where the move is segmented.
The code is abot the same as in G2_G3 wher we had the same problem with too large circles lasting too long.
Fixing #7510
2017-11-28 17:03:51 +01:00
Scott Lahteine
fadf9eb2d7
Simplify midpos calculation
2017-11-27 14:00:35 -06:00
Scott Lahteine
0880031e8e
Satisfy M702 dependencies
2017-11-27 13:39:59 -06:00
Scott Lahteine
0786b61ce7
Followup to #8575
2017-11-27 12:58:40 -06:00
Scott Lahteine
276271e72f
Make MBL work more like PROBE_MANUALLY
2017-11-27 02:12:29 -06:00
Scott Lahteine
94cb412e45
Allow override of probe bounds
2017-11-26 20:55:27 -06:00
Scott Lahteine
c8718aa111
Spacing, macros in LPC1768_PWM
2017-11-26 20:20:05 -06:00
Scott Lahteine
a67cf78c6b
Clean up whitespace, spacing
2017-11-26 20:18:52 -06:00
Scott Lahteine
f0dd4e3fa0
Bootscreen parity with 1.1.x
2017-11-26 20:07:17 -06:00
Scott Lahteine
b634bfe1b1
Tweak to readDir code
2017-11-26 18:25:00 -06:00
Scott Lahteine
7be4857ab9
Tweak BLOCK_BUFFER_SIZE description
2017-11-26 17:36:40 -06:00
Bob-the-Kuhn
7d8b66e207
Merge pull request #8570 from Bob-the-Kuhn/Sbase-PWM
...
[2.0.x] MKS Sbase - add servo pin definitions and add directly controlled PWM
2017-11-26 09:36:18 -06:00
Bob-the-Kuhn
59b32c25b5
MKS Sbase changes
2017-11-26 07:47:06 -06:00
Scott Lahteine
f90c075d1f
SD Menu patches
2017-11-26 01:14:18 -06:00
Scott Lahteine
9b64be0bc5
Fixes for leveling sub-menus
2017-11-26 00:05:36 -06:00
Scott Lahteine
25674da90c
Tweaks to do_blocking_move
2017-11-25 23:31:16 -06:00
Scott Lahteine
22b897e77d
Show M211 output with workspace offset
2017-11-25 20:48:20 -06:00
Scott Lahteine
d06e29846d
Loosen HAS_BED_PROBE definition
2017-11-25 20:11:21 -06:00
Roxy-3D
e48fcad615
change G26 and G29 bit function names to avoid HAL collision
2017-11-25 19:58:45 -06:00
Scott Lahteine
41ec449960
Fix G26 error return
2017-11-25 19:53:14 -06:00
Scott Lahteine
9badf5dc0d
Fix Micromake C1 config
2017-11-25 18:41:07 -06:00
Scott Lahteine
7576ad7fc2
Merge pull request #8554 from tcm0116/2.0.x-cleanup
...
[2.0.x] Fix for #8525 and other cleanup
2017-11-25 18:19:54 -06:00
Scott Lahteine
27c5692b13
Syntax tweaks
2017-11-25 18:13:36 -06:00
Scott Lahteine
d18d40e1d6
M290 report on change, P0 to leave Probe Z Offset alone
2017-11-25 16:47:39 -06:00
LVD-AC
65f365333f
[2.0.x] G33 probe error handling
2017-11-25 16:19:10 -06:00
Bob-the-Kuhn
8c69adba8b
Merge pull request #8553 from Bob-the-Kuhn/2.0.x-U8Glib-follow-up
...
[2.0.X] U8Glib follow up
2017-11-25 14:26:32 -06:00
Scott Lahteine
be00e421a7
Patch up M290, M851
2017-11-25 14:11:57 -06:00
Bob-the-Kuhn
fc40d56131
fixed error, updated defaults, added notes
...
Travis fix - only allow ultralcd_st7920_u8glib_rrd_AVR.cpp to compile when ST7920 selected
2017-11-25 12:35:03 -06:00
Roxy-3D
d29cb646e3
Fix erroneous reference to temperature in time calculations
...
Travis is having problems at: https://github.com/MarlinFirmware/Marlin/pull/8560
So... doing a direct commit to get things correct. Bugfix_v1.1.x does not have this bug. Nothing needs to be done to that branch.
2017-11-25 10:40:56 -06:00
Thomas Moore
7bb1721f35
Fix _BV already defined warnings for Teensy
2017-11-24 22:34:39 -06:00
Thomas Moore
5f9592a523
Cleanup narrowing warning in pin_is_protected
2017-11-24 22:15:56 -06:00
Thomas Moore
34eaaab5fb
Fix _BV already defined warnings
2017-11-24 21:59:31 -06:00
Thomas Moore
2ea779e560
Allow bed probe sanity checks to run
2017-11-24 21:59:01 -06:00
Scott Lahteine
d24b1190bd
Don't use Z_MIN_PROBE_ENDSTOP on DELTA
2017-11-24 18:24:22 -06:00
Scott Lahteine
e34c6827ea
Init MIXING virtual tools as switching
2017-11-24 18:02:09 -06:00
Scott Lahteine
a9ecb975b2
Apply LINEAR_UNIT to M503 output for M200
2017-11-24 17:32:48 -06:00
Scott Lahteine
d95ee0f003
Merge pull request #8551 from revilor/bugfix-2.0.x
...
MK2_MULTIPLEXER does not require E2/E3 stepper pins
2017-11-24 17:16:23 -06:00
Scott Lahteine
80ada58818
One fewer function call in probe_pt
2017-11-24 17:10:38 -06:00
oliver
92a0dc552a
MK2_MULTIPLEXER does not require E2/E3 stepper pins
2017-11-24 23:56:39 +01:00
Scott Lahteine
b49acce035
Tweaks for lcd_external_control
2017-11-24 15:53:25 -06:00
Scott Lahteine
1ef1052ae1
Phatter arrows for Z offset overlay
2017-11-24 15:53:25 -06:00
Scott Lahteine
5926c9c97b
Followup for MESH_EDIT_GFX_OVERLAY
2017-11-24 15:53:25 -06:00
Scott Lahteine
ab03a31cc9
Patch G0/G1 for NANODLP_Z_SYNC
2017-11-24 14:11:12 -06:00
Scott Lahteine
a766dfb3b1
Merge pull request #8536 from thinkyhead/bf2_nanodlp_z_move_sync
...
[2.0.x] Implement NANODLP_Z_SYNC for 2.0.x
2017-11-24 13:11:14 -06:00
Scott Lahteine
01e207213f
Fix MK2_MULTIPLEXER stepper indirection
2017-11-24 12:49:28 -06:00
Roxy-3D
ec04cf27d3
Fix the G26 out of scope identifiers in the v2.0.0 branch ( #8543 )
...
These changes may need to be warmed over. I tried to fix things with
the least amount of disruption. I just wanted to get the bugfix_v2.0.0
branch working for people again.
2017-11-24 10:39:56 -06:00
Scott Lahteine
dc82babe8e
Implement NANODLP_Z_SYNC for 2.0.x
2017-11-24 00:28:06 -06:00
Scott Lahteine
c6b0c104bb
Adapt G26 to work for all meshes
2017-11-23 22:31:37 -06:00
Scott Lahteine
5ce7f23afa
Config option G26_MESH_VALIDATION for all meshes
2017-11-23 21:43:23 -06:00
Scott Lahteine
c19eb33408
Move G26 to gcode sub-folder
2017-11-23 21:43:23 -06:00
Scott Lahteine
a03f93bab4
Fix fan kickstart
2017-11-23 21:42:45 -06:00
Scott Lahteine
9e3c41f9e8
Tweak fan kickstart / speed code
2017-11-23 15:20:35 -06:00
GMagician
118ac61e59
[2.0.x] Tool change bad behaviour fix
...
Previous fix did not work as expected when axeis not homed. It raise Z but never return to original position
2017-11-22 20:24:03 -06:00
Scott Lahteine
c35d27f77c
Merge pull request #8299 from tcm0116/2.0.x-BIQU_BQ111-A4
...
[2.0.x] Add BIQU BQ111-A4 board
2017-11-22 19:16:04 -06:00
Scott Lahteine
1685cd193b
Tweak char_mode init
2017-11-22 19:12:08 -06:00
Scott Lahteine
9406c87a97
Fix up LCD init / charset
2017-11-22 18:22:55 -06:00
Thomas Moore
fa577392b2
Add BIQU BQ111-A4 board
2017-11-22 16:34:59 -06:00
Scott Lahteine
c2fc78c3a8
#ifndef => #if !PIN_EXISTS
2017-11-22 16:28:52 -06:00
Scott Lahteine
c613a1ed38
Fix indentation, stepper.h dependency, etc.
2017-11-22 14:55:30 -06:00
teemuatlut
f011a32771
Board definitions for Ultratronics Pro v1.0
2017-11-22 14:55:24 -06:00
Bob-the-Kuhn
9dad534f02
fixed
2017-11-21 21:37:20 -06:00
Scott Lahteine
4371345cbe
Don't re-init graphical LCD after boot screen
...
Followup to 13a3fb1acc
2017-11-21 18:23:39 -06:00
Scott Lahteine
56c02b7f59
Shift register buttons question
...
Can LCD shift registers keep up with faster MCUs?
2017-11-21 16:12:40 -06:00
Scott Lahteine
3994d3b935
General cosmetic LCD
2017-11-21 16:12:40 -06:00
Scott Lahteine
617993d0ea
Patch for !!TEST (was _BV once?)
2017-11-21 16:12:08 -06:00
Scott Lahteine
3269d8dd62
Tweak M42 var
2017-11-21 16:12:08 -06:00
Mateusz Krawczuk
bb1a6eea88
Remove pin count check for MIGTHYBOARD_REVE
...
Remove assert and unused code since it is implemented in pinsDebug_plus_70.h
2017-11-21 14:38:02 +01:00
Scott Lahteine
1ce0fb336b
Patch Max7219_LED_Set input args
2017-11-20 21:15:15 -06:00
GMagician
a61127a421
[2.0.x] tool change bad behaviours
...
This will solve 2 issues on tool change.
1) when no home is done ("no_move" is set) tool change should never move X & Y because... I don't know where I am...only Z should be adjusted to avoid bed collision if other nozzle is lower than current.
Since no move no bed level matrix should be applied
2) When SWITCHING_NOZZLE is enabled and system is homed there are two movements to go to destination, but first can move Z to older position and then crash on the bed
2017-11-20 16:34:55 -06:00
Vitaliy Sapyanov
e2724c68ab
Update pins_RURAMPS4D.h
...
Add and bugfix pins
2017-11-20 15:36:13 -06:00
Scott Lahteine
9770062309
Merge pull request #8463 from thinkyhead/bf2_32bit_M42
...
[2.0.x] Updates to Anet A8 configurations
2017-11-20 15:12:30 -06:00
Scott Lahteine
3066655727
Try port*100+pin, fix config dependency
2017-11-20 13:58:23 -06:00
Scott Lahteine
ba8bc7ea80
Cosmetic tweaks
2017-11-20 13:58:02 -06:00
Scott Lahteine
f409147116
Fix P2_04, P2_05
2017-11-20 13:58:02 -06:00
Bob-the-Kuhn
a28ccabe2a
M42 P1.20 fix
2017-11-20 13:58:02 -06:00
Unknown
33912fa7e8
Update Temperature::setPwmFrequency prototype to match source
...
Introduced with #8446
2017-11-20 01:50:41 -08:00
Scott Lahteine
b9327a4d16
Misc. general cleanup
2017-11-19 15:43:39 -06:00
Scott Lahteine
8836623e0f
Fix sq
/min
/max
macros after platform headers
2017-11-19 15:43:39 -06:00
Scott Lahteine
fe4f009fdd
32-bit unless…
2017-11-19 15:43:38 -06:00
Scott Lahteine
25af9decfe
Remove enum.h include of MarlinConfig.h
2017-11-19 15:43:38 -06:00
Scott Lahteine
1d4571b88d
Dependency adjustments
2017-11-19 15:43:38 -06:00
Scott Lahteine
550f1025f0
Try using <Arduino.h> everywhere
2017-11-19 14:23:02 -06:00
Scott Lahteine
c0000a0cdc
Move servo code to modules/servo.*
2017-11-19 14:23:02 -06:00
Scott Lahteine
81bc428b48
Don't compile custom u8g without DOGLCD
2017-11-19 13:58:38 -06:00
Bob-the-Kuhn
c14000775b
PWM fixes, slow down fan update
...
include LPC1768 syntax for M42
couple more pin_t changes
consistency
change M42 to R, P format
Revert "change M42 to R, P format"
This reverts commit 01f12f579ec9ccc1bb9126e68d2c86449e9b7edf.
2017-11-18 07:05:50 -06:00
Scott Lahteine
60adc6ff02
Display filwidth ratio in terms of E mm
2017-11-18 07:01:49 -06:00
Scott Lahteine
6e533748eb
Fixes #8472
2017-11-18 05:15:55 -06:00
Scott Lahteine
485abb023b
Merge pull request #8456 from thinkyhead/bf2_wednesday_tweaks
...
[2.0] No retroactive adjustment with M851 Z
2017-11-18 04:49:53 -06:00
Scott Lahteine
3bba7d60f3
No retroactive changes with M851 Z
...
If using babystep to adjust the Z probe offset, the axis will move and the mesh will be updated at the same time, causing a doubling of the Z offset over the rest of the print.
To correct for this, the current Z position would need to be modified in the opposite direction, canceling out the additional Z offset added to the mesh. This would be confusing to users, and moreover it would not be accurate without also taking the current Z fade level and current Z height into account.
It might make sense to change the mesh in the case where no babystepping is taking place, but this could be considered an undesirable side-effect of changing the `zprobe_zoffset`.
One way to remedy this would be to return to storing the mesh with `zprobe_zoffset` included, then subtracting `zprobe_zoffset` from the returned Z value. Thus, a babystep moving the Z axis up 1mm would subtract 1 from `zprobe_zoffset` while adding 1 to all mesh Z values.
Without including the `zprobe_zoffset` in the `z_values` there is no safe way to alter the mesh in conjunction with babystepping, although it's fine without it.
2017-11-18 03:36:39 -06:00
Scott Lahteine
32512332df
Apply some formatting
2017-11-18 03:12:30 -06:00
Scott Lahteine
7dacc999b9
Remove obsolete show_bootscreen var
2017-11-17 17:01:43 -06:00
Roxy-3D
9729528d13
Update UBL's Delta Probable locations
...
This is a non-intuitive change. @oldmcg says in this post https://github.com/MarlinFirmware/Marlin/issues/7572#issuecomment-340641207 that using DELTA_PRINTABLE_RADIUS is better than DELTA_PROBABLE_RADIUS for setting the probe limits. This is because the automatic probe code checks all locations for being reachable by the probe prior to doing the probe.
2017-11-17 16:44:57 -06:00
Scott Lahteine
d48cb6bf41
Apply coding standards to Max7219
2017-11-17 15:32:21 -06:00
Scott Lahteine
bd8bcf06e7
Updates to Anet A8 configurations
...
Based on #8426
2017-11-16 23:19:36 -06:00
Bob-the-Kuhn
7eea000f4b
E0 auto fan fixes
2017-11-16 18:42:56 -06:00
Scott Lahteine
b2dda096fe
Fix FILAMENT_LCD_DISPLAY for disabled state
2017-11-16 16:57:48 -06:00
Scott Lahteine
1e8afb66b7
Fix a planner comment
2017-11-16 16:57:47 -06:00
Scott Lahteine
50f09cc029
Miscellaneous cleanup
2017-11-16 00:47:16 -06:00
Scott Lahteine
63257dc083
Fix M503 output for M145
...
Fixes #7978
2017-11-15 04:00:18 -06:00
Scott Lahteine
0918dae66e
Add OV() macro for use in thermistor tables
2017-11-15 03:15:18 -06:00
Scott Lahteine
24057270a3
Merge pull request #8420 from RowanMeara/rm-dithering-2.0.x
...
[2.0.x] Fix Software Fan PWM
2017-11-15 02:30:19 -06:00
Scott Lahteine
5079a02c90
Add HAL_SERVO_LIB to HAL_Due.h
2017-11-15 02:07:01 -06:00
Scott Lahteine
9c3761047e
Merge pull request #8434 from thinkyhead/bf2_fix_M32_subroutines
...
[2.0] Fix 'M32 P' subroutines
2017-11-15 01:15:02 -06:00
Scott Lahteine
e0d367f1fb
Fix M32 P subroutine handling
2017-11-15 00:44:21 -06:00
Scott Lahteine
9f8b4c5ee8
Patch SD lib files for readability
2017-11-15 00:44:21 -06:00
Scott Lahteine
2c8c30437e
Fix parser parameter value handling
2017-11-14 23:20:33 -06:00
RowanMeara
6131533157
Change dithering behavior to intended.
2017-11-14 00:47:07 -08:00
Scott Lahteine
e70b44dc0b
Make sure leveled[] is defined for later use
2017-11-14 02:13:38 -06:00
Scott Lahteine
54774841ba
Merge pull request #8416 from thinkyhead/bf2_M114_DETAIL
...
[2.0] Add M114_DETAIL to Configuration_adv.h
2017-11-14 00:28:55 -06:00
Scott Lahteine
009e3a7aa7
Add M114_DETAIL to Configuration_adv.h
2017-11-14 00:03:17 -06:00
Scott Lahteine
6d6c3b1e97
Fix up REPRAPWORLD_KEYPAD defines
2017-11-13 22:14:54 -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
14ebedca27
Drop unused LARGE_FLASH option
2017-11-13 15:44:24 -06:00
Scott Lahteine
b7feb53e8a
Support for Extrudrboard in Printrboard Rev.F
2017-11-13 15:44:23 -06:00
Scott Lahteine
91baca6abb
Patches for compiler warnings/errors
2017-11-13 04:43:47 -06:00
Scott Lahteine
2f73dec077
Apply native workspace fixes for G92, G53-59
2017-11-13 02:09:12 -06:00
Scott Lahteine
04abd8d459
Improve and clarify M428 code
2017-11-13 02:09:11 -06:00
Dave Johnson
c009a990e4
[2.0.x] Fix some 8-bit Teensyduino compile warnings ( #8385 )
...
* Fix some 8-bit Teensyduino compile warnings
-Override Teensyduino legacy NOT_A_PIN 127 define
-some fixups for Printrboard_RevF pins
* Proper cleanup of Printrboard Rev.F pins
* Apply LCD fixes to Printrboard v1
2017-11-13 01:07:59 -06:00
Scott Lahteine
e8e92f8969
No leveling data in M114 if no leveling is enabled
2017-11-12 23:03:38 -06:00
Scott Lahteine
f5d210c35c
Fix report_current_position
2017-11-12 23:02:53 -06:00
Roxy-3D
faaae7a1b2
Provide more clearance for BL-Touch probe
2017-11-12 13:11:22 -06:00
Scott Lahteine
06ee6584fd
Remove offsets from soft endstops, tool change
2017-11-11 22:47:38 -06:00
Scott Lahteine
c938273bd5
Coding standard patch of M290
2017-11-11 22:14:21 -06:00
Scott Lahteine
98c1265e3b
Disable laser power when PWM goes to 0
2017-11-11 22:00:22 -06:00
Scott Lahteine
d4a1154c25
Use do_blocking_move_to where possible
2017-11-10 20:55:23 -06:00
Scott Lahteine
36426af564
Merge pull request #8356 from tcm0116/2.0.x-M600
...
[2.0.x] Normalize load/unload length in M600
2017-11-10 19:44:08 -06:00
Scott Lahteine
1ed86adf9c
Cleanup around updatePID
2017-11-10 19:27:34 -06:00
Scott Lahteine
75a58ee4b8
Fix position_is_reachable bug in waiting
2017-11-10 19:27:33 -06:00
LVD-AC
e334efb2a7
PROBE_MANUALLY etc.
2017-11-10 19:27:33 -06:00
Bob-the-Kuhn
b6415dc169
finish
2017-11-10 14:39:55 -06:00
Scott Lahteine
0efa66be0b
Updates to Traditional Chinese
...
From @cheton at #8347
2017-11-10 04:52:20 -06:00
Scott Lahteine
cba9c1cf9e
Add pre-calculated planner.e_factor
2017-11-10 03:14:24 -06:00
Thomas Moore
600c85226e
Normalize load/unload length in M600
2017-11-10 02:31:46 -06:00
Scott Lahteine
81b91b3f9d
Clean up some trailing white-space
2017-11-10 02:31:04 -06:00
Roxy-3D
2f9848ede3
Correct gMax 1.5+ example file
...
And... Keep both branches in synchronization.
2017-11-09 23:44:14 -06:00
Scott Lahteine
006dad4b52
Add pins_RURAMPS4D.h & change pins.h
...
http://3dtoday.ru/blogs/svs0724/ruramps4d-ramps-for-adruino-due-the-pilot-shipment-available-for-zack/
2017-11-09 21:51:06 -06:00
Scott Lahteine
00514857e9
SBASE serial port -1, RAMPS spacing
2017-11-09 21:41:07 -06:00
Scott Lahteine
c66696c507
Merge pull request #8344 from tcm0116/2.0.x-delta_height
...
[2.0.x] Add delta_height variable in lieu of using home_offset
2017-11-09 01:21:53 -06:00
Scott Lahteine
22e18fe832
Patch _manual_goto_xy for kinematics
2017-11-08 22:21:38 -06:00
Scott Lahteine
0cfb936dd1
Clarify some motion code
2017-11-08 22:15:55 -06:00
Thomas Moore
f34c3597dc
Add delta_height variable in lieu of using home_offset
2017-11-08 22:10:08 -06:00
Bob-the-Kuhn
d47fbf791b
Arduini IDE compatibility changes
...
changed includes to make Arduino IDE happy
2017-11-08 20:49:49 -06:00
Scott Lahteine
95ea43bde4
Update XYZ dual stepper configurations
2017-11-08 20:31:43 -06:00
Scott Lahteine
b0b4a20930
Tweaks to core motion code
2017-11-08 20:09:09 -06:00
Scott Lahteine
8805e24cc7
Fix tilt_mesh_based_on_probed_grid output bug
2017-11-08 20:06:20 -06:00
Scott Lahteine
24437fbb13
Fix G26 Y argument bug
2017-11-08 19:20:10 -06:00
Scott Lahteine
09b05c9d79
Merge pull request #8321 from Bob-the-Kuhn/pins_re-arm
...
2.0.x - pins_RAMPS_RE_ARM.h - add mega2560 pin numbers
2017-11-08 13:11:13 -06:00
Scott Lahteine
e6788bb6ae
Fix get_destination_from_command for E
2017-11-08 12:54:00 -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
Bob-the-Kuhn
8875885a15
pins add old names
...
fix typo
re-write PWM section, add "not on Re-ARM" list
2017-11-08 11:11:38 -06:00
Roxy-3D
1c6e83c137
if !HAS_MESH we still need to do some motion! ( #8328 )
...
* if !HAS_MESH we still need to do some motion!
Thank You MagoKimbra !
* Ooops.... need #else and not #elif
2017-11-08 09:42:21 -06:00
Scott Lahteine
82f45c3e6a
Patch G33 misuse of PROBE_MANUALLY
2017-11-08 00:36:06 -06:00
Scott Lahteine
064e6fe60e
Remove debugging pin toggle from LCD code
2017-11-07 23:00:54 -06:00
Bob-the-Kuhn
0483a7df91
AVR RRD works
...
LPC1768 VIKI2 & RRDFG are working
looks like all SPIs are working
library change
sh1106 locks up
fixed lockup, started I2C SW com
pretty
re-org
restore a few files
make library happy
switched HAL version of rrd
fix travis error
travis error fixes
another travis fix
cleanup
minor update
one more
correct spacing in platformio.ini
2017-11-07 18:40:29 -06:00
Scott Lahteine
96c9d715f3
Patch abuse of sprintf_P in G33
2017-11-07 17:33:50 -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
8fea26aa9d
Fix PID_autotune watch temp increase value
2017-11-07 15:51:48 -06:00
Scott Lahteine
2c099fd4c2
Update Thermal Protection Documentation
2017-11-07 15:46:44 -06:00
Colten Edwards
a6160916b0
[2.0] Fix M48 for delta printers/ABL compile issue ( #8286 )
...
* fix M48 for delta printers
fix M48 for delta printers. home printer if not already homed.
* remove ENABLED(DELTA)
remove ENABLED(DELTA) as it is not needed.
* Update M48.cpp
* abl needs queue.h
without queue.h abl will not compile since there is a script that runs at the end of it and we need to queue it up.
2017-11-07 15:36:33 -06:00
Scott Lahteine
17ef0a513b
Update G92 for native workspace
2017-11-07 13:07:16 -06:00
Scott Lahteine
b4bf8928aa
German language updates
...
Corresponding to #8306
2017-11-07 12:10:29 -06:00
Thomas Moore
73ca5345e1
Fix Delta EEPROM
2017-11-07 16:48:21 +00:00
Scott Lahteine
714d2b9bbc
Merge pull request #8297 from thinkyhead/bf2_M118_and_others
...
[2.0] Fix M118, compiler warnings, etc.
2017-11-06 23:25:49 -06:00
Alexey Shvetsov
83555933aa
Add platformio support for stm32 ( #8246 )
...
[2.0] Add platformio support for stm32
2017-11-06 23:03:59 -06:00
Scott Lahteine
85a62bbf46
Misc. fixes to compiler warnings, etc.
2017-11-06 22:57:05 -06:00
Scott Lahteine
e6aba99f16
Fix M118 parameters, with strict guideline
2017-11-06 22:57:01 -06:00
Scott Lahteine
e9b1944a67
Patch non-extended font option
2017-11-06 21:42:21 -06:00
Roxy-3D
6324b09934
Revert "Fix EEPROM crc ( #8284 )" ( #8292 )
...
This reverts commit 172c36f517
.
2017-11-06 19:52:05 -06:00
Rowan Meara
172c36f517
Fix EEPROM crc ( #8284 )
2017-11-06 19:19:30 -06:00
Scott Lahteine
cc4d28b73c
Update bilinear for native workspace
2017-11-06 17:04:41 -06:00
Scott Lahteine
94c7205d64
Merge pull request #8281 from thinkyhead/bf2_alligator_dac
...
[2.0] Use fastio for Alligator dac084s085, etc.
2017-11-06 12:16:18 -06:00
Scott Lahteine
2246316605
Fix name collision. timer_t => hal_timer_t
2017-11-05 19:31:07 -06:00
Jason Hitesman
4efaef7039
[2.0.x] Fix archim2 SSDS define ( #8278 )
...
* Fix SSDS define
* Update pins_ARCHIM2.h
2017-11-05 19:23:19 -06:00
Scott Lahteine
c8dfa26bc8
Use fastio for STM32F1 endstop interrupts
2017-11-05 19:20:28 -06:00
Scott Lahteine
185dec800b
Use fastio for HAL SPI EEPROM
2017-11-05 19:20:03 -06:00
Scott Lahteine
297666ea14
Use fastio for Alligator dac084s085
2017-11-05 19:14:42 -06:00
Scott Lahteine
c5d95d318b
Merge pull request #8249 from thinkyhead/bf2_nozzle_cleanup
...
[2.0] Cleanup Nozzle class, fix XY vs Z move order
2017-11-05 18:51:11 -06:00
Scott Lahteine
7e2fee9d56
Merge pull request #8274 from tcm0116/2.0.x-re_arm_D8
...
[2.0.x] Correct RAMPS_D8_PIN for Re-ARM
2017-11-05 18:39:28 -06:00
Scott Lahteine
59c558d612
Merge pull request #8275 from GMagician/2.0.x-Typo-fix
...
[2.0.x] typo fix (removed spaces)
2017-11-05 18:39:04 -06:00
Scott Lahteine
be73d5cc08
Cleanup Nozzle class, fix XY vs Z move order
2017-11-05 18:31:07 -06:00
GMagician
9e93b7ccbd
[2.0.x] removed spaces
...
Removed spaces in array declaration
2017-11-05 20:42:48 +01:00
Thomas Moore
b91a822d7a
Correct RAMPS_D8_PIN for Re-ARM
2017-11-05 13:03:42 -06:00
studiodyne
d295f984e3
Update fwretract.cpp
2017-11-05 15:42:30 +01:00
Scott Lahteine
1b40e9c464
Implement CNC_COORDINATE_SYSTEMS
2017-11-04 22:28:46 -05:00
Scott Lahteine
1b42fba39b
Add CNC_COORDINATE_SYSTEMS to configs
2017-11-04 22:28:46 -05:00
Scott Lahteine
a22434508f
Match tweaks to G33 from 1.1
2017-11-04 22:28:46 -05:00
Scott Lahteine
c07bbd4154
Prettify some EEPROM code
2017-11-04 22:28:46 -05:00
Scott Lahteine
d6aa127c76
Remove I2CPEM workspace offset
2017-11-04 22:28:46 -05:00
Scott Lahteine
79772219ae
Fix Fan Multiplexer init
2017-11-04 22:28:46 -05:00
Scott Lahteine
ca7d36d9ed
RAMPS pins for ANET_KEYPAD_LCD
2017-11-04 21:22:53 -05:00
Colten Edwards
e0a6ee8da5
[2.0] Fix up G33, LPC1768 + SDCARD_SORT_ALPHA ( #8250 )
...
* Update Conditionals_post.h
* Add a cast to round() to convert to a unsigned int
Add's a cast to round() so that it will compile properly. round() returns a float which must be cast to a integer for the following % operation. Use a unsigned int as a negative index to an array is wrong. Should never be more than 255 points allowing us to use a 8 bit cast.
* Update G33.cpp
2017-11-04 18:04:18 -05:00
Scott Lahteine
dac1f6fe74
Tweaks to cubic_b_spline code style
2017-11-04 14:46:10 -05:00
Scott Lahteine
4df024d7b9
Merge pull request #8234 from thinkyhead/bf2_native_operation
...
[2.0.x] Operate in Native Machine Space
2017-11-04 14:31:44 -05:00
Scott Lahteine
601ccded89
Fix case-insensitive config issue
2017-11-04 14:10:13 -05:00
Scott Lahteine
f8393a0908
Operate in Native Machine Space
2017-11-04 00:05:38 -05: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
AnHardt
ca0e4b4e96
Some cleanup around 'lcd_bootscreen()' and 'lcd_kill_screen()'
...
Move 'lcd_bootscreen()' from `lcd_init()` to 'setup()' where it is cexecute exactly once. Saves 'bool show_bootscreen'.
Move the call of 'lcd_custom_bootscreen()' to the begin of 'lcd_bootscreen()'.
Move the delays into the related functions.
Move the picture loop around 'lcd_kill_screen()' into the function.
2017-11-03 12:02:48 +01:00
Scott Lahteine
84b93d941f
Merge pull request #8178 from thinkyhead/bf2_config_tweak
...
[2.0.x] Faster menu navigation for Anet A8
2017-11-03 04:49:17 -05:00
teemuatlut
70be4d206e
[2.0.x] UltiMachine Archim2 ( #8190 )
...
* UltiMachine Archim2 support
* SPI gets included by the library
* Invert TMC2130 diag pin state
* Clean up Archim2 pins
* Update Archim2 config
* FAN2 -> FAN1
* Cleanup
* Add brief Archim installation instructions
* Bring pins into compliance
* Update 1.0 SD Detect pin for 1.1
* Update Configuration.h
* Update pins_ARCHIM2.h
2017-11-03 04:48:15 -05:00
Scott Lahteine
f3deb37bdf
Merge pull request #8236 from thinkyhead/bf2_protect_M303
...
[2.0.x] M303 thermal runaway protection
2017-11-03 04:42:14 -05:00
Scott Lahteine
31f112cf58
Cleanup trailing whitespace
2017-11-03 04:07:45 -05:00
Scott Lahteine
2f9e42feb9
M303 thermal runaway protection
2017-11-03 03:57:46 -05:00
Scott Lahteine
e5ae545647
Remove ADCKey steps acceleration
2017-11-03 03:41:55 -05:00
Luc Van Daele
6827e243a0
[2.0.x] G33 magic numbers ( #8171 )
...
* [2.0.x] G33 magic numbers
* oops
* Comments
* oops
* warning
* better comment section
* remarks
* extra grids
2017-11-03 03:36:16 -05:00
Scott Lahteine
8735ae984b
Merge pull request #8227 from tcm0116/2.0.x-pin_mapping
...
LPC1768: updates to use the new pin_t typedef
2017-11-03 03:10:19 -05:00
AnHardt
c72a0610b4
Fix watchdog in WATCHDOG_RESET_MANUAL mode AVR
2017-11-03 04:43:00 +01:00
Thomas Moore
13d839795c
LPC1768: updates to use the new pin_t typedef
2017-11-02 18:43:57 -05:00
Scott Lahteine
eb13b8d985
Add MKS Gen L board
2017-11-02 17:06:08 -05:00
Morten
063e957fc4
Update pins_MKS_SBASE.h ( #8188 )
...
* Update pins_MKS_SBASE.h
Deleted E_MUX2, not used.
Changed #define LCD_PINS_D4 P0_14 // EXP1.5 to #define LCD_PINS_D4 P0_15 // EXP1.5, wrong in MKS's pinout schematic.
Swapped TEMP_BED_PIN and TEMP_0_PIN port's, request from user, more logical...
* Update pins_MKS_SBASE.h
Moved MUX signals to J8 and re added MUX2, cleaner wiring..
2017-11-02 13:50:23 -05:00
Scott Lahteine
f7133e53fd
Fix case light off
...
Addressing #8205
2017-11-01 21:22:15 -05:00
Scott Lahteine
0108d5181f
Allow asterisks in G-Code commands
...
Addressing #6655
2017-10-31 21:20:41 -05:00
Scott Lahteine
34745b2183
Organize boards.h by architecture
2017-10-31 16:10:38 -05:00
android444
9cc1d8e312
[2.0.x] Support for SilverGate Board
2017-10-31 15:27:26 -05:00
Scott Lahteine
03e5369411
Faster menu navigation for Anet A8
...
Addressing #8166
2017-10-31 14:46:55 -05:00
Scott Lahteine
f1edf83720
Merge pull request #8187 from rafaljot/patch-5
...
Update InterruptVectors_Due.cpp
2017-10-31 14:14:08 -05:00
Scott Lahteine
b2bd77c40a
Merge pull request #8191 from thinkyhead/bf2_rearm_more
...
[2.0.x] Add SDCARD_SORT_ALPHA options for LPC1768
2017-10-31 14:12:14 -05:00
Scott Lahteine
571ced712d
Add SDCARD_SORT_ALPHA options for LPC1768
2017-10-31 14:05:40 -05:00
rafaljot
778e4e4c23
Update InterruptVectors_Due.cpp
...
const pfnISR_Handler *isrtab = get_relocated_table_addr();
What compiler do you use? Arduino 1.8.5 can't compile this "const".
2017-10-31 15:00:06 +01:00
Scott Lahteine
cae8703e0d
Merge pull request #8181 from thinkyhead/bf2_fix_bootscreen_repeat
...
[2.0.x] Only show custom bootscreen once
2017-10-31 02:37:40 -05:00
Scott Lahteine
a516856df9
Only show custom bootscreen once
2017-10-31 01:47:30 -05:00
GMagician
727a403ba1
[2.0.x] Fix NO_MOTION_BEFORE_HOMING unwanted behaviour ( #8176 )
...
* [2.0.x] Fix NO_MOTION_BEFORE_HOMING unwanted behaviour
NO_MOTION_BEFORE_HOMING should prevent XYZ movements only when homing is not done.
E axes should be allowed
* Update G0_G1.cpp
* Update G0_G1.cpp
2017-10-30 22:50:22 -05:00
Alexey Shvetsov
577659cacf
Basic support for Azteeg_X5_GT ( #8139 )
...
* Basic support for Azteeg_X5_GT
Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>
* Add fan pins for AZTEEG X5 GT
Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>
* Fix endstop pins
* Add servo0 pin
2017-10-30 16:01:20 -05:00
Scott Lahteine
0b02f9cc33
Merge pull request #8168 from thinkyhead/bf2_config_tweak
...
[2.0.x] Apply Re-ARM SPI review items
2017-10-30 15:49:50 -05:00
Scott Lahteine
04c0d9f3c3
Implement kinematic software endstops
2017-10-30 15:16:30 -05:00
Scott Lahteine
9f89b5d876
Fix for MAX_VFAT_ENTRIES sanity check
2017-10-30 15:11:47 -05:00
Scott Lahteine
2cdde08339
Apply items specified in code review
...
Followup to #8122
2017-10-30 15:03:07 -05:00
Scott Lahteine
34be5d33c0
The plural of 'axis' is 'axes'
2017-10-30 14:21:43 -05:00