Browse Source

Update some precompiler tests

Scott Lahteine 6 years ago
parent
commit
eaf1c0954e

+ 9
- 9
Marlin/src/core/language.h View File

367
 
367
 
368
 #include INCLUDE_LANGUAGE
368
 #include INCLUDE_LANGUAGE
369
 
369
 
370
-#if DISABLED(DISPLAY_CHARSET_ISO10646_1) \
371
- && DISABLED(DISPLAY_CHARSET_ISO10646_5) \
372
- && DISABLED(DISPLAY_CHARSET_ISO10646_KANA) \
373
- && DISABLED(DISPLAY_CHARSET_ISO10646_GREEK) \
374
- && DISABLED(DISPLAY_CHARSET_ISO10646_CN) \
375
- && DISABLED(DISPLAY_CHARSET_ISO10646_TR) \
376
- && DISABLED(DISPLAY_CHARSET_ISO10646_PL) \
377
- && DISABLED(DISPLAY_CHARSET_ISO10646_CZ) \
378
- && DISABLED(DISPLAY_CHARSET_ISO10646_SK)
370
+#if NONE(DISPLAY_CHARSET_ISO10646_1, \
371
+         DISPLAY_CHARSET_ISO10646_5, \
372
+         DISPLAY_CHARSET_ISO10646_KANA, \
373
+         DISPLAY_CHARSET_ISO10646_GREEK, \
374
+         DISPLAY_CHARSET_ISO10646_CN, \
375
+         DISPLAY_CHARSET_ISO10646_TR, \
376
+         DISPLAY_CHARSET_ISO10646_PL, \
377
+         DISPLAY_CHARSET_ISO10646_CZ, \
378
+         DISPLAY_CHARSET_ISO10646_SK)
379
   #define DISPLAY_CHARSET_ISO10646_1 // use the better font on full graphic displays.
379
   #define DISPLAY_CHARSET_ISO10646_1 // use the better font on full graphic displays.
380
 #endif
380
 #endif
381
 
381
 

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

161
           SERIAL_ECHOLNPGM("WARNING! Low Z Jerk may lead to unwanted pauses.");
161
           SERIAL_ECHOLNPGM("WARNING! Low Z Jerk may lead to unwanted pauses.");
162
       #endif
162
       #endif
163
     }
163
     }
164
-    #if DISABLED(JUNCTION_DEVIATION) || DISABLED(LIN_ADVANCE)
164
+    #if !BOTH(JUNCTION_DEVIATION, LIN_ADVANCE)
165
       if (parser.seen('E')) planner.max_jerk[E_AXIS] = parser.value_linear_units();
165
       if (parser.seen('E')) planner.max_jerk[E_AXIS] = parser.value_linear_units();
166
     #endif
166
     #endif
167
   #endif
167
   #endif

+ 1
- 1
Marlin/src/gcode/config/M92.cpp View File

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

+ 8
- 10
Marlin/src/inc/SanityCheck.h View File

494
   #endif
494
   #endif
495
 #endif
495
 #endif
496
 
496
 
497
-#if !defined(TARGET_LPC1768) && ( \
498
-     ENABLED(ENDSTOPPULLDOWNS) \
499
-  || ENABLED(ENDSTOPPULLDOWN_XMAX) \
500
-  || ENABLED(ENDSTOPPULLDOWN_YMAX) \
501
-  || ENABLED(ENDSTOPPULLDOWN_ZMAX) \
502
-  || ENABLED(ENDSTOPPULLDOWN_XMIN) \
503
-  || ENABLED(ENDSTOPPULLDOWN_YMIN) \
504
-  || ENABLED(ENDSTOPPULLDOWN_ZMIN) )
497
+#if !defined(TARGET_LPC1768) && ANY( \
498
+    ENDSTOPPULLDOWNS, \
499
+    ENDSTOPPULLDOWN_XMAX, ENDSTOPPULLDOWN_YMAX, \
500
+    ENDSTOPPULLDOWN_ZMAX, ENDSTOPPULLDOWN_XMIN, \
501
+    ENDSTOPPULLDOWN_YMIN, ENDSTOPPULLDOWN_ZMIN \
502
+  )
505
   #error "PULLDOWN pin mode is not available on the selected board."
503
   #error "PULLDOWN pin mode is not available on the selected board."
506
 #endif
504
 #endif
507
 
505
 
602
  * I2C Position Encoders
600
  * I2C Position Encoders
603
  */
601
  */
604
 #if ENABLED(I2C_POSITION_ENCODERS)
602
 #if ENABLED(I2C_POSITION_ENCODERS)
605
-  #if DISABLED(BABYSTEPPING) || DISABLED(BABYSTEP_XY)
603
+  #if !BOTH(BABYSTEPPING, BABYSTEP_XY)
606
     #error "I2C_POSITION_ENCODERS requires BABYSTEPPING and BABYSTEP_XY."
604
     #error "I2C_POSITION_ENCODERS requires BABYSTEPPING and BABYSTEP_XY."
607
   #elif !WITHIN(I2CPE_ENCODER_CNT, 1, 5)
605
   #elif !WITHIN(I2CPE_ENCODER_CNT, 1, 5)
608
     #error "I2CPE_ENCODER_CNT must be between 1 and 5."
606
     #error "I2CPE_ENCODER_CNT must be between 1 and 5."
1256
   #error "G26_MESH_VALIDATION requires MESH_BED_LEVELING, AUTO_BED_LEVELING_BILINEAR, or AUTO_BED_LEVELING_UBL."
1254
   #error "G26_MESH_VALIDATION requires MESH_BED_LEVELING, AUTO_BED_LEVELING_BILINEAR, or AUTO_BED_LEVELING_UBL."
1257
 #endif
1255
 #endif
1258
 
1256
 
1259
-#if ENABLED(MESH_EDIT_GFX_OVERLAY) && (DISABLED(AUTO_BED_LEVELING_UBL) || DISABLED(DOGLCD))
1257
+#if ENABLED(MESH_EDIT_GFX_OVERLAY) && !BOTH(AUTO_BED_LEVELING_UBL, DOGLCD)
1260
   #error "MESH_EDIT_GFX_OVERLAY requires AUTO_BED_LEVELING_UBL and a Graphical LCD."
1258
   #error "MESH_EDIT_GFX_OVERLAY requires AUTO_BED_LEVELING_UBL and a Graphical LCD."
1261
 #endif
1259
 #endif
1262
 
1260
 

+ 1
- 1
Marlin/src/lcd/menu/menu_advanced.cpp View File

554
       #else
554
       #else
555
         MENU_MULTIPLIER_ITEM_EDIT(float52sign, MSG_VC_JERK, &planner.max_jerk[C_AXIS], 0.1f, 990);
555
         MENU_MULTIPLIER_ITEM_EDIT(float52sign, MSG_VC_JERK, &planner.max_jerk[C_AXIS], 0.1f, 990);
556
       #endif
556
       #endif
557
-      #if DISABLED(JUNCTION_DEVIATION) || DISABLED(LIN_ADVANCE)
557
+      #if !BOTH(JUNCTION_DEVIATION, LIN_ADVANCE)
558
         EDIT_JERK(E);
558
         EDIT_JERK(E);
559
       #endif
559
       #endif
560
     #endif
560
     #endif

+ 3
- 3
Marlin/src/module/configuration_store.cpp View File

2252
     planner.max_jerk[X_AXIS] = DEFAULT_XJERK;
2252
     planner.max_jerk[X_AXIS] = DEFAULT_XJERK;
2253
     planner.max_jerk[Y_AXIS] = DEFAULT_YJERK;
2253
     planner.max_jerk[Y_AXIS] = DEFAULT_YJERK;
2254
     planner.max_jerk[Z_AXIS] = DEFAULT_ZJERK;
2254
     planner.max_jerk[Z_AXIS] = DEFAULT_ZJERK;
2255
-    #if DISABLED(JUNCTION_DEVIATION) || DISABLED(LIN_ADVANCE)
2255
+    #if !BOTH(JUNCTION_DEVIATION, LIN_ADVANCE)
2256
       planner.max_jerk[E_AXIS] = DEFAULT_EJERK;
2256
       planner.max_jerk[E_AXIS] = DEFAULT_EJERK;
2257
     #endif
2257
     #endif
2258
   #endif
2258
   #endif
2768
       #endif
2768
       #endif
2769
       #if HAS_CLASSIC_JERK
2769
       #if HAS_CLASSIC_JERK
2770
         SERIAL_ECHOPGM(" X<max_x_jerk> Y<max_y_jerk> Z<max_z_jerk>");
2770
         SERIAL_ECHOPGM(" X<max_x_jerk> Y<max_y_jerk> Z<max_z_jerk>");
2771
-        #if DISABLED(JUNCTION_DEVIATION) || DISABLED(LIN_ADVANCE)
2771
+        #if !BOTH(JUNCTION_DEVIATION, LIN_ADVANCE)
2772
           SERIAL_ECHOPGM(" E<max_e_jerk>");
2772
           SERIAL_ECHOPGM(" E<max_e_jerk>");
2773
         #endif
2773
         #endif
2774
       #endif
2774
       #endif
2786
         , " X", LINEAR_UNIT(planner.max_jerk[X_AXIS])
2786
         , " X", LINEAR_UNIT(planner.max_jerk[X_AXIS])
2787
         , " Y", LINEAR_UNIT(planner.max_jerk[Y_AXIS])
2787
         , " Y", LINEAR_UNIT(planner.max_jerk[Y_AXIS])
2788
         , " Z", LINEAR_UNIT(planner.max_jerk[Z_AXIS])
2788
         , " Z", LINEAR_UNIT(planner.max_jerk[Z_AXIS])
2789
-        #if DISABLED(JUNCTION_DEVIATION) || DISABLED(LIN_ADVANCE)
2789
+        #if !BOTH(JUNCTION_DEVIATION, LIN_ADVANCE)
2790
           , " E", LINEAR_UNIT(planner.max_jerk[E_AXIS])
2790
           , " E", LINEAR_UNIT(planner.max_jerk[E_AXIS])
2791
         #endif
2791
         #endif
2792
       #endif
2792
       #endif

+ 1
- 3
Marlin/src/module/temperature.cpp View File

1005
     if (temp_hotend[1].current < _MAX(HEATER_1_MINTEMP, HEATER_1_MAX6675_TMIN + .01)) min_temp_error(H_E1);
1005
     if (temp_hotend[1].current < _MAX(HEATER_1_MINTEMP, HEATER_1_MAX6675_TMIN + .01)) min_temp_error(H_E1);
1006
   #endif
1006
   #endif
1007
 
1007
 
1008
-  #define HAS_THERMAL_PROTECTION (ENABLED(THERMAL_PROTECTION_HOTENDS) || HAS_THERMALLY_PROTECTED_BED || ENABLED(THERMAL_PROTECTION_CHAMBER))
1009
-
1010
   #if HAS_THERMAL_PROTECTION || DISABLED(PIDTEMPBED) || HAS_AUTO_FAN || HEATER_IDLE_HANDLER
1008
   #if HAS_THERMAL_PROTECTION || DISABLED(PIDTEMPBED) || HAS_AUTO_FAN || HEATER_IDLE_HANDLER
1011
     millis_t ms = millis();
1009
     millis_t ms = millis();
1012
   #endif
1010
   #endif
1933
     }
1931
     }
1934
   }
1932
   }
1935
 
1933
 
1936
-#endif // THERMAL_PROTECTION_HOTENDS || THERMAL_PROTECTION_BED || ENABLED(THERMAL_PROTECTION_CHAMBER)
1934
+#endif // HAS_THERMAL_PROTECTION
1937
 
1935
 
1938
 void Temperature::disable_all_heaters() {
1936
 void Temperature::disable_all_heaters() {
1939
 
1937
 

+ 4
- 2
Marlin/src/module/temperature.h View File

828
     static void min_temp_error(const heater_ind_t e);
828
     static void min_temp_error(const heater_ind_t e);
829
     static void max_temp_error(const heater_ind_t e);
829
     static void max_temp_error(const heater_ind_t e);
830
 
830
 
831
-    #if ENABLED(THERMAL_PROTECTION_HOTENDS) || HAS_THERMALLY_PROTECTED_BED || ENABLED(THERMAL_PROTECTION_CHAMBER)
831
+    #define HAS_THERMAL_PROTECTION (EITHER(THERMAL_PROTECTION_HOTENDS, THERMAL_PROTECTION_CHAMBER) || HAS_THERMALLY_PROTECTED_BED)
832
+
833
+    #if HAS_THERMAL_PROTECTION
832
 
834
 
833
       enum TRState : char { TRInactive, TRFirstHeating, TRStable, TRRunaway };
835
       enum TRState : char { TRInactive, TRFirstHeating, TRStable, TRRunaway };
834
 
836
 
849
 
851
 
850
       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);
852
       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);
851
 
853
 
852
-    #endif // THERMAL_PROTECTION
854
+    #endif // HAS_THERMAL_PROTECTION
853
 };
855
 };
854
 
856
 
855
 extern Temperature thermalManager;
857
 extern Temperature thermalManager;

Loading…
Cancel
Save