Inc updates
This commit is contained in:
parent
f52a31a275
commit
34101224c4
3 changed files with 29 additions and 20 deletions
|
@ -263,7 +263,7 @@
|
||||||
* Advance calculated values
|
* Advance calculated values
|
||||||
*/
|
*/
|
||||||
#if ENABLED(ADVANCE)
|
#if ENABLED(ADVANCE)
|
||||||
#define EXTRUSION_AREA (0.25 * (D_FILAMENT) * (D_FILAMENT) * M_PI)
|
#define EXTRUSION_AREA CIRCLE_CIRC(0.5 * D_FILAMENT)
|
||||||
#define STEPS_PER_CUBIC_MM_E (axis_steps_per_mm[E_AXIS_N] / (EXTRUSION_AREA))
|
#define STEPS_PER_CUBIC_MM_E (axis_steps_per_mm[E_AXIS_N] / (EXTRUSION_AREA))
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -827,6 +827,9 @@
|
||||||
#define ABL_GRID (ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR))
|
#define ABL_GRID (ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR))
|
||||||
#define HAS_ABL (ABL_PLANAR || ABL_GRID || ENABLED(AUTO_BED_LEVELING_UBL))
|
#define HAS_ABL (ABL_PLANAR || ABL_GRID || ENABLED(AUTO_BED_LEVELING_UBL))
|
||||||
#define HAS_LEVELING (HAS_ABL || ENABLED(MESH_BED_LEVELING))
|
#define HAS_LEVELING (HAS_ABL || ENABLED(MESH_BED_LEVELING))
|
||||||
|
#define HAS_AUTOLEVEL (HAS_ABL && DISABLED(PROBE_MANUALLY))
|
||||||
|
#define OLDSCHOOL_ABL (HAS_ABL && DISABLED(AUTO_BED_LEVELING_UBL))
|
||||||
|
#define HAS_MESH (ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL) || ENABLED(MESH_BED_LEVELING))
|
||||||
#define PLANNER_LEVELING (ABL_PLANAR || ABL_GRID || ENABLED(MESH_BED_LEVELING) || UBL_DELTA)
|
#define PLANNER_LEVELING (ABL_PLANAR || ABL_GRID || ENABLED(MESH_BED_LEVELING) || UBL_DELTA)
|
||||||
#define HAS_PROBING_PROCEDURE (HAS_ABL || ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST))
|
#define HAS_PROBING_PROCEDURE (HAS_ABL || ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST))
|
||||||
#if HAS_PROBING_PROCEDURE
|
#if HAS_PROBING_PROCEDURE
|
||||||
|
|
|
@ -23,18 +23,25 @@
|
||||||
#ifndef MARLIN_CONFIG_H
|
#ifndef MARLIN_CONFIG_H
|
||||||
#define MARLIN_CONFIG_H
|
#define MARLIN_CONFIG_H
|
||||||
|
|
||||||
#include "macros.h"
|
#include "../core/boards.h"
|
||||||
#include "src/HAL/HAL.h"
|
#include "../core/macros.h"
|
||||||
#include "boards.h"
|
|
||||||
#include "Version.h"
|
#include "Version.h"
|
||||||
#include "Configuration.h"
|
#include "../config/Configuration.h"
|
||||||
#include "Conditionals_LCD.h"
|
#include "Conditionals_LCD.h"
|
||||||
#include "Configuration_adv.h"
|
#include "../config/Configuration_adv.h"
|
||||||
#include "pins.h"
|
#include "../HAL/HAL.h"
|
||||||
|
#include "../pins/pins.h"
|
||||||
#if defined(ARDUINO_ARCH_AVR) && !defined(USBCON)
|
#if defined(ARDUINO_ARCH_AVR) && !defined(USBCON)
|
||||||
#define HardwareSerial_h // trick to disable the standard HWserial
|
#define HardwareSerial_h // trick to disable the standard HWserial
|
||||||
#endif
|
#endif
|
||||||
#include "Conditionals_post.h"
|
#include "Conditionals_post.h"
|
||||||
#include "SanityCheck.h"
|
#include "SanityCheck.h"
|
||||||
|
|
||||||
|
// Include all core headers
|
||||||
|
#include "../core/enum.h"
|
||||||
|
#include "../core/language.h"
|
||||||
|
#include "../core/types.h"
|
||||||
|
#include "../core/utility.h"
|
||||||
|
#include "../core/serial.h"
|
||||||
|
|
||||||
#endif // MARLIN_CONFIG_H
|
#endif // MARLIN_CONFIG_H
|
||||||
|
|
|
@ -643,13 +643,11 @@ static_assert(1 >= 0
|
||||||
/**
|
/**
|
||||||
* Require some kind of probe for bed leveling and probe testing
|
* Require some kind of probe for bed leveling and probe testing
|
||||||
*/
|
*/
|
||||||
#if HAS_ABL
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
#error "Unified Bed Leveling requires a probe: FIX_MOUNTED_PROBE, BLTOUCH, SOLENOID_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, or Z Servo."
|
#error "Unified Bed Leveling requires a probe: FIX_MOUNTED_PROBE, BLTOUCH, SOLENOID_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, or Z Servo."
|
||||||
#else
|
#elif HAS_ABL
|
||||||
#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."
|
#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."
|
||||||
#endif
|
#endif
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -918,11 +916,12 @@ static_assert(1 >= 0
|
||||||
#error "TEMP_SENSOR_0 is required."
|
#error "TEMP_SENSOR_0 is required."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if HOTENDS > 1 || ENABLED(HEATERS_PARALLEL)
|
// Pins are required for heaters
|
||||||
#if !HAS_HEATER_1
|
#if ENABLED(HEATER_0_USES_MAX6675) && !(defined(MAX6675_SS) && MAX6675_SS >= 0)
|
||||||
|
#error "MAX6675_SS (required for TEMP_SENSOR_0) not defined for this board."
|
||||||
|
#elif (HOTENDS > 1 || ENABLED(HEATERS_PARALLEL)) && !HAS_HEATER_1
|
||||||
#error "HEATER_1_PIN not defined for this board."
|
#error "HEATER_1_PIN not defined for this board."
|
||||||
#endif
|
#endif
|
||||||
#endif
|
|
||||||
|
|
||||||
#if HOTENDS > 1
|
#if HOTENDS > 1
|
||||||
#if TEMP_SENSOR_1 == 0
|
#if TEMP_SENSOR_1 == 0
|
||||||
|
@ -1297,4 +1296,4 @@ static_assert(COUNT(sanity_arr_2) <= XYZE_N, "DEFAULT_MAX_FEEDRATE has too many
|
||||||
static_assert(COUNT(sanity_arr_3) <= XYZE_N, "DEFAULT_MAX_ACCELERATION has too many elements.");
|
static_assert(COUNT(sanity_arr_3) <= XYZE_N, "DEFAULT_MAX_ACCELERATION has too many elements.");
|
||||||
|
|
||||||
|
|
||||||
#include "src/HAL/HAL_SanityCheck.h" // get CPU specific checks
|
#include "../HAL/HAL_SanityCheck.h" // get CPU specific checks
|
||||||
|
|
Reference in a new issue