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

3356 commits

This branch
This branch
All branches
Author SHA1 Message Date
Wurstnase 073e4af7e2 We don't need the old standard one. The STEP_ADD and STEP_IF_COUNTER are also good for non-Toshiba stepper driver. 2015-05-07 18:55:47 +02:00
brupje b7fcb11580 Added example configuration for Megatronics 2015-05-07 13:18:05 +02:00
brupje 8f8174dc93 Revert "Default configuration for megatronics." 
This reverts commit 22e0d2afcb.
 2015-05-07 13:12:17 +02:00
Scott Lahteine 91fa1dea82 Merge pull request #2029 from thinkyhead/hardware_md 
Initial Hardware.md to fix 404 error
 2015-05-06 19:16:30 -07:00
Scott Lahteine 69655205f5 Demote headers, add TOC 2015-05-06 19:04:54 -07:00
Scott Lahteine b492391fa7 Initial Hardware.md to fix 404 error 
- Addressing issue #1935
 2015-05-06 18:30:10 -07:00
Scott Lahteine 26c53634e1 Add a TOC 2015-05-06 18:24:10 -07:00
Scott Lahteine 72bf6acb5b Merge pull request #2027 from thinkyhead/fix_mbl_compile_err 
Fix MBL compile error
 2015-05-06 14:26:48 -07:00
Scott Lahteine 79633a74ab Fix MBL compile error 2015-05-06 14:25:13 -07:00
brupje ba9741139e Clean up pins file for megatronics 2015-05-05 14:01:52 +02:00
brupje 22e0d2afcb Default configuration for megatronics. 2015-05-05 14:01:20 +02:00
brupje 816aa19861 Up/down buttons were reversed, swapped the assignments 2015-05-05 13:04:46 +02:00
brupje df4d50579a This is conflicting with the settings in ultralcd.h. Not sure why it' s redefined here anyway. 2015-05-05 12:47:24 +02:00
brupje 8f8bf3a897 Make Marlin actually compile when #define REPRAPWORLD_KEYPAD is uncommented 2015-05-05 11:03:20 +02:00
Scott Lahteine 777f2d3820 Merge pull request #2018 from fmalpartida/bugFixing 
Bug corrected: persistent HOMING message when HOME button pressed for homing.
 2015-05-05 00:12:32 -07:00
Scott Lahteine ecb46de349 Merge pull request #2013 from bq/Fix_lowercase 
Fixed lowercase change missing on commit a22a228b.
 2015-05-04 23:50:56 -07:00
fmalpartida 150a35eff8 Bug corrected: 
Persistent homing message.
Message was declared as an alert, therefore it was persistent.
Updated to message.
 2015-05-04 19:48:49 +02:00
Gina Häußge 7dbb595424 Merge pull request #2015 from foosel/revert/changedLinenumberMessage 
Reverting changes to error messages on serial console
 2015-05-04 15:25:36 +02:00
Gina Häußge ab246ab032 Reverting changes to error messages on serial console 
This reverts the changes done to the error message for line number mismatches done in commit d43cc2dd5f
 2015-05-04 15:03:00 +02:00
Ivan Galvez Junquera 59529b755d Fixed lowercase change missing on commit a22a228b. 
Servo.cpp and Servo.h were changed to lowercase in Makefile but not their actual filenames.
 2015-05-04 09:44:34 +02:00
Scott Lahteine df4c104637 Merge pull request #2012 from BrianGilbert/Development 
Add example configuration for Boots Industries V2.5 Delta Printer
 2015-05-03 20:42:32 -07:00
Scott Lahteine 1f039cde61 Merge pull request #1992 from thinkyhead/too_many_probes 
Stow Z probe on M402 without extra raise
 2015-05-03 20:40:26 -07:00
Brian Gilbert 1285784a49 Add Boots Industries V2.5 example configuration 2015-05-04 09:10:42 +10:00
Scott Lahteine 65487b75e2 Merge pull request #2011 from thinkyhead/fix_2004 
Tweak to planner.cpp position.debug
 2015-05-03 16:03:30 -07:00
Scott Lahteine 35493e1af9 Tweak to planner.cpp position.debug 2015-05-03 16:03:05 -07:00
paclema 26015b02d8 Fixed typo and updated Configuration.h of configurator 2015-05-03 02:39:34 +02:00
paclema aedd580911 Updated all configuration.h examples 2015-05-03 02:28:43 +02:00
Scott Lahteine 555128d9e6 Merge pull request #2008 from thinkyhead/fix_2004 
Cleanup language.h
 2015-05-01 21:39:28 -07:00
Scott Lahteine 2c892fca6a Cleanup of language.h 2015-05-01 21:38:32 -07:00
Scott Lahteine 4b156a612a Merge pull request #2007 from thinkyhead/fix_2004 
Fix compile error in configuration_store.cpp
 2015-05-01 21:17:12 -07:00
Scott Lahteine 2db384a21d Fix compile error in configuration_store.cpp 2015-05-01 21:15:26 -07:00
Scott Lahteine ca8cec8e8a Merge pull request #1998 from paclema/Filament_runout_fix 
Fixed sintaxis error of filament runout
 2015-04-29 19:53:25 -07: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
Scott Lahteine b12bcd0f92 Merge pull request #2001 from thinkyhead/thermal_protection_on 
Add M428 to set home_offset logically
 2015-04-29 19:15:31 -07:00
Scott Lahteine d4c74b8f8c Don't apply M428 if an error occurs 
- Also move audio feedback into the command
- Added shorthand for `lcd_buzz` availability
 2015-04-29 19:05:48 -07:00
Scott Lahteine d065d37822 Add M428 to set home_offset logically 2015-04-29 18:26:16 -07:00
Scott Lahteine e47e888a08 Merge pull request #1991 from thinkyhead/thermal_protection_on 
Enable thermal runaway protection by default
 2015-04-29 15:43:18 -07:00
paclema 013a09dbe6 Added configurable script for filrunout form configuration.h 2015-04-29 21:38:40 +02:00
paclema 4dcc0fd55a Fixed sintaxis error of filament runout 2015-04-29 21:32:27 +02:00
AnHardt 514d8ac460 Enable TRP for the bed 
in all Configurations.
 2015-04-29 08:47:01 +02:00
Scott Lahteine ce3caf447b Tweak how homeaxis deploys and stows 2015-04-28 19:17:48 -07:00
Scott Lahteine a235dca79c Stow z on M402 without extra raise 2015-04-28 19:10:07 -07: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 7548a56f64 Merge pull request #1886 from ex-nerd/pins_BRAINWAVE_PRO 
Add pin configuration for Brainwave Pro
 2015-04-27 23:13:26 -07:00
Scott Lahteine 02acf0641a Merge pull request #1983 from CONSULitAS/Development_Update_language_de.h 
language_de.h: updated translation and minor typos
 2015-04-27 22:45:24 -07:00
Scott Lahteine a9a4f0ed3b Merge pull request #1989 from thinkyhead/pid_tuning_report 
Fix the M303 S-1 report text
 2015-04-27 22:41:59 -07:00
Scott Lahteine a120bf3fe4 Latest upstream commits 2015-04-27 22:40:19 -07: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 ae53b3cdc3 Fix the M303 S-1 report text 2015-04-27 22:25:00 -07:00