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

Update some precompiler tests

Browse Source
This commit is contained in:
Scott Lahteine
2019-07-14 08:56:29 -05:00
committed by Scott Lahteine
parent ce02c6cee2
commit eaf1c0954e
8 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/src/module/configuration_store.cpp
View File

@ -2252,7 +2252,7 @@ void MarlinSettings::reset() {
planner.max_jerk[X_AXIS] = DEFAULT_XJERK;
planner.max_jerk[Y_AXIS] = DEFAULT_YJERK;
planner.max_jerk[Z_AXIS] = DEFAULT_ZJERK;
#if DISABLED(JUNCTION_DEVIATION) || DISABLED(LIN_ADVANCE)
#if !BOTH(JUNCTION_DEVIATION, LIN_ADVANCE)
planner.max_jerk[E_AXIS] = DEFAULT_EJERK;
#endif
#endif
@ -2768,7 +2768,7 @@ void MarlinSettings::reset() {
#endif
#if HAS_CLASSIC_JERK
SERIAL_ECHOPGM(" X<max_x_jerk> Y<max_y_jerk> Z<max_z_jerk>");
#if DISABLED(JUNCTION_DEVIATION) || DISABLED(LIN_ADVANCE)
#if !BOTH(JUNCTION_DEVIATION, LIN_ADVANCE)
SERIAL_ECHOPGM(" E<max_e_jerk>");
#endif
#endif
@ -2786,7 +2786,7 @@ void MarlinSettings::reset() {
, " X", LINEAR_UNIT(planner.max_jerk[X_AXIS])
, " Y", LINEAR_UNIT(planner.max_jerk[Y_AXIS])
, " Z", LINEAR_UNIT(planner.max_jerk[Z_AXIS])
#if DISABLED(JUNCTION_DEVIATION) || DISABLED(LIN_ADVANCE)
#if !BOTH(JUNCTION_DEVIATION, LIN_ADVANCE)
, " E", LINEAR_UNIT(planner.max_jerk[E_AXIS])
#endif
#endif

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

@ -1005,8 +1005,6 @@ void Temperature::manage_heater() {
if (temp_hotend[1].current < _MAX(HEATER_1_MINTEMP, HEATER_1_MAX6675_TMIN + .01)) min_temp_error(H_E1);
#endif
#define HAS_THERMAL_PROTECTION (ENABLED(THERMAL_PROTECTION_HOTENDS) || HAS_THERMALLY_PROTECTED_BED || ENABLED(THERMAL_PROTECTION_CHAMBER))
#if HAS_THERMAL_PROTECTION || DISABLED(PIDTEMPBED) || HAS_AUTO_FAN || HEATER_IDLE_HANDLER
millis_t ms = millis();
#endif
@ -1933,7 +1931,7 @@ void Temperature::init() {
}
}
#endif // THERMAL_PROTECTION_HOTENDS || THERMAL_PROTECTION_BED || ENABLED(THERMAL_PROTECTION_CHAMBER)
#endif // HAS_THERMAL_PROTECTION
void Temperature::disable_all_heaters() {

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

@ -828,7 +828,9 @@ class Temperature {
static void min_temp_error(const heater_ind_t e);
static void max_temp_error(const heater_ind_t e);
#if ENABLED(THERMAL_PROTECTION_HOTENDS) || HAS_THERMALLY_PROTECTED_BED || ENABLED(THERMAL_PROTECTION_CHAMBER)
#define HAS_THERMAL_PROTECTION (EITHER(THERMAL_PROTECTION_HOTENDS, THERMAL_PROTECTION_CHAMBER) || HAS_THERMALLY_PROTECTED_BED)
#if HAS_THERMAL_PROTECTION
enum TRState : char { TRInactive, TRFirstHeating, TRStable, TRRunaway };
@ -849,7 +851,7 @@ class Temperature {
static void thermal_runaway_protection(tr_state_machine_t &state, const float &current, const float &target, const heater_ind_t heater_id, const uint16_t period_seconds, const uint16_t hysteresis_degc);
#endif // THERMAL_PROTECTION
#endif // HAS_THERMAL_PROTECTION
};
extern Temperature thermalManager;