Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

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

Snippets Groups Projects

Jonas Leder
marlin-anet-a8
Commits
09ef9551

Commit 09ef9551 authored Mar 19, 2016 by Scott Lahteine

Downloads
- Plain Diff

Merge pull request #3086 from thinkyhead/rc_two_fans

Support for multiple PWM fans

parents 4634feae 38b0082b

Branches

Tags

Loading

Changes 11

Show whitespace changes

Inline Side-by-side

Showing

Marlin/Conditionals.h 26 additions, 2 deletions

Marlin/Conditionals.h
Marlin/Marlin.h 3 additions, 5 deletions

Marlin/Marlin.h
Marlin/Marlin_main.cpp 54 additions, 26 deletions

Marlin/Marlin_main.cpp
Marlin/SanityCheck.h 24 additions, 10 deletions

Marlin/SanityCheck.h
Marlin/dogm_lcd_implementation.h 3 additions, 3 deletions

Marlin/dogm_lcd_implementation.h
Marlin/pins_MEGACONTROLLER.h 1 addition, 1 deletion

Marlin/pins_MEGACONTROLLER.h
Marlin/planner.cpp 75 additions, 24 deletions

Marlin/planner.cpp
Marlin/planner.h 7 additions, 1 deletion

Marlin/planner.h
Marlin/temperature.cpp 72 additions, 12 deletions

Marlin/temperature.cpp
Marlin/ultralcd.cpp 42 additions, 4 deletions

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

Marlin/ultralcd_implementation_hitachi_HD44780.h

with 326 additions and 89 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