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

4126 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bo Herrmannsen d54fe3a40c moved to http://www.marlinfirmware.org/ 2015-05-09 14:19:07 +02:00
Bo Herrmannsen 86ed55e75c moved to http://www.marlinfirmware.org/ 2015-05-09 14:18:23 +02:00
Scott Lahteine 28c87ec81b Disable all heaters on temp error 2015-05-08 23:17:25 -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 9a6423ea17 Merge pull request #2021 from brupje/Development 
Fixes for reprapworld's keypad
 2015-05-08 20:35:37 -07:00
Scott Lahteine be77cfd895 Merge pull request #2032 from Wurstnase/toshiba_for_all_stepper 
We don't need the old standard one. The STEP_ADD and STEP_IF_COUNTER …
 2015-05-08 20:32:30 -07:00
Scott Lahteine 8b59e620bb Merge pull request #2039 from thinkyhead/mks_base 
Support for MKS BASE 1.0 board
 2015-05-08 20:29:57 -07:00
Scott Lahteine 44decda00b Add documentation for MKS BASE 1.0 et. al. 2015-05-08 19:35:59 -07:00
Scott Lahteine cb4ea75fab Support for MKS BASE 1.0 board 2015-05-08 19:07:37 -07:00
Scott Lahteine 0e70511381 Merge pull request #2036 from brupje/mainline 
Fixes for reprapworld's keypad
 2015-05-08 18:19:31 -07:00
Wurstnase 0cb87795a3 advanced 'ok' 
ok N(linenumber) P(bufferremaining)
the host can use this to send the data much faster.

Some pseudo code:
If (bufferremaining > 0)  send command
## as long there is free buffer send command

Also
if (linenumber > lastsend - bufferremaining) send command
## as long last linenumber received is bigger than lastsend (host) - last bufferremaining received
 2015-05-08 22:28:51 +02:00
Wurstnase 182e0d99c9 Merge remote-tracking branch 'Marlin8bit/Development' into serial_wait 2015-05-08 21:27:18 +02:00
brupje b425851441 Rename Configuration_megatronics.h to Configuration.h 2015-05-08 14:40:14 +02:00
brupje d1148a0198 Rename Configuration_megatronics.h to Configuration.h 2015-05-08 14:36:23 +02: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 0511ccda23 Merge pull request #2034 from thinkyhead/fixup_configs 
Edit thermal runaway description
 2015-05-07 21:46:05 -07:00
Scott Lahteine 181ccc884c Edit thermal runaway description 2015-05-07 20:46:03 -07:00
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