3b97a7d446
Merge pull request #1944 from AnHardt/beep2
...
More Beeper clean up
9 years ago
064f2b37d0
More Beeper clean up.
...
Centralised beep code to lcd_buzz().
From gcode_M300() and lcd_quick_feedback().
Enforced max. duration for M300 to 5 seconds.
Corrected description in 'Configuration.h'
LCD_FEEDBACK_FREQUENCY_HZ 0 gives now a silent delay of
LCD_FEEDBACK_FREQUENCY_DURATION_MS.
9 years ago
b99e63a7bf
Fixed compilation error "error: stray ‘\357’ in program" in several configuration files.
...
Introduced in commit 697ee2dc
9 years ago
ccbe2c4ea3
Apply CUSTOM_MACHINE_NAME to configurations
...
- Replace “Mendel” with “RepRap”
9 years ago
585eee6549
Z Probe inverting not present in example configs, causes error
...
The line const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to
invert the logic of the endstop is in the main configuration.h but
wasn't present in the example configuration.h's. Causes a compiling
error with Z Probe enabled. Just added it to all the configs. :)
9 years ago
4788b59300
Thermistor values for configurator
9 years ago
7431ef7e2d
Merge branch 'Development' into dev_version
...
Latest upstream commits
9 years ago
eb6e3886f4
Set version to "1.0.3 dev"
9 years ago
a9ed39b12d
Moved checks into SanityCheck.h + removed previous added checks.
9 years ago
002340f32c
Merge branch 'Development-Marlin' into Development
9 years ago
967db181d0
Latest upstream commits
9 years ago
d27c82a450
Added check for Delta printers in Mesh, #error not yet supported.
9 years ago
9a093b2e8f
Added #error + mention not to enable ABL and Mesh at the same time
9 years ago
61de6ecd54
Added change to example Configuration.h's
9 years ago
c065da52ec
Spacing and spelling
9 years ago
e0d4368cb5
Minor code cleanup, move NUM_AXIS out of config
9 years ago
a469d796e1
Add cleanups needed for #1772
9 years ago
0e8182bbf2
Additional pin tests, cleanup
9 years ago
cda4bd4ad9
Correct the comment about M206
9 years ago
ba2c7cb467
Update configs with all the latest
9 years ago
edb67ea165
Patch generic delta config
...
- Addressing issue mentioned at #1699
9 years ago
bc2f249cc6
Merge pull request #1622 from AnHardt/tm-utf-minus-kanji
...
The big Language Pack
9 years ago
20f909567a
Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji
...
Conflicts:
README.md
Solved
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
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
10 years ago
8db4fd7177
Merge branch 'Development' into planner_oh_planner
...
Latest upstream commits
10 years ago
88e81a4804
Latest upstream commits, plus fixes
...
- Also add Manual Bed Leveling to the rest of the configs
10 years ago
2c9bd15625
Move LCD items to `Conditionals.h`
...
- `Conditionals.h` is included twice, setting LCD values the first time
10 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
10 years ago
63d5d28085
Merge branch 'Development' into config_testing
...
Latest upstream changes
10 years ago
b6d381f863
Divide up Conditionals to get LCD items early
10 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
10 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>
10 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.
10 years ago
8a739b6fba
Merge branch 'Development' into delta_auto_bed_level
...
Conflicts:
Marlin/Marlin_main.cpp
10 years ago
39d255608d
Test an extra delta configuration with auto bed leveling code paths
10 years ago
Scott Lahteine