Updates

27pchrisl · 27pchrisl · commit 77721efaa718 · 2025-06-23T10:01:53.000+01:00
diff --git a/src/Commands/GetLed.php b/src/Commands/GetLed.php
@@ -11,7 +11,7 @@
 
 class GetLed extends Command
 {
-    protected $description = 'Get the colour of the specified LED';
+    protected $description = 'Get an LED colour';
 
     protected $signature = 'revpi:led:get {position}';
 
diff --git a/src/Commands/Info.php b/src/Commands/Info.php
@@ -10,7 +10,7 @@
 
 class Info extends Command
 {
-    protected $description = 'Display device list information';
+    protected $description = 'Display device information';
 
     protected $signature = 'revpi:info';
 
diff --git a/src/Commands/Listen.php b/src/Commands/Listen.php
@@ -16,7 +16,7 @@
 
 class Listen extends Command
 {
-    protected $description = 'Start the server';
+    protected $description = 'Listen for incoming websocket requests';
 
     protected $signature = 'revpi:listen {--address=0.0.0.0} {--port=12873}';
 
diff --git a/src/Commands/Run.php b/src/Commands/Run.php
@@ -10,7 +10,7 @@
 
 class Run extends Command
 {
-    protected $description = 'Run the program';
+    protected $description = 'Start the event loop';
 
     protected $signature = 'revpi:run';
 
diff --git a/src/Commands/SetLed.php b/src/Commands/SetLed.php
@@ -12,7 +12,7 @@
 
 class SetLed extends Command
 {
-    protected $description = 'Set the specified LED to the specified colour';
+    protected $description = 'Set an LED colour';
 
     protected $signature = 'revpi:led:set {position} {colour}';
 
diff --git a/src/Exceptions/NotImplementedException.php b/src/Exceptions/NotImplementedException.php
diff --git a/src/Hardware/Virtual/VirtualBlockDevice.php b/src/Hardware/Virtual/VirtualBlockDevice.php
@@ -4,7 +4,7 @@
 
 namespace Flat3\RevPi\Hardware\Virtual;
 
-use Flat3\RevPi\Exceptions\NotImplementedException;
+use Flat3\RevPi\Exceptions\NotSupportedException;
 use Flat3\RevPi\Interfaces\Hardware\Device;
 use Flat3\RevPi\Interfaces\Hardware\Seek;
 
@@ -81,7 +81,7 @@ public function lseek(int $offset, int $whence): int
             SEEK_SET => $offset,
             SEEK_CUR => $curPos + $offset,
             SEEK_END => $memLen + $offset,
-            default => throw new NotImplementedException,
+            default => throw new NotSupportedException,
         };
 
         if ($newPos < 0 || $newPos > $memLen) {
diff --git a/src/Interfaces/Modules/Connect.php b/src/Interfaces/Modules/Connect.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Flat3\RevPi\Interfaces\Modules;
+
+use Flat3\RevPi\Interfaces\Module;
+
+interface Connect extends Module {}
diff --git a/src/Interfaces/Modules/Connect4.php b/src/Interfaces/Modules/Connect4.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Flat3\RevPi\Interfaces\Modules;
+
+use Flat3\RevPi\Interfaces\Module;
+
+interface Connect4 extends Module {}
diff --git a/src/Interfaces/Modules/Core.php b/src/Interfaces/Modules/Core.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Flat3\RevPi\Interfaces\Modules;
+
+use Flat3\RevPi\Interfaces\Module;
+
+interface Core extends Module {}
diff --git a/src/Interfaces/Modules/Flat.php b/src/Interfaces/Modules/Flat.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Flat3\RevPi\Interfaces\Modules;
+
+use Flat3\RevPi\Interfaces\Module;
+
+interface Flat extends Module {}
diff --git a/src/JsonRpc/ClientHandler.php b/src/JsonRpc/ClientHandler.php
@@ -8,7 +8,7 @@
 use Amp\Http\Server\Response;
 use Amp\Websocket\Server\WebsocketClientHandler;
 use Amp\Websocket\WebsocketClient;
-use Flat3\RevPi\Exceptions\NotImplementedException;
+use Flat3\RevPi\Exceptions\NotSupportedException;
 use Flat3\RevPi\Interfaces\Hardware\PiControl;
 use Flat3\RevPi\Interfaces\Hardware\Terminal;
 
@@ -19,7 +19,7 @@ public function handleClient(WebsocketClient $client, Request $request, Response
         $target = match ($request->getQueryParameter('device')) {
             'picontrol' => app(PiControl::class),
             'terminal' => app(Terminal::class),
-            default => throw new NotImplementedException,
+            default => throw new NotSupportedException,
         };
 
         $handler = app(JsonRpcDevice::class);
diff --git a/src/JsonRpc/JsonRpcDevice.php b/src/JsonRpc/JsonRpcDevice.php
@@ -6,7 +6,7 @@
 
 use Amp\Websocket\WebsocketClosedException;
 use Flat3\RevPi\Constants;
-use Flat3\RevPi\Exceptions\NotImplementedException;
+use Flat3\RevPi\Exceptions\NotSupportedException;
 use Flat3\RevPi\Interfaces\Hardware\Device;
 use Flat3\RevPi\Interfaces\Hardware\Ioctl;
 use Flat3\RevPi\Interfaces\Hardware\Seek;
@@ -159,6 +159,6 @@ protected function invoke(string $method, array $params): mixed
                 return 0;
         }
 
-        throw new NotImplementedException; // @phpstan-ignore deadCode.unreachable
+        throw new NotSupportedException; // @phpstan-ignore deadCode.unreachable
     }
 }
diff --git a/src/Led/Connect4Led.php b/src/Led/Connect4Led.php
@@ -0,0 +1,50 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Flat3\RevPi\Led;
+
+use Flat3\RevPi\Exceptions\HardwareNotFoundException;
+
+class Connect4Led extends Led
+{
+    protected function position(LedPosition|int $position): int|LedPosition
+    {
+        return match ($position) {
+            0 => LedPosition::A1,
+            LedPosition::A1 => 0,
+            3 => LedPosition::A2,
+            LedPosition::A2 => 3,
+            6 => LedPosition::A3,
+            LedPosition::A3 => 6,
+            9 => LedPosition::A4,
+            LedPosition::A4 => 9,
+            12 => LedPosition::A5,
+            LedPosition::A5 => 12,
+            default => throw new HardwareNotFoundException,
+        };
+    }
+
+    protected function value(LedColour|int $colour): int|LedColour
+    {
+        return match ($colour) {
+            0 => LedColour::Off,
+            LedColour::Off => 0,
+            1 => LedColour::Red,
+            LedColour::Red => 1,
+            2 => LedColour::Green,
+            LedColour::Green => 2,
+            3 => LedColour::Blue,
+            LedColour::Blue => 3,
+            4 => LedColour::Orange,
+            LedColour::Orange => 4,
+            5 => LedColour::Cyan,
+            LedColour::Cyan => 5,
+            6 => LedColour::Magenta,
+            LedColour::Magenta => 6,
+            7 => LedColour::White,
+            LedColour::White => 7,
+            default => throw new HardwareNotFoundException,
+        };
+    }
+}
diff --git a/src/Led/ConnectLed.php b/src/Led/ConnectLed.php
@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Flat3\RevPi\Led;
+
+use Flat3\RevPi\Exceptions\HardwareNotFoundException;
+
+class ConnectLed extends Led
+{
+    protected function position(LedPosition|int $position): int|LedPosition
+    {
+        return match ($position) {
+            0 => LedPosition::A1,
+            LedPosition::A1 => 0,
+            2 => LedPosition::A2,
+            LedPosition::A2 => 2,
+            4 => LedPosition::A2,
+            LedPosition::A3 => 4,
+            default => throw new HardwareNotFoundException,
+        };
+    }
+
+    protected function value(LedColour|int $colour): int|LedColour
+    {
+        return match ($colour) {
+            0 => LedColour::Off,
+            LedColour::Off => 0,
+            1 => LedColour::Green,
+            LedColour::Green => 1,
+            2 => LedColour::Red,
+            LedColour::Red => 2,
+            3 => LedColour::Orange,
+            LedColour::Orange => 3,
+            default => throw new HardwareNotFoundException,
+        };
+    }
+}
diff --git a/src/Led/CoreLed.php b/src/Led/CoreLed.php
@@ -6,7 +6,7 @@
 
 use Flat3\RevPi\Exceptions\HardwareNotFoundException;
 
-class CoreSLed extends Led
+class CoreLed extends Led
 {
     protected function position(LedPosition|int $position): int|LedPosition
     {
diff --git a/src/Led/FlatLed.php b/src/Led/FlatLed.php
@@ -6,7 +6,7 @@
 
 use Flat3\RevPi\Exceptions\HardwareNotFoundException;
 
-class FlatSLed extends Led
+class FlatLed extends Led
 {
     protected function position(LedPosition|int $position): LedPosition|int
     {
diff --git a/src/Modules/Connect.php b/src/Modules/Connect.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Flat3\RevPi\Modules;
+
+use Flat3\RevPi\Interfaces\Modules\Connect as ConnectModuleInterface;
+use Flat3\RevPi\Led\ConnectLed;
+use Flat3\RevPi\Led\Led;
+use Flat3\RevPi\Led\LedPosition;
+
+class Connect extends Module implements ConnectModuleInterface
+{
+    public function getLed(LedPosition $position): Led
+    {
+        return app(ConnectLed::class, ['position' => $position]);
+    }
+}
diff --git a/src/Modules/Connect4.php b/src/Modules/Connect4.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Flat3\RevPi\Modules;
+
+use Flat3\RevPi\Interfaces\Modules\Connect4 as Connect4ModuleInterface;
+use Flat3\RevPi\Led\Connect4Led;
+use Flat3\RevPi\Led\Led;
+use Flat3\RevPi\Led\LedPosition;
+
+class Connect4 extends Module implements Connect4ModuleInterface
+{
+    public function getLed(LedPosition $position): Led
+    {
+        return app(Connect4Led::class, ['position' => $position]);
+    }
+}
diff --git a/src/Modules/Core.php b/src/Modules/Core.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Flat3\RevPi\Modules;
+
+use Flat3\RevPi\Interfaces\Modules\Core as CoreModuleInterface;
+use Flat3\RevPi\Led\CoreLed;
+use Flat3\RevPi\Led\Led;
+use Flat3\RevPi\Led\LedPosition;
+
+class Core extends Module implements CoreModuleInterface
+{
+    public function getLed(LedPosition $position): Led
+    {
+        return app(CoreLed::class, ['position' => $position]);
+    }
+}
diff --git a/src/Modules/Flat.php b/src/Modules/Flat.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Flat3\RevPi\Modules;
+
+use Flat3\RevPi\Interfaces\Modules\Flat as FlatModuleInterface;
+use Flat3\RevPi\Led\FlatLed;
+use Flat3\RevPi\Led\Led;
+use Flat3\RevPi\Led\LedPosition;
+
+class Flat extends Module implements FlatModuleInterface
+{
+    public function getLed(LedPosition $position): Led
+    {
+        return app(FlatLed::class, ['position' => $position]);
+    }
+}
diff --git a/src/ProcessImage/ProcessImage.php b/src/ProcessImage/ProcessImage.php
@@ -4,7 +4,7 @@
 
 namespace Flat3\RevPi\ProcessImage;
 
-use Flat3\RevPi\Exceptions\NotImplementedException;
+use Flat3\RevPi\Exceptions\NotSupportedException;
 use Flat3\RevPi\Exceptions\OverflowException;
 use Flat3\RevPi\Exceptions\PosixDeviceException;
 use Flat3\RevPi\Exceptions\ProcessImageException;
@@ -15,7 +15,11 @@
 use Flat3\RevPi\Interfaces\Hardware\PiControl;
 use Flat3\RevPi\Interfaces\Module;
 use Flat3\RevPi\Interfaces\Modules\Compact;
+use Flat3\RevPi\Interfaces\Modules\Connect;
+use Flat3\RevPi\Interfaces\Modules\Connect4;
 use Flat3\RevPi\Interfaces\Modules\Connect5;
+use Flat3\RevPi\Interfaces\Modules\Core;
+use Flat3\RevPi\Interfaces\Modules\Flat;
 use Flat3\RevPi\Interfaces\Modules\Virtual;
 use Flat3\RevPi\Interfaces\ProcessImage as ProcessImageInterface;
 use Flat3\RevPi\ProcessImage\Ioctl\DeviceInfoStruct;
@@ -192,10 +196,14 @@ public function reset(): void
     public function getModule(): Module
     {
         return match ($this->getDeviceInfo()->moduleType) {
+            ModuleType::KUNBUS_FW_DESCR_TYP_PI_CORE => app(Core::class),
+            ModuleType::KUNBUS_FW_DESCR_TYP_PI_FLAT => app(Flat::class),
             ModuleType::KUNBUS_FW_DESCR_TYP_PI_COMPACT => app(Compact::class),
+            ModuleType::KUNBUS_FW_DESCR_TYP_PI_CONNECT => app(Connect::class),
+            ModuleType::KUNBUS_FW_DESCR_TYP_PI_CONNECT_4 => app(Connect4::class),
             ModuleType::KUNBUS_FW_DESCR_TYP_PI_CONNECT_5 => app(Connect5::class),
             ModuleType::VIRTUAL => app(Virtual::class),
-            default => throw new NotImplementedException,
+            default => throw new NotSupportedException,
         };
     }
 }
diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
@@ -23,8 +23,12 @@ public function register(): void
         $this->app->bind(Interfaces\ProcessImage::class, ProcessImage\ProcessImage::class);
         $this->app->bind(Interfaces\SerialPort::class, SerialPort\SerialPort::class);
 
+        $this->app->bind(Interfaces\Modules\Connect::class, Modules\Connect::class);
+        $this->app->bind(Interfaces\Modules\Connect4::class, Modules\Connect4::class);
         $this->app->bind(Interfaces\Modules\Connect5::class, Modules\Connect5::class);
         $this->app->bind(Interfaces\Modules\Compact::class, Modules\Compact::class);
+        $this->app->bind(Interfaces\Modules\Core::class, Modules\Core::class);
+        $this->app->bind(Interfaces\Modules\Flat::class, Modules\Flat::class);
         $this->app->bind(Interfaces\Modules\Virtual::class, Modules\Virtual::class);
         $this->app->bind(Interfaces\Modules\Remote::class, Modules\Remote::class);
 

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`
`12`	`12`	`class GetLed extends Command`
`13`	`13`	`{`
`14`		`- protected $description = 'Get the colour of the specified LED';`
	`14`	`+ protected $description = 'Get an LED colour';`
`15`	`15`
`16`	`16`	`protected $signature = 'revpi:led:get {position}';`
`17`	`17`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`
`11`	`11`	`class Info extends Command`
`12`	`12`	`{`
`13`		`- protected $description = 'Display device list information';`
	`13`	`+ protected $description = 'Display device information';`
`14`	`14`
`15`	`15`	`protected $signature = 'revpi:info';`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`
`17`	`17`	`class Listen extends Command`
`18`	`18`	`{`
`19`		`- protected $description = 'Start the server';`
	`19`	`+ protected $description = 'Listen for incoming websocket requests';`
`20`	`20`
`21`	`21`	`protected $signature = 'revpi:listen {--address=0.0.0.0} {--port=12873}';`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`
`13`	`13`	`class SetLed extends Command`
`14`	`14`	`{`
`15`		`- protected $description = 'Set the specified LED to the specified colour';`
	`15`	`+ protected $description = 'Set an LED colour';`
`16`	`16`
`17`	`17`	`protected $signature = 'revpi:led:set {position} {colour}';`
`18`	`18`