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

3891 commits

Author SHA1 Message Date
Scott Lahteine 6c48852b20 Update distribution date 2016-04-28 18:06:53 +09:00
Scott Lahteine 2142d5a62e Merge pull request #3627 from Blue-Marlin/German-again-and-again-and-agin 
Correct an error in lang_de
 2016-04-27 20:14:15 -07:00
Scott Lahteine 0c11566f42 Replace LANGUAGE_INCLUDE with LCD_LANGUAGE 2016-04-27 20:06:40 -07:00
Scott Lahteine 259794c0be Make DISPLAY_CHARSET_HD44780 a single setting 2016-04-27 20:06:40 -07:00
Blue-Marlin e89f01d044 Correct an error in lang_de 
There is no way to translate "A-travel" to "A Rückzug". Thats simply
wrong.
 2016-04-27 12:59:48 +02:00
esenapaj ee2f37f3cc Update distribution date and readme 
It sync with the RC.
 2016-04-27 11:21:51 +09:00
Scott Lahteine ad0f70f2f3 Merge pull request #3620 from Blue-Marlin/feedrate_atfer_toolchange 2016-04-26 17:33:15 -07:00
Scott Lahteine d58c5ac446 Merge pull request #3618 from esenapaj/patch-1 2016-04-26 17:20:04 -07:00
Scott Lahteine 2bb5cf5291 Merge pull request #3622 from floyd871/patch-1 2016-04-26 17:14:36 -07:00
Blue-Marlin e58e281473 Fix feedrate after toolchange 
The fix is simple. Most changes are because of changed indendation,
bacause of leaving early for wrong tool number
 2016-04-27 00:57:45 +02:00
João Brázio 32d798fcc7
Converted all files on src to Unix file format 2016-04-26 21:23:39 +01:00
Michael Neumann 59cfc84dad German "Umlaute" 
We don't have to  avoid German "Umlaute" any more.
 2016-04-26 21:52:05 +02:00
Matt Keveney 4dfc496965 added recalc_delta_settings() call in Config_RetrieveSettings. Appears to be necessary any time delta-related parameters (M665) are modified 2016-04-26 20:01:53 +09:00
Scott Lahteine ec82e1e05d Merge pull request #3616 from thinkyhead/rc_fixup_some_movement 
General cleanup around high level move functions
 2016-04-25 20:23:38 -07:00
Scott Lahteine abeab792cb General cleanup around high level move functions 
- Use new `DEBUG_POS` macro for `DELTA` debug
- Neaten up `prepare_move` a smidgen
- Remove an old commented `prepare_move()` line
 2016-04-25 20:02:24 -07:00
Scott Lahteine 66540f8b84 Merge pull request #3615 from thinkyhead/rc_whats_up_with_M112 
Report current position to host after M206 / M428
 2016-04-25 18:58:41 -07:00
Scott Lahteine 68d0347e67 Call report_current_position after M206 / M428 2016-04-25 18:43:28 -07:00
Scott Lahteine dcb4cdaa9e Call report_current_position instead of gcode_M114 directly 2016-04-25 18:43:27 -07:00
Scott Lahteine e38baaa23e Fix an acceleration anomaly by making locals signed 2016-04-25 14:17:20 -07:00
João Brázio 739dcda0f1
Renamed stopwatch::status to stopwatch::state 2016-04-25 17:40:43 +01:00
Scott Lahteine fce1e843b9 Patch steps rate comment in trapezoid function 2016-04-24 19:38:58 -07:00
João Brázio 7de0161204
Updated example config files 2016-04-24 05:21:17 +01:00
João Brázio 3b6f75511f
Updated multiple pins files 2016-04-24 05:21:17 +01:00
João Brázio 170f7e8a45
Rework Marlin's versioning system 2016-04-24 05:21:17 +01:00
esenapaj 8d0b2f358a Cleanup for language files 
・Remove abolished strings (MSG_NOZZLE1, MSG_NOZZLE2)
・Remove duplicated strings 
・Arrange the strings in unified order
・Adjust spacing
・Remove some comments in Japanese files(follow-up the PR #3560)

The most part of these changes were salvaged from closed my PR#3550.
 2016-04-23 13:27:05 +09:00
Scott Lahteine 2bb56ef6de Merge pull request #3597 from thinkyhead/rc_fix_g29_debug 
Move G29 debug output before matrix.set_to_identity()
 2016-04-22 21:21:00 -07:00
João Brázio a901555da4 Moved G29 debug output before matrix.set_to_identity() 2016-04-22 20:57:22 -07:00
Scott Lahteine 88c6693b9e Fix a typo in #3586 to fix MBL 2016-04-22 20:04:08 -07:00
Scott Lahteine aaf9d19954 Allow Z_SAFE_HOMING to compile without a probe 2016-04-21 15:55:49 -07:00
Scott Lahteine 92ab2c7dd8 Merge pull request #3587 from thinkyhead/rc_z_safe_homing_deps 
Define dependencies for Z_SAFE_HOMING if left out
 2016-04-21 15:46:24 -07:00
Scott Lahteine 63142eef40 Define dependencies for Z_SAFE_HOMING if left out 2016-04-21 15:22:19 -07:00
Scott Lahteine 173334e535 Merge pull request #3418 from jbrazio/translate/danish 
Missing Danish translation
 2016-04-21 14:56:43 -07:00
João Brázio fe4fc88494
Closes #3351: missing Danish translation 2016-04-21 21:31:47 +01:00
Scott Lahteine 003aab6dfd Revert MBL menus to "known" working point 2016-04-21 12:59:55 -07:00
Scott Lahteine 6fac4d9211 Merge pull request #3579 from thinkyhead/rc_fix_dogm_and_mbl_menus 
Fix menu redraw for DOGLCD, improve MBL
 2016-04-20 20:52:56 -07:00
Scott Lahteine 7ddaa79ffe Merge pull request #3578 from thinkyhead/rc_fix_twibus_less_debug_code 
Reduce PROGMEM usage by TWIBus, stopwatch
 2016-04-20 20:52:16 -07:00
Scott Lahteine cfd10fcba1 Merge pull request #3577 from thinkyhead/rc_fix_G92_set_e_twice 
Fix G92 setting E twice
 2016-04-20 20:52:09 -07:00
Scott Lahteine dc2281d2f4 Add nextMenu, nextEncoderPosition to change menus after handler loop 2016-04-20 20:19:12 -07:00
Scott Lahteine 7fa2bda1b9 Give the "alive dot" its own blink 2016-04-20 18:57:17 -07:00
Scott Lahteine 9d5e1f32fd Use axis_homed in _lcd_level_bed_homing, item in Prepare before homing 2016-04-20 18:53:33 -07:00
Scott Lahteine 0c2aa92b07 Z Safe Homing for all 
The `Z_SAFE_HOMING` feature is coupled with probes and not leveling, so
make it available for general use.
 2016-04-20 17:04:52 -07:00
Scott Lahteine 9bcb72e7f8 Further patches to MBL - break up into more handlers 2016-04-20 16:37:35 -07:00
Scott Lahteine 3f6ae85748 Fix some MBL display issues for DOGLCD 2016-04-20 16:36:45 -07:00
Scott Lahteine 71b4f189bf lcd_implementation_drawedit can take 1 arg 2016-04-20 16:36:45 -07:00
Scott Lahteine 1caa2628da Use sync_plan_position_e function elsewhere 2016-04-20 13:02:19 -07:00
Scott Lahteine c7df961144 Fix G92 so it only sets the plan position once 2016-04-20 13:01:58 -07:00
Scott Lahteine 1addb50b62 Shrink debug code in TWIBus and disable by default 2016-04-20 12:44:30 -07:00
Scott Lahteine 21a6b66807 Shrink debug code in Stopwatch and disable by default 2016-04-20 12:44:30 -07:00
Scott Lahteine e523a0dc61 Fix bug in TWIBus ctor declaration 2016-04-20 12:37:46 -07:00
Scott Lahteine ee9bd66a68 Add comments to debug bit flags 2016-04-20 12:37:22 -07:00
Scott Lahteine 3db5a75f30 Merge pull request #3568 from thinkyhead/rc_various_fixes 
General code cleanup, improved naming, etc.
 2016-04-19 20:53:38 -07:00
Scott Lahteine 8a2587f017 Read size for MAX6675 from sizeof(max6675_temp) 2016-04-19 19:57:32 -07:00
Scott Lahteine ac69fad96d lowercase "stop" function 2016-04-19 19:43:54 -07:00
Scott Lahteine 39ee9c526b setTargetedHotend => get_target_extruder_from_command 2016-04-19 19:43:54 -07:00
Scott Lahteine cafa8b8ce3 Rename filament runout items 2016-04-19 19:43:39 -07:00
Scott Lahteine 27b2e2e786 Document some variables 2016-04-19 19:43:39 -07:00
Scott Lahteine a4062a47ac Rename baricuda variables 2016-04-19 19:43:38 -07:00
Scott Lahteine 78747b1328 min_pos/max_pos => sw_endstop_min/sw_endstop_max 2016-04-19 19:43:38 -07:00
Scott Lahteine ba84d8d091 Allow setting PIDTEMP and PIDTEMPBED together or apart 2016-04-19 18:09:29 -07:00
Scott Lahteine 5cb8ec68ae Merge pull request #3566 from thinkyhead/rc_babystep_show_steps 
Show steps done in the babystep display
 2016-04-18 21:52:55 -07:00
Scott Lahteine 3083ee49f3 Merge pull request #3567 from thinkyhead/rc_mf_bash_scripts 
Git helper shell scripts for MarlinFirmware
 2016-04-18 21:41:24 -07:00
Scott Lahteine 00d36d10e2 Merge pull request #3560 from thinkyhead/rc_better_graphical_lcd 
Aesthetic, functional improvements for Graphical Display
 2016-04-18 21:38:02 -07:00
Scott Lahteine dd94ce5bd5 Merge pull request #3565 from thinkyhead/rc_look_at_3563 
Output error message for M303 if PIDTEMP is disabled
 2016-04-18 21:22:50 -07:00
Scott Lahteine 9a12054e0e Git helper shell scripts for MarlinFirmware 2016-04-18 21:18:35 -07:00
Scott Lahteine 4f04bf7fe8 Show steps done in the babystep display 2016-04-18 20:52:38 -07:00
Scott Lahteine d988708ceb Merge pull request #3559 from esenapaj/patch-1 
Update and change Japanese translation
 2016-04-18 20:17:54 -07:00
Scott Lahteine 026ae8f2f0 Call lcd_setFont only when needed 2016-04-18 20:09:04 -07:00
Scott Lahteine 90c97c8185 Add _draw_axis_label function to reduce source 2016-04-18 20:09:04 -07:00
Scott Lahteine 34b17d4a8a Reduce heater status code if no bed 2016-04-18 20:09:04 -07:00
Scott Lahteine fc30aa9d88 Aesthetic and functional improvements for graphical LCD 2016-04-18 20:09:04 -07:00
Scott Lahteine b281001329 Use MSG_X, etc., on Hitachi LCD 2016-04-18 20:09:04 -07:00
Scott Lahteine f90a8661cb Uppercase XYZE on Graphical LCD 2016-04-18 20:09:03 -07:00
Scott Lahteine 3613c550fa Rename README file for fonts 2016-04-18 20:09:03 -07:00
esenapaj 1110814ecf Update and change Japanese translation 
Update and change Japanese translation

・Follow-up the PR #3411(Update Readme.fonts about Kana), Remove "who really..." strings. I had forgotten it.
・Add readable translated strings in comment
・Add Japanese translation.
  MSG_LCD_ENDSTOPS "エンドストップ"
  (utf8 version only. Because non-utf8 version ("ｴﾝﾄﾞｽﾄｯﾌﾟ") over 8 characters)
・Change translation.
  MSG_ACC "カソクド mm/s2"
  MSG_ACC "\xb6\xbf\xb8\xc4\xde mm/s2" ("ｶｿｸﾄﾞ mm/s2")
 2016-04-19 11:28:26 +09:00
Scott Lahteine a26d70e932 Apply indentation to gcode_M303, PID_autotune 2016-04-18 19:04:45 -07:00
Scott Lahteine ba66336503 Output error for disabled M303 2016-04-18 19:03:45 -07:00
Scott Lahteine eda821ca1c Merge pull request #3556 from philfifi/fix_pullup 
Fix bug in pullups handling for Z_MIN_PROBE
 2016-04-18 18:04:26 -07:00
Scott Lahteine 25b1556a94 Merge pull request #3552 from tnw513/fix_endstops_witbox 
Endstop settings modified (witbox). Issue #3547
 2016-04-18 18:03:22 -07:00
Scott Lahteine 2bc2485313 Update font remarks in Conditionals.h 2016-04-18 17:33:41 -07:00
Philippe LUC 86c868771b Fix bug in pullups handling for Z_MIN_PROBE 2016-04-18 21:16:23 +02:00
Silvio Didonna 91de69bb6e Endstop settings modified. Witbox have max endstops for X and Y. 2016-04-18 16:46:19 +02:00
Scott Lahteine f2558b1f2c Additional delta config updates 2016-04-17 20:04:52 -07:00
Marc Urben 9a661bdd59 Updated Kossel XL config files for the latest Marlin 2016-04-17 20:04:19 -07:00
Scott Lahteine 09c6323b68 Merge pull request #3543 from thinkyhead/rc_better_bootscreen 
Better splash screen consolidation
 2016-04-17 17:20:13 -07:00
Scott Lahteine 5905ec5ba8 Merge pull request #3541 from thinkyhead/rc_mbl_one_last_lift 
Add a final lift, if configured, in Manual Bed Leveling
 2016-04-17 17:20:02 -07:00
Scott Lahteine af1711365b Merge pull request #3538 from jbrazio/bugfix/endtop-hit-redeclared 
_ENDSTOP_HIT redeclared
 2016-04-17 17:12:56 -07:00
Scott Lahteine ed622ac796 Better splash screen consolidator 2016-04-17 17:06:07 -07:00
Jeff K 90c49f5a14 Fixed invalid addressing (overflow) of position_shift / software endstops 
Signed-off-by: Jeff K
 2016-04-17 19:28:50 -04:00
João Brázio bcf1e027bb
Fix the redeclaration of _ENDSTOP_HIT 2016-04-17 18:37:37 +01:00
Scott Lahteine c242bee449 Add a final lift, if configured, in Manual Bed Leveling 2016-04-17 00:12:46 -07:00
Scott Lahteine b6227932f5 Merge pull request #3530 from thinkyhead/rc_set_rcbugfix_for_now 
Set version for RCBugFix
 2016-04-16 21:40:55 -07:00
Scott Lahteine 19741a0ba6 Merge pull request #3503 from thinkyhead/rc_lcd_endstop_msg 
Show all endstops on LCD in checkHitEndstops
 2016-04-16 21:32:25 -07:00
Scott Lahteine 7aaff371b0 Set version for RCBugFix 2016-04-16 21:30:52 -07:00
Scott Lahteine db86aaf385 Merge pull request #3528 from thinkyhead/rc_fix_bed_level_equation_oopsie 
Fix borked set_bed_level_equation_lsq
 2016-04-16 21:01:06 -07:00
Scott Lahteine 837df6108c Fix borked set_bed_level_equation_lsq 2016-04-16 20:35:42 -07:00
Scott Lahteine 7c16e774ca Show all endstops on LCD in checkHitEndstops 2016-04-16 20:08:42 -07:00
Scott Lahteine 40050db210 Improve code in Sd2Card::readBlock 2016-04-16 20:03:39 -07:00
Scott Lahteine 8429ae6beb Merge pull request #3525 from thinkyhead/rc_fix_pid_params_per_extruder 
Fix broken PID_PARAMS_PER_EXTRUDER
 2016-04-16 19:49:42 -07:00
Scott Lahteine 339b5b3e34 Patch more configs with new changes 2016-04-16 19:35:02 -07:00
Scott Lahteine ef2fd620e9 Suggested fixups for LCD/SD config comments 2016-04-16 19:35:02 -07:00
João Brázio 7b5d6ba315 Rebase & feedback 2016-04-16 19:35:02 -07:00
João Brázio d7cc2c0847 Moved some conditionals to Conditionals.h 2016-04-16 19:32:41 -07:00
João Brázio 36a49eab1c Improved the LCD and SD comments blocks in Configuration.h 2016-04-16 19:32:41 -07:00
Scott Lahteine d4a848c72a Fix broken PID_PARAMS_PER_EXTRUDER 
As noted by @FalloutBe in #3519
 2016-04-16 19:19:40 -07:00
Scott Lahteine 0fc84b75f4 Merge pull request #3522 from esenapaj/patch-1 
Follow-up and fix for the PR #3453(ELAPSED / PENDING for rollover-safe time checking)
 2016-04-16 19:03:27 -07:00
Scott Lahteine 4b75b11a53 Wrap defines in parentheses in configs, M48 2016-04-16 18:21:09 -07:00
esenapaj 832e1c1f2a Follow-up and fix for the PR #3453(ELAPSED / PENDING for rollover-safe time checking) 
・Add more "UL" suffix
・Restore removed "UL" suffix
 2016-04-17 07:50:02 +09:00
Scott Lahteine 234987ee2f Fix MBL lift 2016-04-16 14:17:06 -07:00
Scott Lahteine e0830bf8f1 Don't use LCD alert unless error or alert level is reset later 2016-04-15 18:48:49 -07:00
Scott Lahteine 773229b020 Merge pull request #3515 from thinkyhead/rc_wider_splash 
On wider screens show a wider splash page, if possible
 2016-04-15 17:26:01 -07:00
Scott Lahteine 86467c24be On wider screens show a wider splash page, if possible 2016-04-15 16:42:29 -07:00
Scott Lahteine a8e4d7c135 Merge pull request #3477 from alephobjects/BedTempHysteresis 
Implementation of M190 bed temp hysteresis
 2016-04-15 16:20:58 -07:00
esenapaj 5ecd75eeb3 Fix for PR #3502(General cleanup of arc code) 2016-04-16 07:22:07 +09:00
gralco 8ec8d59df8 Use #if TEMP_RESIDENCY_TIME > 0 rather than #ifdef TEMP_RESIDENCY_TIME 2016-04-15 11:20:32 -06:00
Scott Lahteine 1cc622b167 Fix minor spelling in comments 2016-04-14 20:06:59 -07:00
Scott Lahteine 866c5be395 Merge pull request #3500 from thinkyhead/rc_shrink_menu_macros 
Reduce redundancy in MENU_ITEM code
 2016-04-14 19:09:14 -07:00
Scott Lahteine 6e52b0b723 Merge pull request #3504 from thinkyhead/rc_fix_debugging 
Fix debugging of vector_3
 2016-04-14 19:08:30 -07:00
Scott Lahteine 88367a37f7 Merge pull request #3227 from thinkyhead/rc_home_offsets_and_limits 
Relating current_position, min_pos, max_pos, and home_offset
 2016-04-14 18:50:43 -07:00
Scott Lahteine b20bf1826d Fix debugging of vector_3 2016-04-14 18:45:26 -07:00
Scott Lahteine 4fb8013be1 Reduce redundancy in MENU_ITEM code 2016-04-14 18:42:06 -07:00
Scott Lahteine b243844690 Merge pull request #3502 from thinkyhead/rc_fix_arcs_bugs 
General cleanup of arc code
 2016-04-14 18:19:44 -07:00
Scott Lahteine f2abfd6d48 Merge pull request #3501 from thinkyhead/rc_config_comment_cleanup 
Update some comments in Configuration.h
 2016-04-14 18:19:29 -07:00
Scott Lahteine 2129db581e Simplify MBL movement, zigzag 2016-04-14 16:58:42 -07:00
Scott Lahteine 0493fccc0b mbl.active is a bool now 2016-04-14 16:58:42 -07:00
Scott Lahteine b05f448317 Comments on MBL menu items 2016-04-14 16:58:42 -07:00
Scott Lahteine e08dd0d831 Merge pull request #3498 from thinkyhead/rc_preheat_abs_both_3489 
Fix bug in lcd_preheat_pla0123 and lcd_preheat_abs0123
 2016-04-14 16:57:38 -07:00
Scott Lahteine 9e95f30de0 Merge pull request #3495 from jbrazio/bugfix/followup-3485 
Throw an error if ENCODER_PULSES_PER_STEP < -1
 2016-04-14 16:56:36 -07:00
Scott Lahteine 8e5099fa0c Update software endstop positions with M206, M428, G92, etc. 2016-04-14 16:47:22 -07:00
Scott Lahteine 5cfb2533d6 Initial cleaning up of arc code 2016-04-14 16:43:49 -07:00
Scott Lahteine de8c0baf8b Update some comments in Configuration.h 2016-04-14 16:41:20 -07:00
Scott Lahteine fda8f96f00 Fix bug in lcd_preheat_pla0123 and lcd_preheat_abs0123 
Trying to preheat a non-existent extruder causes a crash.
 2016-04-14 15:48:43 -07:00
João Brázio 9a3f676709
Throw an error if ENCODER_PULSES_PER_STEP < -1 2016-04-14 16:20:17 +01:00
gralco 69c00aea4c Include bed hysteresis setting in the example configs 2016-04-14 08:03:38 -06:00
Scott Lahteine 9ce4264fda Merge pull request #3490 from thinkyhead/rc_mbl_adjustments 
Document some movement functions, rename a local
 2016-04-13 20:55:20 -07:00
Scott Lahteine f8e10ff1d8 Merge pull request #3491 from thinkyhead/rc_mechanical_probe 
Support for "mechanical probe" with Allen Key as a special case
 2016-04-13 20:55:14 -07:00
Scott Lahteine 7eb476597f Update some comments in Configuration.h 2016-04-13 20:34:42 -07:00
esenapaj 2eb1b102f8 Support for "mechanical probe" with Allen Key as a special case 2016-04-13 20:34:12 -07:00
Scott Lahteine cfcd3d7b3e Rename z_offset local to zoffset 2016-04-13 20:09:20 -07:00
Scott Lahteine 5fd20ecac3 Comments on some movement functions 2016-04-13 20:09:20 -07:00
Scott Lahteine c1b953d38f Merge pull request #3487 from thinkyhead/rc_redo_esenpaj_3479 
Apply esenapaj 3479 and delta/scara position bugfix
 2016-04-13 18:11:33 -07:00
Scott Lahteine a781a6f955 Apply esenapaj 3479 and delta/scara position bugfix 2016-04-13 17:41:20 -07:00
Scott Lahteine 2ae7394640 More fine-grained control of LCD redraw 2016-04-12 21:34:34 -07:00
Scott Lahteine 525d8256d4 Merge pull request #3481 from thinkyhead/rc_extruder_offset_array 
Fix: gcode_T using non-existent Z offset
 2016-04-12 18:23:08 -07:00
Scott Lahteine b9301e6c62 Merge pull request #3482 from thinkyhead/rc_fix_HAS_Z_MIN_PROBE 
Patch conditions for HAS_Z_MIN_PROBE
 2016-04-12 18:23:02 -07:00
Scott Lahteine dc0a3e37be Patch conditions for HAS_Z_MIN_PROBE 2016-04-12 18:11:36 -07:00
Scott Lahteine 46881c846c Add comments for extruder offset options 2016-04-12 17:16:58 -07:00
Scott Lahteine edf376ce0d Fix: gcode_T using non-existent Z offset 
As noted by @snowzach in #3461
 2016-04-12 17:15:10 -07:00
gralco 178aeb79c8 Implementation of M190 bed temp hysteresis 2016-04-12 08:56:14 -06:00
Scott Lahteine 0439483bc8 Merge pull request #3476 from thinkyhead/rc_debug_leveling_gcode_t 
Add DEBUG_LEVELING output for gcode_T
 2016-04-11 21:03:15 -07:00
Scott Lahteine c03e5f5efd Merge pull request #3475 from thinkyhead/rc_language_cleanup 
General cleanup of language files
 2016-04-11 20:50:57 -07:00