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

0d6a7a2d

Commit 0d6a7a2d authored 10 years ago by Scott Lahteine

Downloads
- Plain Diff

Merge with latest upstream changes

parents 430c4b65 6d5c13df

No related branches found

No related tags found

Loading

Changes 16

Hide whitespace changes

Inline Side-by-side

Showing

Marlin/LiquidCrystalRus.cpp 8 additions, 4 deletions

Marlin/LiquidCrystalRus.cpp
Marlin/boards.h 2 additions, 1 deletion

Marlin/boards.h
Marlin/cardreader.cpp 1 addition, 1 deletion

Marlin/cardreader.cpp
Marlin/dogm_lcd_implementation.h 5 additions, 5 deletions

Marlin/dogm_lcd_implementation.h
Marlin/language_ru.h 15 additions, 15 deletions

Marlin/language_ru.h
Marlin/pins.h 5 additions, 1 deletion

Marlin/pins.h
Marlin/pins_AZTEEG_X3.h 8 additions, 0 deletions

Marlin/pins_AZTEEG_X3.h
Marlin/pins_AZTEEG_X3_PRO.h 9 additions, 5 deletions

Marlin/pins_AZTEEG_X3_PRO.h
Marlin/pins_BAM_DICE_DUE.h 11 additions, 0 deletions

Marlin/pins_BAM_DICE_DUE.h
Marlin/pins_HEPHESTOS.h 3 additions, 0 deletions

Marlin/pins_HEPHESTOS.h
Marlin/pins_RAMPS_13.h 11 additions, 27 deletions

Marlin/pins_RAMPS_13.h
Marlin/pins_WITBOX.h 3 additions, 0 deletions

Marlin/pins_WITBOX.h
Marlin/temperature.cpp 4 additions, 6 deletions

Marlin/temperature.cpp
Marlin/ultralcd.cpp 132 additions, 89 deletions

Marlin/ultralcd.cpp
Marlin/ultralcd.h 2 additions, 1 deletion

Marlin/ultralcd.h
Marlin/ultralcd_implementation_hitachi_HD44780.h 9 additions, 9 deletions

Marlin/ultralcd_implementation_hitachi_HD44780.h

with 228 additions and 164 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