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

4070 commits

This branch
This branch
All branches
Author SHA1 Message Date
Scott Lahteine 91cdea4022 Merge pull request #3153 from thinkyhead/rc_fix_macro_expansion 
Additional macro wrapping, patches for #3140
 2016-03-15 01:37:28 -07:00
Scott Lahteine 6e1bc03d3b Additional wrapping for #3140 2016-03-15 01:18:58 -07:00
Scott Lahteine cc9968f893 Patch spacing in #3140 2016-03-15 01:18:58 -07:00
Scott Lahteine 1c384930f3 Merge pull request #3140 from thinkyhead/rc_fix_macro_expansion 
Wrap macros to prevent bad expansions
 2016-03-15 00:25:34 -07:00
Scott Lahteine ff30a18d9c Merge pull request #3150 from esenapaj/patch-2 
Use local variable in recalc_delta_settings()
 2016-03-14 18:55:57 -07:00
esenapaj a4314c4907 Use local variable in recalc_delta_settings() 
diagonal_rod hadn't been used anywhere.
 2016-03-15 06:47:27 +09:00
Scott Lahteine 21be07a6f6 Merge pull request #3126 from Blue-Marlin/stackoverflow-with-e 
Extend stack_overflow_protection for lcd_move_e and _lcd_level_bed
 2016-03-14 00:04:13 -07:00
Blue-Marlin c73f1b2471 Extend stack_overflow_protection for lcd_move_e and _lcd_level_bed 
Extend stack_overflow_protection for lcd_move_e() and _lcd_level_bed() with
a refined method of 3050.
 2016-03-13 13:59:44 +01:00
Scott Lahteine f4a3efd35e Merge pull request #3116 from thinkyhead/rc_fix_value_edit_bug 
Fix value edit click bug
 2016-03-13 04:08:43 -07:00
Scott Lahteine 3f5fbbd398 Merge pull request #3124 from jbrazio/bugfix/update-g29-auto-level-bed-topography 
Update the bed topography output done by G29
 2016-03-13 03:51:43 -07:00
Scott Lahteine c16c47954c Merge pull request #3141 from esenapaj2/RCBugFix 
follow-up the PR #3131
 2016-03-13 03:37:39 -07:00
Scott Lahteine 30c3a21d1f Merge pull request #3112 from thinkyhead/rc_support_MAX31855 2016-03-13 03:30:48 -07:00
Scott Lahteine 81d759efb6 Merge pull request #3138 from jbrazio/bugfix/m109-r-could-wait-forever 2016-03-13 03:26:34 -07:00
Scott Lahteine 2179f598bf Merge pull request #3122 from thinkyhead/rc_group_filament_change 2016-03-13 03:25:38 -07:00
Scott Lahteine 62a9b9902d Merge pull request #3133 from thinkyhead/rc_machine_uuid_in_m115 2016-03-13 03:23:54 -07:00
Scott Lahteine f928894c38 Merge pull request #3132 from thinkyhead/rc_heating_failed_err 2016-03-13 03:23:14 -07:00
esenapaj2 236a44c83b follow-up the PR #3131 
follow-up the commit 7326d63ce0
update Configration_adv.h of Hephestos2
delete unnecessary spaces
 2016-03-13 19:12:39 +09:00
Scott Lahteine 7326d63ce0 Merge pull request #3131 from thinkyhead/pwm_motor_current_config 
PWM_MOTOR_CURRENT Flag
 2016-03-13 00:03:03 -08:00
Scott Lahteine f9ded2a7c4 Wrap macros to prevent bad expansions 2016-03-12 22:38:55 -08:00
jbrazio 1981e53d68 M109 R option if misused could cause a wait-forever situation 2016-03-12 06:24:24 +00:00
Scott Lahteine 7976e29399 Use MACHINE_UUID in M115 
Addressing #2879. The M115 report should display `MACHINE_UUID` but it
always displays `UUID`.
 2016-03-11 05:34:48 -08:00
Scott Lahteine 81aab828e2 Fix a "Heating failed" error 
Addressing #3085. If the target_temperature is set directly it never invokes or disables the timer set in `start_watching_heater`, so after _stopping a print_ or turning off _all heaters_ you could get a “Heating failed” error.
 2016-03-11 05:07:48 -08:00
Scott Lahteine 0c48eaf3de Expose motor current in more configs, disable by default 2016-03-11 02:25:36 -08:00
Elijah Snyder e8b10d2836 Adding PWM_MOTOR_CURRENT flag to help expose PWM_MOTOR_CURRENTS in Configuration_adv.h similar to DIGIPOT_MOTOR_CURRENT 2016-03-11 02:25:36 -08:00
Scott Lahteine 7bb7ac8353 Merge pull request #3123 from thinkyhead/rc_move_stepper_macros 
Move step macros to stepper_indirection.h
 2016-03-10 18:31:01 -08:00
Scott Lahteine cd2ef25032 Merge pull request #3119 from AnHardt/extend-Travis-for-SDSUPPORT 2016-03-10 05:38:35 -08:00
João Brázio 4d4a842cfb Update the bed topography output done by G29 2016-03-10 13:24:17 +00:00
Scott Lahteine 89838cdb10 Move step macros to stepper_indirection.h 2016-03-10 04:34:55 -08:00
Scott Lahteine 70a41a8532 Merge pull request #3121 from thinkyhead/rc_stepper_cleanup 
Reduce code in stepper.cpp with some macros
 2016-03-10 03:55:37 -08:00
Scott Lahteine 27f244ba2c Support MAX31855 as Temperature Sensor -3 2016-03-10 02:49:54 -08:00
Scott Lahteine ce639b8b03 Group FILAMENT_SENSOR options together 2016-03-10 02:41:37 -08:00
Scott Lahteine 3fd31976c3 Reduce code in stepper.cpp with macros 2016-03-10 01:42:58 -08:00
Scott Lahteine b45a0c4c60 Fix bugs in edit submenus so they return to origin 
Expected behavior: After editing a value the menu should return to the
previous place with the edited item selected.
Actual behavior: Either the top (back) item from the previous screen is
selected, or the menu jumps up another level.
Solution: Pass the correct arguments to `lcd_goto_menu` on click when
editing a value.
 2016-03-09 21:06:56 -08:00
AnHardt 25d1c94fa8 Add SDSUPPORT test to TRAVIS 2016-03-10 03:06:00 +01:00
Scott Lahteine bedd4dab6a Merge pull request #3107 from AnHardt/z_raise_before_homing 
Z_RAISE_BEFORE_HOMING -> MIN_Z_HEIGHT_FOR_HOMING
 2016-03-08 19:21:43 -08:00
AnHardt fd5414c6ea Z_RAISE_BEFORE_HOMING -> MIN_Z_HEIGHT_FOR_HOMING 
rebased
corrected spelling
changed to #elif for error

Still with MIN_Z_HEIGHT_FOR_HOMING but con be done with (folder wide) search-replace when we have a better name.
 2016-03-08 17:50:23 +01:00
Scott Lahteine b7928a000a Merge pull request #3108 from AnHardt/M110+ 
M110 and M29 rework
 2016-03-08 03:54:07 -08:00
Scott Lahteine 5cba0b4187 Merge pull request #3111 from thinkyhead/rc_drop_old_condition 
Drop obsolete test for leading "N"
 2016-03-08 03:07:25 -08:00
Scott Lahteine 302d1bfbc4 Drop obsolete test for leading "N" 2016-03-08 02:25:11 -08:00
Scott Lahteine 04b147645d Merge pull request #3105 from esenapaj2/esenapaj2-patch-1 
update example configurations
 2016-03-08 00:43:48 -08:00
AnHardt 37b857e8ec M110 ang M29 rework 
Add 'ok' output for G29 actually closing the file.
Handle M110 when received without linenumber/checksumm.
 2016-03-07 22:27:01 +01:00
esenapaj2 29e09c7c3e update example configurations 
update old comments
update or delete deprecated definitions
complement forgotten updates
adjust spacing
some cosmetic changes
 2016-03-07 22:03:33 +09:00
Scott Lahteine fac85f6fa1 Merge pull request #3102 from jbrazio/bugfix-g28-multiple-z-movements 
Bugfix: G28 was lifting Z-axis multiple times
 2016-03-07 03:52:00 -08:00
jbrazio 642e3699ce Z-axis was being lift multiple times if Z_SAFE_HOMING was enabled and Z_RAISE_BEFORE_HOMING was greater than zero 2016-03-07 03:49:11 +00:00
Scott Lahteine 501f63802a Merge pull request #3077 from Blue-Marlin/watchdogreset-in-kill 
Add Watchdog timer reset in kill()
 2016-03-06 16:21:39 -08:00
Scott Lahteine c23db208d9 Merge pull request #3101 from thinkyhead/rc_fix_stepper_func 
Update name of st_get_axis_position_mm in stepper.h
 2016-03-06 15:52:57 -08:00
Scott Lahteine 1002eb67c8 Update name of st_get_axis_position_mm in stepper.h 2016-03-06 15:46:39 -08:00
Scott Lahteine eafbc5e0cc Add AJ4P pins and fix RAMBO pins 2016-03-06 05:52:01 -08:00
Scott Lahteine cf792fd8d8 Update configurations to use RAMPS 1.4 2016-03-06 05:52:01 -08:00
Scott Lahteine cacf04f8a7 Base RAMPS-like boards on RAMPS 1.4 2016-03-06 05:52:00 -08:00