Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
MarlinKimbra
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
machinery
MarlinKimbra
Commits
c12f1384
Commit
c12f1384
authored
9 years ago
by
Simone Primarosa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update 4.1.5 dev
Added an overall configuration file
parent
251c6e3e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
30 additions
and
19 deletions
+30
-19
Configuration.h
MarlinKimbra/Configuration.h
+19
-18
Configuration_Overall.h
MarlinKimbra/Configuration_Overall.h
+4
-0
Configuration_adv.h
MarlinKimbra/Configuration_adv.h
+7
-1
No files found.
MarlinKimbra/Configuration.h
View file @
c12f1384
...
...
@@ -4,6 +4,7 @@
#include "boards.h"
#include "macros.h"
#include "Default_Version.h"
#include "Configuration_Overall.h"
//===========================================================================
//============================= Getting Started =============================
...
...
@@ -61,23 +62,6 @@
//#define COREXZ
//#define DELTA
//#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
#define EXTRUDERS 1
...
...
@@ -720,7 +704,24 @@ const bool FILRUNOUT_PIN_INVERTING = true; // Should be uncommented and true or
//#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_Overall.h"
#include "thermistortables.h"
/***********************************************************************/
#endif //__CONFIGURATION_H
This diff is collapsed.
Click to expand it.
MarlinKimbra/Configuration_Overall.h
0 → 100644
View file @
c12f1384
/**
* 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
This diff is collapsed.
Click to expand it.
MarlinKimbra/Configuration_adv.h
View file @
c12f1384
...
...
@@ -12,7 +12,7 @@
#define CONFIGURATION_ADV_H
#include "conditionals.h"
#include "Configuration_Overall.h"
//===========================================================================
//=============================Thermal Settings ============================
//===========================================================================
...
...
@@ -561,7 +561,13 @@ const unsigned int dropsegments = 5; // everything with less than this number of
#endif
#include "Configuration_Overall.h"
#include "pins.h"
#include "Configuration_Overall.h"
#include "language.h"
#include "Configuration_Overall.h"
#include "conditionals.h"
#include "Configuration_Overall.h"
#include "sanitycheck.h"
#endif //CONFIGURATION_ADV_H
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment