3276 Commits (41f8cdb3a62817b5bea01309e73f9082883c1728)
 

Author SHA1 Message Date
domonoky d813090d90 Merge remote-tracking branch 'remotes/upstream/Development' into Development
Conflicts:
	Marlin/Marlin_main.cpp
	Marlin/stepper.cpp
10 years ago
Scott Lahteine c321c97f35 Merge pull request #1584 from galexander1/stringcleanup
fix a handful of cases where strtod() was cast to int, instead of just using strtol()
10 years ago
maverikou 53abc5e2f1 Merge branch 'Development' into delta_auto_bed_level 10 years ago
Mehmet Sutas 956fb2d278 Merge pull request #1 from MarlinFirmware/Development
update
10 years ago
Scott Lahteine 978dadf806 Base64 decode AJAX-fetched text properly 10 years ago
Scott Lahteine 0eae9c24bc Merge pull request #1582 from galexander1/deltaconftypo
fix typo in delta example config introduced in commit 697ee2d
10 years ago
Scott Lahteine 624f23f550 Merge pull request #1575 from Wurstnase/fix-controllerFan
Fix controller fan
10 years ago
maverikou 424c747fb3 Enable M401 and M402 for deltas with allen key z-probes. 10 years ago
maverikou 0d593ab7c1 Fix debug message 10 years ago
Greg Alexander 3e8c5678f5 fix bug where, i.e., "G1X1E1" would be interpretted as "G1 X10 E1",
because strtod() will read the E address value as if it was a base 10
exponent.
10 years ago
Greg Alexander ed7874b4e0 M404 should not use 'N' address as parameter because 'N' is reserved for the line number 10 years ago
Greg Alexander b9dfa5cad4 use code_value_long() instead of (int)code_value() 10 years ago
Greg Alexander 901b03d020 use strtol() instead of strtod() when an integer value is desired 10 years ago
Greg Alexander 4fba7b084f fix typo in delta example config introduced in
commit 697ee2dc50
10 years ago
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.
10 years ago
maverikou e6862700af Add Z_RAISE_AFTER_PROBING to all config files 10 years ago
maverikou 39d255608d Test an extra delta configuration with auto bed leveling code paths 10 years ago
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.
10 years ago
Wurstnase a5342c942e Update Marlin_main.cpp 10 years ago
Scott Lahteine 0f3b7d5575 Update annotated configurations
- Also update base configs
10 years ago
Scott Lahteine c5aa56bc4d Merge branch 'Development' into marlin_configurator
Latest upstream commits
10 years ago
Scott Lahteine 9dccd3a94f Merge pull request #1579 from thinkyhead/fix_abl_issues
More sanity-checking for ABL
10 years ago
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
10 years ago
Scott Lahteine 8b6766b37b Merge branch 'Development' into marlin_configurator
Latest upstream changes
10 years ago
Scott Lahteine ca4b36deda Merge pull request #1578 from thinkyhead/require_lcd_style
Make sure a ROM is selected for ULTRA_LCD
10 years ago
Scott Lahteine 9eed8c8cf0 Make sure a ROM is selected for ULTRA_LCD 10 years ago
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.
10 years ago
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'.
10 years ago
Scott Lahteine 254970c92a Merge pull request #1570 from C-o-r-E/escape_fix
Fixes gCode handling of comments and escaped characters
10 years ago
Scott Lahteine d3660d22ae Merge pull request #1577 from thinkyhead/fix_gcode_g29
Fix compile error in gcode_G29
10 years ago
Scott Lahteine 25dc79f124 Remove M48 credits also 10 years ago
Scott Lahteine 34e51f576f Fix compile error in gcode_G29
- A redo of #1576, which missed topo_flag
- Always set verbose_level
10 years ago
AnHardt b14270b029 Added font tools 10 years ago
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.
10 years ago
Scott Lahteine bbeb1117d4 Merge pull request #1572 from Wackerbarth/Issue1572
Minor typos in the README
10 years ago
Scott Lahteine 344a12bd10 Merge pull request #1571 from AnHardt/Undubble
Undubble MSG_MIN & MSG MAX
10 years ago
Scott Lahteine 1149c24b86 More grouping, cleanup, start on overrides 10 years ago
Wurstnase 62bd734612 fix controllerFan() for inverted enable pins
add ```^ !(n_ENABLE_ON)``` for each stepper
10 years ago
Richard Wackerbarth fd9beb1672 Minor typos in the README 10 years ago
AnHardt 3024f6c706 Undubble MSG_MIN &MSG MAX 10 years ago
Corey C ba27f90e36 Merge pull request #1 from foosel/C-o-r-E-escape_fix
In-line comments and escaping fixed by foosel
10 years ago
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 ")"
10 years ago
C-o-r-E 99fb1bc3e8 Attempt to resolve #1568 and add basic escape character support 10 years ago
Wurstnase 92ebb7f4c8 Merge pull request #1 from MarlinFirmware/Development
dev pull
10 years ago
Scott Lahteine fad14ae7eb Merge branch 'Development' into marlin_configurator
Latest upstream changes
10 years ago
Scott Lahteine 273d00353f Merge pull request #1565 from thinkyhead/gcode_handler_functions
Gcode handlers to inline functions
10 years ago
Scott Lahteine cdc38aa783 Move gcode handlers into inline functions 10 years ago
Scott Lahteine 94fd8c7555 Merge pull request #1556 from thinkyhead/enhanced_g29
Enhanced G29
10 years ago
Scott Lahteine 6d9e9a6bef Merge branch 'Development' into enhanced_g29
Latest upstream changes
10 years ago
Scott Lahteine 4db2179f5c Include 4th extruder support 10 years ago