bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Move LCD items to Conditionals.h

Browse Source 
- `Conditionals.h` is included twice, setting LCD values the first time
This commit is contained in:
Scott Lahteine
2015-03-21 15:24:57 -07:00
parent 63abeaff38
commit 2c9bd15625
25 changed files with 59 additions and 440 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Marlin/example_configurations/Felix/Configuration.h
View File

@ -694,10 +694,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
#include "Conditionals_lcd.h"
#include "Configuration_adv.h"
#include "Conditionals.h"
#include "SanityCheck.h"
#include "thermistortables.h"
#endif //CONFIGURATION_H

7
Marlin/example_configurations/Felix/Configuration_DUAL.h
View File

@ -691,10 +691,11 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
//#define FILAMENT_LCD_DISPLAY
#include "Conditionals_lcd.h"
#include "Configuration_adv.h"
#include "Conditionals.h"
#include "SanityCheck.h"
#include "thermistortables.h"
#endif //CONFIGURATION_H

5
Marlin/example_configurations/Felix/Configuration_adv.h
View File

@ -1,6 +1,8 @@
#ifndef CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H
#include "Conditionals.h"
//===========================================================================
//=============================Thermal Settings ============================
//===========================================================================
@ -358,4 +360,7 @@ const unsigned int dropsegments=5; //everything with less than this number of st
#endif
#endif
#include "Conditionals.h"
#include "SanityCheck.h"
#endif //CONFIGURATION_ADV_H

3
Marlin/example_configurations/Hephestos/Configuration.h
View File

@ -722,10 +722,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
#include "Conditionals_lcd.h"
#include "Configuration_adv.h"
#include "Conditionals.h"
#include "SanityCheck.h"
#include "thermistortables.h"
#endif //CONFIGURATION_H

5
Marlin/example_configurations/Hephestos/Configuration_adv.h
View File

@ -1,6 +1,8 @@
#ifndef CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H
#include "Conditionals.h"
//===========================================================================
//=============================Thermal Settings ============================
//===========================================================================
@ -342,4 +344,7 @@ const unsigned int dropsegments=5; //everything with less than this number of st
#endif
#endif
#include "Conditionals.h"
#include "SanityCheck.h"
#endif //CONFIGURATION_ADV_H

3
Marlin/example_configurations/K8200/Configuration.h
View File

@ -726,10 +726,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
#include "Conditionals_lcd.h"
#include "Configuration_adv.h"
#include "Conditionals.h"
#include "SanityCheck.h"
#include "thermistortables.h"
#endif //CONFIGURATION_H

5
Marlin/example_configurations/K8200/Configuration_adv.h
View File

@ -1,6 +1,8 @@
#ifndef CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H
#include "Conditionals.h"
//===========================================================================
//=============================Thermal Settings ============================
//===========================================================================
@ -338,4 +340,7 @@ const unsigned int dropsegments=5; //everything with less than this number of st
#endif
#endif
#include "Conditionals.h"
#include "SanityCheck.h"
#endif //CONFIGURATION_ADV_H

3
Marlin/example_configurations/SCARA/Configuration.h
View File

@ -752,10 +752,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
#include "Conditionals_lcd.h"
#include "Configuration_adv.h"
#include "Conditionals.h"
#include "SanityCheck.h"
#include "thermistortables.h"
#endif //CONFIGURATION_H

5
Marlin/example_configurations/SCARA/Configuration_adv.h
View File

@ -1,6 +1,8 @@
#ifndef CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H
#include "Conditionals.h"
//===========================================================================
//=============================Thermal Settings ============================
//===========================================================================
@ -342,4 +344,7 @@ const unsigned int dropsegments=5; //everything with less than this number of st
#endif
#endif
#include "Conditionals.h"
#include "SanityCheck.h"
#endif //CONFIGURATION_ADV_H

3
Marlin/example_configurations/WITBOX/Configuration.h
View File

@ -719,10 +719,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
#include "Conditionals_lcd.h"
#include "Configuration_adv.h"
#include "Conditionals.h"
#include "SanityCheck.h"
#include "thermistortables.h"
#endif //CONFIGURATION_H

5
Marlin/example_configurations/WITBOX/Configuration_adv.h
View File

@ -1,6 +1,8 @@
#ifndef CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H
#include "Conditionals.h"
//===========================================================================
//=============================Thermal Settings ============================
//===========================================================================
@ -342,4 +344,7 @@ const unsigned int dropsegments=5; //everything with less than this number of st
#endif
#endif
#include "Conditionals.h"
#include "SanityCheck.h"
#endif //CONFIGURATION_ADV_H

3
Marlin/example_configurations/delta/generic/Configuration.h
View File

@ -736,10 +736,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
#include "Conditionals_lcd.h"
#include "Configuration_adv.h"
#include "Conditionals.h"
#include "SanityCheck.h"
#include "thermistortables.h"
#endif //CONFIGURATION_H

5
Marlin/example_configurations/delta/generic/Configuration_adv.h
View File

@ -1,6 +1,8 @@
#ifndef CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H
#include "Conditionals.h"
//===========================================================================
//=============================Thermal Settings ============================
//===========================================================================
@ -342,4 +344,7 @@ const unsigned int dropsegments=5; //everything with less than this number of st
#endif
#endif
#include "Conditionals.h"
#include "SanityCheck.h"
#endif //CONFIGURATION_ADV_H

3
Marlin/example_configurations/delta/kossel_mini/Configuration.h
View File

@ -738,10 +738,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = false; // set to true to invert the logic o
#include "Conditionals_lcd.h"
#include "Configuration_adv.h"
#include "Conditionals.h"
#include "SanityCheck.h"
#include "thermistortables.h"
#endif //CONFIGURATION_H

5
Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
View File

@ -1,6 +1,8 @@
#ifndef CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H
#include "Conditionals.h"
//===========================================================================
//=============================Thermal Settings ============================
//===========================================================================
@ -341,4 +343,7 @@ const unsigned int dropsegments=5; //everything with less than this number of st
#endif
#endif
#include "Conditionals.h"
#include "SanityCheck.h"
#endif //CONFIGURATION_ADV_H

3
Marlin/example_configurations/makibox/Configuration.h
View File

@ -717,10 +717,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
#include "Conditionals_lcd.h"
#include "Configuration_adv.h"
#include "Conditionals.h"
#include "SanityCheck.h"
#include "thermistortables.h"
#endif //CONFIGURATION_H

5
Marlin/example_configurations/makibox/Configuration_adv.h
View File

@ -1,6 +1,8 @@
#ifndef CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H
#include "Conditionals.h"
//===========================================================================
//=============================Thermal Settings ============================
//===========================================================================
@ -339,4 +341,7 @@ const unsigned int dropsegments=5; //everything with less than this number of st
#endif
#endif
#include "Conditionals.h"
#include "SanityCheck.h"
#endif //CONFIGURATION_ADV_H

3
Marlin/example_configurations/tvrrug/Round2/Configuration.h
View File

@ -724,10 +724,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
#include "Conditionals_lcd.h"
#include "Configuration_adv.h"
#include "Conditionals.h"
#include "SanityCheck.h"
#include "thermistortables.h"
#endif //CONFIGURATION_H

5
Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h
View File

@ -1,6 +1,8 @@
#ifndef CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H
#include "Conditionals.h"
//===========================================================================
//=============================Thermal Settings ============================
//===========================================================================
@ -346,4 +348,7 @@ const unsigned int dropsegments=5; //everything with less than this number of st
#endif
#endif
#include "Conditionals.h"
#include "SanityCheck.h"
#endif //CONFIGURATION_ADV_H