esenapaj2
236a44c83b
follow-up the PR #3131
...
follow-up the commit 7326d63ce0
update Configration_adv.h of Hephestos2
delete unnecessary spaces
9 years ago
Scott Lahteine
f9ded2a7c4
Wrap macros to prevent bad expansions
9 years ago
Scott Lahteine
0c48eaf3de
Expose motor current in more configs, disable by default
9 years ago
Scott Lahteine
27f244ba2c
Support MAX31855 as Temperature Sensor -3
9 years ago
Scott Lahteine
ce639b8b03
Group FILAMENT_SENSOR options together
9 years ago
AnHardt
fd5414c6ea
Z_RAISE_BEFORE_HOMING -> MIN_Z_HEIGHT_FOR_HOMING
...
rebased
corrected spelling
changed to #elif for error
Still with MIN_Z_HEIGHT_FOR_HOMING but con be done with (folder wide) search-replace when we have a better name.
9 years ago
esenapaj2
29e09c7c3e
update example configurations
...
update old comments
update or delete deprecated definitions
complement forgotten updates
adjust spacing
some cosmetic changes
9 years ago
Scott Lahteine
cf792fd8d8
Update configurations to use RAMPS 1.4
9 years ago
Scott Lahteine
13ef12ad3f
Fix power calculations
...
As suggested by @max-pau in #3073 - #3074
9 years ago
Scott Lahteine
5cba0210f2
Small patch to Z_SAFE_HOMING comment
9 years ago
jbrazio
143ad74db7
Update PROBE_OFFSET_FROM_EXTRUDER comment section in all example config
...
files.
9 years ago
Scott Lahteine
e7cf85b922
Merge pull request #3013 from thinkyhead/esenapaj-patch-1
...
Enhanced #3010 - formal Mesh/Manual dependency
9 years ago
Scott Lahteine
eb85342fd9
Merge pull request #2989 from AnHardt/fix2661
...
Pre home display - Stepper release
9 years ago
Scott Lahteine
772460a7b8
Various minor spelling corrections
...
Redo of #2939 rebased against RCBugFix
9 years ago
Scott Lahteine
9eb4aceee4
Merge pull request #2986 from thinkyhead/enable_watchdog
...
Enable USE_WATCHDOG by default
9 years ago
AnHardt
615bec2329
Activate warning about possible reduced accuracy by default
...
Renamed `WARN_REDUCED_ACCURACY` to `DISABLE_REDUCED_ACCURACY_WARNING`
Changed the condition for blinking from
```
#if ENABLED(WARN_REDUCED_ACCURACY)
```
to
```
#if DISABLED(DISABLE_REDUCED_ACCURACY_WARNING)
```
9 years ago
AnHardt
4b02f33e69
Distribute config-changes to the other configurations
9 years ago
Scott Lahteine
1093c780c8
Remove obsolete STEPS_MM_E setting
9 years ago
Scott Lahteine
c2e5c6c12c
Nest Manual Bed Leveling options
...
This formalizes the dependency of MANUAL_BED_LEVELING on
MESH_BED_LEVELING
9 years ago
Scott Lahteine
fbfbc5e330
Enable USE_WATCHDOG by default
9 years ago
Scott Lahteine
9df0e0e0cc
Merge pull request #2974 from thinkyhead/sanitycheck_spi_speed
...
Sanity-check deprecated options replaced by SPI_SPEED
9 years ago
Scott Lahteine
b19b272172
Update configurations with SPI_SPEED
...
- Include aligned comment about new SDSUPPORT behavior
9 years ago
esenapaj
27d918d836
Merge pull request #4 from MarlinFirmware/RCBugFix
...
Rc bug fix
9 years ago
Scott Lahteine
159ff94afd
Remove obsolete HEATER_BED_DUTY_CYCLE_DIVIDER #2977
9 years ago
Ruwan J Egoda Gamage
b58083b0fa
Getting rid of SDEXTRASLOW, SDSLOW variables.
9 years ago
Ruwan J Egoda Gamage
1b7c443628
Adding SDULTRASLOW variable.
...
Instead of changing SDEXTRASLOW variable to a slower speed, the new
SDULTRASLOW is used for rigidbot panel.
9 years ago
esenapaj
d7272e3f36
Merge pull request #3 from MarlinFirmware/RCBugFix
...
Rc bug fix
9 years ago
Scott Lahteine
62bad1b60f
Merge pull request #2848 from japzi/RCBugFix
...
Fixing Rigidbot LCD Panel Support
9 years ago
esenapaj
df0d599c79
Update Configuration.h
9 years ago
esenapaj
04ab61bf40
Update Configuration_adv.h
9 years ago
Ruwan J Egoda Gamage
2c9e0415c7
Getting rid of SDEXTRASLOW, SDSLOW variables.
9 years ago
Ruwan J Egoda Gamage
e6cc232184
Adding SDULTRASLOW variable.
...
Instead of changing SDEXTRASLOW variable to a slower speed, the new
SDULTRASLOW is used for rigidbot panel.
9 years ago
Richard Wackerbarth
0b429461d5
Back port Cosmetic changes
9 years ago
Richard Wackerbarth
0cebe85e65
Clean up spacing and duplicate entries
...
• Removing trailing whitespace
• Adjusting indention for better readability
• Removing duplicated entries
9 years ago
Richard Wackerbarth
e7b40bbe98
Change link to U8glib source
9 years ago
AnHardt
c956b52c4a
Babystep Multiplier
...
Analog to https://github.com/MarlinFirmware/MarlinDev/pull/250 by
@RicardoGA
Restore the Babystep Multiplicator functionality and now it's available
for X/Y/Z
9 years ago
Scott Lahteine
9b23490f01
Clean up spacing in configs
9 years ago
KiteLab
0ad25c6665
Hint for changed behaviour of SDSUPPORT
9 years ago
Richard Wackerbarth
e01f5e1ef7
Cleanup
9 years ago
Mike Cochrane
5e36b64635
SDEXTRASLOW for some SD card readers (PR#176)
...
Add SDEXTRASLOW which runs the SD card at SPI_QUARTER_SPEED. Quarter speed is needed for RIGIDBOT_PANEL
9 years ago
Scott Lahteine
db27e67580
Apply PID_ADD_EXTRUSION_RATE to extras
9 years ago
Scott Lahteine
8b3d63c423
Unify Delta XYZ homing rates
...
As noted in #130 allen key probe stow rate is based on homing rates,
but homing rates were left out of most delta configs. This unifies the
XYZ homing rates and applies the unified rates to allen key movements.
9 years ago
Scott Lahteine
7c72b57313
Unify manual feedrate and Fix LCD MANUAL_FEEDRATE (PR#128)
...
As noted by @o-lampe at https://github.com/MarlinFirmware/MarlinDev/issues/114#issuecomment-136757614 the `MANUAL_FEEDRATE` for Delta Z should be the same as XY.
9 years ago
Scott Lahteine
28599c51c7
Wrap Dual Y options in a conditional
9 years ago
Scott Lahteine
11a065c0ca
Remove Z2 pins overrides from Configuration_adv.h
9 years ago
Christian Lefrançois
8347a9d6e4
Fix HOMING_BUMP_DIVISOR for deltas configuration
...
* Re-bump speed divisor should be the same for delta printer.
9 years ago
Richard Wackerbarth
6292d9e815
Rename ENABLE_AUTO_BED_LEVELING
...
With the introduction of the #if ENABLED(…)
reads better than
9 years ago
Christian Lefrançois
9897a9147c
Update ABL comments (PR#95)
...
* Updates the auto bed leveling comments ONLY.
* Renames "Z probe" word usage in //comments and #errors properly.
9 years ago
Christian Lefrançois
a7822e3ff7
Some renaming of Z_PROBE to Z_MIN_PROBE (PR#91)
...
* Fix a couple of renames omission and macro expansion errors.
9 years ago
AnHardt
e2d69f66b2
Make Z_PROBE a Z_MIN_PROBE (PR#65)
...
Currently we use the probe exclusively as a device to find the build platform(bed).
For the currently supported setups this means, we use it as a additional min-endstop.
A triggered when not deployed probe disturbs the homing process for max-endstops.
Rename ENDSTOPPULLUP_ZPROBE to ENDSTOPPULLUP_ZMIN_PROBE
Rename Z_PROBE_ENDSTOP_INVERTING to Z_MIN_PROBE_ENDSTOP_INVERTING
Rename Z_PROBE_ENDSTOP to Z_MIN_PROBE_ENDSTOP
Rename DISABLE_Z_PROBE_ENDSTOP to DISABLE_Z_MIN_PROBE_ENDSTOP
Rename Z_PROBE_REPEATABILITY_TEST to Z_MIN_PROBE_REPEATABILITY_TEST
Rename Z_PROBE_ENDSTOP to Z_MIN_PROBE_ENDSTOP
Adjust comments accordingly
Remove Z_MAX check for the probe in update_endstops().
Using an delta related idea of @clefranc from #61 ,
extended to the general change for all setups.
Tested with Prusa i3, max-z-endstop and permanently triggered z-probe.
Worked for @clefranc's delta.
10 years ago
Scott Lahteine
46453905d6
Apply remaining ENABLED/DISABLED conditionals
10 years ago
Richard Wackerbarth
b227d8c128
Supply a VERSION in a short form for displays
...
The long descriptor will still be available in M115
10 years ago
Richard Wackerbarth
329acc852e
Canonize Option flag USE_AUTOMATIC_VERSION
10 years ago
AnHardt
80f2a20842
Enable bootscreen in all Configurations
10 years ago
Scott Lahteine
1e2deff4fd
Rename BTENABLED to BLUETOOTH
...
- For some reason it’s easy to forget what BT stands for, but it
doesn’t need an abbreviation.
10 years ago
Scott Lahteine
270c766de2
SDCARDDETECT -> SD_DETECT, added docs
...
- `SD_DETECT_PIN` replaces `SDCARDDETECT`
- `SD_DETECT_INVERTED` replaces `SDCARDDETECTINVERTED`
- Revise the description of `SD_DETECT_INVERTED`
- Add a note about the override of `SD_DETECT_INVERTED` in
`Conditionals.h`
10 years ago
Scott Lahteine
37d1879386
Apply overridables to Configuration files
10 years ago
Scott Lahteine
edaaead7e0
Fix comment about SERVO_ENDSTOP_ANGLES
10 years ago
Scott Lahteine
0af2a80e06
Make SERVO_ENDSTOP_ANGLES 2-dimensional
10 years ago
Scott Lahteine
ab6f1fdf8b
Move & document ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED (PR#2528)
...
As suggested in #2521
- Move `ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED` because `SDSUPPORT` is
also required.
- Add a note that endstops must be enabled for the feature to have any
effect
10 years ago
AnHardt
fd0e81b0c7
Distinguish between BUZZER and SPEAKER (PR#2513)
...
A speaker needs a AC or a pulsed DC to make a sound, a buzzer only needs a DC.
A buzzer has it's own resonator. It works in most cases to feed the buzzer with a pulsed DC, but the sound will not be as loud as with pure DC.
There seem to be boards where the BEEPER-pin is not able to handle a PWM. Obviously intended for a buzzer.
To make these board able to handle a speaker
* replace the PWM based tone()-function again with a on-delay-off-delay loop.
Hopefully the last time I touch the beeper code.
10 years ago
AnHardt
8b876241bd
Some more servo code tweaks
...
Just set up the pin. Don't move to a random position.
Simplify servo::move()
* servo::move() does not need the pin parameter - The pin is set during servo_init() with attach().
* servo::move() does not need a return value.
SERVO_LEVELING is the wrong condition to deactivate the servos.
Remove some temporary (Servo *) variables.
SanityCheck for the servo indexes.
10 years ago
AndySze
00dbf69b6d
add MINIPANEL defines
10 years ago
Scott Lahteine
d85861d296
Move macros, add ENABLED/DISABLED, add includes
10 years ago
Scott Lahteine
129f986ccf
Add COREXZ option to configurations
10 years ago
Scott Lahteine
391386dd94
Update configs for new servo deactivation
10 years ago
Scott Lahteine
c3c605c658
Move note about LiquidTWI2 to Configuration.h (PR#2406)
10 years ago
Scott Lahteine
dc40a5f6e0
Patch up more outdated config lines
10 years ago
Scott Lahteine
98c9111a7d
Update delta configs with latest settings
10 years ago
Scott Lahteine
e6baf8afd9
Fix up allen key settings in delta configs
10 years ago
Scott Lahteine
3b293fc5d1
Move Delta settings lower in delta files
10 years ago
Scott Lahteine
df21857583
Move extruder offset settings next to extruders setting
10 years ago
Scott Lahteine
a274769f4f
Clean up spacing and comments
...
Also clean up some trailing spaces in a few other sources
10 years ago
Scott Lahteine
d3bce05d54
Fix up spacing for filament sensor values
10 years ago
Scott Lahteine
b4b10a57fe
Fix configurator section directives and values lists
10 years ago
Scott Lahteine
bba14dcbe6
Move Z Safe Homing point to the middle of the movement range
10 years ago
wurstnase
c85a486445
make the dual z-endstop optional (PR#2277)
...
it's disabled by default
10 years ago
Richard Wackerbarth
58941e543e
ELB_FULL_GRAPHIC_CONTROLLER_SDCARDDETECTINVERTED removed
...
#defining something just to define something else doesn’t
make sense
If you want SDCARDDETECTINVERTED, just define it yourself.
If the previous code was intended to define, undefined and then again define the term, that code is improper.
10 years ago
CONSULitAS
3a5963c0e7
Configuration_adv.h: Add FAN_MIN_PWM for slow fan stopping issue …
...
* all Configuration_adv.h: Add #define FAN_MIN_PWM for slow fan stopping
issue
* for K8200: uncommented with tested (and working) values
10 years ago
Ed Boston
08968c29bb
Adding ELB_FULL_GRAPHIC_CONTROLLER_SDCARDDETECTINVERTED to Examples
10 years ago
AnHardt
d1f4471000
Merge pull request #2146 from Wackerbarth/Versioning
...
Versioning
10 years ago
Jonathan Bastien-Filiatrault
d46d9d998e
Add maximum bed integral term in example configurations.
10 years ago
Richard Wackerbarth
5ea139fd79
Revised Versioning mechanism
10 years ago
Scott Lahteine
38cc0b93c6
Merge pull request #1874 from AnHardt/Bulgarian
...
Introduction of Bulgarian - language_bg.h
10 years ago
Scott Lahteine
50bd7493cc
Merge pull request #2108 from thinkyhead/m33_long_filename_host_support
...
M33 LONG_FILENAME_HOST_SUPPORT
10 years ago
AnHardt
9b8c6ed254
Merge pull request #2120 from chris-bo/dogm_config
...
move dogm font selection to configuration_adv.h
10 years ago
AnHardt
06513565e9
Merge pull request #2105 from eboston/Development
...
Add ELB_FULL_GRAPHIC_CONTROLLER with ADAFRUIT_ST7565 display.
10 years ago
Ed Boston
082ed3beed
Propagate Configuration.h changes
...
Updated all the example Configuration.h files for the new display type.
10 years ago
AnHardt
e353d27430
Merge branch 'Development' of https://github.com/MarlinFirmware/Marlin into Bulgarian
10 years ago
Christian Bohn
258bcdefe0
move dogm font selection to configuration_adv.h
10 years ago
AnHardt
7750180c93
transpire -> expire
...
Minor wording correction.
10 years ago
Scott Lahteine
0f2c9bacfd
M33 LONG_FILENAME_HOST_SUPPORT
10 years ago
Scott Lahteine
76438195f0
NO_TIMEOUTS and ADVANCED_OK off by default
10 years ago
Scott Lahteine
d693e0f378
Use WATCH_TEMP_INCREASE + TEMP_HYSTERESIS + 1 as difference limit
10 years ago
Scott Lahteine
747fd5801c
Merge pull request #2055 from thinkyhead/thermal_unified
...
Combine thermal runaway and watch-period
10 years ago
Scott Lahteine
429c6ccad2
Neaten config formatting
10 years ago
Scott Lahteine
8a0dc4d54a
Merge pull request #1922 from Wurstnase/serial_wait
...
Serial wait
10 years ago
Wurstnase
526ad82d20
activate advanced_ok and no_timeout
10 years ago
Scott Lahteine
2445ae3d3a
Combine thermal runaway and watch-period
...
- Make thermal protection for all hotends and/or bed into simple
switches
- Now enable `WATCH_TEMP_PERIOD` when `THERMAL_PROTECTION_HOTENDS` is
enabled
- Move detailed thermal parameters to `Configuration_adv.h`
- Add sanity checks to warn about old configurations
- Change `WATCH_TEMP_PERIOD` to seconds instead of milliseconds
10 years ago
Scott Lahteine
79106638a8
Fix documentation of heating sanity check
10 years ago
Scott Lahteine
6110494a56
Change default to 4°C in 16s
10 years ago
Scott Lahteine
54deb9eea3
Enable WATCH_TEMP_PERIOD by default
10 years ago
Scott Lahteine
deedb00c18
Document WATCH_TEMP_PERIOD
10 years ago
Scott Lahteine
7f3252eea9
Merge pull request #1999 from paclema/Filrunout_configurable_script
...
Added configurable script for filrunout from configuration.h
10 years ago
Scott Lahteine
181ccc884c
Edit thermal runaway description
10 years ago
paclema
aedd580911
Updated all configuration.h examples
10 years ago
Scott Lahteine
425cd46c12
Merge pull request #1993 from AnHardt/TRP-bed
...
Enable TRP for the bed
10 years ago
AnHardt
514d8ac460
Enable TRP for the bed
...
in all Configurations.
10 years ago
Scott Lahteine
2610b8d047
Enable thermal runaway protection by default
10 years ago
AnHardt
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
Scott Lahteine
3688256f86
Merge pull request #1974 from thinkyhead/eeprom_in_gcode
...
Make EEPROM reproducible in GCode
10 years ago
Scott Lahteine
0970102950
Remove obsolete STRING_URL
10 years ago
Scott Lahteine
0f687b5dda
Merge branch 'Development' into eeprom_in_gcode
...
Latest upstream commits
10 years ago
Scott Lahteine
28aef684b4
Merge pull request #1957 from Voxel8/sjk/home_y_before_x
...
Allow Y to home before X with option in Configuration_adv.h.
10 years ago
Scott Lahteine
2bc1d70a31
Merge pull request #1977 from AnHardt/Cinese2
...
We mark this historic day, when Marlin went to China.
10 years ago
Scott Lahteine
5b248757c7
Level Bed in Prepare submenu
...
- Add “Level Bed” menu item for auto bed leveling
- Hide the option if homing has not been done yet
- Arrange the Prepare submenu more logically (?)
- Add documentation comments, some white-space
- Apply some coding standards here and there
- Move old encoder multiplier debug option to `ultralcd.cpp`
10 years ago
Steve Kelly
98ca46006c
Allow Y to home before X with option in Configuration_adv.h.
...
This addresses comments in #1956 and #1079 . In particular, this is useful
when both endstops are stationary on a CoreXY system, and the Y axis needs
to be homed before the X so the flags are aligned.
10 years ago
AnHardt
6cba6bcd82
Add 'cn' to the other 'Configuration.h's
10 years ago
Scott Lahteine
0fca084ea6
Make EEPROM reproducible in GCode
...
With these changes the output of `M503 S0` is all you need to restore
the EEPROM. Building on this it is straightforward to save and restore
the EEPROM state using the SD card or external GCode file.
- Added `M145` to set “heatup states” for the LCD menu
- Added `M420` to toggle Mesh Bed Leveling
- Added `M421` to set a single Mesh coordinate
- Extended `Config_PrintSettings` with added M codes
- Cleaned up some comments here and there
10 years ago
Scott Lahteine
5c29fda167
Add a warning for DISABLE_[XYZ] options
10 years ago
Scott Lahteine
3b97a7d446
Merge pull request #1944 from AnHardt/beep2
...
More Beeper clean up
10 years ago
AnHardt
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
Ivan Galvez Junquera
b99e63a7bf
Fixed compilation error "error: stray ‘\357’ in program" in several configuration files.
...
Introduced in commit 697ee2dc
and later spread to other files.
10 years ago
Scott Lahteine
ccbe2c4ea3
Apply CUSTOM_MACHINE_NAME to configurations
...
- Replace “Mendel” with “RepRap”
10 years ago
AnHardt
56fc3a4835
bgr -> bg
...
+ update in documentation
10 years ago
Natealus
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
AnHardt
c5961892e3
Bulgarian for all the Configuration.h's
10 years ago
Scott Lahteine
4788b59300
Thermistor values for configurator
10 years ago
Scott Lahteine
7431ef7e2d
Merge branch 'Development' into dev_version
...
Latest upstream commits
10 years ago
Scott Lahteine
eb6e3886f4
Set version to "1.0.3 dev"
10 years ago
Edward Patel
a9ed39b12d
Moved checks into SanityCheck.h + removed previous added checks.
10 years ago
Edward Patel
002340f32c
Merge branch 'Development-Marlin' into Development
10 years ago
Scott Lahteine
7d2c2f1790
Updates for the configurator
...
- Sections in all `Configuration_adv.h`
- Recognize JAPANESE/WESTERN/CYRILLIC options
- Better capturing of comments for tooltips
10 years ago
Scott Lahteine
967db181d0
Latest upstream commits
10 years ago
Edward Patel
d27c82a450
Added check for Delta printers in Mesh, #error not yet supported.
10 years ago
Edward Patel
9a093b2e8f
Added #error + mention not to enable ABL and Mesh at the same time
10 years ago
Edward Patel
61de6ecd54
Added change to example Configuration.h's
10 years ago
Scott Lahteine
c065da52ec
Spacing and spelling
10 years ago
Scott Lahteine
e0d4368cb5
Minor code cleanup, move NUM_AXIS out of config
10 years ago
Scott Lahteine
a469d796e1
Add cleanups needed for #1772
10 years ago
Scott Lahteine
0e8182bbf2
Additional pin tests, cleanup
10 years ago
Scott Lahteine
cda4bd4ad9
Correct the comment about M206
10 years ago
Scott Lahteine
82794fa5f7
Add delta generic not renaming
10 years ago
Scott Lahteine
ba2c7cb467
Update configs with all the latest
10 years ago
Scott Lahteine
edb67ea165
Patch generic delta config
...
- Addressing issue mentioned at #1699
10 years ago
Scott Lahteine
bc2f249cc6
Merge pull request #1622 from AnHardt/tm-utf-minus-kanji
...
The big Language Pack
10 years ago
AnHardt
20f909567a
Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji
...
Conflicts:
README.md
Solved
10 years ago
Scott Lahteine
5eff15c409
Merge branch 'Development' into fixup_leveling
...
Latest upstream commits
10 years ago
Scott Lahteine
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
AnHardt
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
AnHardt
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
Scott Lahteine
8db4fd7177
Merge branch 'Development' into planner_oh_planner
...
Latest upstream commits
10 years ago
Scott Lahteine
88e81a4804
Latest upstream commits, plus fixes
...
- Also add Manual Bed Leveling to the rest of the configs
10 years ago
Scott Lahteine
2c9bd15625
Move LCD items to `Conditionals.h`
...
- `Conditionals.h` is included twice, setting LCD values the first time
10 years ago
AnHardt
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
Scott Lahteine
63d5d28085
Merge branch 'Development' into config_testing
...
Latest upstream changes
10 years ago
Scott Lahteine
b6d381f863
Divide up Conditionals to get LCD items early
10 years ago
Scott Lahteine
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
AnHardt
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
AnHardt
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
maverikou
8a739b6fba
Merge branch 'Development' into delta_auto_bed_level
...
Conflicts:
Marlin/Marlin_main.cpp
10 years ago
maverikou
39d255608d
Test an extra delta configuration with auto bed leveling code paths
10 years ago