Scott Lahteine
6ce2b1ff4a
G33 evolutionary changes
2017-05-20 19:23:39 -05:00
Scott Lahteine
94a4af1d7f
Merge pull request #6773 from thinkyhead/bf_lcd_patch_e5
...
Patch LCD code for 5th extruder
2017-05-18 15:26:55 -05:00
Brian
43c24f0027
Fix recent regressions, &c.
...
- fix broken `M421` due to less-than-careful optimization
- add HOME_AFTER_DEACTIVATE define to advanced config so not everyone has to rehome after steppers are deactivated
- misc. cleanups (remove unused label, unused variables)
2017-05-17 17:21:46 -04:00
Scott Lahteine
3843a5151a
Patch LCD code for 5th extruder, EEPROM reset
2017-05-17 15:33:51 -05:00
Scott Lahteine
00d358d92d
Fix a PROBE_MANUALLY bug in ultralcd.cpp
2017-05-17 03:49:19 -05:00
Tannoo
0cd398c25d
UBL Menu Updates ( #6751 )
...
Things should be pretty stable for a while.
But it wouldn't surprise me if the Delta people have a need for a few special commands.
2017-05-16 08:45:31 -05:00
Scott Lahteine
14a4257c7b
UBL tabs, whitespace, spelling, etc.
2017-05-16 01:19:45 -05:00
Scott Lahteine
a7fb55ea6d
Use GRID_MAX_POINTS. Some formatting
2017-05-12 06:57:19 -05:00
Scott Lahteine
233f824dd6
Define GRID_MAX_POINTS
2017-05-12 01:32:34 -05:00
Pablo Ventura
539e0c2f31
"M80 S" to report the state of the PSU pin
2017-05-10 17:58:58 -05:00
Tannoo
66db6c3acc
UBL Menu System 1.1
...
/**
* UBL System submenu
*
* Prepare
* - Unified Bed Leveling
* - Activate UBL
* - Deactivate UBL
* - Mesh Storage
* Memory Slot:
* Load Bed Mesh
* Save Bed Mesh
* - Output Map
* Map Type:
* Output Bed Mesh Host / Output Bed Mesh CSV
* - UBL Tools
* - Build Mesh
* Build PLA Mesh
* Build ABS Mesh
* - Build Custom Mesh
* Hotend Temp:
* Bed Temp:
* Build Custom Mesh
* Info Screen
* - Build Cold Mesh
* - Fill-in Mesh
* Fill-in Mesh
* Smart Fill-in
* Manual Fill-in
* Info Screen
* Continue Bed Mesh
* Invalidate All
* Invalidate Closest
* - Validate Mesh
* PLA Mesh Validation
* ABS Mesh Validation
* - Custom Mesh Validation
* Hotend Temp:
* Bed Temp:
* Validate Mesh
* Info Screen
* - Edit Mesh
* Fine Tune All
* Fine Tune Closest
* - Adjust Mesh Height
* Height Amount:
* Adjust Mesh Height
* Info Screen
* - Mesh Leveling
* 3-Point Mesh Leveling
* - Grid Mesh Leveling
* Side points:
* Level Mesh
* Info Screen
* - Output UBL Info
*/
2017-05-10 12:14:43 -05:00
Scott Lahteine
081bf1f879
Patch #else / #endif comments
2017-05-09 12:37:23 -05:00
Thomas Moore
3279337f47
Move BLTouch LCD menu from Main to Main/Control
2017-05-08 15:21:01 +00:00
Thomas Moore
acec237092
Shutdown heaters and fan after canceling a print from the SD card
2017-05-03 20:43:09 -05:00
Scott Lahteine
2658cc707a
Treat temperature as integer, when possible
2017-05-03 17:27:25 -05:00
Thomas Moore
b39f634252
Continuously update LCD when hotend status is displayed in Filament Change screens
2017-05-02 21:49:40 -05:00
Scott Lahteine
e79b335367
Patches for leveling reactivation in G28 / M48
2017-05-01 17:38:57 -05:00
Brian
4e1448e75a
Various fixes for compiler warnings
...
add BLTouch-related messages in english and (rusty) french;
add missing endstops.h in ultralcd.cpp;
fix misc. compiler warnings;
fix lsf_reset - ZERO macro can't handle a pointer as it would only memset the size of the pointer, not the size of the entire struct
2017-05-01 02:12:40 -05:00
Scott Lahteine
671a44b8aa
Merge pull request #6410 from teemuatlut/LVD-Delta
...
Delta auto-calibration updates
2017-04-30 16:39:51 -05:00
LVD-AC
585c00a728
Proposed changes
...
This is what I did yesterday:
- basicly gave the tests more comprehensive names; put all the
declarations at the top; got rid of the magic negative C-value (renamed
to P + A, O, T)
- "cos(RADIANS(180 + 30 * axis)) * (1 + circles * 0.1 * ((zig_zag) ? 1 :
-1)) * delta_calibration_radius" compiles wrong is zig_zag statement is
without brackets
- DELTA_TOWER_ANGLE_TRIM reset to 3 values (the calcs use the 3th value
to normalize will not compile otherwise)
-Wrote 3 dummies to keep EEPROM lenght the same
-Reset the configs to the 'original' with autocal + menu disabled (but
can be enabled of course)
2017-04-29 18:53:14 +03:00
Scott Lahteine
29fa241617
Initial patches to G33
2017-04-29 15:29:49 +03:00
Scott Lahteine
2cc9774f34
Apply bltouch_menu
...
As proffered in #6252
2017-04-28 18:43:03 -05:00
LVD-AC
7a6a1ef583
M666 normalize positive values to <=0
...
M666
+ tower radians absolute value
2017-04-28 18:05:24 +03:00
LVD-AC
d8102aeca8
Cn negative : no tower angle calibration
...
Giving a negative number of probe points disables the tower angle
correction calibration ('4point' instead of '7point' solution)
EEPROM version updated
2017-04-27 21:13:07 +03:00
Scott Lahteine
adb8e68592
Fix stuck "Print Aborted" LCD message
...
Fixes #6393
2017-04-26 06:24:23 -05:00
Scott Lahteine
5bdb0b567d
Cosmetic patches
2017-04-26 06:24:23 -05:00
Scott Lahteine
ccda63c473
Drop the accessor form for LCD value editing
2017-04-22 16:19:30 -05:00
LVD-AC
13c8493878
M665 rework and related issues (all delta's)
...
- Making M665 compatible with repetier (see
http://reprap.org/wiki/G_code#M665:_Set_delta_configuration )
- M665 B also sets the radius for manual calibration menu
- Converting tower ajustment definitions to arrays - tower angle
corrections compatible with Esher 3D wizzard
- Only tower angles need to be adjustable with M665 and stored to EEPROM
- tower radius and diag rod can be adjusted in the FW only with #define
2017-04-21 11:58:39 +03:00
Scott Lahteine
e0e069c6d8
Clean up trailing whitespace
2017-04-20 17:52:07 -05:00
Scott Lahteine
1286d9603d
Clean up and organize ultralcd.cpp
2017-04-17 16:39:36 -05:00
Scott Lahteine
3cdf78a79f
MSG_VOLUMETRIC => MSG_FILAMENT
2017-04-17 16:39:36 -05:00
Thomas Moore
f8e77d6545
Add Linear Advance values to EEPROM and enable configuration of K via LCD
2017-04-17 16:39:36 -05:00
Scott Lahteine
a81606c680
Show Cancel/Continue screen for ABL "Level Bed"
2017-04-15 16:51:03 -05:00
Scott Lahteine
4e04383d18
Merge pull request #6354 from thinkyhead/rc_doubleclick_fix
...
Fix undefined symbol if DOUBLECLICK_FOR_Z_BABYSTEPPING and HAS_BED_PROBE defined
2017-04-15 16:06:29 -05:00
Thomas Moore
8dd0492e68
Show lcd_babystep_zoffset screen if DOUBLECLICK_FOR_Z_BABYSTEPPING is enabled and HAS_BED_PROBE is defined
2017-04-15 14:44:50 -05:00
Bob-the-Kuhn
60471b7592
minor improvements
...
Configuration_store.cpp - changed a couple of print statements so the
values were printed. The old method resulted in the formula being
printed.
ubl_G29
1) added support for R option to P4. Now probes all points unless R is
present and the number is greater than 0.
2) P2 - moved map print statement so it showed the point that was
currently being probed, The old location did this only for the first
point.
3) P4 - Moved the map print for the same reason.
ultralcd.cpp - changed "Mesh Editor :" to "Mesh Editor" because the LCD
draw routine puts a ":" in automatically so you end up with an extra ":"
using the old message.
2017-04-15 09:31:55 -05:00
Scott Lahteine
a2356c2825
Fix compiler warning about z-offset callback
2017-04-15 02:50:27 -05:00
Scott Lahteine
cf6f483378
Merge pull request #6187 from thinkyhead/rc_flsun_delta_autocal
...
Delta: DELTA_HEIGHT, G33 Auto-Calibrate, drop M206/M428, add M665 H
2017-04-14 22:32:12 -05:00
Scott Lahteine
24882adfbf
Allow NO_WORKSPACE_OFFSETS with DELTA_AUTO_CALIBRATION
...
- On `DELTA` the `M665 H` option supplants `M206`
- On `DELTA` `NO_WORKSPACE_OFFSETS` only reverts `G92` behavior
- Spawn 4 conditionals based on `NO_WORKSPACE_OFFSETS`
- Optimize coordinate space conversion for `DELTA` workspace
- To keep EEPROM version, retain `home_offset[XYZ]`, just ignore XY
2017-04-14 21:56:49 -05:00
LVD-AC
8821963873
Implement delta auto-calibration and delta_height
2017-04-14 19:46:31 -05:00
benlye
1f9ee42750
Fix lcd_babystep_zoffset()
...
Resolve 'steps_to_mm was not declared in this scope' compilation error after recent changes to merge babystepping with M851
2017-04-14 18:38:35 +01:00
Scott Lahteine
52c3ace102
Add BABYSTEP_ZPROBE_OFFSET as an optional feature
2017-04-13 16:29:43 -05:00
Scott Lahteine
60ac41a32c
Add code to handle changes to zprobe_zoffset
2017-04-13 15:46:35 -05:00
Thomas Moore
361655828f
Use babystepping to adjust bed probe z-offset
2017-04-13 15:46:05 -05:00
Kai
001bc14255
Allow 10mm Movements for Z-Axis
...
I use the movement options via LCD quite often. Especially to get the nozzle out of the way. I see no reason, why the 10mm option is disabled for the Z-Axis, this is why i always delete this line when i compile a new version.
If this is unwanted, please just close this PR
2017-04-11 18:39:26 +02:00
Scott Lahteine
48c16fc6ef
Merge pull request #6307 from thinkyhead/rc_less_no_reentrance
...
Only lcd_synchronize needs no_reentry
2017-04-10 20:58:32 -05:00
Scott Lahteine
4fcfe926d6
Only lcd_synchronize needs no_reentry
2017-04-10 20:13:23 -05:00
Scott Lahteine
67fb7f82ac
Merge pull request #6283 from thinkyhead/rc_eeprom_z_fade
...
Save / restore z_fade_height in EEPROM
2017-04-10 20:05:20 -05:00
Kai
3b82db5fe9
Missing semicolon in ultralcd.cpp
...
When PARK_HEAD_ON_PAUSE is defined Marlin won't compile because of two missing semicolon.
2017-04-10 14:45:51 -05:00
Scott Lahteine
786af73e24
Convert config code to a static class
2017-04-09 22:06:41 -05:00
Scott Lahteine
7a704af5e6
Merge pull request #6284 from thinkyhead/rc_wt150_rebase
...
wt150 (Mightyboard Rev E) & RRD Full Graphic Smart Controller
2017-04-09 20:27:44 -05:00
Scott Lahteine
314a02e2d5
Toggle with XOR
2017-04-09 07:58:47 -05:00
Paweł Stawicki
9b0885f4f6
Allow boards without a thermistor
2017-04-09 06:45:41 -05:00
Scott Lahteine
c54f6cf23d
Updates to support 5 extruders
2017-04-09 03:49:16 -05:00
Scott Lahteine
f8408036f2
Merge pull request #6264 from thinkyhead/rc_five_extruders
...
Support up to 5 extruders in Marlin
2017-04-07 12:48:56 -05:00
Scott Lahteine
832064e4f2
Implementation changes to support 5 extruders
2017-04-07 10:46:37 -05:00
Scott Lahteine
dc84678fc1
Fix HOTEND_STATUS_ITEM for graphical display
2017-04-06 23:07:30 -05:00
Bob-the-Kuhn
6643d553f6
# This is a combination of 2 commits.
...
# This is the 1st commit message:
MCP4728 consistency & fix ultralcd.cpp
The MCP4728 DAC controls the stepper motor current strenth on the
PRINTRBOARD Rev F and RIGIDBOARD V2 boards.
PR #5792 on 9 FEB 2017 implemented default drive percentages but only on
the RIGIDBOARD V2.
This change moves the default settings to Configuration_adv.h.
Also, ultralcd.cpp won't compile because of a type def conflict.
Changed it to match the one in stepper_dac.cpp
===========================================================
reword stepper curent section for clarity
===========================================================
change name & improve comments
===========================================================
changed name from A4JP to SCOOVO_X9H per PR #6139
# This is the commit message #2 :
fix typo
2017-04-06 16:16:27 -05:00
Scott Lahteine
f5c5c1f771
Rename all UBL files with a ubl_ prefix
2017-04-06 05:33:27 -05:00
Scott Lahteine
eb1e6aa29b
Use same config name for all mesh dimensions
2017-04-06 00:42:52 -05:00
Scott Lahteine
3412950abc
Merge pull request #6209 from thinkyhead/rc_psu_zero
...
Power Supply 0 as "General"
2017-04-02 16:44:42 -05:00
Scott Lahteine
699310d1d2
Fix: Thermal runaway if nonexistent bed's temp is set
2017-04-02 11:48:10 -05:00
Scott Lahteine
5bce731962
Fix LCD preheat menus
2017-04-02 09:32:22 -05:00
Tannoo
54173c80ad
Power Supply 0 as "General"
2017-04-02 06:21:34 -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
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
a5e085cbea
Have run_probe() return probe Z, not nozzle Z
2017-03-31 09:27:49 -05:00
Scott Lahteine
9e4bd6b3b5
Further repairs to UBL, comments, spacing
2017-03-31 02:20:20 -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
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
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
d076c1b604
Apply some general cleanup to code
2017-03-24 01:37:51 -05:00
Scott Lahteine
e244399766
Additional cleanup of UBL code
2017-03-22 20:51:10 -05:00
Scott Lahteine
b904b5ae8d
Audible feedback for settings store/load/reset
2017-03-22 02:15:21 -05: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
Scott Lahteine
ff0dd162b7
PARK_HEAD_ON_PAUSE implementation
2017-03-19 07:27:35 -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
77cf648ed3
Move menu selection past static items in 1 screen
2017-03-18 12:26:21 -05:00
Scott Lahteine
fb60aa3736
UBL implementation
2017-03-18 11:35:20 -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
3e927ff204
Replace MBL Z hacking
2017-03-17 06:05:17 -05:00
Scott Lahteine
f02af83d42
Remove some extraneous spaces
2017-03-16 23:59:11 -05:00
Scott Lahteine
2defb1d748
Use SET_INPUT_PULLUP where appropriate
2017-03-07 23:43:33 -06:00
Scott Lahteine
3830778852
Apply NO_WORKSPACE_OFFSETS to lcd menu
2017-03-06 02:21:42 -06:00
Scott Lahteine
7e3aab889d
Fix preheat menu formatting
2017-03-06 02:07:07 -06:00
Scott Lahteine
6c5312559c
Menu item to preheat only the hotend
2017-03-06 01:14:54 -06:00
Scott Lahteine
9d0142e8ae
Move Change Filament above Cooldown
2017-03-06 01:13:12 -06:00
Scott Lahteine
0c55095c5e
Move Cooldown above Preheat
2017-03-06 01:13:12 -06:00
Scott Lahteine
34253497d4
Babysteps code tweak
...
As suggested by https://github.com/MarlinFirmware/Marlin/pull/5887#issuecomment-283832163
2017-03-02 20:35:45 -06:00
Scott Lahteine
fb4aead2b1
Clean up and finish #5887
2017-03-02 20:16:29 -06:00
Roxy-3D
11e892bd84
Merge pull request #5887 from Roxy-3D/RCBugFix
...
Double Click of Encoder Wheel Jumps to Z-BabyStepping
2017-03-01 17:15:02 -07:00
Scott Lahteine
34cba42104
Use PSTR for MSG_HEATING
2017-02-22 11:30:19 -06:00
Roxy-3D
584d147a02
fixup the indentation
2017-02-22 07:23:54 -07:00