6ff1620fcb
Merge pull request #1753 from thinkyhead/fix_extruder_offset
...
Fix EXTRUDER_OFFSET compiler error
9 years ago
cda4bd4ad9
Correct the comment about M206
9 years ago
935592cf6a
offsets off by default
9 years ago
2a45922afe
Restore extruder_offset, init more simply
9 years ago
ba2c7cb467
Update configs with all the latest
9 years ago
5e82ed4f30
Restore ENDSTOPPULLUPS in Configuration.h
9 years ago
bc2f249cc6
Merge pull request #1622 from AnHardt/tm-utf-minus-kanji
...
The big Language Pack
9 years ago
abfcbd793f
Merge pull request #1693 from chris-bo/rework_lcd_beeper
...
use only one implementation for beeper feedback
9 years ago
78090275a9
Fix probe range editing
...
- Increase the probe offset range to -20…20
- Apply the range limits to the menu item
9 years ago
20f909567a
Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji
...
Conflicts:
README.md
Solved
9 years ago
eab5fad539
code formatting
9 years ago
5eff15c409
Merge branch 'Development' into fixup_leveling
...
Latest upstream commits
9 years ago
5261d35737
Fix custom m-code behavior
...
Don’t set CUSTOM_M_CODE_SET_Z_PROBE_OFFSET if there’s no Z probe
9 years ago
2dfd0e5ce7
Update Configuration.h
...
documentation how to disable buzzer feedback
9 years ago
94330705c7
Move definition of PIDdT back to temperature.h
...
make it unconditional
remove all definitions in the 'Configuration.h's
remove form 'Conditionals.h'
9 years ago
9d589cbb2a
Merge https://github.com/MarlinFirmware/Marlin into tm3-utf-minus-kanji
...
Conflicts:
Marlin/example_configurations/delta/generic/Configuration.h
Marlin/example_configurations/delta/kossel_mini/Configuration.h
Marlin/language.h
Conflicts solved
9 years ago
4fbb80567e
Get upstream commits
9 years ago
7717e1ce33
Fix bad insert in configuration
9 years ago
146501215f
Fix mangled probe_pt calls
...
- Address issue #1669
- Remove the TOPO_ORIGIN configuration setting
9 years ago
15eb5d35a2
Merge branch 'Development' into config_testing
...
Latest upstream commits
9 years ago
2c9bd15625
Move LCD items to `Conditionals.h`
...
- `Conditionals.h` is included twice, setting LCD values the first time
9 years ago
a7e89d4cfa
Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
9 years ago
e72cb3e45d
Merge https://github.com/MarlinFirmware/Marlin into tm2-utf-minus-kanji
...
Conflicts:
Marlin/dogm_lcd_implementation.h
Marlin/ultralcd_implementation_hitachi_HD44780.h
Fix merge conflicts 2
9 years ago
63d5d28085
Merge branch 'Development' into config_testing
...
Latest upstream changes
9 years ago
b6d381f863
Divide up Conditionals to get LCD items early
9 years ago
670006b919
Remove invariant code from Configurations
...
- Add `Conditionals.h` with calculated configuration values
- Add `SanityCheck.h` with checks for configuration errors
- Remove equivalent code from all configurations
- Move error checks from some sources to `SanityCheck.h` also
- Fix initialization of count_direction in stepper.cpp
9 years ago
47c1ea72af
Merge https://github.com/kieranc/Marlin into PIDdebug
...
Conflicts:
Marlin/temperature.cpp
Cleaned merge conflict.
Codeposition had changed.
Variable pid_input had vanished.
Signed-off-by: AnHardt <github@kitelab.de>
9 years ago
e917477fec
Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji
...
Conflicts:
Marlin/dogm_lcd_implementation.h
Marlin/fonts/make_fonts.bat
Claerd conflicts with my own #1621 . (His was easy. :-) )
corrected typo in fonts/README.fonts
Applied changes to the new delta-configurations
and deletet there some extra whitespace at the line-endings.
9 years ago
8067a985ce
Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
...
Fixed conflicts:
Marlin/planner.h
9 years ago
1883e1bb60
Applied thinkyheads corrections from 2015-03-17
9 years ago
00b162a993
Merge remote-tracking branch 'origin/utf-kanji' into tm-utf-minus-kanji
...
Conflicts:
Marlin/language.h
Conflict cleaned
9 years ago
8a739b6fba
Merge branch 'Development' into delta_auto_bed_level
...
Conflicts:
Marlin/Marlin_main.cpp
9 years ago
e983a5ab92
Disable option. Enable for use/test.
9 years ago
f34b9c83d1
Added comment about MESH_NUM axis points.
9 years ago
a686c9878f
Move TOPO_ORIGIN define to Configuration.h
...
- Addressing issue #1608
9 years ago
8005d22c81
Added menu option for bed leveling.
9 years ago
0e51e53813
WIP. Adding bed leveling code.
9 years ago
2f374f1465
Removed Kanji.
9 years ago
4b50205f11
Merge branch 'Development' into marlin_configurator
...
Latest upstream changes
9 years ago
96f8d20f2f
Change selection logic another time
...
Automatic selection was to unflexible.
Updated documentation
Updated language files to new logic and documentation.
Updated bdf2u8g.exe
9 years ago
08694339eb
Merge branch 'Development' into marlin_configurator
...
Conflicts:
Marlin/Configuration.h
9 years ago
b373826428
Merge pull request #2 from MarlinFirmware/Development
...
update
9 years ago
5bafb1fe1f
Add user test to language_test.h and make it default.
...
Improve description in Configuration.h
9 years ago
9157cbd8f3
Add Travel Acceleration and change the M204 options
...
Added option to set Travel Acceleration (non printing moves).
The M204 options was a non sense (S for printing moves and T for retract
moves).
It has been changed to:
P = Printing moves
R = Retract only (no X, Y, Z) moves
T = Travel (non
printing) moves
I will add this info o G-Code wiki in reprap.org. I also advise to put
this info in Marlin next version changelog.
9 years ago
817751d4b9
Added new languages, the Cyrillic display and a test language to find out your hardware.
9 years ago
5bf42066fa
Fix typo in configuration.h
9 years ago
8a4b62d081
Set more regular setup in configuration.h
9 years ago
60ceca1bc1
Add speed configuration for home-bumping movement
9 years ago
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.
9 years ago
e6862700af
Add Z_RAISE_AFTER_PROBING to all config files
9 years ago
Scott Lahteine