Simplify logic of probe already triggered
authorJames Richters <james@productionautomation.net>
Mon, 23 Apr 2018 14:15:50 +0000 (10:15 -0400)
committerJames Richters <james@productionautomation.net>
Mon, 23 Apr 2018 14:15:50 +0000 (10:15 -0400)
src/modules/tools/zprobe/ZProbe.cpp

index e74a8de..e16e9b8 100644 (file)
@@ -336,7 +336,7 @@ void ZProbe::on_gcode_received(void *argument)
             return;
         }
 
-        if (((gcode->subcode == 4 || gcode->subcode == 5) && (!this->pin.get())) || ((gcode->subcode == 2 || gcode->subcode == 3) && (this->pin.get()))){
+        if(this->pin.get() ^ (gcode->subcode >= 4)) {
             gcode->stream->printf("error:ZProbe triggered before move, aborting command.\n");
             return;
         }