CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,718 Commits 1 Branch 0 Tags 107 MiB
286de9d677
Commit Graph

18718 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Kahl
286de9d677 Merge branch '31-probe-does-not-save-when-exiting-menu' into 'master' 
Resolve "Probe does not save when exiting menu"

Closes #31

See merge request lulzbot3d/marlin!25
 2021-09-21 15:26:19 +00:00
Brian Kahl
8138753749 saving settings and then displaying the Z offset is saved 2021-09-20 16:38:40 -05:00
Dawson Coleman
ef77725a06 Merge branch '17-add-m48-message-about-movement' into 'master' 
Resolve "Add M48 Message about movement"

Closes #17

See merge request lulzbot3d/marlin!17
 2021-09-17 14:35:01 +00:00
Dawson Coleman
b97cdbb30a Improve behavior of M48 2021-09-17 09:28:47 -05:00
Dawson Coleman
78d9ce98e9 Merge branch 'gitlab-ci' into 'master' 
Enable GitLab CI

See merge request lulzbot3d/marlin!14
 2021-09-16 20:29:46 +00:00
Dawson Coleman
39202b8e7c Use parallel jobs and expose artifacts 2021-09-16 15:21:47 -05:00
Brian Kahl
c1df966d60 Merge branch '2.0.9.0.7' into 'master' 
2.0.9.0.7

See merge request lulzbot3d/marlin!22
 2021-09-16 19:43:27 +00:00
Brian Kahl
09faa3e255 2.0.9.0.6 -> 2.0.9.0.7 2021-09-16 14:36:00 -05:00
Brian Kahl
89ab166297 Merge branch '25-clean-nozzle-script-is-not-used' into 'master' 
Resolve "Clean Nozzle script is not used"

Closes #25

See merge request lulzbot3d/marlin!18
 2021-09-16 18:54:11 +00:00
Brian Kahl
6973259bcd Merge branch '26-cool-down-after-auto-calibration' into 'master' 
Resolve "Cool down after auto calibration"

Closes #26

See merge request lulzbot3d/marlin!20
 2021-09-16 18:53:49 +00:00
Brian Kahl
cbacf989c8 Merge branch '27-hotend-idle-timeout-not-being-used' into 'master' 
Resolve "Hotend Idle Timeout not being used"

Closes #27

See merge request lulzbot3d/marlin!19
 2021-09-16 18:53:16 +00:00
Brian Kahl
0d7512e71b Capitalizing correction to nozzle clean feature 2021-09-16 13:03:20 -05:00
Brian Kahl
1542e70194 Homing before clearing backlash and cooling nozzle after calibration. 2021-09-16 11:52:58 -05:00
Brian Kahl
176378cbfe adding HOTEND_IDLE_TIMEOUT for all printers 2021-09-16 11:35:42 -05:00
Brian Kahl
f9cc7c40a0 Adding space inbetween G28 and O to make reading easier. 2021-09-16 11:19:09 -05:00
Brian Kahl
15e9839344 Making Clean nozzle command the same for all printers with wipe. 2021-09-16 09:09:12 -05:00
Robert Henderson
3ed3100e04 Merge branch '24-pla-load-filament-is-lower-then-before' into 'master' 
Resolve "PLA load filament is lower then before"

Closes #24

See merge request lulzbot3d/marlin!15
 2021-09-16 12:41:21 +00:00
Brian Kahl
b57a369fbc loading PLA at a higher temp of 200 2021-09-16 07:31:08 -05:00
Robert Henderson
688c231fd0 Merge branch '21-motor-current' into 'master' 
Resolve "Motor Current"

Closes #21

See merge request lulzbot3d/marlin!13
 2021-09-15 16:41:33 +00:00
Robert Henderson
c37534b9d4 Merge branch '22-auto_z_align-for-workhorse' into 'master' 
Resolve "Auto_z_align for Workhorse"

Closes #22

See merge request lulzbot3d/marlin!12
 2021-09-15 16:38:19 +00:00
Brian Kahl
219fce8062 correcting workhorse to Workhorse in homing backoff callout 2021-09-15 11:20:49 -05:00
Brian Kahl
3a687e5b3e Auto_z_align option is avalible for workhorse 2021-09-15 11:08:57 -05:00
Brian Kahl
8ef3f00c9e Auto_z_align option is avalible for workhorse 2021-09-15 11:03:52 -05:00
Brandon Kamphake
f62b4eb976 Lulzbot_Motor_Current_E now defines e_current for all toolheads 2021-09-15 10:56:32 -05:00
Brian Kahl
b71d0cfe62 Merge branch '20-compile-issue-for-pro-proxt-involving-the-probe_safe_point' into 'master' 
Resolve "Compile issue for Pro/ProXT involving the Probe_safe_point"

Closes #20

See merge request lulzbot3d/marlin!11
 2021-09-15 15:24:42 +00:00
Brian Kahl
3257e525c6 Fixing compile issue with Pro/ProXT involving Probe_safe_point 2021-09-15 10:15:11 -05:00
Brian Kahl
90fd7a5e91 Merge branch '19-wrong-firmware-title-when-running-m115-on-sidekick-747-sl-se-he' into 'master' 
Resolve "Wrong firmware title when running M115 on Sidekick 747 SL, SE, HE"

Closes #19

See merge request lulzbot3d/marlin!10
 2021-09-15 15:00:42 +00:00
Brian Kahl
0c71bde436 Correcting toolhead name callout for extruder type in m115 2021-09-15 09:55:08 -05:00
Brian Kahl
30cb45df08 Merge branch 'Firmware-retract-option' into 'master' 
Adding in firmware retract option

Closes #18

See merge request lulzbot3d/marlin!9
 2021-09-15 14:42:19 +00:00
Brian Kahl
a468af73c1 Adding in firmware retract option 2021-09-15 09:16:39 -05:00
Brian Kahl
4ebad9cf84 Merge branch 'M48_fix_for_nozzle_as_probe' into 'master' 
2-M48 fix for nozzle as probe

Closes #2

See merge request lulzbot3d/marlin!6
 2021-09-15 14:02:56 +00:00
Brian Kahl
a07036b4d6 Endif missing from statement 2021-09-15 08:39:13 -05:00
Brian Kahl
f8828fe499 Merge branch 'M48_fix_for_nozzle_as_probe' of https://gitlab.com/lulzbot3d/marlin into M48_fix_for_nozzle_as_probe 2021-09-15 08:16:34 -05:00
Brian Kahl
315c5513d7 Fixing redundant if statement 2021-09-15 08:16:30 -05:00
Brian Kahl
0a86e8129a Fixing redundant if statement 2021-09-15 08:07:23 -05:00
Dawson Coleman
03025474a5 Fix universal toolhead not being defined 
FYI: A toolhead must be defined in order for the build to succeed.

Caused by 9c98b4b844
 2021-09-14 15:01:06 -05:00
Robert Henderson
2958d86882 Apply 1 suggestion(s) to 1 file(s) 2021-09-14 15:55:22 +00:00
Brian Kahl
00ed86b815 PROBE_SAFE_POINT for dual extruder 2021-09-14 10:06:06 -05:00
Brian Kahl
da1b54b053 Merge branch '747_x_travel' into 'master' 
Change the x travel to avoid hitting the fan duct on M175v2

See merge request lulzbot3d/marlin!8
 2021-09-14 14:27:05 +00:00
Brian Kahl
e2e24060e7 Adding in M48 to Pro/ProXT Leveling menu. 
Fixing shadowed out level X axis on Pro/ProXT
 2021-09-14 09:26:05 -05:00
Dawson Coleman
da13409e9e Add example .gitlab-ci.yml from pio docs 
Copy and pasted from
https://docs.platformio.org/en/latest/integration/ci/gitlab.html
with a few small changes.
 2021-09-13 16:48:15 -05:00
Dawson Coleman
9c98b4b844 Apply 1 suggestion(s) to 1 file(s) 2021-09-13 21:28:24 +00:00
Brian Kahl
7c92e8ab7a Clean nozzle spelling error corrected 2021-09-13 11:48:26 -05:00
Brian Kahl
b6ca15efd1 Configuring the probe safe position 2021-09-13 11:46:28 -05:00
Brian Kahl
aa968252c5 Change the x travel to avoid hitting the fan duct on M175v2 2021-09-13 11:26:12 -05:00
Robert Henderson
23087565e5 Merge branch 'dualextruderUpdate' into 'master' 
Dualextruder update

See merge request lulzbot3d/marlin!7
 2021-09-13 16:17:35 +00:00
Dawson Coleman
5036438af8 commented out all toolheads 2021-09-13 16:14:32 +00:00
Robert Henderson
7d4c700e7c fix typo in comment 2021-09-13 15:47:55 +00:00
Brandon Kamphake
869612a96d Removed commented out line 2021-09-13 10:41:05 -05:00
Brandon Kamphake
acfb47eeaa cleaned up how servos are defined 2021-09-13 10:34:08 -05:00