diff options
| author | David Crocker <dcrocker@eschertech.com> | 2020-01-14 14:24:45 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2020-01-14 14:24:45 +0300 |
| commit | 2ec108b04280b88d9d86c78f100bde962065d461 (patch) | |
| tree | 903bb6b0d5574205347a71f7f077813b52ccc05e /src/Fans | |
| parent | fe3da689f56b80d200d5e29056140103b7172b38 (diff) | |
Added apiLevel to rr_connect response
Also added firmwareVersion property to Board object
Minor changes to Fans code
Diffstat (limited to 'src/Fans')
| -rw-r--r-- | src/Fans/Fan.cpp | 10 | ||||
| -rw-r--r-- | src/Fans/LocalFan.cpp | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/Fans/Fan.cpp b/src/Fans/Fan.cpp index 7f35515f..00361824 100644 --- a/src/Fans/Fan.cpp +++ b/src/Fans/Fan.cpp @@ -145,12 +145,12 @@ bool Fan::Configure(unsigned int mcode, size_t fanNum, GCodeBuffer& gb, const St if (sensorsMonitored != 0) { reply.catf(", temperature: %.1f:%.1fC, sensors:", (double)triggerTemperatures[0], (double)triggerTemperatures[1]); - for (unsigned int i = 0; i < MaxSensors; ++i) + SensorsBitmap copySensorsMonitored = sensorsMonitored; + while (copySensorsMonitored != 0) { - if (IsBitSet(sensorsMonitored, i)) - { - reply.catf(" %u", i); - } + const unsigned int sensorNum = LowestSetBit(copySensorsMonitored); + ClearBit(copySensorsMonitored, sensorNum); + reply.catf(" %u", sensorNum); } reply.catf(", current speed: %d%%:", (int)(lastVal * 100.0)); } diff --git a/src/Fans/LocalFan.cpp b/src/Fans/LocalFan.cpp index 460d4aec..2847965b 100644 --- a/src/Fans/LocalFan.cpp +++ b/src/Fans/LocalFan.cpp @@ -84,7 +84,7 @@ void LocalFan::InternalRefresh() noexcept SensorsBitmap copySensorsMonitored = sensorsMonitored; while (copySensorsMonitored != 0) { - unsigned int sensorNum = LowestSetBit(copySensorsMonitored); + const unsigned int sensorNum = LowestSetBit(copySensorsMonitored); ClearBit(copySensorsMonitored, sensorNum); const auto sensor = reprap.GetHeat().FindSensor(sensorNum); if (sensor.IsNotNull()) |