SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
2573 commits 1 branch 0 tags 119 MiB
Commit graph

2573 commits

This branch
This branch
All branches
Author SHA1 Message Date
maverikou
53abc5e2f1 Merge branch 'Development' into delta_auto_bed_level 2015-03-09 22:28:57 +02:00
Mehmet Sutas
956fb2d278 Merge pull request #1 from MarlinFirmware/Development 
update
 2015-03-09 11:05:49 +02:00
Scott Lahteine
978dadf806 Base64 decode AJAX-fetched text properly 2015-03-08 21:54:17 -07:00
Scott Lahteine
0eae9c24bc Merge pull request #1582 from galexander1/deltaconftypo 
fix typo in delta example config introduced in commit 697ee2d
 2015-03-08 21:13:14 -07:00
Scott Lahteine
624f23f550 Merge pull request #1575 from Wurstnase/fix-controllerFan 
Fix controller fan
 2015-03-08 20:36:38 -07:00
maverikou
424c747fb3 Enable M401 and M402 for deltas with allen key z-probes. 2015-03-08 09:57:38 +02:00
maverikou
0d593ab7c1 Fix debug message 2015-03-08 09:41:31 +02:00
Greg Alexander
ed7874b4e0 M404 should not use 'N' address as parameter because 'N' is reserved for the line number 2015-03-07 17:35:06 -05:00
Greg Alexander
b9dfa5cad4 use code_value_long() instead of (int)code_value() 2015-03-07 17:33:15 -05:00
Greg Alexander
901b03d020 use strtol() instead of strtod() when an integer value is desired 2015-03-07 17:24:26 -05:00
Greg Alexander
4fba7b084f fix typo in delta example config introduced in 
commit 697ee2dc50
 2015-03-07 16:43:41 -05:00
Mehmet Sutas
cfc6a3a87a Filament Runout Sensor Feature 
With this change a mechanical or optical switch may be used to check the
availability of the filament and when the filament runs out an M600
(filament change) command is issued. This is only done while printing
with an SD card.

This feature was requested several times (issue #679), but the requests
were not accepted since it was believed that this situation should be
handled at host side. However during an SD print the control is totally
on firmware and I think that during an SD print it should be handled by
the firmware.

The original code was posted at reprap forum
(http://forums.reprap.org/read.php?1,297350) by Lazymonk. I have only
corrected some bugs of the code and improved it by adding definitions to
the configuration.h in order to make it more standardized.
 2015-03-07 22:43:15 +02:00
maverikou
e6862700af Add Z_RAISE_AFTER_PROBING to all config files 2015-03-07 20:55:30 +02:00
maverikou
39d255608d Test an extra delta configuration with auto bed leveling code paths 2015-03-07 20:53:23 +02:00
maverikou
7c24b97958 Ported over Johann Rocholl's improvements for delta printers: 
- Nonlinear auto bed leveling code (includes G29, G30, Z_RAISE_AFTER_PROBING). Cleaned it up to be a delta-specific AUTO_BED_LEVELING_GRID code path.
- Allen key z-probe deployment and retraction code. Cleaned it up and added safety checks.
 2015-03-07 20:36:21 +02:00
Wurstnase
a5342c942e Update Marlin_main.cpp 2015-03-07 16:47:53 +01:00
Scott Lahteine
0f3b7d5575 Update annotated configurations 
- Also update base configs
 2015-03-07 01:07:40 -08:00
Scott Lahteine
c5aa56bc4d Merge branch 'Development' into marlin_configurator 
Latest upstream commits
 2015-03-06 23:00:03 -08:00
Scott Lahteine
9dccd3a94f Merge pull request #1579 from thinkyhead/fix_abl_issues 
More sanity-checking for ABL
 2015-03-06 22:50:03 -08:00
Scott Lahteine
d085725c86 More sanity-checking for ABL 
- Moved sanity-checks to Marlin_main.cpp
- Applied to other configuration files
- Fixed formatting of ABL output
- Passing verbose level to probe_pt
- Miscellaneous cleanup
- Put CONFIG_STEPPERS_TOSHIBA into Configuration.h
 2015-03-06 22:14:34 -08:00
Scott Lahteine
8b6766b37b Merge branch 'Development' into marlin_configurator 
Latest upstream changes
 2015-03-06 16:32:57 -08:00
Scott Lahteine
ca4b36deda Merge pull request #1578 from thinkyhead/require_lcd_style 
Make sure a ROM is selected for ULTRA_LCD
 2015-03-06 15:38:24 -08:00
Scott Lahteine
9eed8c8cf0 Make sure a ROM is selected for ULTRA_LCD 2015-03-06 15:37:54 -08:00
AnHardt
7136268273 Added 'dogm_font_data_6x10_marlin_Kanji.h' 
This is copied from http://www.thingiverse.com/thing:664397

// Japanese Original font
// Version 0.1 by ichibey
//
// 営利目的で利用する際は、かならず許可を得てください。非営利の場合は、CCライセンスに従い使用ください。
// http://creativecommons.org/licenses/by-nc/2.1/jp/legalcode

This font is very special. It uses a mixture of katakana an kanji symbols, uses multi character symbols and is only addressable by '\xxx' sequences.
 2015-03-07 00:26:28 +01:00
AnHardt
16e173e167 Added 5 new font.h files to main directory. 
The former place of 'dogm_font_data_6x9_marlin.h' was in 'dogm_font_data_m0arlin.h'.

Deleted 'dogm_font_data_marlin.h'.
 2015-03-07 00:09:49 +01:00
Scott Lahteine
254970c92a Merge pull request #1570 from C-o-r-E/escape_fix 
Fixes gCode handling of comments and escaped characters
 2015-03-06 15:09:35 -08:00
Scott Lahteine
d3660d22ae Merge pull request #1577 from thinkyhead/fix_gcode_g29 
Fix compile error in gcode_G29
 2015-03-06 14:55:05 -08:00
Scott Lahteine
25dc79f124 Remove M48 credits also 2015-03-06 14:54:30 -08:00
Scott Lahteine
34e51f576f Fix compile error in gcode_G29 
- A redo of #1576, which missed topo_flag
- Always set verbose_level
 2015-03-06 14:52:05 -08:00
AnHardt
b14270b029 Added font tools 2015-03-06 23:48:55 +01:00
AnHardt
fe2bd237d5 Add font sources. 
Fonts have been created with fony.exe (http://hukka.ncn.fi/?fony)

The HD44760_? fonts simulate the fonts of the character based displays.
The ISO10646 fonts provide the right size of the standard fonts.
Marlin_symbols contains only the the special symbols of the original marlin font.
 2015-03-06 23:36:56 +01:00
Scott Lahteine
bbeb1117d4 Merge pull request #1572 from Wackerbarth/Issue1572 
Minor typos in the README
 2015-03-06 10:10:40 -08:00
Scott Lahteine
344a12bd10 Merge pull request #1571 from AnHardt/Undubble 
Undubble MSG_MIN & MSG MAX
 2015-03-06 10:08:19 -08:00
Scott Lahteine
1149c24b86 More grouping, cleanup, start on overrides 2015-03-06 08:48:53 -08:00
Wurstnase
62bd734612 fix controllerFan() for inverted enable pins 
add ```^ !(n_ENABLE_ON)``` for each stepper
 2015-03-06 12:01:17 +01:00
Richard Wackerbarth
fd9beb1672 Minor typos in the README 2015-03-05 22:03:21 -06:00
AnHardt
3024f6c706 Undubble MSG_MIN &MSG MAX 2015-03-06 00:25:44 +01:00
Corey C
ba27f90e36 Merge pull request #1 from foosel/C-o-r-E-escape_fix 
In-line comments and escaping fixed by foosel
 2015-03-05 17:50:41 -05:00
Gina Häußge
63b62d8d4e Fixed in-line comments and escaping 
* "G1 X1 ; test" was not executing "G1 X1" due to never leaving comment mode.
  * "M117 Hello \;)" printed "Hello \" to the display due to not replacing serial_char properly.

Tested with the following commands:
    * M117 Hello ; test => displays "Hello" on display, ignores "test"
    * G1 X1 ; foo => moves 1mm in X, ignores "foo"
    * ; test => completely ignored, not even acknowledged
    * M117 Hello \;) => displays "Hello ;)" on display
    * M117 Hello \\;) => displays "Hello \" on display, ignores ")"
 2015-03-05 23:30:34 +01:00
C-o-r-E
99fb1bc3e8 Attempt to resolve #1568 and add basic escape character support 2015-03-05 15:22:37 -05:00
Wurstnase
92ebb7f4c8 Merge pull request #1 from MarlinFirmware/Development 
dev pull
 2015-03-05 17:51:33 +01:00
Scott Lahteine
fad14ae7eb Merge branch 'Development' into marlin_configurator 
Latest upstream changes
 2015-03-05 05:32:31 -08:00
Scott Lahteine
273d00353f Merge pull request #1565 from thinkyhead/gcode_handler_functions 
Gcode handlers to inline functions
 2015-03-05 04:55:46 -08:00
Scott Lahteine
cdc38aa783 Move gcode handlers into inline functions 2015-03-05 04:27:24 -08:00
Scott Lahteine
94fd8c7555 Merge pull request #1556 from thinkyhead/enhanced_g29 
Enhanced G29
 2015-03-05 03:54:53 -08:00
Scott Lahteine
6d9e9a6bef Merge branch 'Development' into enhanced_g29 
Latest upstream changes
 2015-03-05 02:49:18 -08:00
Scott Lahteine
4db2179f5c Include 4th extruder support 2015-03-05 02:37:36 -08:00
Scott Lahteine
0e074d4050 Merge pull request #1561 from OhmEye/Development 
Fix autoretract
 2015-03-05 02:14:34 -08:00
OhmEye
f90a947e65 Fix autoretract 
Autoretract was broken, looks like it was overlooked when the retracted flag was updated for multi extruders.
 2015-03-04 20:28:08 -10:00
Scott Lahteine
2ef6b3d57a Fix wrong defines, broken syntax 2015-03-04 22:24:44 -08:00