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

10c8c034

Commit 10c8c034 authored 6 years ago by 7eggert Committed by Scott Lahteine 6 years ago

Downloads
- Patches
- Plain Diff

Allow both encoder and ADC keypad (#13355)

parent 31ff7da7

Branches

Tags

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

Marlin/src/core/macros.h 2 additions, 1 deletion

Marlin/src/core/macros.h
Marlin/src/inc/Conditionals_LCD.h 0 additions, 6 deletions

Marlin/src/inc/Conditionals_LCD.h
Marlin/src/lcd/ultralcd.cpp 3 additions, 3 deletions

Marlin/src/lcd/ultralcd.cpp
Marlin/src/lcd/ultralcd.h 11 additions, 1 deletion

Marlin/src/lcd/ultralcd.h

with 16 additions and 11 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