Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

M

marlin-anet-a8
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

fbf9b21e

Commit fbf9b21e authored 10 years ago by Scott Lahteine

Downloads
- Plain Diff

Merge plus fixup zprobe_zoffset

- Make `zprobe_zoffset` conditional
- Fix ConfigurationStore for `zprobe_zoffset`

parents 96b5da71 02b4f5f9

Branches

Tags

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

Marlin/ConfigurationStore.cpp 29 additions, 14 deletions

Marlin/ConfigurationStore.cpp
Marlin/Marlin.h 3 additions, 1 deletion

Marlin/Marlin.h
Marlin/Marlin_main.cpp 52 additions, 31 deletions

Marlin/Marlin_main.cpp
Marlin/temperature.cpp 37 additions, 30 deletions

Marlin/temperature.cpp
Marlin/ultralcd.cpp 1 addition, 1 deletion

Marlin/ultralcd.cpp

with 122 additions and 77 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment