meshcore 2.3.15__tar.gz → 2.3.17__tar.gz

meshcore-2.3.17/.github/workflows/python-import.yml

@@ -0,0 +1,24 @@
+name: Python package import
+
+on:
+  push:
+    branches: ["main"]
+  pull_request:
+    branches: ["main"]
+
+jobs:
+  import:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.10", "3.11"]
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install package
+        run: python -m pip install .
+      - name: Import installed package
+        run: python -c "import meshcore"

{meshcore-2.3.15 → meshcore-2.3.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: meshcore
-Version: 2.3.15
+Version: 2.3.17
 Summary: Base classes for communicating with meshcore companion radios
 Project-URL: Homepage, https://github.com/fdlamotte/meshcore_py
 Project-URL: Issues, https://github.com/fdlamotte/meshcore_py/issues

{meshcore-2.3.15 → meshcore-2.3.17}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "meshcore"
-version = "2.3.15"
+version = "2.3.17"
 authors = [
   { name="Florent de Lamotte", email="florent@frizoncorrea.fr" },
   { name="Alex Wolden", email="awolden@gmail.com" },

{meshcore-2.3.15 → meshcore-2.3.17}/src/meshcore/commands/messaging.py

@@ -370,7 +370,8 @@ class MessagingCommands(CommandHandlerBase):
         return await self.send(data, [EventType.OK, EventType.ERROR])
 
     async def send_channel_data(
-        self, chan: int, data_type: int, payload: bytes, path: Optional[bytes] = None
+        self, chan: int, data_type: int, payload: bytes,
+        path: Optional[bytes] = None, path_hash_mode: Optional[int] = 0
     ) -> Event:
         """Send a binary datagram to a channel via CMD_SEND_CHANNEL_DATA (0x3E).
 
@@ -382,6 +383,7 @@ class MessagingCommands(CommandHandlerBase):
             data_type: Application identifier, 0x0001-0xFFFF (0xFFFF is the developer namespace).
             payload:   Binary payload, at most 163 bytes (MAX_CHANNEL_DATA_LENGTH).
             path:      Optional path bytes to send along (default None = flood, path_len 0xFF).
+            path_hash_mode: Optional path_hash_mode (size of the hash - 1)
 
         Returns:
             Event with OK or ERROR.
@@ -400,7 +402,9 @@ class MessagingCommands(CommandHandlerBase):
             path = bytes(path)
             if len(path) >= 0xFF:
                 raise ValueError("path must be shorter than 255 bytes")
-            path_bytes = bytes([len(path)]) + path
+            path_len = int(len(path) / (path_hash_mode + 1))
+            path_bytes = bytes([path_len | (path_hash_mode << 6)]) + path
+        logger.debug(f"Sending raw data {payload.hex()} through path {'Flood' if path is None else path.hex()} of len {'-1' if path is None else path_len} with mode {path_hash_mode} (raw path: {path_bytes.hex()})")
         data = bytes([CommandType.SEND_CHANNEL_DATA.value, chan]) + path_bytes + data_type.to_bytes(2, "little") + bytes(payload)
         return await self.send(data, [EventType.OK, EventType.ERROR])