zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity
5161 commits 1 branch 0 tags 156 MiB
Commit graph

5161 commits

This branch
This branch
All branches
Author SHA1 Message Date
Scott Lahteine 3d56b9d127 Merge pull request #3979 from thinkyhead/mbl_cell 
MBL: cel => cell
 2016-06-07 19:12:46 -07:00
Scott Lahteine cca047424d MBL: cel => cell 2016-06-07 19:10:39 -07:00
Scott Lahteine 08a9bd017b Merge pull request #3976 from petrzjunior/rc_lang_cz_160607 
[Language] Update Czech 2016/06/07
 2016-06-07 18:05:44 -07:00
Scott Lahteine 49ecaf774d Rename some auto/locals to avoid name conflict 2016-06-07 15:38:45 -07:00
petrzjunior 9171a3d94f Update Czech language 2016/06/07 2016-06-07 19:25:15 +02:00
Scott Lahteine 5e6fdbb4cb Merge pull request #3963 from thinkyhead/rc_advance_steppers 
Use e_steps[EXTRUDERS] instead of e_steps[4]
 2016-06-05 02:46:06 -07:00
Scott Lahteine 4b3d5aec7a Merge pull request #3110 from thinkyhead/rc_manual_moves 
Alternative impl. of LCD-based manual movement
 2016-06-05 02:45:39 -07:00
Scott Lahteine 47b5c55c29 Implement the delayed-move technique 2016-06-05 02:29:49 -07:00
Scott Lahteine a3e25a0fca Instead of trying to move now, set a flag to move asap 2016-06-05 02:29:48 -07:00
Scott Lahteine e2a8961635 Use e_steps[EXTRUDERS] instead of e_steps[4] 2016-06-05 01:44:53 -07:00
Scott Lahteine 43947072d5 Merge pull request #3895 from thinkyhead/rc_singlenozzle_part_2 
SINGLENOZZLE: EXTRUDERS versus HOTENDS
 2016-06-04 15:23:17 -07:00
Scott Lahteine 05868de195 Merge pull request #3958 from thinkyhead/rc_fix_3955 
Fix a typo in #3955
 2016-06-04 02:10:26 -07:00
Scott Lahteine d7e4e8e9be Fix a typo in #3955 2016-06-04 02:09:58 -07:00
Scott Lahteine 4bdcf3afe4 Merge pull request #3956 from thinkyhead/rc_mbl_single_axis_fix 
MBL: Keep active when homing single axes (#3750)
 2016-06-03 21:56:12 -07:00
Scott Lahteine c2362c1b3c Apply Marlin coding standards to MBL class 2016-06-03 21:43:32 -07:00
Edward Patel c06de0f097 MBL: Added keeping MBL active when homing single axises for #3750 2016-06-03 21:42:29 -07:00
Scott Lahteine f2fb66c00d With SINGLENOZZLE only set temperature for the active tool 2016-06-03 17:38:03 -07:00
Scott Lahteine cd441ce652 SINGLENOZZLE: EXTRUDERS versus HOTENDS 2016-06-03 17:38:03 -07:00
Scott Lahteine 32f8300cc6 Merge pull request #3944 from thinkyhead/rc_eboston_lcd_contrast 
Improved LCD contrast handling
 2016-06-03 17:08:41 -07:00
Scott Lahteine 9c87bf835c Merge pull request #3947 from thinkyhead/rc_statics_stepper 
Apply static to remaining Stepper methods
 2016-06-03 17:08:15 -07:00
Scott Lahteine 08871d4d6e Merge pull request #3950 from boelle/patch-3 
last of missing defines added
 2016-06-03 17:07:02 -07:00
Scott Lahteine 4e13cd3f35 Merge pull request #3955 from MagoKimbra/RCBugFix 
Fix M428 width DELTA & SCARA
 2016-06-03 15:50:37 -07:00
Scott Lahteine 2403a1cf9c Merge pull request #3952 from rafacouto/RCBugFix 
Galician language update.
 2016-06-03 15:46:03 -07:00
Scott Lahteine 8529122af1 Merge pull request #3946 from thinkyhead/rc_g28_servo_raise_before_stow 
Raise the servo probe before stow outside ABL context
 2016-06-03 15:45:36 -07:00
MagoKimbra f499be084a Fix M428 width DELTA & SCARA 2016-06-03 23:23:23 +02:00
Rafa Couto 5f759a2200 Merge branch 'RCBugFix' of https://github.com/rafacouto/Marlin into RCBugFix 2016-06-03 18:27:02 +02:00
Rafa Couto 5f8db3f574 Galician language update. 2016-06-03 18:24:53 +02:00
Rafa Couto e1591befee Galician language update. 2016-06-03 14:24:35 +02:00
Bo Herrmannsen 8532bf4087 last of missing defines added 
need to check line 101-103
 2016-06-03 11:20:46 +02:00
Scott Lahteine 81384dfd36 Apply static to remaining stepper methods 2016-06-02 18:00:31 -07:00
Scott Lahteine 0d793fb2be Merge pull request #3939 from thinkyhead/rc_resume_get_position 
set_current_position_from_planner() after stepper.quick_stop()
 2016-06-02 17:25:51 -07:00
Scott Lahteine 664b299a51 This fix is not DELTA compatible 2016-06-02 17:16:19 -07:00
Scott Lahteine 064efb20e0 Also call clear_command_queue for lcd_sdcard_stop 2016-06-02 17:16:19 -07:00
Scott Lahteine 6277395e1e set_current_position_from_planner() after stepper.quick_stop() 2016-06-02 17:16:19 -07:00
Scott Lahteine 381bc6f0b0 set_position => set_position_mm 2016-06-02 17:16:19 -07:00
Scott Lahteine 663d2463dc Merge pull request #3922 from thinkyhead/rc_statics_stepper 
Apply static to Stepper class
 2016-06-02 17:14:24 -07:00
Scott Lahteine 194185539d Merge pull request #3925 from thinkyhead/rc_statics_planner 
Apply static to Planner class
 2016-06-02 17:14:04 -07:00
Scott Lahteine 3fd9b331f0 Merge pull request #3924 from thinkyhead/rc_statics_temperature 
Apply static to Temperature class
 2016-06-02 17:13:17 -07:00
Scott Lahteine 5b5270ab50 Merge pull request #3943 from thinkyhead/rc_contrast_adjust 
Combine ST7565 / U8GLIB_NHD_C12864 items in dogm
 2016-06-02 17:05:04 -07:00
Scott Lahteine db0fd021d0 Z raise options independent of ABL so G28 can use them 2016-06-02 16:56:49 -07:00
Scott Lahteine 9eecb4404b Make raise_z_after_probing null sometimes 2016-06-02 16:56:49 -07:00
Scott Lahteine 28fb1f8994 Tweak #endif comment for ABL GRID 2016-06-02 16:56:49 -07:00
Scott Lahteine b3a37b493d Patch G28 servo stow to use Conditionals, raise_z_after_probing 2016-06-02 16:56:49 -07:00
Scott Lahteine 5390c846a5 Positive conditions for HAS_LCD_CONTRAST 2016-06-02 16:17:34 -07:00
Scott Lahteine efa7209acf Improved LCD contrast handling 
Based on MarlinFirmware/MarlinDev#200 from @eboston
 2016-06-02 16:17:34 -07:00
Scott Lahteine b703fa9538 Add sanity check for SAV_3DGLCD display types 2016-06-02 15:21:17 -07:00
lrpirlet 3aefa04386 Raise the servo probe before stow outside ABL context 2016-06-01 21:53:45 +02:00
Scott Lahteine 9729e9c450 Combine ST7565 / U8GLIB_NHD_C12864 items in dogm 2016-06-01 01:42:14 -07:00
Scott Lahteine f331763eca Merge pull request #3829 from thinkyhead/rc_fix_T_command 
Fix bad movement in gcode_T when switching extruders
 2016-05-31 19:36:18 -07:00
Scott Lahteine 67f816ff79 Merge pull request #3926 from thinkyhead/rc_statics_endstops 
Drop FORCE_INLINE from endstops.h
 2016-05-31 19:35:41 -07:00