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

31162714

Commit 31162714 authored 13 years ago by Bernhard

Downloads
- Plain Diff

Merge branch 'smallopt' into Marlin_v1

Conflicts:
	Marlin/temperature.h

parents 85da81e6 2d9a7156

Loading

Changes 11

Show whitespace changes

Inline Side-by-side

Showing

Marlin/EEPROMwrite.h 2 additions, 2 deletions

Marlin/EEPROMwrite.h
Marlin/Marlin.h 4 additions, 1 deletion

Marlin/Marlin.h
Marlin/Marlin.pde 18 additions, 3 deletions

Marlin/Marlin.pde
Marlin/cardreader.h 24 additions, 24 deletions

Marlin/cardreader.h
Marlin/planner.cpp 12 additions, 19 deletions

Marlin/planner.cpp
Marlin/planner.h 27 additions, 5 deletions

Marlin/planner.h
Marlin/stepper.cpp 2 additions, 2 deletions

Marlin/stepper.cpp
Marlin/temperature.h 11 additions, 11 deletions

Marlin/temperature.h
Marlin/ultralcd.h 3 additions, 3 deletions

Marlin/ultralcd.h
Marlin/ultralcd.pde 141 additions, 2 deletions

Marlin/ultralcd.pde
Marlin/watchdog.h 2 additions, 2 deletions

Marlin/watchdog.h

with 246 additions and 74 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