Skip to content

Commit f3f1b4a

Browse files
thinkyheadthinkyhead
committed
✨ PSU_OFF_REDUNDANT, etc.
MarlinFirmware/Marlin#26751
1 parent 4e9493f commit f3f1b4a

File tree

359 files changed

+4308
-1077
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

359 files changed

+4308
-1077
lines changed

‎config/default/Configuration.h

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -412,9 +412,18 @@
412412
//#define PS_OFF_SOUND // Beep 1s when power off
413413
#define PSU_ACTIVE_STATE LOW // Set 'LOW' for ATX, 'HIGH' for X-Box
414414

415-
//#define PSU_DEFAULT_OFF // Keep power off until enabled directly with M80
416-
//#define PSU_POWERUP_DELAY 250 // (ms) Delay for the PSU to warm up to full power
417-
//#define LED_POWEROFF_TIMEOUT 10000 // (ms) Turn off LEDs after power-off, with this amount of delay
415+
//#define PSU_DEFAULT_OFF // Keep power off until enabled directly with M80
416+
//#define PSU_POWERUP_DELAY 250 // (ms) Delay for the PSU to warm up to full power
417+
//#define LED_POWEROFF_TIMEOUT 10000 // (ms) Turn off LEDs after power-off, with this amount of delay
418+
419+
//#define PSU_OFF_REDUNDANT // Second pin for redundant power control
420+
//#define PSU_OFF_REDUNDANT_INVERTED // Redundant pin state is the inverse of PSU_ACTIVE_STATE
421+
422+
//#define PS_ON1_PIN 6 // Redundant pin required to enable power in combination with PS_ON_PIN
423+
424+
//#define PS_ON_EDM_PIN 8 // External Device Monitoring pins for external power control relay feedback. Fault on mismatch.
425+
//#define PS_ON1_EDM_PIN 9
426+
#define PS_EDM_RESPONSE 250 // (ms) Time to allow for relay action
418427

419428
//#define POWER_OFF_TIMER // Enable M81 D<seconds> to power off after a delay
420429
//#define POWER_OFF_WAIT_FOR_COOLDOWN // Enable M81 S to power off only after cooldown

‎config/examples/3DFabXYZ/Migbot/Configuration.h

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -413,9 +413,18 @@
413413
//#define PS_OFF_SOUND // Beep 1s when power off
414414
#define PSU_ACTIVE_STATE LOW // Set 'LOW' for ATX, 'HIGH' for X-Box
415415

416-
//#define PSU_DEFAULT_OFF // Keep power off until enabled directly with M80
417-
//#define PSU_POWERUP_DELAY 250 // (ms) Delay for the PSU to warm up to full power
418-
//#define LED_POWEROFF_TIMEOUT 10000 // (ms) Turn off LEDs after power-off, with this amount of delay
416+
//#define PSU_DEFAULT_OFF // Keep power off until enabled directly with M80
417+
//#define PSU_POWERUP_DELAY 250 // (ms) Delay for the PSU to warm up to full power
418+
//#define LED_POWEROFF_TIMEOUT 10000 // (ms) Turn off LEDs after power-off, with this amount of delay
419+
420+
//#define PSU_OFF_REDUNDANT // Second pin for redundant power control
421+
//#define PSU_OFF_REDUNDANT_INVERTED // Redundant pin state is the inverse of PSU_ACTIVE_STATE
422+
423+
//#define PS_ON1_PIN 6 // Redundant pin required to enable power in combination with PS_ON_PIN
424+
425+
//#define PS_ON_EDM_PIN 8 // External Device Monitoring pins for external power control relay feedback. Fault on mismatch.
426+
//#define PS_ON1_EDM_PIN 9
427+
#define PS_EDM_RESPONSE 250 // (ms) Time to allow for relay action
419428

420429
//#define POWER_OFF_TIMER // Enable M81 D<seconds> to power off after a delay
421430
//#define POWER_OFF_WAIT_FOR_COOLDOWN // Enable M81 S to power off only after cooldown

‎config/examples/ADIMLab/Gantry v1/Configuration.h

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -412,9 +412,18 @@
412412
//#define PS_OFF_SOUND // Beep 1s when power off
413413
#define PSU_ACTIVE_STATE LOW // Set 'LOW' for ATX, 'HIGH' for X-Box
414414

415-
//#define PSU_DEFAULT_OFF // Keep power off until enabled directly with M80
416-
//#define PSU_POWERUP_DELAY 250 // (ms) Delay for the PSU to warm up to full power
417-
//#define LED_POWEROFF_TIMEOUT 10000 // (ms) Turn off LEDs after power-off, with this amount of delay
415+
//#define PSU_DEFAULT_OFF // Keep power off until enabled directly with M80
416+
//#define PSU_POWERUP_DELAY 250 // (ms) Delay for the PSU to warm up to full power
417+
//#define LED_POWEROFF_TIMEOUT 10000 // (ms) Turn off LEDs after power-off, with this amount of delay
418+
419+
//#define PSU_OFF_REDUNDANT // Second pin for redundant power control
420+
//#define PSU_OFF_REDUNDANT_INVERTED // Redundant pin state is the inverse of PSU_ACTIVE_STATE
421+
422+
//#define PS_ON1_PIN 6 // Redundant pin required to enable power in combination with PS_ON_PIN
423+
424+
//#define PS_ON_EDM_PIN 8 // External Device Monitoring pins for external power control relay feedback. Fault on mismatch.
425+
//#define PS_ON1_EDM_PIN 9
426+
#define PS_EDM_RESPONSE 250 // (ms) Time to allow for relay action
418427

419428
//#define POWER_OFF_TIMER // Enable M81 D<seconds> to power off after a delay
420429
//#define POWER_OFF_WAIT_FOR_COOLDOWN // Enable M81 S to power off only after cooldown

‎config/examples/ADIMLab/Gantry v2/Configuration.h

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -412,9 +412,18 @@
412412
//#define PS_OFF_SOUND // Beep 1s when power off
413413
#define PSU_ACTIVE_STATE LOW // Set 'LOW' for ATX, 'HIGH' for X-Box
414414

415-
//#define PSU_DEFAULT_OFF // Keep power off until enabled directly with M80
416-
//#define PSU_POWERUP_DELAY 250 // (ms) Delay for the PSU to warm up to full power
417-
//#define LED_POWEROFF_TIMEOUT 10000 // (ms) Turn off LEDs after power-off, with this amount of delay
415+
//#define PSU_DEFAULT_OFF // Keep power off until enabled directly with M80
416+
//#define PSU_POWERUP_DELAY 250 // (ms) Delay for the PSU to warm up to full power
417+
//#define LED_POWEROFF_TIMEOUT 10000 // (ms) Turn off LEDs after power-off, with this amount of delay
418+
419+
//#define PSU_OFF_REDUNDANT // Second pin for redundant power control
420+
//#define PSU_OFF_REDUNDANT_INVERTED // Redundant pin state is the inverse of PSU_ACTIVE_STATE
421+
422+
//#define PS_ON1_PIN 6 // Redundant pin required to enable power in combination with PS_ON_PIN
423+
424+
//#define PS_ON_EDM_PIN 8 // External Device Monitoring pins for external power control relay feedback. Fault on mismatch.
425+
//#define PS_ON1_EDM_PIN 9
426+
#define PS_EDM_RESPONSE 250 // (ms) Time to allow for relay action
418427

419428
//#define POWER_OFF_TIMER // Enable M81 D<seconds> to power off after a delay
420429
//#define POWER_OFF_WAIT_FOR_COOLDOWN // Enable M81 S to power off only after cooldown

‎config/examples/Alfawise/U20-bltouch/Configuration.h

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -467,9 +467,18 @@
467467
//#define PS_OFF_SOUND // Beep 1s when power off
468468
#define PSU_ACTIVE_STATE LOW // Set 'LOW' for ATX, 'HIGH' for X-Box
469469

470-
//#define PSU_DEFAULT_OFF // Keep power off until enabled directly with M80
471-
//#define PSU_POWERUP_DELAY 250 // (ms) Delay for the PSU to warm up to full power
472-
//#define LED_POWEROFF_TIMEOUT 10000 // (ms) Turn off LEDs after power-off, with this amount of delay
470+
//#define PSU_DEFAULT_OFF // Keep power off until enabled directly with M80
471+
//#define PSU_POWERUP_DELAY 250 // (ms) Delay for the PSU to warm up to full power
472+
//#define LED_POWEROFF_TIMEOUT 10000 // (ms) Turn off LEDs after power-off, with this amount of delay
473+
474+
//#define PSU_OFF_REDUNDANT // Second pin for redundant power control
475+
//#define PSU_OFF_REDUNDANT_INVERTED // Redundant pin state is the inverse of PSU_ACTIVE_STATE
476+
477+
//#define PS_ON1_PIN 6 // Redundant pin required to enable power in combination with PS_ON_PIN
478+
479+
//#define PS_ON_EDM_PIN 8 // External Device Monitoring pins for external power control relay feedback. Fault on mismatch.
480+
//#define PS_ON1_EDM_PIN 9
481+
#define PS_EDM_RESPONSE 250 // (ms) Time to allow for relay action
473482

474483
//#define POWER_OFF_TIMER // Enable M81 D<seconds> to power off after a delay
475484
//#define POWER_OFF_WAIT_FOR_COOLDOWN // Enable M81 S to power off only after cooldown

‎config/examples/Alfawise/U20/Configuration.h

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -467,9 +467,18 @@
467467
//#define PS_OFF_SOUND // Beep 1s when power off
468468
#define PSU_ACTIVE_STATE LOW // Set 'LOW' for ATX, 'HIGH' for X-Box
469469

470-
//#define PSU_DEFAULT_OFF // Keep power off until enabled directly with M80
471-
//#define PSU_POWERUP_DELAY 250 // (ms) Delay for the PSU to warm up to full power
472-
//#define LED_POWEROFF_TIMEOUT 10000 // (ms) Turn off LEDs after power-off, with this amount of delay
470+
//#define PSU_DEFAULT_OFF // Keep power off until enabled directly with M80
471+
//#define PSU_POWERUP_DELAY 250 // (ms) Delay for the PSU to warm up to full power
472+
//#define LED_POWEROFF_TIMEOUT 10000 // (ms) Turn off LEDs after power-off, with this amount of delay
473+
474+
//#define PSU_OFF_REDUNDANT // Second pin for redundant power control
475+
//#define PSU_OFF_REDUNDANT_INVERTED // Redundant pin state is the inverse of PSU_ACTIVE_STATE
476+
477+
//#define PS_ON1_PIN 6 // Redundant pin required to enable power in combination with PS_ON_PIN
478+
479+
//#define PS_ON_EDM_PIN 8 // External Device Monitoring pins for external power control relay feedback. Fault on mismatch.
480+
//#define PS_ON1_EDM_PIN 9
481+
#define PS_EDM_RESPONSE 250 // (ms) Time to allow for relay action
473482

474483
//#define POWER_OFF_TIMER // Enable M81 D<seconds> to power off after a delay
475484
//#define POWER_OFF_WAIT_FOR_COOLDOWN // Enable M81 S to power off only after cooldown

‎config/examples/AliExpress/CL-260/Configuration.h

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -412,9 +412,18 @@
412412
//#define PS_OFF_SOUND // Beep 1s when power off
413413
#define PSU_ACTIVE_STATE LOW // Set 'LOW' for ATX, 'HIGH' for X-Box
414414

415-
//#define PSU_DEFAULT_OFF // Keep power off until enabled directly with M80
416-
//#define PSU_POWERUP_DELAY 250 // (ms) Delay for the PSU to warm up to full power
417-
//#define LED_POWEROFF_TIMEOUT 10000 // (ms) Turn off LEDs after power-off, with this amount of delay
415+
//#define PSU_DEFAULT_OFF // Keep power off until enabled directly with M80
416+
//#define PSU_POWERUP_DELAY 250 // (ms) Delay for the PSU to warm up to full power
417+
//#define LED_POWEROFF_TIMEOUT 10000 // (ms) Turn off LEDs after power-off, with this amount of delay
418+
419+
//#define PSU_OFF_REDUNDANT // Second pin for redundant power control
420+
//#define PSU_OFF_REDUNDANT_INVERTED // Redundant pin state is the inverse of PSU_ACTIVE_STATE
421+
422+
//#define PS_ON1_PIN 6 // Redundant pin required to enable power in combination with PS_ON_PIN
423+
424+
//#define PS_ON_EDM_PIN 8 // External Device Monitoring pins for external power control relay feedback. Fault on mismatch.
425+
//#define PS_ON1_EDM_PIN 9
426+
#define PS_EDM_RESPONSE 250 // (ms) Time to allow for relay action
418427

419428
//#define POWER_OFF_TIMER // Enable M81 D<seconds> to power off after a delay
420429
//#define POWER_OFF_WAIT_FOR_COOLDOWN // Enable M81 S to power off only after cooldown

‎config/examples/AliExpress/UM2pExt/Configuration.h

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -412,9 +412,18 @@
412412
//#define PS_OFF_SOUND // Beep 1s when power off
413413
#define PSU_ACTIVE_STATE LOW // Set 'LOW' for ATX, 'HIGH' for X-Box
414414

415-
//#define PSU_DEFAULT_OFF // Keep power off until enabled directly with M80
416-
//#define PSU_POWERUP_DELAY 250 // (ms) Delay for the PSU to warm up to full power
417-
//#define LED_POWEROFF_TIMEOUT 10000 // (ms) Turn off LEDs after power-off, with this amount of delay
415+
//#define PSU_DEFAULT_OFF // Keep power off until enabled directly with M80
416+
//#define PSU_POWERUP_DELAY 250 // (ms) Delay for the PSU to warm up to full power
417+
//#define LED_POWEROFF_TIMEOUT 10000 // (ms) Turn off LEDs after power-off, with this amount of delay
418+
419+
//#define PSU_OFF_REDUNDANT // Second pin for redundant power control
420+
//#define PSU_OFF_REDUNDANT_INVERTED // Redundant pin state is the inverse of PSU_ACTIVE_STATE
421+
422+
//#define PS_ON1_PIN 6 // Redundant pin required to enable power in combination with PS_ON_PIN
423+
424+
//#define PS_ON_EDM_PIN 8 // External Device Monitoring pins for external power control relay feedback. Fault on mismatch.
425+
//#define PS_ON1_EDM_PIN 9
426+
#define PS_EDM_RESPONSE 250 // (ms) Time to allow for relay action
418427

419428
//#define POWER_OFF_TIMER // Enable M81 D<seconds> to power off after a delay
420429
//#define POWER_OFF_WAIT_FOR_COOLDOWN // Enable M81 S to power off only after cooldown

‎config/examples/Anet/A2/Configuration.h

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -412,9 +412,18 @@
412412
//#define PS_OFF_SOUND // Beep 1s when power off
413413
#define PSU_ACTIVE_STATE LOW // Set 'LOW' for ATX, 'HIGH' for X-Box
414414

415-
//#define PSU_DEFAULT_OFF // Keep power off until enabled directly with M80
416-
//#define PSU_POWERUP_DELAY 250 // (ms) Delay for the PSU to warm up to full power
417-
//#define LED_POWEROFF_TIMEOUT 10000 // (ms) Turn off LEDs after power-off, with this amount of delay
415+
//#define PSU_DEFAULT_OFF // Keep power off until enabled directly with M80
416+
//#define PSU_POWERUP_DELAY 250 // (ms) Delay for the PSU to warm up to full power
417+
//#define LED_POWEROFF_TIMEOUT 10000 // (ms) Turn off LEDs after power-off, with this amount of delay
418+
419+
//#define PSU_OFF_REDUNDANT // Second pin for redundant power control
420+
//#define PSU_OFF_REDUNDANT_INVERTED // Redundant pin state is the inverse of PSU_ACTIVE_STATE
421+
422+
//#define PS_ON1_PIN 6 // Redundant pin required to enable power in combination with PS_ON_PIN
423+
424+
//#define PS_ON_EDM_PIN 8 // External Device Monitoring pins for external power control relay feedback. Fault on mismatch.
425+
//#define PS_ON1_EDM_PIN 9
426+
#define PS_EDM_RESPONSE 250 // (ms) Time to allow for relay action
418427

419428
//#define POWER_OFF_TIMER // Enable M81 D<seconds> to power off after a delay
420429
//#define POWER_OFF_WAIT_FOR_COOLDOWN // Enable M81 S to power off only after cooldown

‎config/examples/Anet/A2plus/Configuration.h

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -412,9 +412,18 @@
412412
//#define PS_OFF_SOUND // Beep 1s when power off
413413
#define PSU_ACTIVE_STATE LOW // Set 'LOW' for ATX, 'HIGH' for X-Box
414414

415-
//#define PSU_DEFAULT_OFF // Keep power off until enabled directly with M80
416-
//#define PSU_POWERUP_DELAY 250 // (ms) Delay for the PSU to warm up to full power
417-
//#define LED_POWEROFF_TIMEOUT 10000 // (ms) Turn off LEDs after power-off, with this amount of delay
415+
//#define PSU_DEFAULT_OFF // Keep power off until enabled directly with M80
416+
//#define PSU_POWERUP_DELAY 250 // (ms) Delay for the PSU to warm up to full power
417+
//#define LED_POWEROFF_TIMEOUT 10000 // (ms) Turn off LEDs after power-off, with this amount of delay
418+
419+
//#define PSU_OFF_REDUNDANT // Second pin for redundant power control
420+
//#define PSU_OFF_REDUNDANT_INVERTED // Redundant pin state is the inverse of PSU_ACTIVE_STATE
421+
422+
//#define PS_ON1_PIN 6 // Redundant pin required to enable power in combination with PS_ON_PIN
423+
424+
//#define PS_ON_EDM_PIN 8 // External Device Monitoring pins for external power control relay feedback. Fault on mismatch.
425+
//#define PS_ON1_EDM_PIN 9
426+
#define PS_EDM_RESPONSE 250 // (ms) Time to allow for relay action
418427

419428
//#define POWER_OFF_TIMER // Enable M81 D<seconds> to power off after a delay
420429
//#define POWER_OFF_WAIT_FOR_COOLDOWN // Enable M81 S to power off only after cooldown

0 commit comments

Comments
 (0)