Skip to content

Commit 7c6a9d6

Browse files
ellenspTracy Spiva
authored and
Tracy Spiva
committed
🔧 Impose Hephestos 2 Bed Kit requirements (MarlinFirmware#25585)
1 parent 3d27570 commit 7c6a9d6

File tree

5 files changed

+37
-70
lines changed

5 files changed

+37
-70
lines changed

Marlin/Configuration_adv.h

-2
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,6 @@
203203
*/
204204
//#define HEPHESTOS2_HEATED_BED_KIT
205205
#if ENABLED(HEPHESTOS2_HEATED_BED_KIT)
206-
#undef TEMP_SENSOR_BED
207-
#define TEMP_SENSOR_BED 70
208206
#define HEATER_BED_INVERTING true
209207
#endif
210208

Marlin/src/inc/Conditionals_post.h

+11-54
Original file line numberDiff line numberDiff line change
@@ -2799,54 +2799,24 @@
27992799
#define HAS_MICROSTEPS 1
28002800
#endif
28012801

2802-
/**
2803-
* Heater signal inversion defaults
2804-
*/
2805-
2806-
#if HAS_HEATER_0 && !defined(HEATER_0_INVERTING)
2807-
#define HEATER_0_INVERTING false
2808-
#endif
2809-
#if HAS_HEATER_1 && !defined(HEATER_1_INVERTING)
2810-
#define HEATER_1_INVERTING false
2811-
#endif
2812-
#if HAS_HEATER_2 && !defined(HEATER_2_INVERTING)
2813-
#define HEATER_2_INVERTING false
2814-
#endif
2815-
#if HAS_HEATER_3 && !defined(HEATER_3_INVERTING)
2816-
#define HEATER_3_INVERTING false
2817-
#endif
2818-
#if HAS_HEATER_4 && !defined(HEATER_4_INVERTING)
2819-
#define HEATER_4_INVERTING false
2820-
#endif
2821-
#if HAS_HEATER_5 && !defined(HEATER_5_INVERTING)
2822-
#define HEATER_5_INVERTING false
2823-
#endif
2824-
#if HAS_HEATER_6 && !defined(HEATER_6_INVERTING)
2825-
#define HEATER_6_INVERTING false
2826-
#endif
2827-
#if HAS_HEATER_7 && !defined(HEATER_7_INVERTING)
2828-
#define HEATER_7_INVERTING false
2829-
#endif
2830-
28312802
/**
28322803
* Helper Macros for heaters and extruder fan
28332804
*/
2834-
2835-
#define WRITE_HEATER_0P(v) WRITE(HEATER_0_PIN, (v) ^ HEATER_0_INVERTING)
2805+
#define WRITE_HEATER_0P(v) WRITE(HEATER_0_PIN, (v) ^ ENABLED(HEATER_0_INVERTING))
28362806
#if EITHER(HAS_MULTI_HOTEND, HEATERS_PARALLEL)
2837-
#define WRITE_HEATER_1(v) WRITE(HEATER_1_PIN, (v) ^ HEATER_1_INVERTING)
2807+
#define WRITE_HEATER_1(v) WRITE(HEATER_1_PIN, (v) ^ ENABLED(HEATER_1_INVERTING))
28382808
#if HOTENDS > 2
2839-
#define WRITE_HEATER_2(v) WRITE(HEATER_2_PIN, (v) ^ HEATER_2_INVERTING)
2809+
#define WRITE_HEATER_2(v) WRITE(HEATER_2_PIN, (v) ^ ENABLED(HEATER_2_INVERTING))
28402810
#if HOTENDS > 3
2841-
#define WRITE_HEATER_3(v) WRITE(HEATER_3_PIN, (v) ^ HEATER_3_INVERTING)
2811+
#define WRITE_HEATER_3(v) WRITE(HEATER_3_PIN, (v) ^ ENABLED(HEATER_3_INVERTING))
28422812
#if HOTENDS > 4
2843-
#define WRITE_HEATER_4(v) WRITE(HEATER_4_PIN, (v) ^ HEATER_4_INVERTING)
2813+
#define WRITE_HEATER_4(v) WRITE(HEATER_4_PIN, (v) ^ ENABLED(HEATER_4_INVERTING))
28442814
#if HOTENDS > 5
2845-
#define WRITE_HEATER_5(v) WRITE(HEATER_5_PIN, (v) ^ HEATER_5_INVERTING)
2815+
#define WRITE_HEATER_5(v) WRITE(HEATER_5_PIN, (v) ^ ENABLED(HEATER_5_INVERTING))
28462816
#if HOTENDS > 6
2847-
#define WRITE_HEATER_6(v) WRITE(HEATER_6_PIN, (v) ^ HEATER_6_INVERTING)
2817+
#define WRITE_HEATER_6(v) WRITE(HEATER_6_PIN, (v) ^ ENABLED(HEATER_6_INVERTING))
28482818
#if HOTENDS > 7
2849-
#define WRITE_HEATER_7(v) WRITE(HEATER_7_PIN, (v) ^ HEATER_7_INVERTING)
2819+
#define WRITE_HEATER_7(v) WRITE(HEATER_7_PIN, (v) ^ ENABLED(HEATER_7_INVERTING))
28502820
#endif // HOTENDS > 7
28512821
#endif // HOTENDS > 6
28522822
#endif // HOTENDS > 5
@@ -2860,10 +2830,6 @@
28602830
#define WRITE_HEATER_0(v) WRITE_HEATER_0P(v)
28612831
#endif
28622832

2863-
#ifndef MIN_POWER
2864-
#define MIN_POWER 0
2865-
#endif
2866-
28672833
/**
28682834
* Heated bed requires settings
28692835
*/
@@ -2874,10 +2840,7 @@
28742840
#ifndef MAX_BED_POWER
28752841
#define MAX_BED_POWER 255
28762842
#endif
2877-
#ifndef HEATER_BED_INVERTING
2878-
#define HEATER_BED_INVERTING false
2879-
#endif
2880-
#define WRITE_HEATER_BED(v) WRITE(HEATER_BED_PIN, (v) ^ HEATER_BED_INVERTING)
2843+
#define WRITE_HEATER_BED(v) WRITE(HEATER_BED_PIN, (v) ^ ENABLED(HEATER_BED_INVERTING))
28812844
#endif
28822845

28832846
/**
@@ -2890,10 +2853,7 @@
28902853
#ifndef MAX_CHAMBER_POWER
28912854
#define MAX_CHAMBER_POWER 255
28922855
#endif
2893-
#ifndef HEATER_CHAMBER_INVERTING
2894-
#define HEATER_CHAMBER_INVERTING false
2895-
#endif
2896-
#define WRITE_HEATER_CHAMBER(v) WRITE(HEATER_CHAMBER_PIN, (v) ^ HEATER_CHAMBER_INVERTING)
2856+
#define WRITE_HEATER_CHAMBER(v) WRITE(HEATER_CHAMBER_PIN, (v) ^ ENABLED(HEATER_CHAMBER_INVERTING))
28972857
#endif
28982858

28992859
/**
@@ -2903,10 +2863,7 @@
29032863
#ifndef MAX_COOLER_POWER
29042864
#define MAX_COOLER_POWER 255
29052865
#endif
2906-
#ifndef COOLER_INVERTING
2907-
#define COOLER_INVERTING true
2908-
#endif
2909-
#define WRITE_HEATER_COOLER(v) WRITE(COOLER_PIN, (v) ^ COOLER_INVERTING)
2866+
#define WRITE_HEATER_COOLER(v) WRITE(COOLER_PIN, (v) ^ ENABLED(COOLER_INVERTING))
29102867
#endif
29112868

29122869
#if HAS_HOTEND || HAS_HEATED_BED || HAS_HEATED_CHAMBER || HAS_COOLER

Marlin/src/inc/SanityCheck.h

+11
Original file line numberDiff line numberDiff line change
@@ -736,6 +736,17 @@ static_assert(COUNT(arm) == LOGICAL_AXES, "AXIS_RELATIVE_MODES must contain " _L
736736
#undef _ISMAX_1
737737
#undef _ISSNS_1
738738

739+
/**
740+
* Hephestos 2 Heated Bed Kit requirements
741+
*/
742+
#if ENABLED(HEPHESTOS2_HEATED_BED_KIT)
743+
#if TEMP_SENSOR_BED != 70
744+
#error "HEPHESTOS2_HEATED_BED_KIT requires TEMP_SENSOR_BED 70."
745+
#elif DISABLED(HEATER_BED_INVERTING)
746+
#error "HEPHESTOS2_HEATED_BED_KIT requires HEATER_BED_INVERTING."
747+
#endif
748+
#endif
749+
739750
/**
740751
* Probe temp compensation requirements
741752
*/

Marlin/src/module/temperature.cpp

+13-13
Original file line numberDiff line numberDiff line change
@@ -2630,47 +2630,47 @@ void Temperature::init() {
26302630

26312631
#if HAS_HEATER_0
26322632
#ifdef BOARD_OPENDRAIN_MOSFETS
2633-
OUT_WRITE_OD(HEATER_0_PIN, HEATER_0_INVERTING);
2633+
OUT_WRITE_OD(HEATER_0_PIN, ENABLED(HEATER_0_INVERTING));
26342634
#else
2635-
OUT_WRITE(HEATER_0_PIN, HEATER_0_INVERTING);
2635+
OUT_WRITE(HEATER_0_PIN, ENABLED(HEATER_0_INVERTING));
26362636
#endif
26372637
#endif
26382638
#if HAS_HEATER_1
2639-
OUT_WRITE(HEATER_1_PIN, HEATER_1_INVERTING);
2639+
OUT_WRITE(HEATER_1_PIN, ENABLED(HEATER_1_INVERTING));
26402640
#endif
26412641
#if HAS_HEATER_2
2642-
OUT_WRITE(HEATER_2_PIN, HEATER_2_INVERTING);
2642+
OUT_WRITE(HEATER_2_PIN, ENABLED(HEATER_2_INVERTING));
26432643
#endif
26442644
#if HAS_HEATER_3
2645-
OUT_WRITE(HEATER_3_PIN, HEATER_3_INVERTING);
2645+
OUT_WRITE(HEATER_3_PIN, ENABLED(HEATER_3_INVERTING));
26462646
#endif
26472647
#if HAS_HEATER_4
2648-
OUT_WRITE(HEATER_4_PIN, HEATER_4_INVERTING);
2648+
OUT_WRITE(HEATER_4_PIN, ENABLED(HEATER_4_INVERTING));
26492649
#endif
26502650
#if HAS_HEATER_5
2651-
OUT_WRITE(HEATER_5_PIN, HEATER_5_INVERTING);
2651+
OUT_WRITE(HEATER_5_PIN, ENABLED(HEATER_5_INVERTING));
26522652
#endif
26532653
#if HAS_HEATER_6
2654-
OUT_WRITE(HEATER_6_PIN, HEATER_6_INVERTING);
2654+
OUT_WRITE(HEATER_6_PIN, ENABLED(HEATER_6_INVERTING));
26552655
#endif
26562656
#if HAS_HEATER_7
2657-
OUT_WRITE(HEATER_7_PIN, HEATER_7_INVERTING);
2657+
OUT_WRITE(HEATER_7_PIN, ENABLED(HEATER_7_INVERTING));
26582658
#endif
26592659

26602660
#if HAS_HEATED_BED
26612661
#ifdef BOARD_OPENDRAIN_MOSFETS
2662-
OUT_WRITE_OD(HEATER_BED_PIN, HEATER_BED_INVERTING);
2662+
OUT_WRITE_OD(HEATER_BED_PIN, ENABLED(HEATER_BED_INVERTING));
26632663
#else
2664-
OUT_WRITE(HEATER_BED_PIN, HEATER_BED_INVERTING);
2664+
OUT_WRITE(HEATER_BED_PIN, ENABLED(HEATER_BED_INVERTING));
26652665
#endif
26662666
#endif
26672667

26682668
#if HAS_HEATED_CHAMBER
2669-
OUT_WRITE(HEATER_CHAMBER_PIN, HEATER_CHAMBER_INVERTING);
2669+
OUT_WRITE(HEATER_CHAMBER_PIN, ENABLED(HEATER_CHAMBER_INVERTING));
26702670
#endif
26712671

26722672
#if HAS_COOLER
2673-
OUT_WRITE(COOLER_PIN, COOLER_INVERTING);
2673+
OUT_WRITE(COOLER_PIN, ENABLED(COOLER_INVERTING));
26742674
#endif
26752675

26762676
#if HAS_FAN0

Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,10 @@
121121
#include "pins_RAMPS_13.h" // ... RAMPS
122122

123123
//
124-
// Used by the Hephestos 2 heated bed upgrade kit
124+
// Hephestos 2 heated bed upgrade kit uses pin 8
125125
//
126126
#if ENABLED(HEPHESTOS2_HEATED_BED_KIT)
127127
#undef HEATER_BED_PIN
128128
#define HEATER_BED_PIN 8
129+
#define HEATER_BED_INVERTING true
129130
#endif

0 commit comments

Comments
 (0)