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

3879 commits

Author SHA1 Message Date
Jochen Groppe 0bae00c1ed Merge pull request #3644 from tkurbad/german_translation 
Revisited German translation
 2016-05-02 16:46:19 +02:00
Blue-Marlin 5ad7d263e9 8.3-filenames second try 
Fix for #6 3593, #3648
this time excludung 'DEL' instead of accidently '~'.
 2016-05-02 15:58:04 +02:00
Torsten Kurbad aae2f502e0 Revisited German translation 2016-05-02 15:18:12 +02:00
esenapaj a82cfcff2d Follow-up the PR #3631(Encapsulate Stepper, ... 
Follow-up the PR #3631(Encapsulate Stepper, Planner, Endstops in singleton classes)

plan_bed_level_matrix -> planner.bed_level_matrix in multi extruders section of Marlin_main.cpp
It probably fix the Issue #3658(plan_bed_level_matrix not declarate).

movesplanned() -> planner.movesplanned() in ADVANCED_OK section of Marlin_main.cpp
It fix compilation error when ADVANCED_OK is enabled
 2016-05-02 22:04:26 +09:00
esenapaj 2fa4bc344c Some clean-up for example configuration files 
Some clean-up for example configuration files

Follow-up and fix the PR #3253(Make the Autotune item(s) in the LCD menu optional):
・Update forgotten file(Felix/Configuration_DUAL.h)

Follow-up the PR #3526(Configuration.h LCD & SDCard section rewrite):
・Add section of RigidBot Panel to RepRapWorld/Megatronics/Configuration.h

Follow-up the PR #3576(Z Safe Homing for all):
・Adjust spacing

Follow-up and fix the PR #3625(Print job statistics):
・Update forgotten file(Felix/Configuration_DUAL.h)
・Remove ambiguous character "f" in top of RigidBot/Configuration.h
 2016-05-02 21:16:00 +09:00
Scott Lahteine da47b83b3d Revert PR 3648 to fix SD printing 
The character 0x7E is common in 8.3 filenames. Maybe the last condition
should be removed completely instead.
 2016-05-01 18:04:04 -07:00
Scott Lahteine 60c6efb75c Merge pull request #3653 from thinkyhead/rc_bed_temp_watch_merge 
Introduce temp watch protection for the bed
 2016-05-01 13:58:28 -07:00
Scott Lahteine 5b7a6c217a Include more fans in sensitive pins list 2016-05-01 13:49:32 -07:00
Scott Lahteine f508c54c6c Use #undef in AZTEEG_X3_PRO for RAMPS overrides 2016-05-01 13:49:32 -07:00
Scott Lahteine c6f1337f5c NOOP macro for do-nothing macros 2016-05-01 13:49:32 -07:00
Scott Lahteine c2145566c7 Merge pull request #3631 from thinkyhead/rc_singletons 
Encapsulate Stepper, Planner, Endstops in singleton classes
 2016-05-01 13:47:47 -07:00
Scott Lahteine fbf69081b4 Updated comment for THERMAL_PROTECTION_BED 2016-05-01 13:12:51 -07:00
gralco 908229dbb3 Introduce temp watch protection for the bed 
When setting the bed temp via M140/M190 if the thermistor does not read an increase of WATCH_BED_TEMP_INCREASE degrees by WATCH_BED_TEMP_PERIOD seconds then it will throw "Error:Heating failed, system stopped! Heater_ID: bed" and call the kill() function.

Conflicts:
	Marlin/Configuration_adv.h
 2016-05-01 13:12:51 -07:00
Scott Lahteine 77d6e5283b Merge pull request #3648 from Blue-Marlin/83filenames 
Don't reject 8.3-filenames with chars > 0x7f
 2016-04-30 17:48:03 -07:00
Scott Lahteine 24a15332b3 Encapsulate dual Z endstop handling 2016-04-30 17:26:50 -07:00
Scott Lahteine 462a8a951e A little extra gcode_T spacing 2016-04-30 17:26:50 -07:00
Scott Lahteine 96f51f400f Planner singleton class 2016-04-30 17:26:50 -07:00
Scott Lahteine 5076d12344 Localize M119 in Endstops class 2016-04-30 17:26:50 -07:00
Scott Lahteine 5e4e535ce8 Stepper and Endstops as singleton objects 2016-04-30 17:26:50 -07:00
Scott Lahteine 6d3e4e1f8f Prevent stuck M109/M190 when target is changed 2016-04-30 17:03:54 -07:00
Blue-Marlin ac4caab8f1 Don't mangel 8.3-filenames with chars > 0x7f 
Don't mangel 8.3-filenames with chars > 0x7f

Windows produces 8.3filenames wit chars > 0x7f. Those have been rejected
by Marlin until now.

With these 'malformed' filenames can now be worked with:
In the LCD menue
With RepetierHost (V1.6.1 tested) - full support. Characters are
displayed as '?'
With Octoprint (1.2.10 tested) the files do not appear in the files
area. At the console, listed with M20 they appear with a '�'.
With Pronterface the files appear in the sd-window but you can't start
them. They are mangled by pronterface. The names are altered and than
recected by Marlin. In the console they apper with differen but not the
correct characters.

All in all a little step forward.

Fix for #3593
 2016-04-30 17:37:22 +02:00
Scott Lahteine eeef571be2 Merge pull request #3613 from thinkyhead/rc_acceleration_fix1 
Fix an acceleration anomaly by making locals signed
 2016-04-29 16:39:31 -07:00
Scott Lahteine c3ef9993b9 Merge pull request #3625 from jbrazio/feature/print-counter 
Print job statistics
 2016-04-29 15:31:14 -07:00
Scott Lahteine 96b2b3f4fe Merge pull request #3642 from thinkyhead/rc_quieter_wait_for_temps 
Keepalive not needed while waiting for temperatures
 2016-04-29 15:20:12 -07:00
João Brázio e34f4653ef
Fixed a typo on the configuration files 2016-04-29 23:13:59 +01:00
João Brázio 1491d682fb
Miscellaneous tweaks on PrintCounter 2016-04-29 23:13:59 +01:00
João Brázio 27088e356f
Updated example configuration files 2016-04-29 23:13:59 +01:00
João Brázio 8fb23e899f
PrintCounter EEPROM read/write optimizations 2016-04-29 23:13:59 +01:00
João Brázio 9589e51810
Disable DEBUG_PRINTCOUNTER 2016-04-29 23:13:59 +01:00
João Brázio e2da7e5000
Updated the default configuration and fixed a printcounter.h typo 2016-04-29 23:13:58 +01:00
João Brázio d6cfcc9c8b
Added new G-Code: M78 2016-04-29 23:13:58 +01:00
João Brázio 4f541c5bb5
Added a new object: PrintCounter 2016-04-29 23:13:58 +01:00
João Brázio 26b166d7cf
Made all stopwatch::debug() calls static 2016-04-29 23:13:58 +01:00
Scott Lahteine 5897b58a70 Merge pull request #3634 from esenapaj/patch-2 
Update distribution date and readme again
 2016-04-28 21:19:08 -07:00
Scott Lahteine f4706bb90e Keepalive not needed while waiting for temperatures 2016-04-28 21:11:15 -07:00
Scott Lahteine 924285afa6 Merge pull request #3641 from thinkyhead/rc_reverse_menu_doc 
Correct the REVERSE_MENU_DIRECTION comment
 2016-04-28 20:28:46 -07:00
Scott Lahteine f1b00eb12b Correct the REVERSE_MENU_DIRECTION comment 2016-04-28 20:27:17 -07:00
Scott Lahteine 8905908081 Merge pull request #3632 from thinkyhead/i3_millie_language_fun 
Simplified LCD Language settings
 2016-04-28 19:52:10 -07:00
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