CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Marlin/src/core/language.h
View File

@ -367,15 +367,15 @@
#include INCLUDE_LANGUAGE #include INCLUDE_LANGUAGE
#if DISABLED(DISPLAY_CHARSET_ISO10646_1) \ #if NONE(DISPLAY_CHARSET_ISO10646_1, \
&& DISABLED(DISPLAY_CHARSET_ISO10646_5) \ DISPLAY_CHARSET_ISO10646_5, \
&& DISABLED(DISPLAY_CHARSET_ISO10646_KANA) \ DISPLAY_CHARSET_ISO10646_KANA, \
&& DISABLED(DISPLAY_CHARSET_ISO10646_GREEK) \ DISPLAY_CHARSET_ISO10646_GREEK, \
&& DISABLED(DISPLAY_CHARSET_ISO10646_CN) \ DISPLAY_CHARSET_ISO10646_CN, \
&& DISABLED(DISPLAY_CHARSET_ISO10646_TR) \ DISPLAY_CHARSET_ISO10646_TR, \
&& DISABLED(DISPLAY_CHARSET_ISO10646_PL) \ DISPLAY_CHARSET_ISO10646_PL, \
&& DISABLED(DISPLAY_CHARSET_ISO10646_CZ) \ DISPLAY_CHARSET_ISO10646_CZ, \
&& DISABLED(DISPLAY_CHARSET_ISO10646_SK) DISPLAY_CHARSET_ISO10646_SK)
#define DISPLAY_CHARSET_ISO10646_1 // use the better font on full graphic displays. #define DISPLAY_CHARSET_ISO10646_1 // use the better font on full graphic displays.
#endif #endif

2
Marlin/src/gcode/config/M200-M205.cpp
View File

@ -161,7 +161,7 @@ void GcodeSuite::M205() {
SERIAL_ECHOLNPGM("WARNING! Low Z Jerk may lead to unwanted pauses."); SERIAL_ECHOLNPGM("WARNING! Low Z Jerk may lead to unwanted pauses.");
#endif #endif
} }
#if DISABLED(JUNCTION_DEVIATION) || DISABLED(LIN_ADVANCE) #if !BOTH(JUNCTION_DEVIATION, LIN_ADVANCE)
if (parser.seen('E')) planner.max_jerk[E_AXIS] = parser.value_linear_units(); if (parser.seen('E')) planner.max_jerk[E_AXIS] = parser.value_linear_units();
#endif #endif
#endif #endif

2
Marlin/src/gcode/config/M92.cpp
View File

@ -76,7 +76,7 @@ void GcodeSuite::M92() {
const float value = parser.value_per_axis_units((AxisEnum)(E_AXIS_N(target_extruder))); const float value = parser.value_per_axis_units((AxisEnum)(E_AXIS_N(target_extruder)));
if (value < 20) { if (value < 20) {
float factor = planner.settings.axis_steps_per_mm[E_AXIS_N(target_extruder)] / value; // increase e constants if M92 E14 is given for netfab. float factor = planner.settings.axis_steps_per_mm[E_AXIS_N(target_extruder)] / value; // increase e constants if M92 E14 is given for netfab.
#if HAS_CLASSIC_JERK && (DISABLED(JUNCTION_DEVIATION) || DISABLED(LIN_ADVANCE)) #if HAS_CLASSIC_JERK && !BOTH(JUNCTION_DEVIATION, LIN_ADVANCE)
planner.max_jerk[E_AXIS] *= factor; planner.max_jerk[E_AXIS] *= factor;
#endif #endif
planner.settings.max_feedrate_mm_s[E_AXIS_N(target_extruder)] *= factor; planner.settings.max_feedrate_mm_s[E_AXIS_N(target_extruder)] *= factor;

18
Marlin/src/inc/SanityCheck.h
View File

@ -494,14 +494,12 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
#endif #endif
#endif #endif
#if !defined(TARGET_LPC1768) && ( \ #if !defined(TARGET_LPC1768) && ANY( \
ENABLED(ENDSTOPPULLDOWNS) \ ENDSTOPPULLDOWNS, \
|| ENABLED(ENDSTOPPULLDOWN_XMAX) \ ENDSTOPPULLDOWN_XMAX, ENDSTOPPULLDOWN_YMAX, \
|| ENABLED(ENDSTOPPULLDOWN_YMAX) \ ENDSTOPPULLDOWN_ZMAX, ENDSTOPPULLDOWN_XMIN, \
|| ENABLED(ENDSTOPPULLDOWN_ZMAX) \ ENDSTOPPULLDOWN_YMIN, ENDSTOPPULLDOWN_ZMIN \
|| ENABLED(ENDSTOPPULLDOWN_XMIN) \ )
|| ENABLED(ENDSTOPPULLDOWN_YMIN) \
|| ENABLED(ENDSTOPPULLDOWN_ZMIN) )
#error "PULLDOWN pin mode is not available on the selected board." #error "PULLDOWN pin mode is not available on the selected board."
#endif #endif
@ -602,7 +600,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
* I2C Position Encoders * I2C Position Encoders
*/ */
#if ENABLED(I2C_POSITION_ENCODERS) #if ENABLED(I2C_POSITION_ENCODERS)
#if DISABLED(BABYSTEPPING) || DISABLED(BABYSTEP_XY) #if !BOTH(BABYSTEPPING, BABYSTEP_XY)
#error "I2C_POSITION_ENCODERS requires BABYSTEPPING and BABYSTEP_XY." #error "I2C_POSITION_ENCODERS requires BABYSTEPPING and BABYSTEP_XY."
#elif !WITHIN(I2CPE_ENCODER_CNT, 1, 5) #elif !WITHIN(I2CPE_ENCODER_CNT, 1, 5)
#error "I2CPE_ENCODER_CNT must be between 1 and 5." #error "I2CPE_ENCODER_CNT must be between 1 and 5."
@ -1256,7 +1254,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
#error "G26_MESH_VALIDATION requires MESH_BED_LEVELING, AUTO_BED_LEVELING_BILINEAR, or AUTO_BED_LEVELING_UBL." #error "G26_MESH_VALIDATION requires MESH_BED_LEVELING, AUTO_BED_LEVELING_BILINEAR, or AUTO_BED_LEVELING_UBL."
#endif #endif
#if ENABLED(MESH_EDIT_GFX_OVERLAY) && (DISABLED(AUTO_BED_LEVELING_UBL) || DISABLED(DOGLCD)) #if ENABLED(MESH_EDIT_GFX_OVERLAY) && !BOTH(AUTO_BED_LEVELING_UBL, DOGLCD)
#error "MESH_EDIT_GFX_OVERLAY requires AUTO_BED_LEVELING_UBL and a Graphical LCD." #error "MESH_EDIT_GFX_OVERLAY requires AUTO_BED_LEVELING_UBL and a Graphical LCD."
#endif #endif

2
Marlin/src/lcd/menu/menu_advanced.cpp
View File

@ -554,7 +554,7 @@ void menu_backlash();
#else #else
MENU_MULTIPLIER_ITEM_EDIT(float52sign, MSG_VC_JERK, &planner.max_jerk[C_AXIS], 0.1f, 990); MENU_MULTIPLIER_ITEM_EDIT(float52sign, MSG_VC_JERK, &planner.max_jerk[C_AXIS], 0.1f, 990);
#endif #endif
#if DISABLED(JUNCTION_DEVIATION) || DISABLED(LIN_ADVANCE) #if !BOTH(JUNCTION_DEVIATION, LIN_ADVANCE)
EDIT_JERK(E); EDIT_JERK(E);
#endif #endif
#endif #endif

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[X_AXIS] = DEFAULT_XJERK;
planner.max_jerk[Y_AXIS] = DEFAULT_YJERK; planner.max_jerk[Y_AXIS] = DEFAULT_YJERK;
planner.max_jerk[Z_AXIS] = DEFAULT_ZJERK; 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; planner.max_jerk[E_AXIS] = DEFAULT_EJERK;
#endif #endif
#endif #endif
@ -2768,7 +2768,7 @@ void MarlinSettings::reset() {
#endif #endif
#if HAS_CLASSIC_JERK #if HAS_CLASSIC_JERK
SERIAL_ECHOPGM(" X<max_x_jerk> Y<max_y_jerk> Z<max_z_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>"); SERIAL_ECHOPGM(" E<max_e_jerk>");
#endif #endif
#endif #endif
@ -2786,7 +2786,7 @@ void MarlinSettings::reset() {
, " X", LINEAR_UNIT(planner.max_jerk[X_AXIS]) , " X", LINEAR_UNIT(planner.max_jerk[X_AXIS])
, " Y", LINEAR_UNIT(planner.max_jerk[Y_AXIS]) , " Y", LINEAR_UNIT(planner.max_jerk[Y_AXIS])
, " Z", LINEAR_UNIT(planner.max_jerk[Z_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]) , " E", LINEAR_UNIT(planner.max_jerk[E_AXIS])
#endif #endif
#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); if (temp_hotend[1].current < _MAX(HEATER_1_MINTEMP, HEATER_1_MAX6675_TMIN + .01)) min_temp_error(H_E1);
#endif #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 #if HAS_THERMAL_PROTECTION || DISABLED(PIDTEMPBED) || HAS_AUTO_FAN || HEATER_IDLE_HANDLER
millis_t ms = millis(); millis_t ms = millis();
#endif #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() { 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 min_temp_error(const heater_ind_t e);
static void max_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 }; 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); 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; extern Temperature thermalManager;