Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Duet3D/RepRapFirmware.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src/Fans
diff options
context:
space:
mode:
authorDavid Crocker <dcrocker@eschertech.com>2020-02-25 14:33:11 +0300
committerDavid Crocker <dcrocker@eschertech.com>2020-02-25 14:33:11 +0300
commite05e1148325a61addb35ba1fbfb7524b0cd8e398 (patch)
tree4fb01d37c2adab24515e89f949ff3f7be0c65ec7 /src/Fans
parentdaa58d8e11d5dfe24863f654683ea8e2f4cdc7ef (diff)
3.01-RC3 provisonal
Emergency Stop now stops expansion boards and tool boards Simplified fan configuration code (thanks wilriker) Reset line number when starting a new GCode file G4 no longer waits for motion to stop if no motion was commanded by the same channel When a GCode source is waiting for motion to stop, start executing queued moves immediately Wait until config processing has finished before starting daemon task Implemented filamentPresent OM propert for laser and rotating magnet filament monitors that are configured with a switch Implemented runonce.g file Implemented filament OM property in tool and extruder objects Fixes for building Duet 2 config with TMC2660 support disabled
Diffstat (limited to 'src/Fans')
-rw-r--r--src/Fans/Fan.cpp14
1 files changed, 2 insertions, 12 deletions
diff --git a/src/Fans/Fan.cpp b/src/Fans/Fan.cpp
index d24f0b9d..1f89c8f6 100644
--- a/src/Fans/Fan.cpp
+++ b/src/Fans/Fan.cpp
@@ -92,23 +92,13 @@ bool Fan::Configure(unsigned int mcode, size_t fanNum, GCodeBuffer& gb, const St
if (gb.Seen('L')) // Set minimum speed
{
seen = true;
- float speed = gb.GetFValue();
- if (speed > 1.0)
- {
- speed /= 255.0;
- }
- minVal = constrain<float>(speed, 0.0, maxVal);
+ minVal = min<float>(gb.GetPwmValue(), maxVal);
}
if (gb.Seen('X')) // Set maximum speed
{
seen = true;
- float speed = gb.GetFValue();
- if (speed > 1.0)
- {
- speed /= 255.0;
- }
- maxVal = constrain<float>(speed, minVal, 1.0);
+ maxVal = max<float>(gb.GetPwmValue(), minVal);
}
if (gb.Seen('H')) // Set thermostatically-controlled sensors