0afe6696f0
Merge remote-tracking branch 'MarlinFirmware/Development' into Merge_cleanup
10 years ago
66b3b53e76
Merge pull request #1762 from AnHardt/MiMa
...
Fix MIN&MAX temperatures again
10 years ago
745d9fe1a4
Merge remote-tracking branch 'MarlinFirmware/Development' into Merge_cleanup
...
Conflicts:
Marlin/Marlin_main.cpp
10 years ago
18bb6be80e
Fix homing and leveling
...
- Include the current Z when raising the axis after and between probing
- Add `sync_plan_position_delta` for parity with `sync_plan_position`
- Clean up and clarify `M48`, `dock_sled`, and others
10 years ago
3f2e863206
Improve conditions for HAS_TEMP
...
and use them in temperuture.h
Flattened the if structure - the preprocessor is doing the work - not the Arduino. Arduino.
10 years ago
45ece5afb1
Merge remote-tracking branch 'MarlinFirmware/Development' into Development
10 years ago
17707e7479
Fixed Z_PROBE_PIN pullup bug.
...
Documented some additional areas that should be addressed if Z_PROBE is
fully separated from Z_MIN or Z_MAX.
Fixed a documentation error in sanity checks. Servos start at 0 not 1.
10 years ago
3348b3bf0c
Allow SD_FINISHED_RELEASECOMMAND to be undefined
10 years ago
3175c70c79
Manually synching back up with MarlinFirmware/Development.
10 years ago
92b54aa27e
#define HAS_POWER_SWITCH
10 years ago
6864280803
Use elif and parentheses in conditionals
10 years ago
2faed961ce
Allow POWER_SUPPLY 0 for no power switch
10 years ago
782464ea4d
Parentheses need here otherwise sanitycheck.h does wrong thing on line 222
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
19df90622b
Include Conditionals.h file in update
10 years ago
2c9bd15625
Move LCD items to `Conditionals.h`
...
- `Conditionals.h` is included twice, setting LCD values the first time
10 years ago
b6d381f863
Divide up Conditionals to get LCD items early
10 years ago
33c7c6e11d
Conditionals.h requires Arduino.h
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
Chris Roadfeldt