Skip to content

M
MarlinKimbra
Commit a57c2e87 authored by Simone Primarosa's avatar Simone Primarosa
Browse files
Options

Update 5.0.0 dev 

Inital STABLE commit
parent d57ece57
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 34 deletions
MarlinKimbra/Configuration_Cartesian.h
View file @ a57c2e87
......@@ -24,6 +24,7 @@
*
* Basic-settings can be found in Configuration_Basic.h
* Feature-settings can be found in Configuration_Feature.h
* Pins-settings can be found in "Configuration_Pins.h"
*/
/*****************************************************************************************
......
MarlinKimbra/Configuration_Core.h
View file @ a57c2e87
#ifndef CONFIGURATION_MECHANISM
#define CONFIGURATION_MECHANISM
#define KNOWN_MECH 1
......@@ -26,6 +25,7 @@
*
* Basic-settings can be found in Configuration_Basic.h
* Feature-settings can be found in Configuration_Feature.h
* Pins-settings can be found in "Configuration_Pins.h"
*/
/*****************************************************************************************
......
MarlinKimbra/Configuration_Delta.h
View file @ a57c2e87
#ifndef CONFIGURATION_MECHANISM
* Pins-settings can be found in "Configuration_Pins.h"#ifndef CONFIGURATION_MECHANISM
#define CONFIGURATION_MECHANISM
#define KNOWN_MECH 1
......@@ -25,6 +26,7 @@
*
* Basic-settings can be found in Configuration_Basic.h
* Feature-settings can be found in Configuration_Feature.h
* Pins-settings can be found in "Configuration_Pins.h"
*/
/*****************************************************************************************
......
MarlinKimbra/Configuration_Scara.h
View file @ a57c2e87
......@@ -26,6 +26,7 @@
*
* Basic-settings can be found in Configuration_Basic.h
* Feature-settings can be found in Configuration_Feature.h
* Pins-settings can be found in "Configuration_Pins.h"
*/
/*****************************************************************************************
......
MarlinKimbra/conditionals.h
View file @ a57c2e87
......@@ -219,6 +219,7 @@
#endif
#include "pins.h"
#include "Configuration_Overall.h"
/**
* SINGLENOZZLE
......@@ -550,10 +551,10 @@
#define HAS_HEATER_2 (PIN_EXISTS(HEATER_2))
#define HAS_HEATER_3 (PIN_EXISTS(HEATER_3))
#define HAS_HEATER_BED (PIN_EXISTS(HEATER_BED))
#define HAS_AUTO_FAN_0 (PIN_EXISTS(EXTRUDER_0_AUTO_FAN))
#define HAS_AUTO_FAN_1 (PIN_EXISTS(EXTRUDER_1_AUTO_FAN))
#define HAS_AUTO_FAN_2 (PIN_EXISTS(EXTRUDER_2_AUTO_FAN))
#define HAS_AUTO_FAN_3 (PIN_EXISTS(EXTRUDER_3_AUTO_FAN))
#define HAS_AUTO_FAN_0 (ENABLED(EXTRUDER_AUTO_FAN) && PIN_EXISTS(EXTRUDER_0_AUTO_FAN))
#define HAS_AUTO_FAN_1 (ENABLED(EXTRUDER_AUTO_FAN) && PIN_EXISTS(EXTRUDER_1_AUTO_FAN))
#define HAS_AUTO_FAN_2 (ENABLED(EXTRUDER_AUTO_FAN) && PIN_EXISTS(EXTRUDER_2_AUTO_FAN))
#define HAS_AUTO_FAN_3 (ENABLED(EXTRUDER_AUTO_FAN) && PIN_EXISTS(EXTRUDER_3_AUTO_FAN))
#define HAS_AUTO_FAN (HAS_AUTO_FAN_0 || HAS_AUTO_FAN_1 || HAS_AUTO_FAN_2 || HAS_AUTO_FAN_3)
#define HAS_FAN (PIN_EXISTS(FAN))
#define HAS_CONTROLLERFAN (ENABLED(CONTROLLERFAN) && PIN_EXISTS(CONTROLLERFAN))
......
MarlinKimbra/configuration_basic.h
View file @ a57c2e87
......@@ -13,6 +13,7 @@
*
* Mechanisms-settings can be found in Configuration_Xxxxxx.h (where Xxxxxx can be: Cartesian - Delta - Core - Scara)
* Feature-settings can be found in Configuration_Feature.h
* Pins-settings can be found in "Configuration_Pins.h"
*/
/***********************************************************************
......
MarlinKimbra/configuration_feature.h
View file @ a57c2e87
......@@ -70,6 +70,7 @@
*
* Basic-settings can be found in Configuration_Basic.h
* Mechanisms-settings can be found in Configuration_Xxxxxx.h (where Xxxxxx can be: Cartesian - Delta - Core - Scara)
* Pins-settings can be found in "Configuration_Pins.h"
*
*/
......@@ -301,7 +302,7 @@
// This is for controlling a fan to cool down the stepper drivers
// it will turn on when any driver is enabled
// and turn off after the set amount of seconds from last driver being disabled again
// You need to set CONTROLLERFAN_PIN in pins.h
// You need to set CONTROLLERFAN_PIN in Configuration_pins.h
//#define CONTROLLERFAN
#define CONTROLLERFAN_SECS 60 // How many seconds, after all motors were disabled, the fan should run
#define CONTROLLERFAN_SPEED 255 // 255 = full speed
......@@ -312,7 +313,7 @@
// extruder temperature is above/below EXTRUDER_AUTO_FAN_TEMPERATURE.
// Multiple extruders can be assigned to the same pin in which case
// the fan will turn on when any selected extruder is above the threshold.
// You need to set _AUTO_FAN_PIN in pins.h
// You need to set _AUTO_FAN_PIN in Configuration_pins.h
//#define EXTRUDER_AUTO_FAN
#define EXTRUDER_AUTO_FAN_TEMPERATURE 50
#define EXTRUDER_AUTO_FAN_SPEED 255 // 255 = full speed
......@@ -368,7 +369,7 @@
***********************************************************************
* *
* Setting for more extruder width relay system *
* See pins.h for pin command relay *
* See Configuration_pins.h for pin command relay *
* *
* Uncomment MKR4 to enable this feature *
* *
......@@ -385,7 +386,7 @@
* Find angle setting by g-Code "M997 Cxxx" *
* *
* Uncomment NPR2 to enable this feature *
* You also need to set E_MIN_PIN in pins.h *
* You also need to set E_MIN_PIN in Configuration_pins.h *
* *
***********************************************************************/
//#define NPR2
......@@ -926,7 +927,7 @@
* Single extruder only at this point (extruder 0) *
* *
* Uncomment FILAMENT_SENSOR to enable this feature *
* You also need to set FILWIDTH_PIN in pins.h *
* You also need to set FILWIDTH_PIN in Configuration_pins.h *
* *
**********************************************************************************/
//#define FILAMENT_SENSOR
......@@ -958,7 +959,7 @@
* Single extruder only at this point (extruder 0) *
* *
* Uncomment FILAMENT_RUNOUT_SENSOR to enable this feature *
* You also need to set FILRUNOUT_PIN in pins.h *
* You also need to set FILRUNOUT_PIN in Configuration_pins.h *
* *
**********************************************************************************/
//#define FILAMENT_RUNOUT_SENSOR
......@@ -1239,7 +1240,7 @@
* Data from: http://www.doc-diy.net/photo/rc-1_hacked/ *
* *
* Uncomment PHOTOGRAPH to enable this feature *
* You also need to set PHOTOGRAPH_PIN in pins.h *
* You also need to set PHOTOGRAPH_PIN in Configuration_pins.h *
* *
**************************************************************************/
//#define PHOTOGRAPH
......@@ -1253,7 +1254,7 @@
* http://captain-slow.dk/2014/03/09/3d-printing-timelapses/ *
* *
* Uncomment CHDK to enable this feature *
* You also need to set CHDK_PIN in pins.h *
* You also need to set CHDK_PIN in Configuration_pins.h *
* *
**************************************************************************/
//#define CHDK
......@@ -1278,7 +1279,8 @@
**************************************************************************
* *
* Support for laser beam *
* Check also LASER_PWR_PIN and LASER_TTL_PIN in pins.h *
* Check also LASER_PWR_PIN and LASER_TTL_PIN in Configuration_pins.h *
* Check also LASER_PWR_PIN and LASER_TTL_PIN in Configuration_pins.h *
* *
**************************************************************************/
//#define LASERBEAM
......
MarlinKimbra/pins.h
View file @ a57c2e87
......@@ -3028,7 +3028,6 @@
#define ORIG_FAN_PIN 6
#define BEEPER_PIN 33
#define CONTROLLERFAN_PIN 4
#define PS_ON_PIN 12
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) || ENABLED(G3D_PANEL)
......
MarlinKimbra/sanitycheck.h
View file @ a57c2e87
......@@ -1447,7 +1447,7 @@
* Require a Z Probe Pin if Z_PROBE_ENDSTOP is enabled.
*/
#if ENABLED(Z_PROBE_ENDSTOP)
#if !PIN_EXISTS(Z_PROBE_PIN)
#if !PIN_EXISTS(Z_PROBE)
#error DEPENDENCY ERROR: You must set Z_PROBE_PIN to a valid pin if you enable Z_PROBE_ENDSTOP
#endif
#if DISABLED(ENABLE_SERVOS)
......@@ -1516,7 +1516,7 @@
* Delta & Z_PROBE_ENDSTOP
*/
#if MECH(DELTA) && ENABLED(Z_PROBE_ENDSTOP)
#if PIN_EXISTS(Z_PROBE_PIN)
#if PIN_EXISTS(Z_PROBE)
#error DEPENDENCY ERROR: You must set Z_PROBE_PIN to a valid pin if you enable Z_PROBE_ENDSTOP
#endif
#endif
......@@ -1594,56 +1594,56 @@
#if ENABLED(MKR4)
#if (EXTRUDERS == 2) && (DRIVER_EXTRUDERS == 1) && !PIN_EXISTS(E0E1_CHOICE_PIN)
#if (EXTRUDERS == 2) && (DRIVER_EXTRUDERS == 1) && !PIN_EXISTS(E0E1_CHOICE)
#error DEPENDENCY ERROR: You have to set E0E1_CHOICE_PIN to a valid pin if you enable MKR4 with 2 extruder and 1 driver
#elif (EXTRUDERS == 3) && (DRIVER_EXTRUDERS == 1) && (!PIN_EXISTS(E0E1_CHOICE_PIN) || !PIN_EXISTS(E0E2_CHOICE_PIN))
#elif (EXTRUDERS == 3) && (DRIVER_EXTRUDERS == 1) && (!PIN_EXISTS(E0E1_CHOICE) || !PIN_EXISTS(E0E2_CHOICE))
#error DEPENDENCY ERROR: You have to set E0E1_CHOICE_PIN and E0E2_CHOICE_PIN to a valid pin if you enable MKR4 with 3 extruder and 1 driver
#elif (EXTRUDERS == 4) && (DRIVER_EXTRUDERS == 1) && (!PIN_EXISTS(E0E1_CHOICE_PIN) || !PIN_EXISTS(E0E2_CHOICE_PIN) || !PIN_EXISTS(E0E3_CHOICE_PIN))
#elif (EXTRUDERS == 4) && (DRIVER_EXTRUDERS == 1) && (!PIN_EXISTS(E0E1_CHOICE) || !PIN_EXISTS(E0E2_CHOICE) || !PIN_EXISTS(E0E3_CHOICE))
#error DEPENDENCY ERROR: You have to set E0E1_CHOICE_PIN, E0E2_CHOICE_PIN and E0E3_CHOICE_PIN to a valid pin if you enable MKR4 with 4 extruder and 1 driver
#elif (EXTRUDERS == 3) && (DRIVER_EXTRUDERS == 2) && !PIN_EXISTS(E0E2_CHOICE_PIN)
#elif (EXTRUDERS == 3) && (DRIVER_EXTRUDERS == 2) && !PIN_EXISTS(E0E2_CHOICE)
#error DEPENDENCY ERROR: You have to set E0E2_CHOICE_PIN to a valid pin if you enable MKR4 with 3 extruder and 2 driver
#elif (EXTRUDERS == 4) && (DRIVER_EXTRUDERS == 2) && (!PIN_EXISTS(E0E1_CHOICE_PIN) || !PIN_EXISTS(E1E3_CHOICE_PIN))
#elif (EXTRUDERS == 4) && (DRIVER_EXTRUDERS == 2) && (!PIN_EXISTS(E0E1_CHOICE) || !PIN_EXISTS(E1E3_CHOICE))
#error DEPENDENCY ERROR: You have to set E0E2_CHOICE_PIN and E1E3_CHOICE_PIN to a valid pin if you enable MKR4 with 4 extruder and 2 driver
#endif
#endif
#if ENABLED(NPR2) && !PIN_EXISTS(E_MIN_PIN)
#if ENABLED(NPR2) && !PIN_EXISTS(E_MIN)
#error DEPENDENCY ERROR: You have to set E_MIN_PIN to a valid pin if you enable NPR2
#endif
#if ENABLED(LASERBEAM) && (!PIN_EXISTS(LASER_PWR_PIN) || !PIN_EXISTS(LASER_TTL_PIN))
#if ENABLED(LASERBEAM) && (!PIN_EXISTS(LASER_PWR) || !PIN_EXISTS(LASER_TTL))
#error DEPENDENCY ERROR: You have to set LASER_PWR_PIN and LASER_TTL_PIN to a valid pin if you enable LASERBEAM
#endif
#if ENABLED(FILAMENT_RUNOUT_SENSOR) && !PIN_EXISTS(FILRUNOUT_PIN)
#if ENABLED(FILAMENT_RUNOUT_SENSOR) && !PIN_EXISTS(FILRUNOUT)
#error DEPENDENCY ERROR: You have to set FILRUNOUT_PIN to a valid pin if you enable FILAMENT_RUNOUT_SENSOR
#endif
#if ENABLED(FILAMENT_SENSOR) && !PIN_EXISTS(FILWIDTH_PIN)
#if ENABLED(FILAMENT_SENSOR) && !PIN_EXISTS(FILWIDTH)
#error DEPENDENCY ERROR: You have to set FILWIDTH_PIN to a valid pin if you enable FILAMENT_SENSOR
#endif
#if ENABLED(POWER_CONSUMPTION) && !PIN_EXISTS(POWER_CONSUMPTION_PIN)
#if ENABLED(POWER_CONSUMPTION) && !PIN_EXISTS(POWER_CONSUMPTION)
#error DEPENDENCY ERROR: You have to set POWER_CONSUMPTION_PIN to a valid pin if you enable POWER_CONSUMPTION
#endif
#if ENABLED(PHOTOGRAPH) && !PIN_EXISTS(PHOTOGRAPH_PIN)
#if ENABLED(PHOTOGRAPH) && !PIN_EXISTS(PHOTOGRAPH)
#error DEPENDENCY ERROR: You have to set PHOTOGRAPH_PIN to a valid pin if you enable PHOTOGRAPH
#endif
#if ENABLED(CHDK) && !PIN_EXISTS(CHDK_PIN)
#if ENABLED(CHDK) && !PIN_EXISTS(CHDK)
#error DEPENDENCY ERROR: You have to set CHDK_PIN to a valid pin if you enable CHDK
#endif
#if ENABLED(CONTROLLERFAN) && !PIN_EXISTS(CONTROLLERFAN_PIN)
#if ENABLED(CONTROLLERFAN) && !PIN_EXISTS(CONTROLLERFAN)
#error DEPENDENCY ERROR: You have to set CONTROLLERFAN_PIN to a valid pin if you enable CONTROLLERFAN
#endif
#if ENABLED(EXTRUDER_AUTO_FAN) && !PIN_EXISTS(EXTRUDER_0_AUTO_FAN_PIN) && !PIN_EXISTS(EXTRUDER_1_AUTO_FAN_PIN) && !PIN_EXISTS(EXTRUDER_2_AUTO_FAN_PIN) && !PIN_EXISTS(EXTRUDER_3_AUTO_FAN_PIN)
#if ENABLED(EXTRUDER_AUTO_FAN) && !PIN_EXISTS(EXTRUDER_0_AUTO_FAN) && !PIN_EXISTS(EXTRUDER_1_AUTO_FAN) && !PIN_EXISTS(EXTRUDER_2_AUTO_FAN) && !PIN_EXISTS(EXTRUDER_3_AUTO_FAN)
#error DEPENDENCY ERROR: You have to set at least one EXTRUDER_?_AUTO_FAN_PIN to a valid pin if you enable EXTRUDER_AUTO_FAN
#endif
#if ENABLED(X2_IS_TMC) && (!PIN_EXISTS(X2_ENABLE_PIN) || !PIN_EXISTS(X2_STEP_PIN) || !PIN_EXISTS(X2_DIR_PIN))
#if ENABLED(X2_IS_TMC) && (!PIN_EXISTS(X2_ENABLE) || !PIN_EXISTS(X2_STEP) || !PIN_EXISTS(X2_DIR))
#error DEPENDENCY ERROR: You have to set X2_ENABLE_PIN, X2_STEP_PIN and X2_DIR_PIN to a valid pin if you enable X2_IS_TMC
#endif
......@@ -1651,7 +1651,7 @@
#error DEPENDENCY ERROR: You have to set at least one SERVO?_PIN to a valid pin if you enable ENABLE_SERVOS
#endif
#if ENABLED(Z_PROBE_SLED) && !PIN_EXISTS(SLED_PIN)
#if ENABLED(Z_PROBE_SLED) && !PIN_EXISTS(SLED)
#error DEPENDENCY ERROR: You have to set SLED_PIN to a valid pin if you enable Z_PROBE_SLED
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment