Scott Lahteine
af09095f03
Merge pull request #6154 from thinkyhead/rc_fil_sensor_vs_sd
...
Show Filament Width on LCD when SD is disabled
2017-03-29 05:24:48 -05:00
Remo Kallio
d38b1bc4b1
Show filament width sensor values in LCD constantly if SD card support is not enabled.
2017-03-29 04:03:08 -05:00
Scott Lahteine
e3459ec178
Merge pull request #5989 from MagoKimbra/rc_fix_delta_angles
...
Fix delta_angles
2017-03-29 03:35:18 -05:00
Scott Lahteine
f49aec057f
Tweak "can not" => "can't" in RUMBA pins
2017-03-29 01:04:50 -05:00
Scott Lahteine
0a23a1bb3b
Dynamic feedrate on SCARA, converting target mm/s to deg/s
2017-03-28 17:21:07 -05:00
Roxy-3D
d8724bb546
Get G29's P1 (Automated Probing) working again.
...
Incorrect optimizations of data types and ternary operators caused some
issues.
2017-03-28 17:11:02 -05:00
Scott Lahteine
c7f6ee9c93
Board A4JP should be SCOOVO_X9H
2017-03-27 22:22:13 -05:00
Scott Lahteine
a9fc30ae2e
Use safe_delay to ensure watchdog reset
2017-03-26 23:49:56 -05:00
Roxy-3D
171904b6c7
Make G29 What command print reliably and fix G29 P1 bug Waldo found
2017-03-26 17:05:58 -05:00
Roxy-3D
9d3ac66f73
Map clean up of UBL
...
UBL's maps are cleaner. And with a 1 value, G29 O 1 will generate a
map suitable to be Cut & Pasted into Excel so a Suface Map can be
generated.
2017-03-25 18:55:05 -05:00
Roxy-3D
9a1949a91e
Cleaned up G26 ready to replace existing one at MarlinFirmware/Marlin
2017-03-25 10:15:40 -05:00
Roxy-3D
aec85ad45a
Start of process to get UBL running again.
...
The wait_for_user change totally broke UBL. But there is stuff wrong
now in the thermal code and/or LCD Panel code.
2017-03-24 18:38:27 -05:00
Scott Lahteine
b47eaf14ae
Merge pull request #6109 from thinkyhead/rc_soft_pwm_dither
...
PWM dithering followup
2017-03-24 18:21:07 -05:00
Scott Lahteine
34d1c41b5f
Merge pull request #6111 from benlye/benlye-patch-echo_command
...
Fix type conversion issue with echo_command
2017-03-24 17:57:28 -05:00
benlye
6a601aca35
Fix type conversion issue with echo_command
...
With the the current definition of echo_command I cannot compile RCBugFix (Arduino IDE 1.8.1) with the error "invalid conversion from 'const char*' to 'char*'". This change resolves that.
2017-03-24 17:23:02 +00:00
Scott Lahteine
009a6ddd39
Adjust bilinear grid in M851
2017-03-24 06:28:59 -05:00
Scott Lahteine
eab7854a73
Merge pull request #6074 from thinkyhead/rc_immediate_shove
...
Immediate commands take precedence
2017-03-24 05:52:27 -05:00
Stefan Brüns
5699e2b881
Add SOFT_PWM_DITHER to other configurations
2017-03-24 05:02:24 -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
Scott Lahteine
043be2856b
Use "& 0x3F" instead of "% 64"
2017-03-24 04:13:50 -05:00
Stefan Brüns
6a040a6967
SOFT_PWM: Do not switch off heaters twice on pwm_count wraparound
...
After wraparound, pwm_count <= pwm_mask holds, thus soft_pwm_X <= pwm_count
guarantees soft_pwm_X < pwm_mask is true, and the heater will be switched
off in the first branch.
Do not evaluate the pwm conditions a second time, this reduces the
instruction count (4 instructions per PWM) and text size (6 byte).
Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2017-03-24 04:13:50 -05:00
Stefan Brüns
0a74774af1
soft_pwm: avoid useless refetches of pwm_count
...
The compiler is not able to reuse the value of pwm_count, but reloads it
on every evaluation, if is stored in a static variable, as it cannot prove
it will be unchanged. A variable with local scope may not be modified from
the outside, so its value can be reused.
Doing so reduces text size and instruction count.
Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2017-03-24 04:13:50 -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
Stefan Brüns
2aed66a955
temperature: Fix SOFT_PWM off by one
...
A 128 step PWM has 127 intervals (0/127 ... 127/127 duty). Currently, a
PWM setting of 1/127 is active for 2/128, i.e. double the expected time,
or, in general n+1/128 instead of n/127.
Fixes issue#6003.
Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2017-03-24 04:13:36 -05:00
Scott Lahteine
b5711a99a2
Patches to bring UBL closer to compliance
2017-03-24 01:37:52 -05:00
Scott Lahteine
d076c1b604
Apply some general cleanup to code
2017-03-24 01:37:51 -05:00
Scott Lahteine
d1e6b0e21a
Reduce STEP_PULSE_CYCLES code slightly
2017-03-24 00:50:05 -05:00
Scott Lahteine
783338a0b8
Add UBL_MESH_EDIT_ENABLED to configs
2017-03-24 00:44:55 -05:00
Scott Lahteine
8d54ffbf05
Adjust vector_3 code with const, some optimization
2017-03-23 19:41:42 -05:00
Roxy-3D
8ee2612ebb
The hex nibble routine can print again!
...
The code to print a hex nibble got broke. SERIAL_ECHO( (char) ) isn't
suitable for its use.
2017-03-23 16:08:37 -05:00
Roxy-3D
b8e4a6970b
Get UBL up and running again
...
All the changes to get the code into compliance with Marlin coding
standards made UBL sick. This pretty much gets UBL back up and
running.
2017-03-23 16:08:37 -05:00
Roxy-3D
5de1da2b3c
Make UBL honor the #define ENABLE_LEVELING_FADE_HEIGHT option
2017-03-23 16:08:37 -05:00
Scott Lahteine
8f9face956
Merge pull request #6088 from rafaljot/patch-3
...
Update Marlin_main.cpp
2017-03-23 01:51:51 -05:00
Scott Lahteine
782634b6c9
Merge pull request #6081 from Sebastianv650/MIN_STEPPER_PULSE_for_Babystepping
...
Add MINIMUM_STEPPER_PULSE ability to babystepping
2017-03-22 21:57:36 -05:00
Scott Lahteine
af2ea23e9c
EXTRUDER_RUNOUT_PREVENT uses buffer_line_kinematic
2017-03-22 20:51:12 -05:00
Scott Lahteine
cd882b88db
#if defined => #ifdef / PIN_EXISTS
2017-03-22 20:51:11 -05:00
Scott Lahteine
e244399766
Additional cleanup of UBL code
2017-03-22 20:51:10 -05:00
Bob-the-Kuhn
0934563b97
G38 optional double touch
...
Made the double touch portion a conditional compile based on the
PROBE_DOUBLE_TOUCH flag.
==============================================
Bugfix
The current G38 only stopped a move if it involved the Z axis.
Moved all the G38 code to it's own section and put it where it would
always be executed no matter what axis was moving or if the endstop was
enabled.
Also added a comment to configuration_adv to alert the user the double
tap had to be turned on.
==============================================
Change G38 back to using Z_MIN_PROBE
There's no Z_MIN endstop if Z_DUAL_ENDSTOPS is enabled and you have them
set to the top of the gantry.
G38 started out as using the Z_MIN_PROBE pin. I don't remember why we
changed it to the Z_MIN endstop.
2017-03-22 15:08:49 -05:00
Scott Lahteine
cc3204509c
UBL patch from Bob-the-Kuhn
2017-03-22 07:54:20 -05:00
Scott Lahteine
b904b5ae8d
Audible feedback for settings store/load/reset
2017-03-22 02:15:21 -05:00
Sebastianv650
bf57eb2447
Protect Babystepping against other ISRs
...
Especialy against stepper ISR.
This is even more important when a minimum pulse width is set,
increasing the runtime of a babystep.
2017-03-21 18:05:44 +01:00
Sebastianv650
80830919dc
Add MINIMUM_STEPPER_PULSE ability to babystepping
2017-03-21 17:50:38 +01:00
rafaljot
6da949bbf0
Update Marlin_main.cpp
...
Sometimes after killing heaters are still on.
2017-03-21 15:06:01 +01:00
Roxy-3D
72f7b14e66
Make G29's Interactive Mesh Editor Work
2017-03-20 12:52:51 -05:00
Roxy-3D
3fd74b121f
Get G29's Interactive Mesh Editor running
...
G29 P4 R O should work now.
2017-03-20 12:52:51 -05:00
Roxy-3D
1d58558bec
Spelling fix
2017-03-20 12:52:51 -05:00
Scott Lahteine
2573f4dd05
Merge pull request #6052 from thinkyhead/rc_lift_on_pause
...
Add PARK_HEAD_ON_PAUSE feature / M125
2017-03-20 03:36:31 -05:00
Scott Lahteine
48c6284c91
Immediate commands take precedence
2017-03-19 21:50:48 -05:00
Roxy-3D
76c270fdf2
Allow FWRETRACT with UBL Enabled
...
The retraction flag in UBL's G26 was conflicting with the FWRETRACT option.
All fixed!
2017-03-19 15:43:12 -06:00
Roxy-3D
c377c59d47
Allow G29 P1 R to generate the mesh
...
Fix the logic change that happened when UBL got merged.
2017-03-19 15:13:33 -06:00
Scott Lahteine
ff0dd162b7
PARK_HEAD_ON_PAUSE implementation
2017-03-19 07:27:35 -05:00
Scott Lahteine
26473cab6d
Add PARK_HEAD_ON_PAUSE feature
2017-03-19 05:06:55 -05:00
Scott Lahteine
4cf51157b3
Use XYZE rather than NUM_AXIS
2017-03-19 01:14:39 -05:00
Scott Lahteine
4c7f14752a
Add disable_e_steppers function
2017-03-19 01:14:39 -05:00
Scott Lahteine
8eb29f91e6
Patch filament change options and beep code
2017-03-19 01:14:39 -05:00
Scott Lahteine
56c9dfc83b
Merge pull request #6066 from thinkyhead/rc_felix_fix
...
Update Felix config for UBL
2017-03-19 01:11:02 -05:00
Scott Lahteine
9b2b53f63a
Merge pull request #6042 from thinkyhead/rc_fix_toolchange_z
...
Move Z last in tool-change for SWITCHING_EXTRUDER
2017-03-19 00:34:41 -05:00
Scott Lahteine
f98fb6b38e
Update Felix config for UBL
2017-03-19 00:28:48 -05:00
Scott Lahteine
7cabe81373
Merge pull request #6057 from thinkyhead/rc_followup_6054
...
Followup 6054 with some cleanup
2017-03-18 13:49:20 -05:00
Scott Lahteine
4bca27ab89
Fix Kelvin conversion
...
Thanks to @ospalh -- #6056
2017-03-18 13:23:08 -05:00
Scott Lahteine
143ab8f329
Remove Roxy's personal configurations
2017-03-18 12:35:02 -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
77cf648ed3
Move menu selection past static items in 1 screen
2017-03-18 12:26:21 -05:00
Scott Lahteine
2c630a1b5c
Merge pull request #6054 from thinkyhead/rc_ubl_renewal
...
UBL for RCBugFix — cleanup, rebase, patch
2017-03-18 12:07:57 -05:00
Scott Lahteine
0492a3a8f1
Merge pull request #6027 from Bob-the-Kuhn/add_kill_info
...
Message for every KILL and STOP
2017-03-18 11:49:35 -05:00
Scott Lahteine
6618346148
Patches to work around "register spill" compiler bug
2017-03-18 11:35:21 -05:00
Scott Lahteine
be7dd90382
Add Thermistor 75: MGB18 silicon pad
2017-03-18 11:35:20 -05:00
Scott Lahteine
b0a9c82c31
Fix single-char echo and pinMode usage
2017-03-18 11:35:20 -05:00
Scott Lahteine
fb60aa3736
UBL implementation
2017-03-18 11:35:20 -05:00
Scott Lahteine
238b8fd2a3
UBL core and support files
2017-03-18 11:35:19 -05:00
Scott Lahteine
cf94688925
Univeral Bed Leveling - configuration
2017-03-18 11:35:19 -05:00
Scott Lahteine
03aa424ccb
Merge pull request #6053 from thinkyhead/rc_clean
...
Remove extraneous whitespace
2017-03-18 03:26:45 -05:00
Scott Lahteine
af644871bf
Merge pull request #6045 from thinkyhead/rc_remove_raw_kinematics
...
Remove delta optimization concepts… for now
2017-03-18 03:26:24 -05:00
Scott Lahteine
77491dd924
Remove extraneous whitespace
2017-03-18 03:17:39 -05:00
Scott Lahteine
b865b21d32
Can't use Z fade height with DELTA
2017-03-17 08:34:47 -05:00
Scott Lahteine
1e57b0c269
Remove delta interpolation concept
2017-03-17 06:32:11 -05:00
Scott Lahteine
e46898f8e5
Remove kinematic optimizations
2017-03-17 06:30:22 -05:00
Scott Lahteine
11f1fdfab4
_lcd_level_bed_position => manual_probe_index
2017-03-17 06:05:17 -05:00
Scott Lahteine
0e410c9dfd
Software endstop options as simple switches
2017-03-17 06:05:17 -05:00
Scott Lahteine
d01b915085
Implement soft_endstops_enabled for clamping
2017-03-17 06:05:17 -05:00
Scott Lahteine
e4649c9044
Add HAS_SOFTWARE_ENDSTOPS macro
2017-03-17 06:05:17 -05:00
Scott Lahteine
3e927ff204
Replace MBL Z hacking
2017-03-17 06:05:17 -05:00
Scott Lahteine
4e53124681
Merge pull request #6039 from Bob-the-Kuhn/M114-sync-with-stepper
...
M114 - wait for move completion before reporting position
2017-03-17 05:22:46 -05:00
Scott Lahteine
734f9ea133
Merge pull request #6040 from thinkyhead/rc_sanity_use_assert
...
Simplify some sanity checks with static_assert
2017-03-17 05:22:17 -05:00
Scott Lahteine
f02af83d42
Remove some extraneous spaces
2017-03-16 23:59:11 -05:00
Scott Lahteine
672e45652e
Improved solution to tool-change bug
2017-03-16 23:59:10 -05:00
Scott Lahteine
23f1cfb46f
Fix stuck CHDK pin as suggested in #6041
2017-03-16 21:49:39 -05:00
Scott Lahteine
0b22069e82
Merge pull request #6021 from Bob-the-Kuhn/BUG-FIX--Switching-extruder-tool-change-Z-height
...
Bug Fix: Switching extruder tool change leaves Z in wrong position
2017-03-16 21:15:20 -05:00
Scott Lahteine
e7e4500629
Simplify some sanity checks with static_assert
2017-03-16 16:31:34 -05:00
Bob-the-Kuhn
34ff0c3439
M114 - wait for move completion before reporting position
2017-03-16 15:10:45 -05:00
Bob-the-Kuhn
b31604a492
Message for every KILL and STOP
...
No more mystery halts & resets
Moved messages to language.h
Added current command to inactive timeout message
2017-03-15 21:05:11 -05:00
Kai
13b44d019b
Update language_de.h
...
Addition of missing strings to match language_en.h
2017-03-15 16:06:52 +01:00
Bob-the-Kuhn
685ed5393a
Bug Fix: Switching extruder tool change leaves Z in wrong position
...
The tool_change function saves the current_position to the destination
array soon after starting. Later in the switching extruder section, the
destination array is modified when moving the Z axis up & down. A later
section of tool_change moves the head back to the “original location”
using the destination array. This later section assumes that the
destination array hasn’t been modified.
The fix is to save the destination Z position and then restore it after
the Z movements have completed.
Going back to using the current_position array for the switching
extruder Z axis moves (and leaving the destination array untouched)
doesn’t fix the problem.
This bug was introduced by the “Make tool_change kinematic compatible”
commit # 847429eff4
which was merged on 10
Oct 2016 as part of PR 4982.
This bug was discovered in Issue 5966.
2017-03-14 02:36:24 -05:00
Scott Lahteine
51353f8fea
Merge pull request #6000 from trivalik/NoWorkspaceWarning
...
prevent warning with define of NO_WORKSPACE_OFFSETS
2017-03-12 00:00:51 -06:00
MagoKimbra
a4a9bd8bc9
Fix BUG set_position_mm
...
Set postion must have axis and not E_AXIS + active_extruder.
2017-03-11 14:13:39 +01:00
Trivalik
71ac6f9d42
prevent warning with define of NO_WORKSPACE_OFFSETS
2017-03-09 23:49:57 +01:00
Stefan Brüns
9ba6c051a1
Makefile: add nozzle.cpp too CXXSRC list
...
The file is required by the optional NOZZLE_PARK_FEATURE.
Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2017-03-09 03:08:49 +01:00
Stefan Brüns
9cc8d495b8
Makefile: remove no longer existing search paths
...
ArduinoAddons has been removed from Marlin, remove any references to it.
Replace HARDWARE_SRC and HARDWARE_DIR with its expanded equivalents.
Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2017-03-09 01:46:47 +01:00
Stefan Brüns
bf563e62c1
Makefile: add printcounter.cpp too CXXSRC list
...
The file is required by the optional PRINTCOUNTER feature.
Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2017-03-09 01:45:54 +01:00