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

3cc7626d

Commit 3cc7626d authored 11 years ago by Cylindric

Downloads
- Plain Diff

Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into update_menu_plan

parents 363dc2f0 9fa328e5

No related branches found

No related tags found

No related merge requests found

Changes 16

Expand all Show whitespace changes

Inline Side-by-side

Showing

Marlin/Configuration.h 29 additions, 22 deletions

Marlin/Configuration.h
Marlin/Configuration_adv.h 22 additions, 16 deletions

Marlin/Configuration_adv.h
Marlin/LiquidCrystalRus.cpp 5 additions, 5 deletions

Marlin/LiquidCrystalRus.cpp
Marlin/Makefile 3 additions, 2 deletions

Marlin/Makefile
Marlin/Marlin.h 2 additions, 0 deletions

Marlin/Marlin.h
Marlin/MarlinSerial.cpp 2 additions, 2 deletions

Marlin/MarlinSerial.cpp
Marlin/Marlin_main.cpp 111 additions, 135 deletions

Marlin/Marlin_main.cpp
Marlin/cardreader.cpp 3 additions, 3 deletions

Marlin/cardreader.cpp
Marlin/language.h 491 additions, 287 deletions

Marlin/language.h
Marlin/pins.h 1 addition, 1 deletion

Marlin/pins.h
Marlin/thermistortables.h 64 additions, 0 deletions

Marlin/thermistortables.h
Marlin/ultralcd.cpp 7 additions, 2 deletions

Marlin/ultralcd.cpp
Marlin/ultralcd_implementation_hitachi_HD44780.h 11 additions, 1 deletion

Marlin/ultralcd_implementation_hitachi_HD44780.h
Marlin/ultralcd_st7920_u8glib_rrd.h 4 additions, 4 deletions

Marlin/ultralcd_st7920_u8glib_rrd.h
Marlin/vector_3.cpp 3 additions, 13 deletions

Marlin/vector_3.cpp
Marlin/watchdog.h 2 additions, 2 deletions

Marlin/watchdog.h

with 760 additions and 495 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