Scott Lahteine
c56eec29f0
Configurable delay for BLTouch servo emulation
2017-04-02 11:14:53 -05:00
Scott Lahteine
deaad78df9
Merge pull request #5678 from Bob-the-Kuhn/G38-optional-double-tap
...
G38 bug fix, made double touch optional & reverted to Z_MIN_PROBE
2017-04-02 10:32:04 -05:00
Scott Lahteine
5bce731962
Fix LCD preheat menus
2017-04-02 09:32:22 -05:00
Scott Lahteine
4c72167af3
Prevent a warning on echo_command
2017-04-02 08:36:58 -05:00
Scott Lahteine
9b5fd9522e
Fix formatting, order for a UBL change
2017-04-02 07:15:40 -05:00
Tannoo
54173c80ad
Power Supply 0 as "General"
2017-04-02 06:21:34 -05:00
Scott Lahteine
a2775d0c70
can wstring be removed?
2017-04-02 04:43:33 -05:00
Scott Lahteine
de4e19f17e
Patch MarlinSerial to match up with 32-bit version
2017-04-02 04:39:18 -05:00
Scott Lahteine
2cbc7b4b73
Relocate serial macros and functions
2017-04-02 01:05:25 -05:00
Scott Lahteine
eaa66f3c46
Indent MarlinSerial code
2017-04-02 01:05:25 -05:00
Scott Lahteine
7a7a80e6c5
status_printf => lcd_status_printf_P
2017-04-02 01:05:25 -05:00
Scott Lahteine
0e6ec34228
Use PSTR versions of lcd_status... to save SRAM
2017-04-02 00:45:39 -05:00
Scott Lahteine
34e2420b9b
Apply const args, clean up find_closest_circle_to_print
2017-04-01 23:15:41 -05:00
Scott Lahteine
e19fbd27ce
Minor spelling patch
2017-04-01 23:08:00 -05:00
Scott Lahteine
790a3e9a8c
Remove extraneous check of UBL_G26_MESH_EDITING
2017-04-01 23:03:40 -05:00
Scott Lahteine
7310110ec0
Fix logic of UBL::fade_scaling_factor_for_z
2017-04-01 22:52:48 -05:00
Scott Lahteine
1a775cecac
Revert behavior of enqueue_and_echo_commands_P
2017-04-01 21:53:46 -05:00
Scott Lahteine
79d42d87c1
Syntax cleanup
2017-04-01 21:53:46 -05:00
Scott Lahteine
b47fd31c37
Revert some changes to UBL
2017-04-01 21:53:45 -05:00
Bob-the-Kuhn
185337e787
add delays to allow stop & kill messages to get out
2017-04-01 00:23:14 -05:00
Scott Lahteine
63abb65146
Update description of PINS_DEBUGGING
2017-03-31 18:57:48 -05:00
Scott Lahteine
73e193da1d
Implement LCD_BED_LEVELING for PROBE_MANUALLY
2017-03-31 11:50:18 -05:00
Scott Lahteine
fcadc7bb1a
Implement the "manual" option for ABL
2017-03-31 11:50:18 -05:00
Scott Lahteine
9e22184936
Add a "manual" option for ABL
2017-03-31 11:50:18 -05:00
Scott Lahteine
541165e878
Merge pull request #6181 from thinkyhead/rc_ubl_further_fixes
...
Further adjustments to UBL code
2017-03-31 11:35:02 -05:00
Scott Lahteine
b19a15fa7f
Within applied to UBL
2017-03-31 11:12:57 -05:00
Scott Lahteine
342ee458ae
Additional UBL fixes, optimizations
2017-03-31 11:12:57 -05:00
Scott Lahteine
a5e085cbea
Have run_probe() return probe Z, not nozzle Z
2017-03-31 09:27:49 -05:00
Scott Lahteine
4487d22d56
Apply FIXFLOAT macro
2017-03-31 09:27:48 -05:00
Scott Lahteine
6cac0f43eb
MBL fiddle
2017-03-31 09:27:48 -05:00
Scott Lahteine
25a6bfa7ed
Add and apply WITHIN macro
2017-03-31 09:27:48 -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
Scott Lahteine
93aad54dc1
Clean up code, remove _now command function
2017-03-31 04:17:31 -05:00
Stefan Brüns
6ba6c92a81
Add example configuration for TinyBoy L10/L16
...
The TB2 is a Indiegogo funded 3d printer. It uses a MKS SMELZI V1.0
main board (based on MELZI, i.e. Sanguinololu). I comes as a complete kit,
including display and panel.
Two variants exists, L10 and L16, with a height of 100 and 160 mm.
The heating function of the provided bed can enabled by soldering a
thermistor and some wires to it.
Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2017-03-31 04:05:35 -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
65ca6472ba
Make G26 compatible with G92 and M206
2017-03-31 02:20:20 -05:00
Scott Lahteine
4902fd4e95
More data in UBL class, make it a static class
...
- Make all `unified_bed_leveling` data/methods static
- Move some UBL-related variables into the class
- Replace `map_[xy]_index_to_bed_location` with `mesh_index_to_[xy]pos`
2017-03-31 02:20:20 -05:00
Scott Lahteine
edbc024d76
Disable UBL_G26_MESH_EDITING by default
2017-03-31 02:20:20 -05:00
Scott Lahteine
9e4bd6b3b5
Further repairs to UBL, comments, spacing
2017-03-31 02:20:20 -05:00
Bob-the-Kuhn
f3618c3337
Reduce UBL RAM usage by making G26/G29 optional
2017-03-31 02:20:19 -05:00
Scott Lahteine
c9eb1d6ab7
Make MBL a static class, use lookup for index-to-point conversion
2017-03-31 01:28:07 -05:00
Scott Lahteine
de9d2cddc3
Merge pull request #6152 from thinkyhead/rc_cleanup_6150_etc
...
UBL cleanup, optimization
2017-03-30 17:40:29 -05:00
Scott Lahteine
9217e4b8ec
Various UBL cleanups and bug fixes
2017-03-30 17:09:49 -05:00
Scott Lahteine
9924199802
Merge pull request #5908 from thinkyhead/rc_fix_slowdown
...
General minor cleanup
2017-03-29 21:43:33 -05:00
Scott Lahteine
0e71e7b2fb
Cleanup to planner.cpp
2017-03-29 06:48:07 -05:00
Scott Lahteine
f105cad43c
Marlin: Slight cleanup to Marlin_main.cpp
2017-03-29 06:40:29 -05:00
Scott Lahteine
499f9e04e1
Marlin: Temperature soft-PWM cleanup
2017-03-29 06:37:27 -05:00
Scott Lahteine
7ddd94dc61
Merge pull request #5994 from StefanBruens/fix_Makefile_errors
...
Fix makefile errors, cleanup
2017-03-29 06:32:08 -05:00
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
