Commit Graph

27 Commits (a366e5738542d8e59f6f1e6ff30c4b78d89ad664)

Author SHA1 Message Date
Christian Bohn fb44b53ae3 sled improvements
- create sled pin definition
- G28 Works with sled
Scott Lahteine a00ebf03d4 Merge pull request from AnHardt/LCD_STR
Moved the definitions of the LCD_STR_* to Conditionals.h
AnHardt ea897654a4 Moved the definitions of the LCD_STR_* to Conditionals.h
to avoid errors in Marlin_main.cpp. 

In the include tree of Marlin_main.cpp the decision between the display types is not made.
To include the right LCD_STR_* ether 'dogm_lcd_implementation.h' or 'ultralcd_implementation_hitachi_HD44780.h' with all their code.
A 'dogm_lcd_implementation.h.h' would be a curiosity.
So i moved both of the definition blocks to conditionals.h

On the long term it could make sense to use the same numbering for the u8glib and the hitachi symbols.
AnHardt 6a514f3dc9 Aplied HAS_LCD_CONTRAST also to Marlin_main.cpp
and cleaned typo.
AnHardt bcc04192fc Remove Contrast Menu for U8GLIB_ST7920
The other two devices we use in u8glib have more than only dummy code.
Checked this in the library code.
Scott Lahteine a469d796e1 Add cleanups needed for
Scott Lahteine c0ca26cd50 Merge branch 'Development' into fixup_probing
Latest upstream commits
Scott Lahteine 0e8182bbf2 Additional pin tests, cleanup
Chris Roadfeldt 0afe6696f0 Merge remote-tracking branch 'MarlinFirmware/Development' into Merge_cleanup
Scott Lahteine 66b3b53e76 Merge pull request from AnHardt/MiMa
Fix MIN&MAX temperatures again
Chris Roadfeldt 745d9fe1a4 Merge remote-tracking branch 'MarlinFirmware/Development' into Merge_cleanup
Conflicts:
	Marlin/Marlin_main.cpp
Scott Lahteine 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
AnHardt 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.
Chris Roadfeldt 45ece5afb1 Merge remote-tracking branch 'MarlinFirmware/Development' into Development
Chris Roadfeldt 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.
Scott Lahteine 3348b3bf0c Allow SD_FINISHED_RELEASECOMMAND to be undefined
Chris Roadfeldt 3175c70c79 Manually synching back up with MarlinFirmware/Development.
Scott Lahteine 92b54aa27e #define HAS_POWER_SWITCH
Scott Lahteine 6864280803 Use elif and parentheses in conditionals
Scott Lahteine 2faed961ce Allow POWER_SUPPLY 0 for no power switch
Edward Patel 782464ea4d Parentheses need here otherwise sanitycheck.h does wrong thing on line 222
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'
Scott Lahteine 19df90622b Include Conditionals.h file in update
Scott Lahteine 2c9bd15625 Move LCD items to `Conditionals.h`
- `Conditionals.h` is included twice, setting LCD values the first time
Scott Lahteine b6d381f863 Divide up Conditionals to get LCD items early
Scott Lahteine 33c7c6e11d Conditionals.h requires Arduino.h
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