|
2799 | 2799 | #define HAS_MICROSTEPS 1
|
2800 | 2800 | #endif
|
2801 | 2801 |
|
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 |
| - |
2831 | 2802 | /**
|
2832 | 2803 | * Helper Macros for heaters and extruder fan
|
2833 | 2804 | */
|
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)) |
2836 | 2806 | #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)) |
2838 | 2808 | #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)) |
2840 | 2810 | #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)) |
2842 | 2812 | #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)) |
2844 | 2814 | #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)) |
2846 | 2816 | #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)) |
2848 | 2818 | #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)) |
2850 | 2820 | #endif // HOTENDS > 7
|
2851 | 2821 | #endif // HOTENDS > 6
|
2852 | 2822 | #endif // HOTENDS > 5
|
|
2860 | 2830 | #define WRITE_HEATER_0(v) WRITE_HEATER_0P(v)
|
2861 | 2831 | #endif
|
2862 | 2832 |
|
2863 |
| -#ifndef MIN_POWER |
2864 |
| - #define MIN_POWER 0 |
2865 |
| -#endif |
2866 |
| - |
2867 | 2833 | /**
|
2868 | 2834 | * Heated bed requires settings
|
2869 | 2835 | */
|
|
2874 | 2840 | #ifndef MAX_BED_POWER
|
2875 | 2841 | #define MAX_BED_POWER 255
|
2876 | 2842 | #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)) |
2881 | 2844 | #endif
|
2882 | 2845 |
|
2883 | 2846 | /**
|
|
2890 | 2853 | #ifndef MAX_CHAMBER_POWER
|
2891 | 2854 | #define MAX_CHAMBER_POWER 255
|
2892 | 2855 | #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)) |
2897 | 2857 | #endif
|
2898 | 2858 |
|
2899 | 2859 | /**
|
|
2903 | 2863 | #ifndef MAX_COOLER_POWER
|
2904 | 2864 | #define MAX_COOLER_POWER 255
|
2905 | 2865 | #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)) |
2910 | 2867 | #endif
|
2911 | 2868 |
|
2912 | 2869 | #if HAS_HOTEND || HAS_HEATED_BED || HAS_HEATED_CHAMBER || HAS_COOLER
|
|
0 commit comments