josh
/
Teacup_Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Factor out some boilerplate code from configs 

Configs are always included via a config_wrapper.h now, and configs always
must include this safety-definition for a missing DEFINE_HEATER.  Let's
simplify the configs by moving it to a common location.
This commit is contained in:
Phil Hord 2016-12-05 12:20:53 -08:00 committed by Nico Tonnhofer
parent f8c78e6384
commit ab2c355821
24 changed files with 4 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/board.3drag.h
View File

@ -194,10 +194,6 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO14, THERMISTOR_BED)
* * * *
\***************************************************************************/ \***************************************************************************/
#ifndef DEFINE_HEATER
#define DEFINE_HEATER(...)
#endif
/** \def HEATER_PIN /** \def HEATER_PIN
Heater pins a user should be able to choose from in configtool. All Heater pins a user should be able to choose from in configtool. All
commented out. commented out.

4
config/board.cnc-shield-v3.h
View File

@ -196,10 +196,6 @@ DEFINE_TEMP_SENSOR(extruder, TT_THERMISTOR, AIO3, THERMISTOR_EXTRUDER)
* * * *
\***************************************************************************/ \***************************************************************************/
#ifndef DEFINE_HEATER
#define DEFINE_HEATER(...)
#endif
/** \def HEATER_PIN /** \def HEATER_PIN
Heater pins a user should be able to choose from in configtool. All Heater pins a user should be able to choose from in configtool. All
commented out. commented out.

4
config/board.gen3.h
View File

@ -190,10 +190,6 @@ DEFINE_TEMP_SENSOR(noheater, TT_INTERCOM, AIO0, 0)
* * * *
\***************************************************************************/ \***************************************************************************/
#ifndef DEFINE_HEATER
#define DEFINE_HEATER(...)
#endif
/** \def HEATER_PIN /** \def HEATER_PIN
Heater pins a user should be able to choose from in configtool. All Heater pins a user should be able to choose from in configtool. All
commented out. commented out.

4
config/board.gen6.h
View File

@ -191,10 +191,6 @@ DEFINE_TEMP_SENSOR(extruder, TT_THERMISTOR, AIO5, THERMISTOR_EXTRUDER)
* * * *
\***************************************************************************/ \***************************************************************************/
#ifndef DEFINE_HEATER
#define DEFINE_HEATER(...)
#endif
/** \def HEATER_PIN /** \def HEATER_PIN
Heater pins a user should be able to choose from in configtool. All Heater pins a user should be able to choose from in configtool. All
commented out. commented out.

4
config/board.gen7-arm.h
View File

@ -194,10 +194,6 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, PIO1_0,THERMISTOR_BED)
* * * *
\***************************************************************************/ \***************************************************************************/
#ifndef DEFINE_HEATER
#define DEFINE_HEATER(...)
#endif
/** \def HEATER_PIN /** \def HEATER_PIN
Heater pins a user should be able to choose from in configtool. All Heater pins a user should be able to choose from in configtool. All
commented out. commented out.

4
config/board.gen7-v1.1-v1.3.h
View File

@ -198,10 +198,6 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO2, THERMISTOR_BED)
* * * *
\***************************************************************************/ \***************************************************************************/
#ifndef DEFINE_HEATER
#define DEFINE_HEATER(...)
#endif
/** \def HEATER_PIN /** \def HEATER_PIN
Heater pins a user should be able to choose from in configtool. All Heater pins a user should be able to choose from in configtool. All
commented out. commented out.

4
config/board.gen7-v1.4.h
View File

@ -199,10 +199,6 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO0, THERMISTOR_BED)
* * * *
\***************************************************************************/ \***************************************************************************/
#ifndef DEFINE_HEATER
#define DEFINE_HEATER(...)
#endif
/** \def HEATER_PIN /** \def HEATER_PIN
Heater pins a user should be able to choose from in configtool. All Heater pins a user should be able to choose from in configtool. All
commented out. commented out.

4
config/board.melzi.h
View File

@ -197,10 +197,6 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO6, THERMISTOR_BED)
* * * *
\***************************************************************************/ \***************************************************************************/
#ifndef DEFINE_HEATER
#define DEFINE_HEATER(...)
#endif
/** \def HEATER_PIN /** \def HEATER_PIN
Heater pins a user should be able to choose from in configtool. All Heater pins a user should be able to choose from in configtool. All
commented out. commented out.

4
config/board.nanoheart-v1.0.h
View File

@ -197,10 +197,6 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO7, THERMISTOR_BED)
* * * *
\***************************************************************************/ \***************************************************************************/
#ifndef DEFINE_HEATER
#define DEFINE_HEATER(...)
#endif
/** \def HEATER_PIN /** \def HEATER_PIN
Heater pins a user should be able to choose from in configtool. All Heater pins a user should be able to choose from in configtool. All
commented out. commented out.

4
config/board.pcbscriber.h
View File

@ -194,10 +194,6 @@
* * * *
\***************************************************************************/ \***************************************************************************/
#ifndef DEFINE_HEATER
#define DEFINE_HEATER(...)
#endif
/** \def HEATER_PIN /** \def HEATER_PIN
Heater pins a user should be able to choose from in configtool. All Heater pins a user should be able to choose from in configtool. All
commented out. commented out.

4
config/board.ramps-v1.2.h
View File

@ -195,10 +195,6 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO1, THERMISTOR_BED)
* * * *
\***************************************************************************/ \***************************************************************************/
#ifndef DEFINE_HEATER
#define DEFINE_HEATER(...)
#endif
/** \def HEATER_PIN /** \def HEATER_PIN
Heater pins a user should be able to choose from in configtool. All Heater pins a user should be able to choose from in configtool. All
commented out. commented out.

4
config/board.ramps-v1.3.h
View File

@ -196,10 +196,6 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO14, THERMISTOR_BED)
* * * *
\***************************************************************************/ \***************************************************************************/
#ifndef DEFINE_HEATER
#define DEFINE_HEATER(...)
#endif
/** \def HEATER_PIN /** \def HEATER_PIN
Heater pins a user should be able to choose from in configtool. All Heater pins a user should be able to choose from in configtool. All
commented out. commented out.

4
config/board.rumba.h
View File

@ -197,10 +197,6 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO11, THERMISTOR_BED)
* * * *
\***************************************************************************/ \***************************************************************************/
#ifndef DEFINE_HEATER
#define DEFINE_HEATER(...)
#endif
/** \def HEATER_PIN /** \def HEATER_PIN
Heater pins a user should be able to choose from in configtool. All Heater pins a user should be able to choose from in configtool. All
commented out. commented out.

4
config/board.sanguinololu-v1.1.h
View File

@ -197,10 +197,6 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO6, THERMISTOR_BED)
* * * *
\***************************************************************************/ \***************************************************************************/
#ifndef DEFINE_HEATER
#define DEFINE_HEATER(...)
#endif
/** \def HEATER_PIN /** \def HEATER_PIN
Heater pins a user should be able to choose from in configtool. All Heater pins a user should be able to choose from in configtool. All
commented out. commented out.

4
config/board.sanguinololu-v1.2.h
View File

@ -197,10 +197,6 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO6, THERMISTOR_BED)
* * * *
\***************************************************************************/ \***************************************************************************/
#ifndef DEFINE_HEATER
#define DEFINE_HEATER(...)
#endif
/** \def HEATER_PIN /** \def HEATER_PIN
Heater pins a user should be able to choose from in configtool. All Heater pins a user should be able to choose from in configtool. All
commented out. commented out.

4
config/board.sanguish.h
View File

@ -197,10 +197,6 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO0, THERMISTOR_BED)
* * * *
\***************************************************************************/ \***************************************************************************/
#ifndef DEFINE_HEATER
#define DEFINE_HEATER(...)
#endif
/** \def HEATER_PIN /** \def HEATER_PIN
Heater pins a user should be able to choose from in configtool. All Heater pins a user should be able to choose from in configtool. All
commented out. commented out.

4
config/board.sinaptec-at328-02.h
View File

@ -197,10 +197,6 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO6, THERMISTOR_BED)
* * * *
\***************************************************************************/ \***************************************************************************/
#ifndef DEFINE_HEATER
#define DEFINE_HEATER(...)
#endif
/** \def HEATER_PIN /** \def HEATER_PIN
Heater pins a user should be able to choose from in configtool. All Heater pins a user should be able to choose from in configtool. All
commented out. commented out.

4
config/board.teensy++-v2.0.h
View File

@ -194,10 +194,6 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO6, THERMISTOR_BED)
* * * *
\***************************************************************************/ \***************************************************************************/
#ifndef DEFINE_HEATER
#define DEFINE_HEATER(...)
#endif
/** \def HEATER_PIN /** \def HEATER_PIN
Heater pins a user should be able to choose from in configtool. All Heater pins a user should be able to choose from in configtool. All
commented out. commented out.

4
config/board.teensy-v2.0.h
View File

@ -194,10 +194,6 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO0, THERMISTOR_BED)
* * * *
\***************************************************************************/ \***************************************************************************/
#ifndef DEFINE_HEATER
#define DEFINE_HEATER(...)
#endif
/** \def HEATER_PIN /** \def HEATER_PIN
Heater pins a user should be able to choose from in configtool. All Heater pins a user should be able to choose from in configtool. All
commented out. commented out.

4
config/board.tronxy.h
View File

@ -195,10 +195,6 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO6, THERMISTOR_BED)
* * * *
\***************************************************************************/ \***************************************************************************/
#ifndef DEFINE_HEATER
#define DEFINE_HEATER(...)
#endif
/** \def HEATER_PIN /** \def HEATER_PIN
Heater pins a user should be able to choose from in configtool. All Heater pins a user should be able to choose from in configtool. All
commented out. commented out.

4
config_wrapper.h
View File

@ -7,6 +7,10 @@
*/ */
#include "arduino.h" #include "arduino.h"
#ifndef DEFINE_HEATER
#define DEFINE_HEATER(...)
#endif
/** /**
This wrapper config header is used to allow makefiles and test scripts to This wrapper config header is used to allow makefiles and test scripts to
replace or augment the user's 'config.h' file in a controlled manner. A replace or augment the user's 'config.h' file in a controlled manner. A

4
configtool/board.generic.h
View File

@ -188,10 +188,6 @@
* * * *
\***************************************************************************/ \***************************************************************************/
#ifndef DEFINE_HEATER
#define DEFINE_HEATER(...)
#endif
/** \def HEATER_PIN /** \def HEATER_PIN
Heater pins a user should be able to choose from in configtool. All Heater pins a user should be able to choose from in configtool. All
commented out. commented out.

4
testcases/board.regtest-no-endstops.h
View File

@ -63,10 +63,6 @@
DEFINE_TEMP_SENSOR(extruder, TT_THERMISTOR, AIO1, THERMISTOR_EXTRUDER) DEFINE_TEMP_SENSOR(extruder, TT_THERMISTOR, AIO1, THERMISTOR_EXTRUDER)
DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO2, THERMISTOR_BED) DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO2, THERMISTOR_BED)
#ifndef DEFINE_HEATER
#define DEFINE_HEATER(...)
#endif
DEFINE_HEATER(extruder, DIO4, 0, 1, 100) DEFINE_HEATER(extruder, DIO4, 0, 1, 100)
DEFINE_HEATER(bed, DIO3, 0, 1, 100) DEFINE_HEATER(bed, DIO3, 0, 1, 100)

4
testcases/config.h.Profiling
View File

@ -531,10 +531,6 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO0, THERMISTOR_EXTRUDER)
* * * *
\***************************************************************************/ \***************************************************************************/
#ifndef DEFINE_HEATER
#define DEFINE_HEATER(...)
#endif
/** \def HEATER_PIN /** \def HEATER_PIN
Heater pins a user should be able to choose from in configtool. All Heater pins a user should be able to choose from in configtool. All
commented out. commented out.