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

3330 commits

Author SHA1 Message Date
Scott Lahteine d56c6af24e Merge pull request #3114 from thinkyhead/rc_reverse_lcd_menu 
Option to reverse the click-wheel direction in menus
 2016-03-18 15:39:29 -07:00
Scott Lahteine cc291aeb3c Move definition of "blink" to main ultralcd file 2016-03-17 18:19:05 -07:00
Scott Lahteine e7e1866589 Merge pull request #3161 from Alex9779/fix_InitialExtruderDirection 
Fix initial extruder direction for second/third/fourth extruder if they run inverted to the first
 2016-03-16 12:58:10 -07:00
Scott Lahteine 57e82cacc9 Merge pull request #3156 from esenapaj/patch-3 
Fix CardReader::lsDive()
 2016-03-16 12:48:22 -07:00
Alexander Leisentritt 4338813814 save last extruder and set stepper directions too in case the extruder changed 
fixes MarlinFirmware/Marlin#3144 and MarlinFirmware/Marlin#3083
 2016-03-16 20:20:34 +01:00
Scott Lahteine 8f24475e02 Simplify limiting encoderLine in END_MENU 2016-03-16 04:05:41 -07:00
Scott Lahteine fbef2f5b61 Implement reverse menu direction in ultralcd.cpp 2016-03-16 04:03:49 -07:00
Scott Lahteine b8b51d8da8 Add the REVERSE_MENU_DIRECTION option 2016-03-16 04:02:40 -07:00
Scott Lahteine 999a76dbdf Merge pull request #3157 from esenapaj/patch-4 
Use variable in lcd_erase_line()
 2016-03-16 02:46:42 -07:00
Scott Lahteine e8fa843c2d Merge pull request #3164 from epatel/epatel/RCBugFix 
Fix for #3160 MESH_BED_LEVELING broke correct G1 movement in Z
 2016-03-16 02:40:54 -07:00
Scott Lahteine fc04b587cf Merge pull request #3147 from thinkyhead/rc_stringify_macro 
Promote STRINGIFY to macros.h
 2016-03-15 17:37:03 -07:00
Scott Lahteine d7c6fd5c2f Merge pull request #3146 from thinkyhead/rc_enabled_true_false 
Support "true" and "false" in the ENABLED macro
 2016-03-15 17:35:55 -07:00
Edward Patel cb0dbfa3b5 Fix for #3160 MESH_BED_LEVELING broke correct G1 movement in Z 2016-03-16 01:26:00 +01:00
esenapaj a15c5d222a Use variable in lcd_erase_line() 
lcd_erase_line() is called with argument, but the argument is ignored by lcd_erase_line().
 2016-03-16 02:59:06 +09:00
esenapaj 609c0d46d9 Fix CardReader::lsDive() 
If comparison between signed char(-128 ~ +127) and DIR_NAME_DELETED(uint8_t const 0XE5, it's +229),
it makes incorrect result.
 2016-03-16 02:47:58 +09:00
Scott Lahteine 2ef49a9d53 Wrap DEFAULT_Ki, DEFAULT_Kd, PID_dT 
Addition to #3140
 2016-03-15 03:49:44 -07:00
Scott Lahteine eb8cf29464 Merge pull request #3151 from hydrocat/RCBugFix 
Uptades the pt-br translation
 2016-03-15 02:46:46 -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
VITORIO MIGUEL PRIETO CILIA de2cca73ac Uptades the pt-br translation 2016-03-14 21:16:57 -03: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
esenapaj 8de7a6f9b1 suppress warnings 2016-03-15 06:34:02 +09:00
Scott Lahteine 9418b4f2f3 Promote STRINGIFY to macros.h 2016-03-13 23:15:17 -07:00
Scott Lahteine 4b648793f2 Use ENABLED with DISABLE_[INACTIVE_][XYZ] 2016-03-13 22:15:45 -07:00
Scott Lahteine 73a59a4e45 Allow ENABLED(b) to work with "true" and "false" 2016-03-13 22:15:01 -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 f9ded2a7c4 Wrap macros to prevent bad expansions 2016-03-12 22:38:55 -08:00
jbrazio a645860431 All print timer related activity now uses print_job_start(), print_job_timer() or print_job_stop() 2016-03-12 07:16:39 +00: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
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
João Brázio 793cd0ae3b Clean up the code a bit 2016-03-10 11:52:43 +00: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
jbrazio 986b508ff7 Print timer now stops when it sees the last extruder temperature being shutdown 2016-03-08 18:11:02 +00: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
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 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
Scott Lahteine 50e3482e0a Handle RAMPS 1.3 as the special case 2016-03-06 05:52:00 -08:00
Scott Lahteine 679be3294f Rename RAMPS 1.3 pins for RAMPS 1.4 2016-03-06 05:52:00 -08:00
Scott Lahteine f18d3f451a Limit LCD move_to_x/y coordinates for deltas 
Related to MarlinFirmware/MarlinDev#270
 2016-03-06 05:52:00 -08:00
Scott Lahteine 988332c67a Cosmetic tweaks from dev 2016-03-06 05:52:00 -08:00
Scott Lahteine 2690d8568e DOGLCD width/height in Conditionals.h 2016-03-06 05:51:59 -08:00
Scott Lahteine 614febaaf3 Fix acceleration limits 
See: https://github.com/Ultimaker/Marlin/pull/7
 2016-03-06 05:51:59 -08:00
Scott Lahteine 13ef12ad3f Fix power calculations 
As suggested by @max-pau in #3073 - #3074
 2016-03-06 05:51:59 -08:00
Scott Lahteine e2b022cce2 Include #3053 2016-03-06 05:51:59 -08:00
Scott Lahteine 5cba0210f2 Small patch to Z_SAFE_HOMING comment 2016-03-06 05:51:58 -08:00
Scott Lahteine 6165fd41a5 Fix Hephestos 2 and other configs 2016-03-06 05:51:58 -08:00
Scott Lahteine 71718d888a Fix typos in check_axes_activity 2016-03-06 05:51:58 -08:00
Lukas Abfalterer 83795d3e63 deleted double used comments 2016-03-06 05:51:58 -08:00
jbrazio 143ad74db7 Update PROBE_OFFSET_FROM_EXTRUDER comment section in all example config 
files.
 2016-03-06 05:51:58 -08:00
jbrazio b0f5ba0232 Update the PROBE_OFFSET_FROM_EXTRUDE comment section 
This changes have being discussed at MarlinFirmware/Marlin#2849.
 2016-03-06 05:51:57 -08:00
jbrazio 02b131b552 Replaced stock BQ PID values with fine tuned ones generated using M303 2016-03-06 05:51:57 -08:00
jbrazio 45dc8a51f3 Added readme file for bqh2 and disabled the SLOWDOWN config flag 2016-03-06 05:51:57 -08:00
Scott Lahteine 6a21180bd4 Implemented BQ ZUM Mega 3D board layout as an override to RAMPS 1.3 2016-03-06 05:51:57 -08:00
jbrazio b18816fcbf Fine tuned XYJERK. 
Disallowed the Z_PROBE_OFFSET_RANGE_MAX to be greater than zero.
 2016-03-06 05:51:57 -08:00
jbrazio be83036212 Applying suggestions by @thinkyhead at MarlinFirmware/Marlin#3049. 
- Remove the forced activation of SDSUPPORT, I guess people may use the ZUM
3D board and not the LCD module.
 - Fixed the tab issue within boards.h file.
 2016-03-06 05:51:56 -08:00
jbrazio b82d91eca6 Added configuration example for the BQ Hephestos 2 3D printer. 
Added support for BQ ZUM Mega 3D board and stock Hephestos 2 thermistor.
 2016-03-06 05:51:56 -08:00
Scott Lahteine 45bcc43e48 Don't override SOURCE_CODE_URL in Default_Version.h 
- Defining `SOURCE_CODE_URL` in `Default_Version.h` overrides it
elsewhere. So don’t define it there.
- Also fix up `language.h` so no `#undef` will be needed.
 2016-03-06 05:51:56 -08:00
Scott Lahteine ef68c1910c Check that the temperature is close to target 2016-03-06 05:51:56 -08:00
Scott Lahteine ea9fd1200b Fix M109 so it won't wait for cooling 
Addressing issue #2767
 2016-03-06 05:51:56 -08:00
Scott Lahteine e4945b30d2 sbi and cbi are deprecated 2016-03-06 05:51:55 -08:00
Scott Lahteine ff13070b59 Use _BV macros, patch up others 2016-03-06 05:51:55 -08:00
Scott Lahteine 209f5f21e0 Use macros where possible 
Apply `constrain`, `NOMORE`, `NOLESS` and `CRITICAL_SECTION` macros
wherever possible.
 2016-03-06 05:51:55 -08:00
Scott Lahteine c8f76bb8aa Create BITSET/BITCLR macros 2016-03-06 05:51:55 -08:00
Scott Lahteine adc25db8c4 Merge pull request #3005 from thinkyhead/rcbugfix_eeprom 
Fix layout descr. in configuration_store.cpp
 2016-03-06 00:31:44 -08:00
Scott Lahteine e7cf85b922 Merge pull request #3013 from thinkyhead/esenapaj-patch-1 
Enhanced #3010 - formal Mesh/Manual dependency
 2016-03-06 00:30:02 -08:00
Scott Lahteine 6e64895c30 Merge pull request #3001 from AlwaysTinkering/RCBugFix 
Rc bug fix - Fix for issue #2931
 2016-03-06 00:20:29 -08:00
Scott Lahteine 34b8b9f0f5 Merge pull request #2995 from thinkyhead/rcbugfix_corexy_corexz 
Add CORE support to st_get_position_mm (and elsewhere)
 2016-03-06 00:17:03 -08:00
Scott Lahteine 1e20949afb Merge pull request #3092 from thinkyhead/rc_2860_printrbot_lcd 
Fix Printrboard with LCD (redo)
 2016-03-06 00:14:29 -08:00
Scott Lahteine f5972c4d2c Merge pull request #2994 from AnHardt/Inerrup-save-serial 
Interrupt safe serial --- Guard against non-atomic variable changes from interrupt routines
 2016-03-05 22:25:12 -08:00
Scott Lahteine 3a3d358df9 Fix Printrboard with LCD (redo) 
Based on #2860 - rebased for RCBugFix
 2016-03-05 22:13:00 -08:00
Scott Lahteine eb85342fd9 Merge pull request #2989 from AnHardt/fix2661 
Pre home display - Stepper release
 2016-03-05 21:30:17 -08:00
Scott Lahteine 14f3ca1b2e Merge pull request #2978 from thinkyhead/tool_offset_abl_rcbugfix 
Apply bed leveling matrix when switching extruders
 2016-03-05 21:23:25 -08:00