From dda593e6178f64ee211e0c38d13b9219dc14d5b8 Mon Sep 17 00:00:00 2001 From: Ben Menking Date: Fri, 29 May 2026 15:17:31 -0400 Subject: [PATCH] fixed channel response; updated log RX --- src/CoreParser.php | 34 ++++++++------------------------ src/Model/ChannelResponse.php | 2 +- src/Model/LogReceiveResponse.php | 7 +++++++ 3 files changed, 16 insertions(+), 27 deletions(-) diff --git a/src/CoreParser.php b/src/CoreParser.php index 0a58128..6f6f8ef 100644 --- a/src/CoreParser.php +++ b/src/CoreParser.php @@ -289,24 +289,6 @@ class CoreParser { return $data; } - /** - * - * @param string $payload - * @return ChannelResponse - */ - protected static function parseGetChannel(string $payload): ChannelResponse { - $detail = explode("\0", substr($payload, 2, 32)); - - $data = new ChannelResponse(); - - $data->code = ord($payload[0]); - $data->channel_idx = ord($payload[1]); - $data->detail = $detail; - $data->channel_secret = base64_encode(substr($payload, 34, 16)); - - return $data; - } - /** * * @param string $payload @@ -419,15 +401,15 @@ class CoreParser { return $info; } - public static function parseChannelInfoResponse(string $payload) { - $info = [ - 'code'=>ord($payload[0]), - 'channel_idx'=>ord($payload[1]), - 'channel_name'=>self::readCstring(substr($payload, 2, 32)), - 'channel_secret'=>substr($payload, 34, 16) - ]; + public static function parseChannelInfoResponse(string $payload): ChannelResponse { + $m = new ChannelResponse(); - return $info; + $m->code = ord($payload[0]); + $m->channel_idx = ord($payload[1]); + $m->channel_name = self::readCstring(substr($payload, 2, 32)); + $m->channel_secret = substr($payload, 34, 16); + + return $m; } public static function parseMessage(string $payload) { diff --git a/src/Model/ChannelResponse.php b/src/Model/ChannelResponse.php index 981ae8d..cb65271 100644 --- a/src/Model/ChannelResponse.php +++ b/src/Model/ChannelResponse.php @@ -5,6 +5,6 @@ namespace Menking\Meshcore\Model; class ChannelResponse extends Response { public int $code; public int $channel_idx; - public array $detail; + public string $channel_name; public string $channel_secret; } diff --git a/src/Model/LogReceiveResponse.php b/src/Model/LogReceiveResponse.php index aa6dba6..d6d327d 100644 --- a/src/Model/LogReceiveResponse.php +++ b/src/Model/LogReceiveResponse.php @@ -7,4 +7,11 @@ class LogReceiveResponse extends Response { public int $flags; public int $snr; public string $raw; + + public int $header; + public int $transport_id; + public int $path_len; + public string $path; + public string $payload; + }