瀏覽代碼

Inc updates

Scott Lahteine 7 年之前
父節點
當前提交
34101224c4
共有 3 個檔案被更改,包括 29 行新增20 行删除
  1. 5
    2
      Marlin/src/inc/Conditionals_post.h
  2. 13
    6
      Marlin/src/inc/MarlinConfig.h
  3. 11
    12
      Marlin/src/inc/SanityCheck.h

+ 5
- 2
Marlin/src/inc/Conditionals_post.h 查看文件

263
    * Advance calculated values
263
    * Advance calculated values
264
    */
264
    */
265
   #if ENABLED(ADVANCE)
265
   #if ENABLED(ADVANCE)
266
-    #define EXTRUSION_AREA (0.25 * (D_FILAMENT) * (D_FILAMENT) * M_PI)
266
+    #define EXTRUSION_AREA CIRCLE_CIRC(0.5 * D_FILAMENT)
267
     #define STEPS_PER_CUBIC_MM_E (axis_steps_per_mm[E_AXIS_N] / (EXTRUSION_AREA))
267
     #define STEPS_PER_CUBIC_MM_E (axis_steps_per_mm[E_AXIS_N] / (EXTRUSION_AREA))
268
   #endif
268
   #endif
269
 
269
 
826
   #define ABL_PLANAR (ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_3POINT))
826
   #define ABL_PLANAR (ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_3POINT))
827
   #define ABL_GRID   (ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR))
827
   #define ABL_GRID   (ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR))
828
   #define HAS_ABL    (ABL_PLANAR || ABL_GRID || ENABLED(AUTO_BED_LEVELING_UBL))
828
   #define HAS_ABL    (ABL_PLANAR || ABL_GRID || ENABLED(AUTO_BED_LEVELING_UBL))
829
-  #define HAS_LEVELING          (HAS_ABL || ENABLED(MESH_BED_LEVELING))
829
+  #define HAS_LEVELING  (HAS_ABL || ENABLED(MESH_BED_LEVELING))
830
+  #define HAS_AUTOLEVEL (HAS_ABL && DISABLED(PROBE_MANUALLY))
831
+  #define OLDSCHOOL_ABL (HAS_ABL && DISABLED(AUTO_BED_LEVELING_UBL))
832
+  #define HAS_MESH   (ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL) || ENABLED(MESH_BED_LEVELING))
830
   #define PLANNER_LEVELING      (ABL_PLANAR || ABL_GRID || ENABLED(MESH_BED_LEVELING) || UBL_DELTA)
833
   #define PLANNER_LEVELING      (ABL_PLANAR || ABL_GRID || ENABLED(MESH_BED_LEVELING) || UBL_DELTA)
831
   #define HAS_PROBING_PROCEDURE (HAS_ABL || ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST))
834
   #define HAS_PROBING_PROCEDURE (HAS_ABL || ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST))
832
   #if HAS_PROBING_PROCEDURE
835
   #if HAS_PROBING_PROCEDURE

+ 13
- 6
Marlin/src/inc/MarlinConfig.h 查看文件

23
 #ifndef MARLIN_CONFIG_H
23
 #ifndef MARLIN_CONFIG_H
24
 #define MARLIN_CONFIG_H
24
 #define MARLIN_CONFIG_H
25
 
25
 
26
-#include "macros.h"
27
-#include "src/HAL/HAL.h"
28
-#include "boards.h"
26
+#include "../core/boards.h"
27
+#include "../core/macros.h"
29
 #include "Version.h"
28
 #include "Version.h"
30
-#include "Configuration.h"
29
+#include "../config/Configuration.h"
31
 #include "Conditionals_LCD.h"
30
 #include "Conditionals_LCD.h"
32
-#include "Configuration_adv.h"
33
-#include "pins.h"
31
+#include "../config/Configuration_adv.h"
32
+#include "../HAL/HAL.h"
33
+#include "../pins/pins.h"
34
 #if defined(ARDUINO_ARCH_AVR) && !defined(USBCON)
34
 #if defined(ARDUINO_ARCH_AVR) && !defined(USBCON)
35
   #define HardwareSerial_h // trick to disable the standard HWserial
35
   #define HardwareSerial_h // trick to disable the standard HWserial
36
 #endif
36
 #endif
37
 #include "Conditionals_post.h"
37
 #include "Conditionals_post.h"
38
 #include "SanityCheck.h"
38
 #include "SanityCheck.h"
39
 
39
 
40
+// Include all core headers
41
+#include "../core/enum.h"
42
+#include "../core/language.h"
43
+#include "../core/types.h"
44
+#include "../core/utility.h"
45
+#include "../core/serial.h"
46
+
40
 #endif // MARLIN_CONFIG_H
47
 #endif // MARLIN_CONFIG_H

+ 11
- 12
Marlin/src/inc/SanityCheck.h 查看文件

301
     #error "BABYSTEPPING is not implemented for SCARA yet."
301
     #error "BABYSTEPPING is not implemented for SCARA yet."
302
   #elif ENABLED(DELTA) && ENABLED(BABYSTEP_XY)
302
   #elif ENABLED(DELTA) && ENABLED(BABYSTEP_XY)
303
     #error "BABYSTEPPING only implemented for Z axis on deltabots."
303
     #error "BABYSTEPPING only implemented for Z axis on deltabots."
304
-  #elif ENABLED(BABYSTEP_ZPROBE_OFFSET) &&  ENABLED(MESH_BED_LEVELING)
304
+  #elif ENABLED(BABYSTEP_ZPROBE_OFFSET) && ENABLED(MESH_BED_LEVELING)
305
     #error "MESH_BED_LEVELING and BABYSTEP_ZPROBE_OFFSET is not a valid combination"
305
     #error "MESH_BED_LEVELING and BABYSTEP_ZPROBE_OFFSET is not a valid combination"
306
   #elif ENABLED(BABYSTEP_ZPROBE_OFFSET) && !HAS_BED_PROBE
306
   #elif ENABLED(BABYSTEP_ZPROBE_OFFSET) && !HAS_BED_PROBE
307
     #error "BABYSTEP_ZPROBE_OFFSET requires a probe."
307
     #error "BABYSTEP_ZPROBE_OFFSET requires a probe."
643
   /**
643
   /**
644
    * Require some kind of probe for bed leveling and probe testing
644
    * Require some kind of probe for bed leveling and probe testing
645
    */
645
    */
646
-  #if HAS_ABL
647
-    #if ENABLED(AUTO_BED_LEVELING_UBL)
648
-      #error "Unified Bed Leveling requires a probe: FIX_MOUNTED_PROBE, BLTOUCH, SOLENOID_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, or Z Servo."
649
-    #else
650
-      #error "Auto Bed Leveling requires one of these: PROBE_MANUALLY, FIX_MOUNTED_PROBE, BLTOUCH, SOLENOID_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, or a Z Servo."
651
-    #endif
646
+  #if ENABLED(AUTO_BED_LEVELING_UBL)
647
+    #error "Unified Bed Leveling requires a probe: FIX_MOUNTED_PROBE, BLTOUCH, SOLENOID_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, or Z Servo."
648
+  #elif HAS_ABL
649
+    #error "Auto Bed Leveling requires one of these: PROBE_MANUALLY, FIX_MOUNTED_PROBE, BLTOUCH, SOLENOID_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, or a Z Servo."
652
   #endif
650
   #endif
653
 
651
 
654
 #endif
652
 #endif
918
   #error "TEMP_SENSOR_0 is required."
916
   #error "TEMP_SENSOR_0 is required."
919
 #endif
917
 #endif
920
 
918
 
921
-#if HOTENDS > 1 || ENABLED(HEATERS_PARALLEL)
922
-  #if !HAS_HEATER_1
923
-    #error "HEATER_1_PIN not defined for this board."
924
-  #endif
919
+// Pins are required for heaters
920
+#if ENABLED(HEATER_0_USES_MAX6675) && !(defined(MAX6675_SS) && MAX6675_SS >= 0)
921
+  #error "MAX6675_SS (required for TEMP_SENSOR_0) not defined for this board."
922
+#elif (HOTENDS > 1 || ENABLED(HEATERS_PARALLEL)) && !HAS_HEATER_1
923
+  #error "HEATER_1_PIN not defined for this board."
925
 #endif
924
 #endif
926
 
925
 
927
 #if HOTENDS > 1
926
 #if HOTENDS > 1
1297
 static_assert(COUNT(sanity_arr_3) <= XYZE_N, "DEFAULT_MAX_ACCELERATION has too many elements.");
1296
 static_assert(COUNT(sanity_arr_3) <= XYZE_N, "DEFAULT_MAX_ACCELERATION has too many elements.");
1298
 
1297
 
1299
 
1298
 
1300
-#include "src/HAL/HAL_SanityCheck.h"  // get CPU specific checks
1299
+#include "../HAL/HAL_SanityCheck.h"  // get CPU specific checks

Loading…
取消
儲存