6fc2ccd568
Make use of new remenbering fontswitch.
2015-03-10 18:04:03 +01:00
0f26f3abf2
Add a test_language.
...
Will show the compleet utf8 or ASCII charset
To se the second half of ASCII click on "01234..."
2015-03-10 17:59:28 +01:00
901cf203fe
Add legal stuff to marlin_kanji.h
2015-03-10 17:49:16 +01:00
2d5134b0ed
Introduce - clean - prepae language files
2015-03-10 17:46:25 +01:00
d813090d90
Merge remote-tracking branch 'remotes/upstream/Development' into Development
...
Conflicts:
Marlin/Marlin_main.cpp
Marlin/stepper.cpp
2015-03-10 10:46:37 +01:00
c321c97f35
Merge pull request #1584 from galexander1/stringcleanup
...
fix a handful of cases where strtod() was cast to int, instead of just using strtol()
2015-03-10 01:48:30 -07:00
956fb2d278
Merge pull request #1 from MarlinFirmware/Development
...
update
2015-03-09 11:05:49 +02:00
978dadf806
Base64 decode AJAX-fetched text properly
2015-03-08 21:54:17 -07:00
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
624f23f550
Merge pull request #1575 from Wurstnase/fix-controllerFan
...
Fix controller fan
2015-03-08 20:36:38 -07:00
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
b9dfa5cad4
use code_value_long() instead of (int)code_value()
2015-03-07 17:33:15 -05:00
901b03d020
use strtol() instead of strtod() when an integer value is desired
2015-03-07 17:24:26 -05:00
4fba7b084f
fix typo in delta example config introduced in
...
commit 697ee2dc50
2015-03-07 16:43:41 -05:00
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
a5342c942e
Update Marlin_main.cpp
2015-03-07 16:47:53 +01:00
0f3b7d5575
Update annotated configurations
...
- Also update base configs
2015-03-07 01:07:40 -08:00
c5aa56bc4d
Merge branch 'Development' into marlin_configurator
...
Latest upstream commits
2015-03-06 23:00:03 -08:00
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
8b6766b37b
Merge branch 'Development' into marlin_configurator
...
Latest upstream changes
2015-03-06 16:32:57 -08:00
9eed8c8cf0
Make sure a ROM is selected for ULTRA_LCD
2015-03-06 15:37:54 -08:00
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
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
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
25dc79f124
Remove M48 credits also
2015-03-06 14:54:30 -08:00
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
b14270b029
Added font tools
2015-03-06 23:48:55 +01:00
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
344a12bd10
Merge pull request #1571 from AnHardt/Undubble
...
Undubble MSG_MIN & MSG MAX
2015-03-06 10:08:19 -08:00
1149c24b86
More grouping, cleanup, start on overrides
2015-03-06 08:48:53 -08:00
62bd734612
fix controllerFan() for inverted enable pins
...
add ```^ !(n_ENABLE_ON)``` for each stepper
2015-03-06 12:01:17 +01:00
3024f6c706
Undubble MSG_MIN &MSG MAX
2015-03-06 00:25:44 +01:00
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
99fb1bc3e8
Attempt to resolve #1568 and add basic escape character support
2015-03-05 15:22:37 -05:00
fad14ae7eb
Merge branch 'Development' into marlin_configurator
...
Latest upstream changes
2015-03-05 05:32:31 -08:00
cdc38aa783
Move gcode handlers into inline functions
2015-03-05 04:27:24 -08:00
6d9e9a6bef
Merge branch 'Development' into enhanced_g29
...
Latest upstream changes
2015-03-05 02:49:18 -08:00
4db2179f5c
Include 4th extruder support
2015-03-05 02:37:36 -08:00
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
2ef6b3d57a
Fix wrong defines, broken syntax
2015-03-04 22:24:44 -08:00
08b722b635
Merge pull request #1555 from C-o-r-E/solenoids
...
Add support for solenoid articulated extruders
2015-03-04 21:36:29 -08:00
32744d41a9
Do sanity checking on LRFB values
...
- Setting boundaries based on configured limits, contrasting with G28
(which forgets these limits?)
2015-03-04 21:32:11 -08:00
0a7d85c20e
Minor fixes
2015-03-04 12:35:32 +00:00
48e3a97a18
Removed extra encoder definitions from pins_FELIX2.h
2015-03-04 12:21:18 +00:00
d052a3c6aa
Merge pull request #1551 from thinkyhead/redundant_encrot
...
Cleanup rotary encoder encrot* defines
2015-03-04 03:22:24 -08:00
d8eeddfb93
Updated DUAL Extruder config, added README and enabled NEWPANEL by default
2015-03-04 09:59:58 +00:00
b423b90c77
Added Configuration_adv.h to examples for LCD/SD Support
2015-03-03 19:09:25 +01:00
075507fb9a
missed one X_ENABLE_PIN
2015-03-03 11:09:56 +01:00
dfb38874f8
Some suggested changes for #1555
2015-03-03 00:48:20 -08:00
7f8ea7105f
Arrange ProbeAction values bitwise
2015-03-02 20:14:37 -08:00
