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

🎨 Check flags without ENABLED

Browse Source
This commit is contained in:
Scott Lahteine
2021-07-09 17:09:58 -05:00
parent fea4e06484
commit 78c2eb6876
31 changed files with 90 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/module/settings.cpp
View File

@ -3818,10 +3818,10 @@ void MarlinSettings::reset() {
SERIAL_CHAR(' ', 'B'); // B (maps to E1 by default)
SERIAL_ECHOLN(stepper.motor_current_setting[4]);
#endif
#elif ENABLED(HAS_MOTOR_CURRENT_I2C) // i2c-based has any number of values
#elif HAS_MOTOR_CURRENT_I2C // i2c-based has any number of values
// Values sent over i2c are not stored.
// Indexes map directly to drivers, not axes.
#elif ENABLED(HAS_MOTOR_CURRENT_DAC) // DAC-based has 4 values, for X Y Z (I J K) E
#elif HAS_MOTOR_CURRENT_DAC // DAC-based has 4 values, for X Y Z (I J K) E
// Values sent over i2c are not stored. Uses indirect mapping.
#endif

14
Marlin/src/module/temperature.h
View File

@ -340,16 +340,16 @@ class Temperature {
static const celsius_t hotend_maxtemp[HOTENDS];
static inline celsius_t hotend_max_target(const uint8_t e) { return hotend_maxtemp[e] - (HOTEND_OVERSHOOT); }
#endif
#if ENABLED(HAS_HEATED_BED)
#if HAS_HEATED_BED
static bed_info_t temp_bed;
#endif
#if ENABLED(HAS_TEMP_PROBE)
#if HAS_TEMP_PROBE
static probe_info_t temp_probe;
#endif
#if ENABLED(HAS_TEMP_CHAMBER)
#if HAS_TEMP_CHAMBER
static chamber_info_t temp_chamber;
#endif
#if ENABLED(HAS_TEMP_COOLER)
#if HAS_TEMP_COOLER
static cooler_info_t temp_cooler;
#endif
#if HAS_TEMP_REDUNDANT
@ -441,7 +441,7 @@ class Temperature {
static lpq_ptr_t lpq_ptr;
#endif
#if ENABLED(HAS_HOTEND)
#if HAS_HOTEND
static temp_range_t temp_range[HOTENDS];
#endif
@ -477,7 +477,7 @@ class Temperature {
static millis_t preheat_end_time[HOTENDS];
#endif
#if ENABLED(HAS_AUTO_FAN)
#if HAS_AUTO_FAN
static millis_t next_auto_fan_check_ms;
#endif
@ -920,7 +920,7 @@ class Temperature {
static void checkExtruderAutoFans();
#if ENABLED(HAS_HOTEND)
#if HAS_HOTEND
static float get_pid_output_hotend(const uint8_t e);
#endif
#if ENABLED(PIDTEMPBED)