Updates

Author: 27pchrisl

src/IO/IO.php

@@ -5,7 +5,7 @@
 namespace Flat3\RevPi\IO;
 
 use Flat3\RevPi\Interfaces\Module;
-use Flat3\RevPi\Monitors\DigitalTrigger;
+use Flat3\RevPi\Monitors\DigitalMonitor;
 
 abstract class IO
 {
@@ -22,7 +22,7 @@ public function get(): int|bool
 
     public function monitor(callable $callback): void
     {
-        $this->module->monitor(new DigitalTrigger($this->name, $callback));
+        $this->module->monitor(new DigitalMonitor($this->name, $callback));
     }
 
     public function default(): int|bool

src/Interfaces/Module.php

@@ -5,7 +5,7 @@
 namespace Flat3\RevPi\Interfaces;
 
 use Flat3\RevPi\Led\LedPosition;
-use Flat3\RevPi\Monitors\Trigger;
+use Flat3\RevPi\Monitors\Monitor;
 
 interface Module
 {
@@ -15,7 +15,7 @@ public function getProcessImage(): ProcessImage;
 
     public function resume(): void;
 
-    public function monitor(Trigger $monitor): void;
+    public function monitor(Monitor $monitor): void;
 
     public function getSerialPort(string $devicePath): SerialPort;
 }

src/Modules/Module.php

@@ -9,7 +9,7 @@
 use Flat3\RevPi\Interfaces\Module as ModuleInterface;
 use Flat3\RevPi\Interfaces\ProcessImage;
 use Flat3\RevPi\Interfaces\SerialPort;
-use Flat3\RevPi\Monitors\Trigger;
+use Flat3\RevPi\Monitors\Monitor;
 use Illuminate\Support\Facades\Event;
 use Revolt\EventLoop;
 
@@ -54,7 +54,7 @@ public function cancel(): void
         $this->pollingCallbackId = null;
     }
 
-    public function monitor(Trigger $monitor): void
+    public function monitor(Monitor $monitor): void
     {
         Event::listen(PollingEvent::class, function () use ($monitor) {
             static $previous = null;

src/Modules/Remote.php

@@ -14,7 +14,7 @@
 use Flat3\RevPi\Interfaces\SerialPort;
 use Flat3\RevPi\Led\LedPosition;
 use Flat3\RevPi\Led\RemoteLed;
-use Flat3\RevPi\Monitors\Trigger;
+use Flat3\RevPi\Monitors\Monitor;
 use Flat3\RevPi\ProcessImage\ProcessImage;
 
 use function Amp\Websocket\Client\connect;
@@ -49,7 +49,7 @@ public function resume(): void
         throw new NotImplementedException;
     }
 
-    public function monitor(Trigger $monitor): void
+    public function monitor(Monitor $monitor): void
     {
         throw new NotImplementedException;
     }

src/Monitors/DigitalTrigger.php renamed to src/Monitors/DigitalMonitor.php

@@ -4,7 +4,7 @@
 
 namespace Flat3\RevPi\Monitors;
 
-class DigitalTrigger extends Trigger
+class DigitalMonitor extends Monitor
 {
     public function evaluate(mixed $previous, mixed $next): void
     {

src/Monitors/Trigger.php renamed to src/Monitors/Monitor.php

@@ -4,7 +4,7 @@
 
 namespace Flat3\RevPi\Monitors;
 
-abstract class Trigger
+abstract class Monitor
 {
     /**
      * @param  callable  $callback

tests/Integration/Connect5Test.php

@@ -7,7 +7,7 @@
 use Flat3\RevPi\Interfaces\Module;
 use Flat3\RevPi\Led\LedColour;
 use Flat3\RevPi\Led\LedPosition;
-use Flat3\RevPi\Monitors\DigitalTrigger;
+use Flat3\RevPi\Monitors\DigitalMonitor;
 use Flat3\RevPi\Tests\TestCase;
 
 class Connect5Test extends TestCase
@@ -34,7 +34,7 @@ public function test_analog_watch_high_low(): void
         $module->getProcessImage()->writeVariable('AnalogOutputLogicLevel_1', false);
         $this->loop(2);
 
-        $module->monitor(new DigitalTrigger('AnalogInputLogicLevel_1', function ($next) {
+        $module->monitor(new DigitalMonitor('AnalogInputLogicLevel_1', function ($next) {
             $this->switch = $next;
         }));
 
@@ -67,7 +67,7 @@ public function test_digital_watch_high_low(): void
         $module->getProcessImage()->writeVariable('DigitalOutput_3', false);
         self::assertFalse($module->getProcessImage()->readVariable('DigitalOutput_3'));
 
-        $module->monitor(new DigitalTrigger('DigitalInput_4', function ($next) {
+        $module->monitor(new DigitalMonitor('DigitalInput_4', function ($next) {
             $this->switch = $next;
         }));