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

118 commits

Author SHA1 Message Date
Scott Lahteine d85861d296 Move macros, add ENABLED/DISABLED, add includes 2015-07-22 18:16:05 -05:00
Scott Lahteine 129f986ccf Add COREXZ option to configurations 2015-07-19 16:17:03 -05:00
Scott Lahteine de25a48dec Remove PID examples from preconfigured configs 2015-07-15 19:13:53 -05:00
Scott Lahteine 391386dd94 Update configs for new servo deactivation 2015-07-15 19:13:40 -05:00
Scott Lahteine c3c605c658 Move note about LiquidTWI2 to Configuration.h (PR#2406) 2015-07-09 05:33:17 -05:00
Scott Lahteine dc40a5f6e0 Patch up more outdated config lines 2015-06-15 20:20:32 -05:00
Scott Lahteine a274769f4f Clean up spacing and comments 
Also clean up some trailing spaces in a few other sources
 2015-06-15 20:20:31 -05:00
Scott Lahteine d3bce05d54 Fix up spacing for filament sensor values 2015-06-15 20:20:31 -05:00
Scott Lahteine b4b10a57fe Fix configurator section directives and values lists 2015-06-15 20:20:31 -05:00
Scott Lahteine bba14dcbe6 Move Z Safe Homing point to the middle of the movement range 2015-06-15 20:20:31 -05:00
wurstnase c85a486445 make the dual z-endstop optional (PR#2277) 
it's disabled by default
 2015-06-10 15:45:59 -05:00
Richard Wackerbarth 58941e543e ELB_FULL_GRAPHIC_CONTROLLER_SDCARDDETECTINVERTED removed 
#defining something just to define something else doesn’t
make sense

If you want SDCARDDETECTINVERTED, just define it yourself.

If the previous code was intended to define, undefined and then again define the term, that code is improper.
 2015-06-06 21:44:59 -05:00
CONSULitAS 3a5963c0e7 Configuration_adv.h: Add FAN_MIN_PWM for slow fan stopping issue … 
* all Configuration_adv.h: Add #define FAN_MIN_PWM for slow fan stopping
issue
* for K8200: uncommented with tested (and working) values
 2015-06-06 20:13:56 -05:00
Ed Boston 08968c29bb Adding ELB_FULL_GRAPHIC_CONTROLLER_SDCARDDETECTINVERTED to Examples 2015-06-06 16:40:32 -05:00
AnHardt d1f4471000 Merge pull request #2146 from Wackerbarth/Versioning 
Versioning
 2015-06-02 18:31:21 +02:00
Jonathan Bastien-Filiatrault d46d9d998e Add maximum bed integral term in example configurations. 2015-05-28 12:51:37 -04:00
Richard Wackerbarth 5ea139fd79 Revised Versioning mechanism 2015-05-25 15:53:14 -05:00
Scott Lahteine 38cc0b93c6 Merge pull request #1874 from AnHardt/Bulgarian 
Introduction of Bulgarian - language_bg.h
 2015-05-22 13:59:50 -07:00
Scott Lahteine 50bd7493cc Merge pull request #2108 from thinkyhead/m33_long_filename_host_support 
M33 LONG_FILENAME_HOST_SUPPORT
 2015-05-21 16:22:47 -07:00
AnHardt 9b8c6ed254 Merge pull request #2120 from chris-bo/dogm_config 
move dogm font selection to configuration_adv.h
 2015-05-20 10:11:34 +02:00
AnHardt 06513565e9 Merge pull request #2105 from eboston/Development 
Add  ELB_FULL_GRAPHIC_CONTROLLER with ADAFRUIT_ST7565 display.
 2015-05-20 09:56:21 +02:00
Ed Boston 082ed3beed Propagate Configuration.h changes 
Updated all the example Configuration.h files for the new display type.
 2015-05-19 14:04:57 -07:00
AnHardt e353d27430 Merge branch 'Development' of https://github.com/MarlinFirmware/Marlin into Bulgarian 2015-05-18 23:56:53 +02:00
Christian Bohn 258bcdefe0 move dogm font selection to configuration_adv.h 2015-05-18 22:54:53 +02:00
AnHardt 7750180c93 transpire -> expire 
Minor wording correction.
 2015-05-18 21:48:10 +02:00
Scott Lahteine 0f2c9bacfd M33 LONG_FILENAME_HOST_SUPPORT 2015-05-17 17:36:32 -07:00
Scott Lahteine 76438195f0 NO_TIMEOUTS and ADVANCED_OK off by default 2015-05-16 02:47:20 -07:00
Scott Lahteine d693e0f378 Use WATCH_TEMP_INCREASE + TEMP_HYSTERESIS + 1 as difference limit 2015-05-12 18:30:38 -07:00
Scott Lahteine 747fd5801c Merge pull request #2055 from thinkyhead/thermal_unified 
Combine thermal runaway and watch-period
 2015-05-12 08:04:29 -07:00
Scott Lahteine 429c6ccad2 Neaten config formatting 2015-05-10 23:27:00 -07:00
Scott Lahteine 8a0dc4d54a Merge pull request #1922 from Wurstnase/serial_wait 
Serial wait
 2015-05-10 23:10:25 -07:00
Wurstnase 526ad82d20 activate advanced_ok and no_timeout 2015-05-11 08:01:51 +02:00
Scott Lahteine 2445ae3d3a Combine thermal runaway and watch-period 
- Make thermal protection for all hotends and/or bed into simple
switches
- Now enable `WATCH_TEMP_PERIOD` when `THERMAL_PROTECTION_HOTENDS` is
enabled
- Move detailed thermal parameters to `Configuration_adv.h`
- Add sanity checks to warn about old configurations
- Change `WATCH_TEMP_PERIOD` to seconds instead of milliseconds
 2015-05-10 22:52:01 -07:00
Scott Lahteine 79106638a8 Fix documentation of heating sanity check 2015-05-08 22:50:08 -07:00
Scott Lahteine 6110494a56 Change default to 4°C in 16s 2015-05-08 22:41:12 -07:00
Scott Lahteine 54deb9eea3 Enable WATCH_TEMP_PERIOD by default 2015-05-08 22:36:02 -07:00
Scott Lahteine deedb00c18 Document WATCH_TEMP_PERIOD 2015-05-08 22:25:51 -07:00
Scott Lahteine 7f3252eea9 Merge pull request #1999 from paclema/Filrunout_configurable_script 
Added configurable script for filrunout from configuration.h
 2015-05-08 04:39:59 -07:00
Scott Lahteine 181ccc884c Edit thermal runaway description 2015-05-07 20:46:03 -07:00
paclema aedd580911 Updated all configuration.h examples 2015-05-03 02:28:43 +02:00
Scott Lahteine 425cd46c12 Merge pull request #1993 from AnHardt/TRP-bed 
Enable TRP for the bed
 2015-04-29 19:44:50 -07:00
AnHardt 514d8ac460 Enable TRP for the bed 
in all Configurations.
 2015-04-29 08:47:01 +02:00
Scott Lahteine 2610b8d047 Enable thermal runaway protection by default 2015-04-28 17:40:29 -07:00
AnHardt b4b19a6cbd Merge https://github.com/MarlinFirmware/Marlin into Bulgarian 
Conflicts:
	Marlin/Configuration.h
	Marlin/configurator/config/Configuration.h
	Marlin/example_configurations/Felix/Configuration.h
	Marlin/example_configurations/Felix/Configuration_DUAL.h
	Marlin/example_configurations/Hephestos/Configuration.h
	Marlin/example_configurations/K8200/Configuration.h
	Marlin/example_configurations/SCARA/Configuration.h
	Marlin/example_configurations/WITBOX/Configuration.h
	Marlin/example_configurations/delta/generic/Configuration.h
	Marlin/example_configurations/delta/kossel_mini/Configuration.h
	Marlin/example_configurations/makibox/Configuration.h
	Marlin/example_configurations/tvrrug/Round2/Configuration.h

Conflicts with my Chinese implementation resolved.
 2015-04-28 09:24:32 +02:00
Scott Lahteine 3688256f86 Merge pull request #1974 from thinkyhead/eeprom_in_gcode 
Make EEPROM reproducible in GCode
 2015-04-27 22:35:41 -07:00
Scott Lahteine 0970102950 Remove obsolete STRING_URL 2015-04-27 21:59:14 -07:00
Scott Lahteine 0f687b5dda Merge branch 'Development' into eeprom_in_gcode 
Latest upstream commits
 2015-04-27 21:47:47 -07:00
Scott Lahteine 28aef684b4 Merge pull request #1957 from Voxel8/sjk/home_y_before_x 
Allow Y to home before X with option in Configuration_adv.h.
 2015-04-27 21:41:14 -07:00
Scott Lahteine 2bc1d70a31 Merge pull request #1977 from AnHardt/Cinese2 
We mark this historic day, when Marlin went to China.
 2015-04-27 20:37:00 -07:00
Scott Lahteine 5b248757c7 Level Bed in Prepare submenu 
- Add “Level Bed” menu item for auto bed leveling
- Hide the option if homing has not been done yet
- Arrange the Prepare submenu more logically (?)
- Add documentation comments, some white-space
- Apply some coding standards here and there
- Move old encoder multiplier debug option to `ultralcd.cpp`
 2015-04-27 19:11:25 -07:00