Commit c12f1384 authored by Simone Primarosa's avatar Simone Primarosa

Update 4.1.5 dev

Added an overall configuration file
parent 251c6e3e
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include "boards.h" #include "boards.h"
#include "macros.h" #include "macros.h"
#include "Default_Version.h" #include "Default_Version.h"
#include "Configuration_Overall.h"
//=========================================================================== //===========================================================================
//============================= Getting Started ============================= //============================= Getting Started =============================
...@@ -61,23 +62,6 @@ ...@@ -61,23 +62,6 @@
//#define COREXZ //#define COREXZ
//#define DELTA //#define DELTA
//#define SCARA //#define SCARA
/***********************************************************************\
/***********************************************************************\
********************** Do not touch this section **********************
***********************************************************************/
#if ENABLED(CARTESIAN)
#include "Configuration_Cartesian.h"
#elif ENABLED(COREXY)
#include "Configuration_Core.h"
#elif ENABLED(COREXZ)
#include "Configuration_Core.h"
#elif ENABLED(DELTA)
#include "Configuration_Delta.h"
#elif ENABLED(SCARA)
#include "Configuration_Scara.h"
#endif
/***********************************************************************/
// This defines the number of extruder real or virtual // This defines the number of extruder real or virtual
#define EXTRUDERS 1 #define EXTRUDERS 1
...@@ -720,7 +704,24 @@ const bool FILRUNOUT_PIN_INVERTING = true; // Should be uncommented and true or ...@@ -720,7 +704,24 @@ const bool FILRUNOUT_PIN_INVERTING = true; // Should be uncommented and true or
//#define LASERBEAM //#define LASERBEAM
//=========================================================================== //===========================================================================
/***********************************************************************\
********************** Do not touch this section **********************
***********************************************************************/
#include "Configuration_Overall.h"
#if ENABLED(CARTESIAN)
#include "Configuration_Cartesian.h"
#elif ENABLED(COREXY)
#include "Configuration_Core.h"
#elif ENABLED(COREXZ)
#include "Configuration_Core.h"
#elif ENABLED(DELTA)
#include "Configuration_Delta.h"
#elif ENABLED(SCARA)
#include "Configuration_Scara.h"
#endif
#include "Configuration_Overall.h"
#include "Configuration_adv.h" #include "Configuration_adv.h"
#include "Configuration_Overall.h"
#include "thermistortables.h" #include "thermistortables.h"
/***********************************************************************/
#endif //__CONFIGURATION_H #endif //__CONFIGURATION_H
/**
* Configuration_Overall.h
* Here you can define all your custom settings and they will overwrite configurations in the main configuration files.
*/
\ No newline at end of file
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#define CONFIGURATION_ADV_H #define CONFIGURATION_ADV_H
#include "conditionals.h" #include "conditionals.h"
#include "Configuration_Overall.h"
//=========================================================================== //===========================================================================
//=============================Thermal Settings ============================ //=============================Thermal Settings ============================
//=========================================================================== //===========================================================================
...@@ -561,7 +561,13 @@ const unsigned int dropsegments = 5; // everything with less than this number of ...@@ -561,7 +561,13 @@ const unsigned int dropsegments = 5; // everything with less than this number of
#endif #endif
#include "Configuration_Overall.h"
#include "pins.h"
#include "Configuration_Overall.h"
#include "language.h"
#include "Configuration_Overall.h"
#include "conditionals.h" #include "conditionals.h"
#include "Configuration_Overall.h"
#include "sanitycheck.h" #include "sanitycheck.h"
#endif //CONFIGURATION_ADV_H #endif //CONFIGURATION_ADV_H
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