#239-Filament presence on startup (#240)

* #239-Filament presence on startup * Update tests
vintagepc · Sep 17, 2020 · 9aecd47 · 9aecd47
1 parent 0fdeaf9
commit 9aecd47
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 2 deletions.
diff --git a/parts/printers/Prusa_MK3.h b/parts/printers/Prusa_MK3.h
@@ -38,7 +38,7 @@ class Prusa_MK3: public Prusa_MK3S
 			lIR.ConnectFrom(LaserSensor.GetIRQ(PAT9125::LED_OUT),LED::LED_IN);
 
 			LaserSensor.ConnectFrom(E.GetIRQ(TMC2130::POSITION_OUT), PAT9125::E_IN);
-			LaserSensor.Set(PAT9125::FS_NO_FILAMENT); // No filament - but this just updates the LED.
+			LaserSensor.Set(PAT9125::FS_FILAMENT_PRESENT);
 		}; // Overridde to setup the PAT.
 
 		inline void ToggleFSensor() override { LaserSensor.Toggle(); };

diff --git a/parts/printers/Prusa_MK3S.cpp b/parts/printers/Prusa_MK3S.cpp
@@ -139,6 +139,7 @@ void Prusa_MK3S::SetupIR()
 	AddHardware(IR, GetPinNumber(VOLT_IR_PIN));
 	TryConnect(IR,IRSensor::DIGITAL_OUT, IR_SENSOR_PIN);
 	TryConnect(IR_SENSOR_PIN, lIR, LED::LED_IN);
+	IR.Set(IRSensor::IR_v4_FILAMENT_PRESENT);
 }
 
 void Prusa_MK3S::SetupHardware()

diff --git a/scripts/tests/snaps/GFXLiteKey07.png b/scripts/tests/snaps/GFXLiteKey07.png
diff --git a/scripts/tests/snaps/GFXLiteKey08.png b/scripts/tests/snaps/GFXLiteKey08.png
diff --git a/scripts/tests/snaps/MK301.png b/scripts/tests/snaps/MK301.png
diff --git a/scripts/tests/snaps/MK302.png b/scripts/tests/snaps/MK302.png
diff --git a/scripts/tests/snaps/MK3S02.png b/scripts/tests/snaps/MK3S02.png
diff --git a/scripts/tests/test_GLPrint.txt b/scripts/tests/test_GLPrint.txt
@@ -6,7 +6,7 @@ EEPROM::Poke(3935,0)
 EEPROM::Poke(4087,1)
 LCD::WaitForText(Prusa i3 MK3S OK,3)
 3DVisuals::ToggleNozzleCam()
-IRSensor::Toggle()
+IRSensor::Set(2)
 Serial0::SendGCode(M23 test~1.gco)
 Serial0::SendGCode(M24)
 Serial0::SendGCode(G4 S0)