Commit Graph

15985 Commits

Author SHA1 Message Date
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
f7185fba08 Merge pull request #3651 from jbrazio/feature/generate_version_header_for_marlin
Update version header generation script
2016-05-01 20:30:01 -07:00
11b56a31ab Merge pull request #3657 from thinkyhead/rc_revert_3648_fix_sd_printing
Revert PR 3648 to fix SD printing
2016-05-01 20:02:23 -07:00
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
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
196af30467 Merge pull request #3654 from thinkyhead/rc_cleanup_pins
Pins cleanups
2016-05-01 13:56:04 -07:00
5b7a6c217a Include more fans in sensitive pins list 2016-05-01 13:49:32 -07:00
f508c54c6c Use #undef in AZTEEG_X3_PRO for RAMPS overrides 2016-05-01 13:49:32 -07:00
c6f1337f5c NOOP macro for do-nothing macros 2016-05-01 13:49:32 -07:00
c2145566c7 Merge pull request #3631 from thinkyhead/rc_singletons
Encapsulate Stepper, Planner, Endstops in singleton classes
2016-05-01 13:47:47 -07:00
fbf69081b4 Updated comment for THERMAL_PROTECTION_BED 2016-05-01 13:12:51 -07:00
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
ff7a303a0e Updated version header gen script 2016-05-01 03:31:19 +01:00
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
24a15332b3 Encapsulate dual Z endstop handling 2016-04-30 17:26:50 -07:00
462a8a951e A little extra gcode_T spacing 2016-04-30 17:26:50 -07:00
96f51f400f Planner singleton class 2016-04-30 17:26:50 -07:00
5076d12344 Localize M119 in Endstops class 2016-04-30 17:26:50 -07:00
5e4e535ce8 Stepper and Endstops as singleton objects 2016-04-30 17:26:50 -07:00
98f30283fa Merge pull request #3650 from thinkyhead/rc_temp_change_during_m109_m190
Prevent stuck M109/M190 when target is changed
2016-04-30 17:24:51 -07:00
6d3e4e1f8f Prevent stuck M109/M190 when target is changed 2016-04-30 17:03:54 -07:00
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
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
c3ef9993b9 Merge pull request #3625 from jbrazio/feature/print-counter
Print job statistics
2016-04-29 15:31:14 -07:00
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
e34f4653ef Fixed a typo on the configuration files 2016-04-29 23:13:59 +01:00
1491d682fb Miscellaneous tweaks on PrintCounter 2016-04-29 23:13:59 +01:00
27088e356f Updated example configuration files 2016-04-29 23:13:59 +01:00
8fb23e899f PrintCounter EEPROM read/write optimizations 2016-04-29 23:13:59 +01:00
9589e51810 Disable DEBUG_PRINTCOUNTER 2016-04-29 23:13:59 +01:00
484de24e22 Updated travis to test for PRINTCOUNTER 2016-04-29 23:13:58 +01:00
e2da7e5000 Updated the default configuration and fixed a printcounter.h typo 2016-04-29 23:13:58 +01:00
d6cfcc9c8b Added new G-Code: M78 2016-04-29 23:13:58 +01:00
4f541c5bb5 Added a new object: PrintCounter 2016-04-29 23:13:58 +01:00
26b166d7cf Made all stopwatch::debug() calls static 2016-04-29 23:13:58 +01:00
5897b58a70 Merge pull request #3634 from esenapaj/patch-2
Update distribution date and readme again
2016-04-28 21:19:08 -07:00
f4706bb90e Keepalive not needed while waiting for temperatures 2016-04-28 21:11:15 -07:00
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
f1b00eb12b Correct the REVERSE_MENU_DIRECTION comment 2016-04-28 20:27:17 -07:00
8905908081 Merge pull request #3632 from thinkyhead/i3_millie_language_fun
Simplified LCD Language settings
2016-04-28 19:52:10 -07:00
c7e4b3044b Change "RC6" to "RCBugFix" on top part of the readme, etc
・Change "RC6" to "RCBugFix" on top part of the readme
・Unify distribution date of RCBugFix and RC6
・Move comments about IDE version from RCBugFix section to RC6 section
2016-04-28 20:30:39 +09:00
6c48852b20 Update distribution date 2016-04-28 18:06:53 +09:00
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
0c11566f42 Replace LANGUAGE_INCLUDE with LCD_LANGUAGE 2016-04-27 20:06:40 -07:00
259794c0be Make DISPLAY_CHARSET_HD44780 a single setting 2016-04-27 20:06:40 -07:00
a5d00f755b Merge pull request #3619 from esenapaj/patch-2
Update distribution date and readme
2016-04-27 19:52:30 -07:00
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
ee2f37f3cc Update distribution date and readme
It sync with the RC.
2016-04-27 11:21:51 +09:00
2d89b5527f fixed link to wiki 2016-04-27 11:19:46 +09:00
ad0f70f2f3 Merge pull request #3620 from Blue-Marlin/feedrate_atfer_toolchange 2016-04-26 17:33:15 -07:00