melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
5,691 Commits 2 Branches 0 Tags 2 GiB
e4816293a8
Commit Graph

5691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Scott Lahteine
2bd4f33369 Merge pull request #3928 from thinkyhead/rc_allen_key_cleanup 
Remove excess allen key probe examples from configs
 2016-05-31 19:18:21 -07:00
Scott Lahteine
d698c89971 Fix bad movement in gcode_T when switching 2016-05-31 19:14:33 -07:00
Scott Lahteine
1a01a44a94 Merge pull request #3936 from thinkyhead/rc_sav_mk1 
Support for SAV_3DGLCD OLED LCD controller
 2016-05-31 18:46:25 -07:00
Scott Lahteine
4770d7c346 Merge pull request #3933 from boelle/patch-2 
added defines present in en but not in da
 2016-05-31 18:42:38 -07:00
Scott Lahteine
c6c01eaaac Merge pull request #3888 from thinkyhead/rc_slower_max31855 
Slower SPI speed for MAX31855
 2016-05-31 18:40:38 -07:00
Scott Lahteine
a0b000d752 Support for SAV_3DGLCD OLED LCD controller 2016-05-31 14:41:16 -07:00
Scott Lahteine
bd97bbc52a Make HAS_LCD_CONTRAST a boolean flag 2016-05-31 11:47:02 -07:00
Scott Lahteine
bc77670673 Merge pull request #3929 from thinkyhead/rc_fix_printrboard_dac 
Need to call dac_init() in setup() for DAC_STEPPER_CURRENT
 2016-05-31 10:29:37 -07:00
Bo Herrmannsen
a1a8240606 added defines present in en but not in da 2016-05-31 14:57:52 +02:00
Roxy-3DPrintBoard
3d7d034fad Merge pull request #3932 from boelle/patch-1 
initial changes to DA
 2016-05-31 07:34:29 -05:00
Bo Herrmannsen
5eb7a79d93 initial changes to DA 2016-05-31 14:24:33 +02:00
Scott Lahteine
55ef04a566 Need to call dac_init() in setup() for DAC_STEPPER_CURRENT 
As reported by https://github.com/MarlinFirmware/Marlin/pull/3182#issuecomment-222595488
 2016-05-30 23:35:06 -07:00
Scott Lahteine
43a71ef226 Remove excess allen key probe examples from configs 2016-05-30 18:26:53 -07:00
Scott Lahteine
1582ed43bf Merge pull request #3918 from epatel/marlin/mbl_negative_xy_adv 
MBL: Move border macros to Configuration_adv.h
 2016-05-30 18:15:50 -07:00
Scott Lahteine
ff53819856 Drop FORCE_INLINE in planner.h 
This change actually does increase the binary size by about 12 bytes,
but how does it affect performance?
 2016-05-30 17:18:28 -07:00
Scott Lahteine
e60224a943 Drop FORCE_INLINE from endstops.h 
`FORCE_INLINE` seems to have no effect with standard optimization.
 2016-05-30 17:08:56 -07:00
Scott Lahteine
85512e9372 Drop FORCE_INLINE from temperature.h 
`FORCE_INLINE` seems to have no effect on code generation with standard
optimization.
 2016-05-30 17:06:50 -07:00
Scott Lahteine
78fb02a5ad Apply static to Temperature class 2016-05-30 16:50:51 -07:00
Scott Lahteine
c3df293fc6 Merge pull request #3923 from thinkyhead/rc_statics_endstops 
Apply static to Endstops class
 2016-05-30 16:48:23 -07:00
Scott Lahteine
02735fd500 Merge pull request #3921 from thinkyhead/rc_calc_timer_tweak 
Tiny calc_timer speedup
 2016-05-30 16:47:03 -07:00
Scott Lahteine
668d50f68e Keep Stepper encapsulation, use static data and methods 2016-05-30 16:24:04 -07:00