Merge remote-tracking branch 'upstream/edge' into feature/soft-endstops

[clinton/Smoothieware.git] / src / modules / tools / laser / Laser.cpp

diff --git a/src/modules/tools/laser/Laser.cpp b/src/modules/tools/laser/Laser.cpp
index 87dda5e..7ed5dea 100644 (file)
--- a/src/modules/tools/laser/Laser.cpp
+++ b/src/modules/tools/laser/Laser.cpp
@@ -268,5 +268,6 @@ void Laser::on_halt(void *argument)
 
 float Laser::get_current_power() const
 {
-    return pwm_pin->read() * 100;
+       float p= pwm_pin->read();
+    return (this->pwm_inverting ? 1 - p : p) * 100;
 }