From 62bd734612eb81258616ce98a004186707427b28 Mon Sep 17 00:00:00 2001
From: Wurstnase <wurstnase.reprap@gmail.com>
Date: Fri, 6 Mar 2015 12:01:17 +0100
Subject: [PATCH 1/3] fix controllerFan() for inverted enable pins
add ```^ !(n_ENABLE_ON)``` for each stepper
---
Marlin/Marlin_main.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index 79416850be..bcfb9a22dc 100644
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -5039,17 +5039,17 @@ void controllerFan()
{
lastMotorCheck = millis();
- if(!READ(X_ENABLE_PIN) || !READ(Y_ENABLE_PIN) || !READ(Z_ENABLE_PIN) || (soft_pwm_bed > 0)
+ if((!READ(X_ENABLE_PIN) ^ !(X_ENABLE_ON)) || (!READ(Y_ENABLE_PIN) ^ !(Y_ENABLE_ON)) || (!READ(Z_ENABLE_PIN) ^ !(Z_ENABLE_ON)) || (soft_pwm_bed > 0)
#if EXTRUDERS > 2
- || !READ(E2_ENABLE_PIN)
+ || (!READ(E2_ENABLE_PIN) ^ !(E_ENABLE_ON))
#endif
#if EXTRUDER > 1
#if defined(X2_ENABLE_PIN) && X2_ENABLE_PIN > -1
- || !READ(X2_ENABLE_PIN)
+ || (!READ(X2_ENABLE_PIN) ^ !(X_ENABLE_ON))
#endif
- || !READ(E1_ENABLE_PIN)
+ || (!READ(E1_ENABLE_PIN) ^ !(E_ENABLE_ON))
#endif
- || !READ(E0_ENABLE_PIN)) //If any of the drivers are enabled...
+ || (!READ(E0_ENABLE_PIN) ^ !(E_ENABLE_ON))) //If any of the drivers are enabled...
{
lastMotor = millis(); //... set time to NOW so the fan will turn on
}
From a5342c942e7b4cb85255a1728ebb3fdfeea10116 Mon Sep 17 00:00:00 2001
From: Wurstnase <wurstnase.reprap@gmail.com>
Date: Sat, 7 Mar 2015 16:47:53 +0100
Subject: [PATCH 2/3] Update Marlin_main.cpp
---
Marlin/Marlin_main.cpp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index bcfb9a22dc..7a7e633a42 100644
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -5038,18 +5038,18 @@ void controllerFan()
if ((millis() - lastMotorCheck) >= 2500) //Not a time critical function, so we only check every 2500ms
{
lastMotorCheck = millis();
-
- if((!READ(X_ENABLE_PIN) ^ !(X_ENABLE_ON)) || (!READ(Y_ENABLE_PIN) ^ !(Y_ENABLE_ON)) || (!READ(Z_ENABLE_PIN) ^ !(Z_ENABLE_ON)) || (soft_pwm_bed > 0)
+
+ if((READ(X_ENABLE_PIN) == (X_ENABLE_ON)) || (READ(Y_ENABLE_PIN) == (Y_ENABLE_ON)) || (READ(Z_ENABLE_PIN) == (Z_ENABLE_ON)) || (soft_pwm_bed > 0)
#if EXTRUDERS > 2
- || (!READ(E2_ENABLE_PIN) ^ !(E_ENABLE_ON))
+ || (READ(E2_ENABLE_PIN) == (E_ENABLE_ON))
#endif
#if EXTRUDER > 1
#if defined(X2_ENABLE_PIN) && X2_ENABLE_PIN > -1
- || (!READ(X2_ENABLE_PIN) ^ !(X_ENABLE_ON))
+ || (READ(X2_ENABLE_PIN) == (X_ENABLE_ON))
#endif
- || (!READ(E1_ENABLE_PIN) ^ !(E_ENABLE_ON))
+ || (READ(E1_ENABLE_PIN) == (E_ENABLE_ON))
#endif
- || (!READ(E0_ENABLE_PIN) ^ !(E_ENABLE_ON))) //If any of the drivers are enabled...
+ || (READ(E0_ENABLE_PIN) == (E_ENABLE_ON))) //If any of the drivers are enabled...
{
lastMotor = millis(); //... set time to NOW so the fan will turn on
}
From 4fba7b084f399a829b397d0227089d8ade2cb261 Mon Sep 17 00:00:00 2001
From: Greg Alexander <gitgreg@galexander.org>
Date: Sat, 7 Mar 2015 16:43:41 -0500
Subject: [PATCH 3/3] fix typo in delta example config introduced in commit
697ee2dc502eb9e9dda8600a57ed21d7db621547
---
Marlin/example_configurations/delta/Configuration.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Marlin/example_configurations/delta/Configuration.h b/Marlin/example_configurations/delta/Configuration.h
index 35f7e81b2f..e44d3c7868 100644
--- a/Marlin/example_configurations/delta/Configuration.h
+++ b/Marlin/example_configurations/delta/Configuration.h
@@ -1,4 +1,4 @@
-#ifndef CONFIGURATION_H
+#ifndef CONFIGURATION_H
#define CONFIGURATION_H
#include "boards.h"