diff options
| author | David Crocker <dcrocker@eschertech.com> | 2020-10-01 10:49:32 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2020-10-01 10:49:32 +0300 |
| commit | fe23a7c4db559704009dce793b4525faee13279b (patch) | |
| tree | 8c3687b9be6ff3aaded2b05fddcd319de510bfcf /src/Heating | |
| parent | 2e6f7d25cdcd0cfbcfd5e30d9d632ce56157d1e2 (diff) | |
Fixes issue when a homing file terminates with an exception
Diffstat (limited to 'src/Heating')
| -rw-r--r-- | src/Heating/LocalHeater.cpp | 8 | ||||
| -rw-r--r-- | src/Heating/LocalHeater.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/Heating/LocalHeater.cpp b/src/Heating/LocalHeater.cpp index aeefb930..2f6cb28d 100644 --- a/src/Heating/LocalHeater.cpp +++ b/src/Heating/LocalHeater.cpp @@ -85,7 +85,7 @@ void LocalHeater::ResetHeater() noexcept } // Configure the heater port and the sensor number -GCodeResult LocalHeater::ConfigurePortAndSensor(const char *portName, PwmFrequency freq, unsigned int sensorNumber, const StringRef& reply) +GCodeResult LocalHeater::ConfigurePortAndSensor(const char *portName, PwmFrequency freq, unsigned int sn, const StringRef& reply) { if (!port.AssignPort(portName, reply, PinUsedBy::heater, PinAccess::pwm)) { @@ -93,10 +93,10 @@ GCodeResult LocalHeater::ConfigurePortAndSensor(const char *portName, PwmFrequen } port.SetFrequency(freq); - SetSensorNumber(sensorNumber); - if (reprap.GetHeat().FindSensor(sensorNumber).IsNull()) + SetSensorNumber(sn); + if (reprap.GetHeat().FindSensor(sn).IsNull()) { - reply.printf("Sensor number %u has not been defined", sensorNumber); + reply.printf("Sensor number %u has not been defined", sn); return GCodeResult::warning; } return GCodeResult::ok; diff --git a/src/Heating/LocalHeater.h b/src/Heating/LocalHeater.h index de6f7d39..818c69af 100644 --- a/src/Heating/LocalHeater.h +++ b/src/Heating/LocalHeater.h @@ -28,7 +28,7 @@ public: LocalHeater(unsigned int heaterNum) noexcept; ~LocalHeater() noexcept; - GCodeResult ConfigurePortAndSensor(const char *portName, PwmFrequency freq, unsigned int sensorNumber, const StringRef& reply) override; + GCodeResult ConfigurePortAndSensor(const char *portName, PwmFrequency freq, unsigned int sn, const StringRef& reply) override; GCodeResult SetPwmFrequency(PwmFrequency freq, const StringRef& reply) noexcept override; GCodeResult ReportDetails(const StringRef& reply) const noexcept override; |