bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Simplify power supply naming logic (#14488)

Browse Source 
Co-Authored-By: Tim Moore <tim.moore@lightbend.com>
Co-Authored-By: AnHardt <github@kitelab.de>
This commit is contained in:
Tim Moore
2019-07-04 23:58:34 -07:00
committed by Scott Lahteine
parent 44e4f853c8
commit eb6dec03bd
119 changed files with 1141 additions and 1460 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/pins/pins.h
View File

@ -741,7 +741,7 @@
#ifndef LED_PIN
#define LED_PIN -1
#endif
#if POWER_SUPPLY == 0 || !defined(PS_ON_PIN)
#if DISABLED(PSU_CONTROL) || !defined(PS_ON_PIN)
#undef PS_ON_PIN
#define PS_ON_PIN -1
#endif

4
Marlin/src/pins/pins_MKS_GEN_13.h
View File

@ -44,9 +44,9 @@
//
// PSU / SERVO
//
// If POWER_SUPPLY is specified, always hijack Servo 3
// If PSU_CONTROL is specified, always hijack Servo 3
//
#if POWER_SUPPLY > 0
#if ENABLED(PSU_CONTROL)
#define SERVO3_PIN -1
#define PS_ON_PIN 4
#endif