b4b19a6cbd
Merge https://github.com/MarlinFirmware/Marlin into Bulgarian
...
Conflicts:
Marlin/Configuration.h
Marlin/configurator/config/Configuration.h
Marlin/example_configurations/Felix/Configuration.h
Marlin/example_configurations/Felix/Configuration_DUAL.h
Marlin/example_configurations/Hephestos/Configuration.h
Marlin/example_configurations/K8200/Configuration.h
Marlin/example_configurations/SCARA/Configuration.h
Marlin/example_configurations/WITBOX/Configuration.h
Marlin/example_configurations/delta/generic/Configuration.h
Marlin/example_configurations/delta/kossel_mini/Configuration.h
Marlin/example_configurations/makibox/Configuration.h
Marlin/example_configurations/tvrrug/Round2/Configuration.h
Conflicts with my Chinese implementation resolved.
10 years ago
0970102950
Remove obsolete STRING_URL
10 years ago
6cba6bcd82
Add 'cn' to the other 'Configuration.h's
10 years ago
5c29fda167
Add a warning for DISABLE_[XYZ] options
10 years ago
3b97a7d446
Merge pull request #1944 from AnHardt/beep2
...
More Beeper clean up
10 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.
10 years ago
b99e63a7bf
Fixed compilation error "error: stray ‘\357’ in program" in several configuration files.
...
Introduced in commit 697ee2dc
10 years ago
74e4b42f7e
Default MACHINE_NAME to "3D Printer"
10 years ago
ccbe2c4ea3
Apply CUSTOM_MACHINE_NAME to configurations
...
- Replace “Mendel” with “RepRap”
10 years ago
56fc3a4835
bgr -> bg
...
+ update in documentation
10 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. :)
10 years ago
c5961892e3
Bulgarian for all the Configuration.h's
10 years ago
4788b59300
Thermistor values for configurator
10 years ago
7431ef7e2d
Merge branch 'Development' into dev_version
...
Latest upstream commits
10 years ago
eb6e3886f4
Set version to "1.0.3 dev"
10 years ago
a9ed39b12d
Moved checks into SanityCheck.h + removed previous added checks.
10 years ago
002340f32c
Merge branch 'Development-Marlin' into Development
10 years ago
967db181d0
Latest upstream commits
10 years ago
d27c82a450
Added check for Delta printers in Mesh, #error not yet supported.
10 years ago
9a093b2e8f
Added #error + mention not to enable ABL and Mesh at the same time
10 years ago
61de6ecd54
Added change to example Configuration.h's
10 years ago
c065da52ec
Spacing and spelling
10 years ago
e0d4368cb5
Minor code cleanup, move NUM_AXIS out of config
10 years ago
a469d796e1
Add cleanups needed for #1772
10 years ago
0e8182bbf2
Additional pin tests, cleanup
10 years ago
cda4bd4ad9
Correct the comment about M206
10 years ago
ba2c7cb467
Update configs with all the latest
10 years ago
5eff15c409
Merge branch 'Development' into fixup_leveling
...
Latest upstream commits
10 years ago
5261d35737
Fix custom m-code behavior
...
Don’t set CUSTOM_M_CODE_SET_Z_PROBE_OFFSET if there’s no Z probe
10 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'
10 years ago
8db4fd7177
Merge branch 'Development' into planner_oh_planner
...
Latest upstream commits
10 years ago
34a41648ab
Merge branch 'Development' into planner_oh_planner
...
Latest upstream commits
10 years ago
4fbb80567e
Get upstream commits
10 years ago
7717e1ce33
Fix bad insert in configuration
10 years ago
146501215f
Fix mangled probe_pt calls
...
- Address issue #1669
- Remove the TOPO_ORIGIN configuration setting
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
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
8a739b6fba
Merge branch 'Development' into delta_auto_bed_level
...
Conflicts:
Marlin/Marlin_main.cpp
10 years ago
a686c9878f
Move TOPO_ORIGIN define to Configuration.h
...
- Addressing issue #1608
10 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.
10 years ago
60ceca1bc1
Add speed configuration for home-bumping movement
10 years ago
e6862700af
Add Z_RAISE_AFTER_PROBING to all config files
10 years ago
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
29097b0ab2
Enable PID debugging for heated bed
10 years ago
a9e15aa503
Updated example configurations
10 years ago
f4b0a40abb
Additional fixes to temperature.cpp and found another missing line
...
Looks like INVERT_E3_DIR was missing in the configuration.h also as I
did a test compile with 4 extruders and Azteeg X3 Pro defined. So I also
added those lines too. Additional formatting to make the comments line
up better in that section.
10 years ago
AnHardt