diff options
Diffstat (limited to 'src/Heating')
-rw-r--r-- | src/Heating/Heat.h | 2 | ||||
-rw-r--r-- | src/Heating/Heater.h | 1 | ||||
-rw-r--r-- | src/Heating/LocalHeater.h | 1 | ||||
-rw-r--r-- | src/Heating/Sensors/TemperatureSensor.cpp | 2 | ||||
-rw-r--r-- | src/Heating/Sensors/TemperatureSensor.h | 7 | ||||
-rw-r--r-- | src/Heating/Sensors/TmcDriverTemperatureSensor.h | 2 |
6 files changed, 5 insertions, 10 deletions
diff --git a/src/Heating/Heat.h b/src/Heating/Heat.h index bd1f9890..bf37e91f 100644 --- a/src/Heating/Heat.h +++ b/src/Heating/Heat.h @@ -29,8 +29,6 @@ Licence: GPL #include <Platform/RepRap.h> #include "Heater.h" #include "TemperatureError.h" -#include <Platform/MessageType.h> -#include <GCodes/GCodeResult.h> #include <RTOSIface/RTOSIface.h> class TemperatureSensor; diff --git a/src/Heating/Heater.h b/src/Heating/Heater.h index dc9d5e8e..7a08444c 100644 --- a/src/Heating/Heater.h +++ b/src/Heating/Heater.h @@ -12,7 +12,6 @@ #include <General/NamedEnum.h> #include "FOPDT.h" #include "HeaterMonitor.h" -#include <GCodes/GCodeResult.h> #include <ObjectModel/ObjectModel.h> #include <Math/DeviationAccumulator.h> diff --git a/src/Heating/LocalHeater.h b/src/Heating/LocalHeater.h index 02fde4f9..040b6ba6 100644 --- a/src/Heating/LocalHeater.h +++ b/src/Heating/LocalHeater.h @@ -16,7 +16,6 @@ #include "FOPDT.h" #include "TemperatureError.h" #include <Hardware/IoPorts.h> -#include <GCodes/GCodeResult.h> class HeaterMonitor; diff --git a/src/Heating/Sensors/TemperatureSensor.cpp b/src/Heating/Sensors/TemperatureSensor.cpp index fee02dd5..e7251508 100644 --- a/src/Heating/Sensors/TemperatureSensor.cpp +++ b/src/Heating/Sensors/TemperatureSensor.cpp @@ -248,7 +248,7 @@ TemperatureSensor *TemperatureSensor::Create(unsigned int sensorNum, const char { ts = new TmcDriverTemperatureSensor(sensorNum, 0); } -# ifdef DUET_NG +# if defined(DUET_NG) || defined(PCCB_10) else if (ReducedStringEquals(typeName, TmcDriverTemperatureSensor::DuexTypeName)) { ts = new TmcDriverTemperatureSensor(sensorNum, 1); diff --git a/src/Heating/Sensors/TemperatureSensor.h b/src/Heating/Sensors/TemperatureSensor.h index 96c59e6c..cebbeed4 100644 --- a/src/Heating/Sensors/TemperatureSensor.h +++ b/src/Heating/Sensors/TemperatureSensor.h @@ -1,10 +1,9 @@ #ifndef TEMPERATURESENSOR_H #define TEMPERATURESENSOR_H -#include "RepRapFirmware.h" -#include "Heating/TemperatureError.h" // for result codes -#include "Hardware/IoPorts.h" -#include "GCodes/GCodeResult.h" +#include <RepRapFirmware.h> +#include <Heating/TemperatureError.h> // for result codes +#include <Hardware/IoPorts.h> #include <ObjectModel/ObjectModel.h> class GCodeBuffer; diff --git a/src/Heating/Sensors/TmcDriverTemperatureSensor.h b/src/Heating/Sensors/TmcDriverTemperatureSensor.h index ca89cc44..2469df17 100644 --- a/src/Heating/Sensors/TmcDriverTemperatureSensor.h +++ b/src/Heating/Sensors/TmcDriverTemperatureSensor.h @@ -22,7 +22,7 @@ public: const char *GetShortSensorType() const noexcept override; static constexpr const char *PrimaryTypeName = "drivers"; -#ifdef DUET_NG +#if defined(DUET_NG) || defined(PCCB_10) static constexpr const char *DuexTypeName = "drivers-duex"; static constexpr const char *DuexTypeShortName = "driversduex"; #endif |