fix: don't overwrite Node.channel from MAP_REPORT_APP if already set (#147)

NODEINFO_APP is the better / authoritative source for a nodes primary channel.
MAP_REPORT_APP packets can arrive on a different MQTT uplink channel and
are unconditionally overwriting the channel set by NODEINFO, causing
nodes to appear on the wrong channel in the map and channel filters.

now MAP_REPORT_APP only sets Node.channel when it is not (yetw) known,
making it a fallback rather than an override.

.dockerignore

@@ -0,0 +1,10 @@
+# This keeps Docker from including hostOS virtual environment folders
+env/
+.venv/
+
+# Database files and backups
+*.db
+*.db-shm
+*.db-wal
+backups/
+*.db.gz

.github/workflows/container.yml

@@ -0,0 +1,54 @@
+name: Build container
+
+on:
+  push:
+  workflow_dispatch:
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          # list of Docker images to use as base name for tags
+          images: |
+            ghcr.io/${{ github.repository }}
+          # generate Docker tags based on the following events/attributes
+          tags: |
+            type=ref,event=branch
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+            # publish :latest from the default branch
+            type=raw,value=latest,enable={{is_default_branch}}
+      - name: Login to GitHub Container Registry
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ./Containerfile
+          push: ${{ github.event_name != 'pull_request' }}
+          labels: ${{ steps.meta.outputs.labels }}
+          tags: ${{ steps.meta.outputs.tags }}
+          platforms: linux/amd64,linux/arm64
+          # optional cache (speeds up rebuilds)
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.github/workflows/lint.yml

@@ -0,0 +1,39 @@
+name: Ruff
+
+on:
+  pull_request:
+    paths:
+      - "**/*.py"
+      - "pyproject.toml"
+      - "ruff.toml"
+      - ".pre-commit-config.yaml"
+
+jobs:
+  ruff:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.13"
+
+      - name: Cache Ruff
+        uses: actions/cache@v4
+        with:
+          path: ~/.cache/ruff
+          key: ruff-${{ runner.os }}-${{ hashFiles('**/pyproject.toml', '**/ruff.toml') }}
+
+      - name: Install Ruff
+        run: pip install "ruff==0.13.3"
+
+      # Lint (with GitHub annotation format for inline PR messages)
+      - name: Ruff check
+        run: ruff check --output-format=github .
+
+      # Fail PR if formatting is needed
+      - name: Ruff format (check-only)
+        run: ruff format --check .
+
+      # TODO: Investigate only applying to changed files and possibly apply fixes

.gitignore

@@ -1,7 +1,47 @@
 env/*
 __pycache__/*
 meshview/__pycache__/*
+alembic/__pycache__/*
+
+# Database files
 packets.db
+packets*.db
+*.db
+*.db-shm
+*.db-wal
+
+# Database backups
+backups/
+*.db.gz
+
+# Process files
+meshview-db.pid
+meshview-web.pid
+
+# Config and logs
 /table_details.py
 config.ini
+*.log
+
+# Screenshots
 screenshots/*
+
+# Python
+python/nanopb
+__pycache__/
+*.pyc
+*.pyo
+*.pyd
+.Python
+
+# IDE
+.vscode/
+.idea/
+*.swp
+*.swo
+*~
+
+# OS
+.DS_Store
+Thumbs.db
+packets.db-journal

.gitmodules

@@ -0,0 +1 @@
+

.pre-commit-config.yaml

@@ -0,0 +1,8 @@
+repos:
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.13.3  # pin the latest you’re comfortable with
+    hooks:
+      - id: ruff
+        args: [--fix, --exit-non-zero-on-fix]  # fail if it had to change files
+      - id: ruff-format
+      

AGENTS.md

@@ -0,0 +1,204 @@
+# AI Agent Guidelines for Meshview
+
+This document provides context and guidelines for AI coding assistants working on the Meshview project.
+
+## Project Overview
+
+Meshview is a real-time monitoring and diagnostic tool for Meshtastic mesh networks. It provides web-based visualization and analysis of network activity, including:
+
+- Real-time packet monitoring from MQTT streams
+- Interactive map visualization of node locations
+- Network topology graphs showing connectivity
+- Message traffic analysis and conversation tracking
+- Node statistics and telemetry data
+- Packet inspection and traceroute analysis
+
+## Architecture
+
+### Core Components
+
+1. **MQTT Reader** (`meshview/mqtt_reader.py`) - Subscribes to MQTT topics and receives mesh packets
+2. **Database Manager** (`meshview/database.py`, `startdb.py`) - Handles database initialization and migrations
+3. **MQTT Store** (`meshview/mqtt_store.py`) - Processes and stores packets in the database
+4. **Web Server** (`meshview/web.py`, `main.py`) - Serves the web interface and API endpoints
+5. **API Layer** (`meshview/web_api/api.py`) - REST API endpoints for data access
+6. **Models** (`meshview/models.py`) - SQLAlchemy database models
+7. **Decode Payload** (`meshview/decode_payload.py`) - Protobuf message decoding
+
+### Technology Stack
+
+- **Python 3.13+** - Main language
+- **aiohttp** - Async web framework
+- **aiomqtt** - Async MQTT client
+- **SQLAlchemy (async)** - ORM with async support
+- **Alembic** - Database migrations
+- **Jinja2** - Template engine
+- **Protobuf** - Message serialization (Meshtastic protocol)
+- **SQLite/PostgreSQL** - Database backends (SQLite default, PostgreSQL via asyncpg)
+
+### Key Patterns
+
+- **Async/Await** - All I/O operations are asynchronous
+- **Database Migrations** - Use Alembic for schema changes (see `docs/Database-Changes-With-Alembic.md`)
+- **Configuration** - INI file-based config (`config.ini`, see `sample.config.ini`)
+- **Modular API** - API routes separated into `meshview/web_api/` module
+
+## Project Structure
+
+```
+meshview/
+├── alembic/              # Database migration scripts
+├── docs/                 # Technical documentation
+├── meshview/             # Main application package
+│   ├── static/          # Static web assets (HTML, JS, CSS)
+│   ├── templates/       # Jinja2 HTML templates
+│   ├── web_api/         # API route handlers
+│   └── *.py            # Core modules
+├── main.py              # Web server entry point
+├── startdb.py           # Database manager entry point
+├── mvrun.py             # Combined runner (starts both services)
+├── config.ini           # Runtime configuration
+└── requirements.txt     # Python dependencies
+```
+
+## Development Workflow
+
+### Setup
+
+1. Use Python 3.13+ virtual environment
+
+### Running
+
+- **Database**: `./env/bin/python startdb.py`
+- **Web Server**: `./env/bin/python main.py`
+- **Both**: `./env/bin/python mvrun.py`
+
+
+## Code Style
+
+- **Line length**: 100 characters (see `pyproject.toml`)
+- **Linting**: Ruff (configured in `pyproject.toml`)
+- **Formatting**: Ruff formatter
+- **Type hints**: Preferred but not strictly required
+- **Async**: Use `async def` and `await` for I/O operations
+
+## Important Files
+
+### Configuration
+- `config.ini` - Runtime configuration (server, MQTT, database, cleanup)
+- `sample.config.ini` - Template configuration file
+- `alembic.ini` - Alembic migration configuration
+
+### Database
+- `meshview/models.py` - SQLAlchemy models (Packet, Node, Traceroute, etc.)
+- `meshview/database.py` - Database initialization and session management
+- `alembic/versions/` - Migration scripts
+
+### Core Logic
+- `meshview/mqtt_reader.py` - MQTT subscription and message reception
+- `meshview/mqtt_store.py` - Packet processing and storage
+- `meshview/decode_payload.py` - Protobuf decoding
+- `meshview/web.py` - Web server routes and handlers
+- `meshview/web_api/api.py` - REST API endpoints
+
+### Templates
+- `meshview/templates/` - Jinja2 HTML templates
+- `meshview/static/` - Static files (HTML pages, JS, CSS)
+
+## Common Tasks
+
+### Adding a New API Endpoint
+
+1. Add route handler in `meshview/web_api/api.py`
+2. Register route in `meshview/web.py` (if needed)
+3. Update `docs/API_Documentation.md` if public API
+
+### Database Schema Changes
+
+1. Modify models in `meshview/models.py`
+2. Create migration: `alembic revision --autogenerate -m "description"`
+3. Review generated migration in `alembic/versions/`
+4. Test migration: `alembic upgrade head`
+5. **Never** modify existing migration files after they've been applied
+
+### Adding a New Web Page
+
+1. Create template in `meshview/templates/`
+2. Add route in `meshview/web.py`
+3. Add navigation link if needed (check existing templates for pattern)
+4. Add static assets if needed in `meshview/static/`
+
+### Processing New Packet Types
+
+1. Check `meshview/decode_payload.py` for existing decoders
+2. Add decoder function if new type
+3. Update `meshview/mqtt_store.py` to handle new packet type
+4. Update database models if new data needs storage
+
+
+## Key Concepts
+
+### Meshtastic Protocol
+- Uses Protobuf for message serialization
+- Packets contain various message types (text, position, telemetry, etc.)
+- MQTT topics follow pattern: `msh/{region}/{subregion}/#`
+
+### Database Schema
+- **packet** - Raw packet data
+- **node** - Mesh node information
+- **traceroute** - Network path information
+- **packet_seen** - Packet observation records
+
+### Real-time Updates
+- Web pages use Server-Sent Events (SSE) for live updates
+- Map and firehose pages auto-refresh based on config intervals
+- API endpoints return JSON for programmatic access
+
+## Best Practices
+
+1. **Always use async/await** for database and network operations
+2. **Use Alembic** for all database schema changes
+3. **Follow existing patterns** - check similar code before adding new features
+4. **Update documentation** - keep `docs/` and README current
+5. **Test migrations** - verify migrations work both up and down
+6. **Handle errors gracefully** - log errors, don't crash on bad packets
+7. **Respect configuration** - use `config.ini` values, don't hardcode
+
+## Common Pitfalls
+
+- **Don't modify applied migrations** - create new ones instead
+- **Don't block the event loop** - use async I/O, not sync
+- **Don't forget timezone handling** - timestamps are stored in UTC
+- **Don't hardcode paths** - use configuration values
+- **Don't ignore MQTT reconnection** - handle connection failures gracefully
+
+## Resources
+
+- **Main README**: `README.md` - Installation and basic usage
+- **Docker Guide**: `README-Docker.md` - Container deployment
+- **API Docs**: `docs/API_Documentation.md` - API endpoint reference
+- **Migration Guide**: `docs/Database-Changes-With-Alembic.md` - Database workflow
+- **Contributing**: `CONTRIBUTING.md` - Contribution guidelines
+
+## Version Information
+
+- **Current Version**: 3.0.0 (November 2025)
+- **Python Requirement**: 3.13+
+- **Key Features**: Alembic migrations, automated backups, Docker support, traceroute return paths
+
+
+## Rules for robots
+- Always run ruff check and ruff format after making changes (only on python changes)
+
+
+---
+
+When working on this project, prioritize:
+1. Maintaining async patterns
+2. Following existing code structure
+3. Using proper database migrations
+4. Keeping documentation updated
+5. Testing changes thoroughly
+
+
+

API Documentation.md

@@ -1,159 +0,0 @@
-
-# API Documentation
-
-## 1. Chat API
-
-### GET `/api/chat`
-Returns the most recent chat messages.
-
-**Query Parameters**
-- `limit` (optional, int): Maximum number of messages to return. Default: `100`.
-
-**Response Example**
-```json
-{
-  "packets": [
-    {
-      "id": 123,
-      "import_time": "2025-07-22T12:45:00",
-      "from_node_id": 987654,
-      "from_node": "Alice",
-      "channel": "main",
-      "payload": "Hello, world!"
-    }
-  ]
-}
-```
-
----
-
-### GET `/api/chat/updates`
-Returns chat messages imported after a given timestamp.
-
-**Query Parameters**
-- `last_time` (optional, ISO timestamp): Only messages imported after this time are returned.
-
-**Response Example**
-```json
-{
-  "packets": [
-    {
-      "id": 124,
-      "import_time": "2025-07-22T12:50:00",
-      "from_node_id": 987654,
-      "from_node": "Alice",
-      "channel": "main",
-      "payload": "New message!"
-    }
-  ],
-  "latest_import_time": "2025-07-22T12:50:00"
-}
-```
-
----
-
-## 2. Nodes API
-
-### GET `/api/nodes`
-Returns a list of all nodes, with optional filtering by last seen.
-
-**Query Parameters**
-- `hours` (optional, int): Return nodes seen in the last N hours.
-- `days` (optional, int): Return nodes seen in the last N days.
-- `last_seen_after` (optional, ISO timestamp): Return nodes seen after this time.
-
-**Response Example**
-```json
-{
-  "nodes": [
-    {
-      "node_id": 1234,
-      "long_name": "Alice",
-      "short_name": "A",
-      "channel": "main",
-      "last_seen": "2025-07-22T12:40:00",
-      "hardware": "T-Beam",
-      "firmware": "1.2.3",
-      "role": "client",
-      "last_lat": 37.7749,
-      "last_long": -122.4194
-    }
-  ]
-}
-```
-
----
-
-## 3. Packets API
-
-### GET `/api/packets`
-Returns a list of packets with optional filters.
-
-**Query Parameters**
-- `limit` (optional, int): Maximum number of packets to return. Default: `200`.
-- `since` (optional, ISO timestamp): Only packets imported after this timestamp are returned.
-
-**Response Example**
-```json
-{
-  "packets": [
-    {
-      "id": 123,
-      "from_node_id": 5678,
-      "to_node_id": 91011,
-      "portnum": 1,
-      "import_time": "2025-07-22T12:45:00",
-      "payload": "Hello, Bob!"
-    }
-  ]
-}
-```
-
----
-
-### Notes
-- All timestamps (`import_time`, `last_seen`) are returned in ISO 8601 format.
-- `portnum` is an integer representing the packet type.
-- `payload` is always a UTF-8 decoded string.
-
-## 4 Statistics API: GET `/api/stats`
-
-Retrieve packet statistics aggregated by time periods, with optional filtering.
-
----
-
-## Query Parameters
-
-| Parameter    | Type    | Required | Default  | Description                                                                                       |
-|--------------|---------|----------|----------|-------------------------------------------------------------------------------------------------|
-| `period_type` | string  | No       | `hour`   | Time granularity of the stats. Allowed values: `hour`, `day`.                                   |
-| `length`      | integer | No       | 24       | Number of periods to include (hours or days).                                                   |
-| `channel`     | string  | No       | —        | Filter results by channel name (case-insensitive).                                             |
-| `portnum`     | integer | No       | —        | Filter results by port number.                                                                  |
-| `to_node`     | integer | No       | —        | Filter results to packets sent **to** this node ID.                                            |
-| `from_node`   | integer | No       | —        | Filter results to packets sent **from** this node ID.                                          |
-
----
-
-## Response
-
-```json
-{
-  "period_type": "hour",
-  "length": 24,
-  "channel": "LongFast",
-  "portnum": 1,
-  "to_node": 12345678,
-  "from_node": 87654321,
-  "data": [
-    {
-      "period": "2025-08-08 14:00",
-      "count": 10
-    },
-    {
-      "period": "2025-08-08 15:00",
-      "count": 7
-    }
-    // more entries...
-  ]
-}

CONTRIBUTING.md

@@ -0,0 +1,133 @@
+# Contributing to Meshview
+
+First off, thanks for taking the time to contribute! ❤️  
+All types of contributions are encouraged and valued. See the [Table of Contents](#table-of-contents) for ways to help and details about how this project handles contributions. Please read the relevant section before getting started — it will make things smoother for both you and the maintainers.  
+
+The Meshview community looks forward to your contributions. 🎉
+
+> And if you like the project but don’t have time to contribute code, that’s fine! You can still support Meshview by:  
+> - ⭐ Starring the repo on GitHub  
+> - Talking about Meshview on social media  
+> - Referencing Meshview in your own project’s README  
+> - Mentioning Meshview at local meetups or to colleagues/friends  
+
+---
+
+## Table of Contents
+
+- [Code of Conduct](#code-of-conduct)  
+- [I Have a Question](#i-have-a-question)  
+- [I Want to Contribute](#i-want-to-contribute)  
+  - [Reporting Bugs](#reporting-bugs)  
+  - [Suggesting Enhancements](#suggesting-enhancements)  
+  - [Your First Code Contribution](#your-first-code-contribution)  
+  - [Improving the Documentation](#improving-the-documentation)  
+- [Styleguides](#styleguides)  
+  - [Commit Messages](#commit-messages)  
+- [Join the Project Team](#join-the-project-team)  
+
+---
+
+## Code of Conduct
+
+Meshview is an open and welcoming community. We want everyone to feel safe, respected, and valued.
+
+### Our Standards
+- Be respectful and considerate in all interactions.  
+- Welcome new contributors and help them learn.  
+- Provide constructive feedback, not personal attacks.  
+- Focus on collaboration and what benefits the community.  
+
+Unacceptable behavior includes harassment, insults, hate speech, personal attacks, or publishing others’ private information without permission.
+
+---
+
+## I Have a Question
+
+> Before asking, please read the [documentation](docs/README.md) if available.  
+
+1. Search the [issues list](../../issues) to see if your question has already been asked.  
+2. If not, open a [new issue](../../issues/new) with the **question** label.  
+3. Provide as much context as possible (OS, Python version, database type, etc.).  
+
+---
+
+## I Want to Contribute
+
+### Legal Notice
+By contributing to Meshview, you agree that:
+- You authored the content yourself.  
+- You have the necessary rights to the content.  
+- Your contribution can be provided under the project’s license.  
+
+---
+
+### Reporting Bugs
+
+Before submitting a bug report:
+- Make sure you’re using the latest Meshview version.  
+- Verify the issue is not due to a misconfigured environment (SQLite/MySQL, Python version, etc.).  
+- Search existing [bug reports](../../issues?q=label%3Abug).  
+- Collect relevant information:  
+  - Steps to reproduce  
+  - Error messages / stack traces  
+  - OS, Python version, and database backend  
+  - Any logs (`meshview-db.service`, `mqtt_reader.py`, etc.)  
+
+How to report:  
+- Open a [new issue](../../issues/new).  
+- Use a **clear and descriptive title**.  
+- Include reproduction steps and expected vs. actual behavior.  
+
+⚠️ Security issues should **not** be reported in public issues. Instead, email us at **meshview-maintainers@proton.me**.  
+
+---
+
+### Suggesting Enhancements
+
+Enhancements are tracked as [issues](../../issues). Before suggesting:  
+- Make sure the feature doesn’t already exist.  
+- Search for prior suggestions.  
+- Check that it fits Meshview’s scope (mesh packet analysis, visualization, telemetry, etc.).  
+
+When submitting:  
+- Use a **clear and descriptive title**.  
+- Describe the current behavior and what you’d like to see instead.  
+- Include examples, screenshots, or mockups if relevant.  
+- Explain why it would be useful to most Meshview users.  
+
+---
+
+### Your First Code Contribution
+
+We love first-time contributors! 🚀
+
+If you’d like to start coding:  
+1. Look for issues tagged with [good first issue](../../issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22).  
+2. Fork the repository and clone it locally.  
+3. Set up the development environment:  
+4. Run the app locally
+5. Create a new branch, make your changes, commit, and push.  
+6. Open a pull request!  
+
+---
+
+### Improving the Documentation
+
+Docs are just as important as code. You can help by:  
+- Fixing typos or broken links.  
+- Clarifying confusing instructions.  
+- Adding examples (e.g., setting up Nginx as a reverse proxy, SQLite vs. MySQL setup).  
+- Writing or updating tutorials.  
+
+---
+
+## Join the Project Team
+
+Meshview is a community-driven project. If you consistently contribute (code, documentation, or community help), we’d love to invite you as a maintainer.  
+
+Start by contributing regularly, engaging in issues/PRs, and helping others.  
+
+---
+
+✨ That’s it! Thanks again for being part of Meshview. Every contribution matters.  

Containerfile

@@ -0,0 +1,79 @@
+# Build Image
+# Uses python:3.13-slim because no native dependencies are needed for meshview itself
+# (everything is available as a wheel)
+
+FROM docker.io/python:3.13-slim AS meshview-build
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends curl patch && \
+    rm -rf /var/lib/apt/lists/*
+
+# Add a non-root user/group
+ARG APP_USER=app
+RUN useradd -m -u 10001 -s /bin/bash ${APP_USER}
+
+# Install uv and put it on PATH system-wide
+RUN curl -LsSf https://astral.sh/uv/install.sh | sh \
+ && install -m 0755 /root/.local/bin/uv /usr/local/bin/uv
+
+WORKDIR /app
+RUN chown -R ${APP_USER}:${APP_USER} /app
+
+# Copy deps first for caching
+COPY --chown=${APP_USER}:${APP_USER} pyproject.toml uv.lock* requirements*.txt ./
+
+# Optional: wheels-only to avoid slow source builds
+ENV UV_NO_BUILD=1
+RUN uv venv /opt/venv
+# RUN uv sync --frozen
+ENV VIRTUAL_ENV=/opt/venv
+ENV PATH="$VIRTUAL_ENV/bin:$PATH"
+
+RUN uv pip install --no-cache-dir --upgrade pip \
+ && if [ -f requirements.txt ]; then uv pip install --only-binary=:all: -r requirements.txt; fi
+
+# Copy app code
+COPY --chown=${APP_USER}:${APP_USER} . .
+
+# Patch config
+COPY --chown=${APP_USER}:${APP_USER} container/config.ini /app/sample.config.ini
+
+# Clean
+RUN rm -rf /app/.git* && \
+  rm -rf /app/.pre-commit-config.yaml && \
+  rm -rf /app/*.md && \
+  rm -rf /app/COPYING && \
+  rm -rf /app/Containerfile && \
+  rm -rf /app/Dockerfile && \
+  rm -rf /app/container && \
+  rm -rf /app/docker && \
+  rm -rf /app/docs && \
+  rm -rf /app/pyproject.toml && \
+  rm -rf /app/requirements.txt && \
+  rm -rf /app/screenshots
+
+# Prepare /app and /opt to copy
+RUN mkdir -p /meshview && \
+  mv /app /opt /meshview
+
+# Use a clean container for install
+FROM docker.io/python:3.13-slim
+ARG APP_USER=app
+COPY --from=meshview-build /meshview /
+RUN apt-get update && \
+  apt-get install -y --no-install-recommends graphviz && \
+  rm -rf /var/lib/apt/lists/* && \
+  useradd -m -u 10001 -s /bin/bash ${APP_USER} && \
+  mkdir -p /etc/meshview /var/lib/meshview /var/log/meshview && \
+  mv /app/sample.config.ini /etc/meshview/config.ini && \
+  chown -R ${APP_USER}:${APP_USER} /var/lib/meshview /var/log/meshview
+
+# Drop privileges
+USER ${APP_USER}
+
+WORKDIR /app
+
+ENTRYPOINT [ "/opt/venv/bin/python", "mvrun.py"]
+CMD ["--pid_dir", "/tmp", "--py_exec", "/opt/venv/bin/python", "--config", "/etc/meshview/config.ini" ]
+
+EXPOSE 8081
+VOLUME [ "/etc/meshview", "/var/lib/meshview", "/var/log/meshview" ]

Dockerfile

@@ -0,0 +1 @@
+Containerfile

README-Docker.md

@@ -0,0 +1,247 @@
+# Running MeshView with Docker
+
+MeshView container images are built automatically and published to GitHub Container Registry.
+
+## Quick Start
+
+Pull and run the latest image:
+
+```bash
+docker pull ghcr.io/pablorevilla-meshtastic/meshview:latest
+
+docker run -d \
+  --name meshview \
+  -p 8081:8081 \
+  -v ./config:/etc/meshview \
+  -v ./data:/var/lib/meshview \
+  -v ./logs:/var/log/meshview \
+  ghcr.io/pablorevilla-meshtastic/meshview:latest
+```
+
+Access the web interface at: http://localhost:8081
+
+## Volume Mounts
+
+The container uses three volumes for persistent data:
+
+| Volume | Purpose | Required |
+|--------|---------|----------|
+| `/etc/meshview` | Configuration files | Yes |
+| `/var/lib/meshview` | Database storage | Recommended |
+| `/var/log/meshview` | Log files | Optional |
+
+### Configuration Volume
+
+Mount a directory containing your `config.ini` file:
+
+```bash
+-v /path/to/your/config:/etc/meshview
+```
+
+If no config is provided, the container will use the default `sample.config.ini`.
+
+### Database Volume
+
+Mount a directory to persist the SQLite database:
+
+```bash
+-v /path/to/your/data:/var/lib/meshview
+```
+
+**Important:** Without this mount, your database will be lost when the container stops.
+
+### Logs Volume
+
+Mount a directory to access logs from the host:
+
+```bash
+-v /path/to/your/logs:/var/log/meshview
+```
+
+## Complete Example
+
+Create a directory structure and run:
+
+```bash
+# Create directories
+mkdir -p meshview/{config,data,logs,backups}
+
+# Copy sample config (first time only)
+docker run --rm ghcr.io/pablorevilla-meshtastic/meshview:latest \
+  cat /etc/meshview/config.ini > meshview/config/config.ini
+
+# Edit config.ini with your MQTT settings
+nano meshview/config/config.ini
+
+# Run the container
+docker run -d \
+  --name meshview \
+  --restart unless-stopped \
+  -p 8081:8081 \
+  -v $(pwd)/meshview/config:/etc/meshview \
+  -v $(pwd)/meshview/data:/var/lib/meshview \
+  -v $(pwd)/meshview/logs:/var/log/meshview \
+  ghcr.io/pablorevilla-meshtastic/meshview:latest
+```
+
+## Docker Compose
+
+Create a `docker-compose.yml`:
+
+```yaml
+version: '3.8'
+
+services:
+  meshview:
+    image: ghcr.io/pablorevilla-meshtastic/meshview:latest
+    container_name: meshview
+    restart: unless-stopped
+    ports:
+      - "8081:8081"
+    volumes:
+      - ./config:/etc/meshview
+      - ./data:/var/lib/meshview
+      - ./logs:/var/log/meshview
+      - ./backups:/var/lib/meshview/backups  # For database backups
+    environment:
+      - TZ=America/Los_Angeles  # Set your timezone
+```
+
+Run with:
+
+```bash
+docker-compose up -d
+```
+
+## Configuration
+
+### Minimum Configuration
+
+Edit your `config.ini` to configure MQTT connection:
+
+```ini
+[mqtt]
+server = mqtt.meshtastic.org
+topics = ["msh/US/#"]
+port = 1883
+username =
+password =
+
+[database]
+# SQLAlchemy async connection string.
+# Examples:
+#   sqlite+aiosqlite:///var/lib/meshview/packets.db
+#   postgresql+asyncpg://user:pass@host:5432/meshview
+connection_string = sqlite+aiosqlite:////var/lib/meshview/packets.db
+```
+
+### Database Backups
+
+To enable automatic daily backups inside the container:
+
+```ini
+[cleanup]
+backup_enabled = True
+backup_dir = /var/lib/meshview/backups
+backup_hour = 2
+backup_minute = 00
+```
+
+Then mount the backups directory:
+
+```bash
+-v $(pwd)/meshview/backups:/var/lib/meshview/backups
+```
+
+## Available Tags
+
+| Tag | Description |
+|-----|-------------|
+| `latest` | Latest build from the main branch |
+| `dev-v3` | Development branch |
+| `v1.2.3` | Specific version tags |
+
+## Updating
+
+Pull the latest image and restart:
+
+```bash
+docker pull ghcr.io/pablorevilla-meshtastic/meshview:latest
+docker restart meshview
+```
+
+Or with docker-compose:
+
+```bash
+docker-compose pull
+docker-compose up -d
+```
+
+## Logs
+
+View container logs:
+
+```bash
+docker logs meshview
+
+# Follow logs
+docker logs -f meshview
+
+# Last 100 lines
+docker logs --tail 100 meshview
+```
+
+## Troubleshooting
+
+### Container won't start
+
+Check logs:
+```bash
+docker logs meshview
+```
+
+### Database permission issues
+
+Ensure the data directory is writable:
+```bash
+chmod -R 755 meshview/data
+```
+
+### Can't connect to MQTT
+
+1. Check your MQTT configuration in `config.ini`
+2. Verify network connectivity from the container:
+   ```bash
+   docker exec meshview ping mqtt.meshtastic.org
+   ```
+
+### Port already in use
+
+Change the host port (left side):
+```bash
+-p 8082:8081
+```
+
+Then access at: http://localhost:8082
+
+## Building Your Own Image
+
+If you want to build from source:
+
+```bash
+git clone https://github.com/pablorevilla-meshtastic/meshview.git
+cd meshview
+docker build -f Containerfile -t meshview:local .
+```
+
+## Security Notes
+
+- The container runs as a non-root user (`app`, UID 10001)
+- No privileged access required
+- Only port 8081 is exposed
+- All data stored in mounted volumes
+
+## Support
+
+- GitHub Issues: https://github.com/pablorevilla-meshtastic/meshview/issues
+- Documentation: https://github.com/pablorevilla-meshtastic/meshview

README.md

@@ -2,13 +2,92 @@
 # Meshview
 ![Start Page](screenshots/animated.gif)
 
-The project serves as a real-time monitoring and diagnostic tool for the Meshtastic mesh network. It provides detailed insights into the network's activity, including message traffic, node positions, and telemetry data.
+The project serves as a real-time monitoring and diagnostic tool for the Meshtastic mesh network. It provides detailed insights into network activity, including message traffic, node positions, and telemetry data.
+
+### Version 3.0.7 — May 2026
+- Reliability report: added a dedicated reliability page for checking how well a selected node is heard across the mesh, including heard/missed status, packet counts, hop counts, gateway tables, and a map view.
+- Node list/map UX: added node list filtering for wider active-node ranges, included all database nodes where appropriate, and made map node colors persistent across reboots.
+- QR/API fixes: corrected QR code generation when a node role is missing or unavailable.
+- Database cleanup: removed stored node public key data and added the Alembic migration to drop `node.public_key`.
+- Protobufs: refreshed vendored Meshtastic protobuf Python modules to upstream commit `9ab4a1d08cb833d897aee2367013318718391f2f`, including new hardware models such as `RAK6421`.
+- Tooling: improved the protobuf updater so it supports raw commit SHAs, the newer upstream `meshtastic/*.proto` layout, generated `.pyi` stubs, and the vendored `nanopb`/`serial_hal` outputs.
+
+### Version 3.0.6 — March 2026
+- Daily snapshots: added the `daily_snapshot` table, scheduled snapshot capture, and `/api/snapshots/daily` for historical node, packet, and gateway counts.
+- Stats/UI: expanded stats views with snapshot data and added channel filters to Chat and Firehose.
+- Map/node fixes: corrected node location handling, map popup behavior, packet page display, and node list sorting.
+- Ingestion/API reliability: improved duplicate `PacketSeen` handling, guarded invalid node info packets, and made traceroute/edge APIs more tolerant of decode failures.
+- Language support: added Russian translations.
+
+### Version 3.0.5 — February 2026
+- **IMPORTANT:** the predicted coverage feature requires the extra `pyitm` dependency. If it is not installed, the coverage API will return 503.
+  - Ubuntu install (inside the venv): `./env/bin/pip install pyitm`
+- Coverage: predicted coverage overlay (Longley‑Rice area mode) with perimeter rendering and documentation.
+- UI: added QR code display for quick node/app access.
+- Gateways: persistent gateway tracking (`is_mqtt_gateway`) and UI indicators in nodes, map popups, and stats.
+- Map UX: deterministic jitter for overlapping nodes; edges follow jittered positions.
+- Tooling: Meshtastic protobuf updater script with `--check` and `UPSTREAM_REV.txt` tracking.
+
+
+### Version 3.0.4 — Late January 2026
+- Database: multi‑DB support, PostgreSQL scripts, WAL config for SQLite, cleanup query timing fixes, removal of import time columns, and various time‑handling fixes.
+- UI/UX: extensive updates to node.html, nodelist.html, top.html, and packet.html (paging, stats, distance, status/favorites), plus net view changes to 12‑hour window.
+- API/logic: weekly mesh query fix, node list performance improvement, backwards‑compatibility and other bug fixes.
+- MQTT reader: configurable skip‑node list and secondary decryption keys.
+- Docs/ops: multiple documentation updates, updated site list, container workflow fixes/tests, README updates.
+
+### Version 3.0.2 — January 2026
+- Changes to the Database to will make it so that there is a need for space when updating to the latest. SQlite requires to rebuild the database when droping a column. ( we are droping some of the old columns) so make sure you have 1.2x the size of the db of space in your environment. Depending on how big your db is it would take a long time.
+  
+### Version 3.0.1 — December 2025
+
+#### 🌐 Multi-Language Support (i18n)
+- New `/api/lang` endpoint for serving translations  
+- Section-based translation loading (e.g., `?section=firehose`)  
+- Default language controlled via config file language section
+- JSON-based translation files for easy expansion  
+- Core pages updated to support `data-translate-lang` attributes  
+
+### 🛠 Improvements
+- Updated UI elements across multiple templates for localization readiness  
+- General cleanup to support future language additions  
+
+### Version 3.0.0 update - November 2025
+
+**Major Infrastructure Improvements:**
+
+* **Database Migrations**: Alembic integration for safe schema upgrades and database versioning
+* **Automated Backups**: Independent database backup system with gzip compression (separate from cleanup)
+* **Development Tools**: Quick setup script (`setup-dev.sh`) with pre-commit hooks for code quality
+* **Docker Support**: Pre-built containers now available on GitHub Container Registry with automatic builds - ogarcia 
+
+**New Features:**
+
+* **Traceroute Return Path**: Log and display return path data for traceroute packets - jschrempp 
+* **Microsecond Timestamps**: Added `import_time_us` columns for higher precision time tracking
+
+**Technical Improvements:**
+
+* Migration from manual SQL to Alembic-managed schema
+* Container images use `uv` for faster dependency installation
+* Python 3.13 support with slim Debian-based images
+* Documentation collection in `docs/` directory
+* API routes moved to separate modules for better organization
+* /version and /health endpoints added for monitoring
+
+See [README-Docker.md](README-Docker.md) for container deployment and [docs/](docs/) for technical documentation.
+
+### Version 2.0.7 update - September 2025
+* New database maintenance capability to automatically keep a specific number of days of data.
+* Added configuration for update intervals for both the Live Map and the Firehose pages.
+
 ### Version 2.0.6 update - August 2025
 * New Live Map (Shows packet feed live)
 * New API /api/config (See API documentation)
 * New API /api/edges (See API documentation)
 * Adds edges to the map (click to see traceroute and neighbours)
 
+
 ### Version 2.0.4 update - August 2025
 * New statistic page with more data.
 * New API /api/stats (See API documentation).
@@ -36,34 +115,95 @@ The project serves as a real-time monitoring and diagnostic tool for the Meshtas
 
 Samples of currently running instances:
 
-- https://meshview.bayme.sh (SF Bay Area)
-- https://www.svme.sh/ (Sacramento Valley)
-- https://meshview.nyme.sh/   (New York)
-- https://map.wpamesh.net/ (Western Pennsylvania)
-- https://meshview.chicagolandmesh.org/ (Chicago)
-- https://meshview.mt.gt (Canadaverse)
-- https://meshview.meshtastic.es (Spain)
-- https://view.mtnme.sh/ (North Georgia / East Tennessee)
-- https://socalmesh.w4hac.com  (Southern California)
-- https://meshview.lsinfra.de (Hessen - Germany)
-- https://map.nswmesh.au/ (Sydney - Australia)
-- https://meshview.pvmesh.org/ (Pioneer Valley, Massachusetts)
+| Area | URL | Version | Nodes | Last Updated |
+| --- | --- | --- | ---: | --- |
+| Polski Mesh | https://meshview.format.ovh | 3.0.6 (65386be) | 4,827 | 4/1/2026, 12:12:25 PM |
+| Poland | https://meshview.szastan.pl | 3.0.5 (unknown) | 4,194 | 4/1/2026, 12:12:39 PM |
+| Spain | https://meshview.meshtastic.es | 3.0.5 (unknown) | 2,466 | 4/1/2026, 12:11:17 PM |
+| San Francisco Bay Area | https://meshview.bayme.sh | 3.0.5 (bdf70da) | 1,983 | 4/1/2026, 12:11:08 PM |
+| Southern California | https://meshview.socalmesh.org | 3.0.5 (unknown) | 1,205 | 4/1/2026, 12:11:50 PM |
+| Oregon (USA) | https://meshview.meshoregon.com | 3.0.5 (bdf70da) | 1,167 | 4/1/2026, 12:11:41 PM |
+| Australia/ New Zeland | https://my.meshview.world/anz | plus 1.0.0 | 1,165 | 4/1/2026, 12:11:59 PM |
+| Hessen - Germany | https://meshview.lsinfra.de | 3.0.5 (unknown) | 1,082 | 4/1/2026, 12:11:30 PM |
+| New York City | https://meshview.nyme.sh | 3.0.5 (bdf70da) | 984 | 4/1/2026, 12:11:26 PM |
+| Salt Lake City (USA) | https://meshview.freq51.net | — | 801 | 4/1/2026, 12:11:36 PM |
+| Salzburg / Austria | https://meshview-salzburg.jmt.gr | — | 748 | 4/1/2026, 12:11:21 PM |
+| North Georgia / East Tennessee - USA | https://view.mtnme.sh | 3.0.3 (ff30623) | 730 | 4/1/2026, 12:11:33 PM |
+| Canada | https://mv.canadaverse.org | 3.0.1 (unknown) | 674 | 4/1/2026, 12:12:06 PM |
+| Pioneer Valley, Massachusetts (USA) | https://meshview.pvmesh.org | 3.0.4 (018e16e) | 560 | 4/1/2026, 12:11:44 PM |
+| Western Pennsylvania (USA) | https://map.wpamesh.net | 3.0.5 (unknown) | 447 | 4/1/2026, 12:11:38 PM |
+| Great Britan | https://my.meshview.world/gb | plus 1.0.0 | 421 | 4/1/2026, 12:12:03 PM |
+| Chicago (USA) | https://meshview.chicagolandmesh.org | 3.0.5 (unknown) | 420 | 4/1/2026, 12:12:41 PM |
+| Georgia (USA) | https://meshview.gamesh.net | 3.0.1 (unknown) | 384 | 4/1/2026, 12:11:45 PM |
+| Brazil | https://my.meshview.world/brazil | plus 1.0.0 | 364 | 4/1/2026, 12:12:01 PM |
+| Mexico | https://my.meshview.world/mexico | plus 1.0.0 | 268 | 4/1/2026, 12:11:59 PM |
+| Northeast Ohio | https://meshview.neomesh.org | 3.0.5 (unknown) | 264 | 4/1/2026, 12:11:52 PM |
+| South Africa | https://my.meshview.world/za | plus 1.0.0 | 263 | 4/1/2026, 12:12:07 PM |
+| Argentina | https://my.meshview.world/argentina | plus 1.0.0 | 258 | 4/1/2026, 12:12:00 PM |
+| Northwest Indiana (USA) | https://meshview.nwimesh.net | 3.0.5 (2cc53dc) | 219 | 4/1/2026, 12:12:08 PM |
+| Louisiana (USA) | https://meshview.louisianamesh.org | — | 78 | 4/1/2026, 12:11:51 PM |
+| Chile | https://my.meshview.world/chile | plus 1.0.0 | 58 | 4/1/2026, 12:12:06 PM |
+| Colombia | https://meshview.meshcolombia.co | 3.0.5 (2cc53dc) | 55 | 4/1/2026, 12:11:46 PM |
+| Croatia | https://map.cromesh.eu | — | 0 | 4/1/2026, 12:11:45 PM |
+| Saint Louis (USA) | https://meshview.meshstl.org | 3.0.5 (2cc53dc) | 0 | 4/1/2026, 12:11:51 PM |
+| Southwest Louisiana (USA) | https://www.swlamesh.com | — | 0 | 4/1/2026, 12:11:46 PM |
+
 ---
 
+
+
+### Updating from 2.x to 3.x
+We are adding the use of Alembic. If using GitHub
+Update your codebase by running the pull command
+```bash
+cd meshview
+git pull origin master
+```
+Install Alembic in your environment
+```bash
+./env/bin/pip install alembic
+```
+Start your scripts or services. This process will update your database with the latest schema.
+
 ## Installing
 
-Requires **`python3.11`** or above.
+### Using Docker (Recommended)
+
+The easiest way to run MeshView is using Docker. Pre-built images are available from GitHub Container Registry.
+
+See **[README-Docker.md](README-Docker.md)** for complete Docker installation and usage instructions.
+
+### Manual Installation
+
+Requires **`python3.13`** or above.
 
 Clone the repo from GitHub:
 
 ```bash
 git clone https://github.com/pablorevilla-meshtastic/meshview.git
+cd meshview
 ```
 
+#### Quick Setup (Recommended)
+
+Run the development setup script:
+
+```bash
+./setup-dev.sh
+```
+
+This will:
+- Create Python virtual environment
+- Install all requirements
+- Install development tools (pre-commit, pytest)
+- Set up pre-commit hooks for code formatting
+- Create config.ini from sample
+
+#### Manual Setup
+
 Create a Python virtual environment:
 
 ```bash
-cd meshview
 python3 -m venv env
 ```
 
@@ -73,7 +213,7 @@ Install the environment requirements:
 ./env/bin/pip install -r requirements.txt
 ```
 
-Install `graphviz`:
+Install `graphviz` on MacOS or Debian/Ubuntu Linux:
 
 ```bash
 sudo apt-get install graphviz
@@ -125,12 +265,18 @@ acme_challenge =
 # The domain name of your site.
 domain =
 
+# Select language (this represents the name of the json file in the /lang directory)
+language = es
+
 # Site title to show in the browser title bar and headers.
 title = Bay Area Mesh
 
 # A brief message shown on the homepage.
 message = Real time data from around the bay area and beyond.
 
+# Starting URL when loading the index page.
+starting = /chat
+
 # Enable or disable site features (as strings: "True" or "False").
 nodes = True
 conversations = True
@@ -142,16 +288,21 @@ map = True
 top = True
 
 # Map boundaries (used for the map view).
+# Defaults will show the San Francisco Bay Area
 map_top_left_lat = 39
 map_top_left_lon = -123
 map_bottom_right_lat = 36
 map_bottom_right_lon = -121
 
+# Updates intervals in seconds, zero or negative number means no updates
+# defaults will be 3 seconds
+map_interval=3
+firehose_interval=3
+
 # Weekly net details
 weekly_net_message = Weekly Mesh check-in. We will keep it open on every Wednesday from 5:00pm for checkins. The message format should be (LONG NAME) - (CITY YOU ARE IN) #BayMeshNet.
 net_tag = #BayMeshNet
 
-
 # -------------------------
 # MQTT Broker Configuration
 # -------------------------
@@ -160,7 +311,7 @@ net_tag = #BayMeshNet
 server = mqtt.bayme.sh
 
 # Topics to subscribe to (as JSON-like list, but still a string).
-topics = ["msh/US/bayarea/#", "msh/US/CA/mrymesh/#", "msh/US/CA/sacvalley/#"]
+topics = ["msh/US/bayarea/#", "msh/US/CA/mrymesh/#", "msh/US/CA/sacvalley"]
 
 # Port used by MQTT (typically 1883 for unencrypted).
 port = 1883
@@ -174,15 +325,60 @@ password = large4cats
 # Database Configuration
 # -------------------------
 [database]
-# SQLAlchemy connection string. This one uses SQLite with asyncio support.
+# SQLAlchemy async connection string.
+# Examples:
+#   sqlite+aiosqlite:///packets.db
+#   postgresql+asyncpg://user:pass@host:5432/meshview
 connection_string = sqlite+aiosqlite:///packets.db
+
+
+# -------------------------
+# Database Cleanup Configuration
+# -------------------------
+[cleanup]
+# Enable or disable daily cleanup
+enabled = False
+# Number of days to keep records in the database
+days_to_keep = 14
+# Time to run daily cleanup (24-hour format)
+hour = 2
+minute = 00
+# Run VACUUM after cleanup
+vacuum = False
+
+
+# -------------------------
+# Logging Configuration
+# -------------------------
+[logging]
+# Enable or disable HTTP access logs from the web server
+# When disabled, request logs like "GET /api/chat" will not appear
+# Application logs (errors, startup messages, etc.) are unaffected
+# Set to True to enable, False to disable (default: False)
+access_log = False
+# Database cleanup logfile location
+db_cleanup_logfile = dbcleanup.log
 ```
 
 ---
 
+## NOTE (PostgreSQL setup)**  
+If you want to use PostgreSQL instead of SQLite:
+
+Install PostgreSQL for your OS.  
+Create a user and database:
+```
+`CREATE USER meshview WITH PASSWORD 'change_me';`
+`CREATE DATABASE meshview OWNER meshview;`
+```
+Update `config.ini` example:
+```
+`connection_string = postgresql+asyncpg://meshview:change_me@localhost:5432/meshview`
+```
+
 ## Running Meshview
 
-Start the database:
+Start the database manager:
 
 ```bash
 ./env/bin/python startdb.py
@@ -209,12 +405,29 @@ Open in your browser: http://localhost:8081/
 ## Running Meshview with `mvrun.py`
 
 - `mvrun.py` starts both `startdb.py` and `main.py` in separate threads and merges the output.
-- It accepts the `--config` argument like the others.
+- It accepts several command-line arguments for flexible deployment.
 
 ```bash
 ./env/bin/python mvrun.py
 ```
 
+**Command-line options:**
+- `--config CONFIG` - Path to the configuration file (default: `config.ini`)
+- `--pid_dir PID_DIR` - Directory for PID files (default: `.`)
+- `--py_exec PY_EXEC` - Path to the Python executable (default: `./env/bin/python`)
+
+**Examples:**
+```bash
+# Use a specific config file
+./env/bin/python mvrun.py --config /etc/meshview/config.ini
+
+# Store PID files in a specific directory
+./env/bin/python mvrun.py --pid_dir /var/run/meshview
+
+# Use a different Python executable
+./env/bin/python mvrun.py --py_exec /usr/bin/python3
+```
+
 ---
 
 ## Setting Up Systemd Services (Ubuntu)
@@ -303,15 +516,44 @@ sudo systemctl daemon-reload
 ```
 
 ## 5. Database Maintenance
+### Database maintnance can now be done via the script itself here is the section from the configuration file.
+- Simple to setup
+- It will not drop any packets
+```
+# -------------------------
+# Database Cleanup Configuration
+# -------------------------
+[cleanup]
+# Enable or disable daily cleanup
+enabled = False
+# Number of days to keep records in the database
+days_to_keep = 14
+# Time to run daily cleanup (24-hour format)
+hour = 2
+minute = 00
+# Run VACUUM after cleanup
+vacuum = False
+
+# -------------------------
+# Logging Configuration
+# -------------------------
+[logging]
+# Enable or disable HTTP access logs from the web server
+access_log = False
+# Database cleanup logfile location
+db_cleanup_logfile = dbcleanup.log
+```
+Once changes are done you need to restart the script for changes to load.
+
+### Alternatively we can do it via your OS (This example is Ubuntu like OS)
 - Create and save bash script below. (Modify /path/to/file/ to the correct path)
 - Name it cleanup.sh
 - Make it executable.
 ```bash
- #!/bin/bash
+#!/bin/bash
 
 DB_FILE="/path/to/file/packets.db"
 
-
 # Stop DB service
 sudo systemctl stop meshview-db.service
 sudo systemctl stop meshview-web.service
@@ -320,10 +562,22 @@ sleep 5
 echo "Run cleanup..."
 # Run cleanup queries
 sqlite3 "$DB_FILE" <<EOF 
-DELETE FROM packet WHERE import_time < datetime('now', '-14 day');
-DELETE FROM packet_seen WHERE import_time < datetime('now', '-14 day');
-DELETE FROM traceroute WHERE import_time < datetime('now', '-14 day');
-DELETE FROM node WHERE last_update < datetime('now', '-14 day') OR last_update IS NULL OR last_update = '';
+DELETE FROM packet
+WHERE import_time_us IS NOT NULL
+  AND import_time_us < (strftime('%s','now','-14 days') * 1000000);
+SELECT 'packet deleted: ' || changes();
+DELETE FROM packet_seen
+WHERE import_time_us IS NOT NULL
+  AND import_time_us < (strftime('%s','now','-14 days') * 1000000);
+SELECT 'packet_seen deleted: ' || changes();
+DELETE FROM traceroute
+WHERE import_time_us IS NOT NULL
+  AND import_time_us < (strftime('%s','now','-14 days') * 1000000);
+SELECT 'traceroute deleted: ' || changes();
+DELETE FROM node
+WHERE last_seen_us IS NULL
+   OR last_seen_us < (strftime('%s','now','-14 days') * 1000000);
+SELECT 'node deleted: ' || changes();
 VACUUM;
 EOF
 
@@ -333,6 +587,80 @@ sudo systemctl start meshview-web.service
 
 echo "Database cleanup completed on $(date)"
 
+```
+- If you are using PostgreSQL, use this version instead (adjust credentials/DB name):
+```bash
+#!/bin/bash
+set -euo pipefail
+
+DB="postgresql://meshview@localhost:5432/meshview"
+RETENTION_DAYS=14
+BATCH_SIZE=100
+
+PSQL="/usr/bin/psql"
+
+echo "[$(date)] Starting batched cleanup..."
+
+while true; do
+  DELETED=$(
+    $PSQL "$DB" -At -v ON_ERROR_STOP=1 <<EOF
+WITH cutoff AS (
+  SELECT (EXTRACT(EPOCH FROM (NOW() - INTERVAL '${RETENTION_DAYS} days')) * 1000000)::bigint AS ts
+),
+old_packets AS (
+  SELECT id
+  FROM packet, cutoff
+  WHERE import_time_us IS NOT NULL
+    AND import_time_us < cutoff.ts
+  ORDER BY id
+  LIMIT ${BATCH_SIZE}
+),
+ps_del AS (
+  DELETE FROM packet_seen
+  WHERE packet_id IN (SELECT id FROM old_packets)
+  RETURNING 1
+),
+tr_del AS (
+  DELETE FROM traceroute
+  WHERE packet_id IN (SELECT id FROM old_packets)
+  RETURNING 1
+),
+p_del AS (
+  DELETE FROM packet
+  WHERE id IN (SELECT id FROM old_packets)
+  RETURNING 1
+)
+SELECT COUNT(*) FROM p_del;
+EOF
+  )
+
+  if [[ "$DELETED" -eq 0 ]]; then
+    break
+  fi
+  
+  sleep 0.1
+done
+
+echo "[$(date)] Packet cleanup complete"
+
+echo "[$(date)] Cleaning old nodes..."
+
+$PSQL "$DB" -v ON_ERROR_STOP=1 <<EOF
+DELETE FROM node
+WHERE last_seen_us IS NOT NULL
+  AND last_seen_us < (
+    EXTRACT(EPOCH FROM (NOW() - INTERVAL '${RETENTION_DAYS} days')) * 1000000
+  );
+EOF
+
+echo "[$(date)] Node cleanup complete"
+
+$PSQL "$DB" -c "VACUUM (ANALYZE) packet_seen;"
+$PSQL "$DB" -c "VACUUM (ANALYZE) traceroute;"
+$PSQL "$DB" -c "VACUUM (ANALYZE) packet;"
+$PSQL "$DB" -c "VACUUM (ANALYZE) node;"
+
+echo "[$(date)] Cleanup finished"
 ```
 - Schedule running the script on a regular basis. 
 - In this example it runs every night at 2:00am.
@@ -348,4 +676,8 @@ Add schedule to the bottom of the file (modify /path/to/file/ to the correct pat
 
 Check the log file to see it the script run at the specific time.
 
+---
 
+## Technical Documentation
+
+For more detailed technical documentation including database migrations, architecture details, and advanced topics, see the [docs/](docs/) directory.

alembic.ini

@@ -0,0 +1,120 @@
+# A generic, single database configuration.
+
+[alembic]
+# path to migration scripts
+# Use forward slashes (/) also on windows to provide an os agnostic path
+script_location = alembic
+
+# template used to generate migration file names; The default value is %%(rev)s_%%(slug)s
+# Uncomment the line below if you want the files to be prepended with date and time
+# see https://alembic.sqlalchemy.org/en/latest/tutorial.html#editing-the-ini-file
+# for all available tokens
+# file_template = %%(year)d_%%(month).2d_%%(day).2d_%%(hour).2d%%(minute).2d-%%(rev)s_%%(slug)s
+
+# sys.path path, will be prepended to sys.path if present.
+# defaults to the current working directory.
+prepend_sys_path = .
+
+# timezone to use when rendering the date within the migration file
+# as well as the filename.
+# If specified, requires the python>=3.9 or backports.zoneinfo library and tzdata library.
+# Any required deps can installed by adding `alembic[tz]` to the pip requirements
+# string value is passed to ZoneInfo()
+# leave blank for localtime
+# timezone =
+
+# max length of characters to apply to the "slug" field
+# truncate_slug_length = 40
+
+# set to 'true' to run the environment during
+# the 'revision' command, regardless of autogenerate
+# revision_environment = false
+
+# set to 'true' to allow .pyc and .pyo files without
+# a source .py file to be detected as revisions in the
+# versions/ directory
+# sourceless = false
+
+# version location specification; This defaults
+# to alembic/versions.  When using multiple version
+# directories, initial revisions must be specified with --version-path.
+# The path separator used here should be the separator specified by "version_path_separator" below.
+# version_locations = %(here)s/bar:%(here)s/bat:alembic/versions
+
+# version path separator; As mentioned above, this is the character used to split
+# version_locations. The default within new alembic.ini files is "os", which uses os.pathsep.
+# If this key is omitted entirely, it falls back to the legacy behavior of splitting on spaces and/or commas.
+# Valid values for version_path_separator are:
+#
+# version_path_separator = :
+# version_path_separator = ;
+# version_path_separator = space
+# version_path_separator = newline
+#
+# Use os.pathsep. Default configuration used for new projects.
+version_path_separator = os
+
+# set to 'true' to search source files recursively
+# in each "version_locations" directory
+# new in Alembic version 1.10
+# recursive_version_locations = false
+
+# the output encoding used when revision files
+# are written from script.py.mako
+# output_encoding = utf-8
+
+# sqlalchemy.url will be set programmatically from meshview config
+# sqlalchemy.url = driver://user:pass@localhost/dbname
+
+
+[post_write_hooks]
+# post_write_hooks defines scripts or Python functions that are run
+# on newly generated revision scripts.  See the documentation for further
+# detail and examples
+
+# format using "black" - use the console_scripts runner, against the "black" entrypoint
+# hooks = black
+# black.type = console_scripts
+# black.entrypoint = black
+# black.options = -l 79 REVISION_SCRIPT_FILENAME
+
+# lint with attempts to fix using "ruff" - use the exec runner, execute a binary
+# hooks = ruff
+# ruff.type = exec
+# ruff.executable = %(here)s/.venv/bin/ruff
+# ruff.options = --fix REVISION_SCRIPT_FILENAME
+
+# Logging configuration
+[loggers]
+keys = root,sqlalchemy,alembic
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = INFO
+handlers = console
+qualname =
+
+[logger_sqlalchemy]
+level = WARNING
+handlers =
+qualname = sqlalchemy.engine
+
+[logger_alembic]
+level = INFO
+handlers =
+qualname = alembic
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(asctime)s %(filename)s:%(lineno)d [pid:%(process)d] %(levelname)s - %(message)s
+datefmt = %Y-%m-%d %H:%M:%S

alembic/README

@@ -0,0 +1 @@
+Generic single-database configuration.

alembic/env.py

@@ -0,0 +1,102 @@
+import asyncio
+from logging.config import fileConfig
+
+from sqlalchemy import pool
+from sqlalchemy.engine import Connection
+from sqlalchemy.ext.asyncio import async_engine_from_config
+
+from alembic import context
+
+# Import models metadata for autogenerate support
+from meshview.models import Base
+
+# this is the Alembic Config object, which provides
+# access to the values within the .ini file in use.
+config = context.config
+
+# Interpret the config file for Python logging.
+# This line sets up loggers basically.
+# Use disable_existing_loggers=False to preserve app logging configuration
+if config.config_file_name is not None:
+    fileConfig(config.config_file_name, disable_existing_loggers=False)
+
+# Add your model's MetaData object here for 'autogenerate' support
+target_metadata = Base.metadata
+
+
+def run_migrations_offline() -> None:
+    """Run migrations in 'offline' mode.
+
+    This configures the context with just a URL
+    and not an Engine, though an Engine is acceptable
+    here as well.  By skipping the Engine creation
+    we don't even need a DBAPI to be available.
+
+    Calls to context.execute() here emit the given string to the
+    script output.
+
+    """
+    url = config.get_main_option("sqlalchemy.url")
+    context.configure(
+        url=url,
+        target_metadata=target_metadata,
+        literal_binds=True,
+        dialect_opts={"paramstyle": "named"},
+    )
+
+    with context.begin_transaction():
+        context.run_migrations()
+
+
+def do_run_migrations(connection: Connection) -> None:
+    """Run migrations with the given connection."""
+    context.configure(connection=connection, target_metadata=target_metadata)
+
+    with context.begin_transaction():
+        context.run_migrations()
+
+
+async def run_async_migrations() -> None:
+    """Run migrations in async mode."""
+    # Get configuration section
+    configuration = config.get_section(config.config_ini_section, {})
+
+    # If sqlalchemy.url is not set in alembic.ini, try to get it from meshview config
+    if "sqlalchemy.url" not in configuration:
+        try:
+            from meshview.config import CONFIG
+
+            configuration["sqlalchemy.url"] = CONFIG["database"]["connection_string"]
+        except Exception:
+            # Fallback to a default for initial migration creation
+            configuration["sqlalchemy.url"] = "sqlite+aiosqlite:///packets.db"
+
+    connectable = async_engine_from_config(
+        configuration,
+        prefix="sqlalchemy.",
+        poolclass=pool.NullPool,
+    )
+
+    async with connectable.connect() as connection:
+        await connection.run_sync(do_run_migrations)
+
+    await connectable.dispose()
+
+
+def run_migrations_online() -> None:
+    """Run migrations in 'online' mode with async support."""
+    try:
+        # Event loop is already running, schedule and run the coroutine
+        import concurrent.futures
+
+        with concurrent.futures.ThreadPoolExecutor() as pool:
+            pool.submit(lambda: asyncio.run(run_async_migrations())).result()
+    except RuntimeError:
+        # No event loop running, create one
+        asyncio.run(run_async_migrations())
+
+
+if context.is_offline_mode():
+    run_migrations_offline()
+else:
+    run_migrations_online()

alembic/script.py.mako

@@ -0,0 +1,26 @@
+"""${message}
+
+Revision ID: ${up_revision}
+Revises: ${down_revision | comma,n}
+Create Date: ${create_date}
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+${imports if imports else ""}
+
+# revision identifiers, used by Alembic.
+revision: str = ${repr(up_revision)}
+down_revision: Union[str, None] = ${repr(down_revision)}
+branch_labels: Union[str, Sequence[str], None] = ${repr(branch_labels)}
+depends_on: Union[str, Sequence[str], None] = ${repr(depends_on)}
+
+
+def upgrade() -> None:
+    ${upgrades if upgrades else "pass"}
+
+
+def downgrade() -> None:
+    ${downgrades if downgrades else "pass"}

alembic/versions/1717fa5c6545_add_example_table.py

@@ -0,0 +1,45 @@
+"""Add example table
+
+Revision ID: 1717fa5c6545
+Revises: c88468b7ab0b
+Create Date: 2025-10-26 20:59:04.347066
+
+"""
+
+from collections.abc import Sequence
+
+import sqlalchemy as sa
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = '1717fa5c6545'
+down_revision: str | None = 'add_time_us_cols'
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade() -> None:
+    """Create example table with sample columns."""
+    op.create_table(
+        'example',
+        sa.Column('id', sa.Integer(), nullable=False, primary_key=True, autoincrement=True),
+        sa.Column('name', sa.String(length=100), nullable=False),
+        sa.Column('description', sa.Text(), nullable=True),
+        sa.Column('value', sa.Float(), nullable=True),
+        sa.Column('is_active', sa.Boolean(), nullable=False, server_default='1'),
+        sa.Column(
+            'created_at', sa.DateTime(), nullable=False, server_default=sa.text('CURRENT_TIMESTAMP')
+        ),
+        sa.Column('updated_at', sa.DateTime(), nullable=True),
+        sa.PrimaryKeyConstraint('id'),
+    )
+
+    # Create an index on the name column for faster lookups
+    op.create_index('idx_example_name', 'example', ['name'])
+
+
+def downgrade() -> None:
+    """Remove example table."""
+    op.drop_index('idx_example_name', table_name='example')
+    op.drop_table('example')

alembic/versions/23dad03d2e42_add_is_mqtt_gateway_to_node.py

@@ -0,0 +1,27 @@
+"""Add is_mqtt_gateway to node
+
+Revision ID: 23dad03d2e42
+Revises: a0c9c13e118f
+Create Date: 2026-02-13 00:00:00.000000
+
+"""
+
+from collections.abc import Sequence
+
+import sqlalchemy as sa
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = "23dad03d2e42"
+down_revision: str | None = "a0c9c13e118f"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade() -> None:
+    op.add_column("node", sa.Column("is_mqtt_gateway", sa.Boolean(), nullable=True))
+
+
+def downgrade() -> None:
+    op.drop_column("node", "is_mqtt_gateway")

alembic/versions/2b5a61bb2b75_auto_generated_migration.py

@@ -0,0 +1,35 @@
+"""Add first_seen_us and last_seen_us to node table
+
+Revision ID: 2b5a61bb2b75
+Revises: ac311b3782a1
+Create Date: 2025-11-05 15:19:13.446724
+
+"""
+
+from collections.abc import Sequence
+
+import sqlalchemy as sa
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = '2b5a61bb2b75'
+down_revision: str | None = 'ac311b3782a1'
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade() -> None:
+    # Add microsecond epoch timestamp columns for first and last seen times
+    op.add_column('node', sa.Column('first_seen_us', sa.BigInteger(), nullable=True))
+    op.add_column('node', sa.Column('last_seen_us', sa.BigInteger(), nullable=True))
+    op.create_index('idx_node_first_seen_us', 'node', ['first_seen_us'], unique=False)
+    op.create_index('idx_node_last_seen_us', 'node', ['last_seen_us'], unique=False)
+
+
+def downgrade() -> None:
+    # Remove the microsecond epoch timestamp columns and their indexes
+    op.drop_index('idx_node_last_seen_us', table_name='node')
+    op.drop_index('idx_node_first_seen_us', table_name='node')
+    op.drop_column('node', 'last_seen_us')
+    op.drop_column('node', 'first_seen_us')

alembic/versions/4f1d2a9c8b71_add_daily_snapshot_table.py

@@ -0,0 +1,35 @@
+"""Add daily_snapshot table
+
+Revision ID: 4f1d2a9c8b71
+Revises: 23dad03d2e42
+Create Date: 2026-03-05 00:00:00.000000
+
+"""
+
+from collections.abc import Sequence
+
+import sqlalchemy as sa
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = "4f1d2a9c8b71"
+down_revision: str | None = "23dad03d2e42"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade() -> None:
+    op.create_table(
+        "daily_snapshot",
+        sa.Column("snapshot_date", sa.Date(), nullable=False),
+        sa.Column("node_count", sa.BigInteger(), nullable=False),
+        sa.Column("packet_count", sa.BigInteger(), nullable=False),
+        sa.Column("gateway_count", sa.BigInteger(), nullable=False),
+        sa.Column("captured_at_us", sa.BigInteger(), nullable=False),
+        sa.PrimaryKeyConstraint("snapshot_date"),
+    )
+
+
+def downgrade() -> None:
+    op.drop_table("daily_snapshot")

alembic/versions/9f3b1a8d2c4f_drop_import_time_columns.py

@@ -0,0 +1,65 @@
+"""Drop import_time columns.
+
+Revision ID: 9f3b1a8d2c4f
+Revises: 2b5a61bb2b75
+Create Date: 2026-01-09 09:55:00.000000
+"""
+
+from collections.abc import Sequence
+
+import sqlalchemy as sa
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = "9f3b1a8d2c4f"
+down_revision: str | None = "2b5a61bb2b75"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade() -> None:
+    conn = op.get_bind()
+    inspector = sa.inspect(conn)
+
+    packet_indexes = {idx["name"] for idx in inspector.get_indexes("packet")}
+    packet_columns = {col["name"] for col in inspector.get_columns("packet")}
+
+    with op.batch_alter_table("packet", schema=None) as batch_op:
+        if "idx_packet_import_time" in packet_indexes:
+            batch_op.drop_index("idx_packet_import_time")
+        if "idx_packet_from_node_time" in packet_indexes:
+            batch_op.drop_index("idx_packet_from_node_time")
+        if "import_time" in packet_columns:
+            batch_op.drop_column("import_time")
+
+    packet_seen_columns = {col["name"] for col in inspector.get_columns("packet_seen")}
+    with op.batch_alter_table("packet_seen", schema=None) as batch_op:
+        if "import_time" in packet_seen_columns:
+            batch_op.drop_column("import_time")
+
+    traceroute_indexes = {idx["name"] for idx in inspector.get_indexes("traceroute")}
+    traceroute_columns = {col["name"] for col in inspector.get_columns("traceroute")}
+    with op.batch_alter_table("traceroute", schema=None) as batch_op:
+        if "idx_traceroute_import_time" in traceroute_indexes:
+            batch_op.drop_index("idx_traceroute_import_time")
+        if "import_time" in traceroute_columns:
+            batch_op.drop_column("import_time")
+
+
+def downgrade() -> None:
+    with op.batch_alter_table("traceroute", schema=None) as batch_op:
+        batch_op.add_column(sa.Column("import_time", sa.DateTime(), nullable=True))
+        batch_op.create_index("idx_traceroute_import_time", ["import_time"], unique=False)
+
+    with op.batch_alter_table("packet_seen", schema=None) as batch_op:
+        batch_op.add_column(sa.Column("import_time", sa.DateTime(), nullable=True))
+
+    with op.batch_alter_table("packet", schema=None) as batch_op:
+        batch_op.add_column(sa.Column("import_time", sa.DateTime(), nullable=True))
+        batch_op.create_index("idx_packet_import_time", [sa.text("import_time DESC")], unique=False)
+        batch_op.create_index(
+            "idx_packet_from_node_time",
+            ["from_node_id", sa.text("import_time DESC")],
+            unique=False,
+        )

alembic/versions/a0c9c13e118f_add_node_public_key.py

@@ -0,0 +1,43 @@
+"""Add node_public_key table
+
+Revision ID: a0c9c13e118f
+Revises: d4d7b0c2e1a4
+Create Date: 2026-02-06 00:00:00.000000
+
+"""
+
+from collections.abc import Sequence
+
+import sqlalchemy as sa
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = "a0c9c13e118f"
+down_revision: str | None = "d4d7b0c2e1a4"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade() -> None:
+    op.create_table(
+        "node_public_key",
+        sa.Column("id", sa.Integer(), primary_key=True, autoincrement=True),
+        sa.Column("node_id", sa.BigInteger(), nullable=False),
+        sa.Column("public_key", sa.String(), nullable=False),
+        sa.Column("first_seen_us", sa.BigInteger(), nullable=True),
+        sa.Column("last_seen_us", sa.BigInteger(), nullable=True),
+    )
+    op.create_index("idx_node_public_key_node_id", "node_public_key", ["node_id"], unique=False)
+    op.create_index(
+        "idx_node_public_key_public_key",
+        "node_public_key",
+        ["public_key"],
+        unique=False,
+    )
+
+
+def downgrade() -> None:
+    op.drop_index("idx_node_public_key_public_key", table_name="node_public_key")
+    op.drop_index("idx_node_public_key_node_id", table_name="node_public_key")
+    op.drop_table("node_public_key")

alembic/versions/ac311b3782a1_add_route_return_to_traceroute.py

@@ -0,0 +1,31 @@
+"""add route_return to traceroute
+
+Revision ID: ac311b3782a1
+Revises: 1717fa5c6545
+Create Date: 2025-11-04 20:28:33.174137
+
+"""
+
+from collections.abc import Sequence
+
+import sqlalchemy as sa
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = 'ac311b3782a1'
+down_revision: str | None = '1717fa5c6545'
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade() -> None:
+    # Add route_return column to traceroute table
+    with op.batch_alter_table('traceroute', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('route_return', sa.LargeBinary(), nullable=True))
+
+
+def downgrade() -> None:
+    # Remove route_return column from traceroute table
+    with op.batch_alter_table('traceroute', schema=None) as batch_op:
+        batch_op.drop_column('route_return')

alembic/versions/add_import_time_us_columns.py

@@ -0,0 +1,74 @@
+"""add import_time_us columns
+
+Revision ID: add_time_us_cols
+Revises: c88468b7ab0b
+Create Date: 2025-11-03 14:10:00.000000
+
+"""
+
+from collections.abc import Sequence
+
+import sqlalchemy as sa
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = 'add_time_us_cols'
+down_revision: str | None = 'c88468b7ab0b'
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade() -> None:
+    # Check if columns already exist, add them if they don't
+    conn = op.get_bind()
+    inspector = sa.inspect(conn)
+
+    # Add import_time_us to packet table
+    packet_columns = [col['name'] for col in inspector.get_columns('packet')]
+    if 'import_time_us' not in packet_columns:
+        with op.batch_alter_table('packet', schema=None) as batch_op:
+            batch_op.add_column(sa.Column('import_time_us', sa.BigInteger(), nullable=True))
+        op.create_index(
+            'idx_packet_import_time_us', 'packet', [sa.text('import_time_us DESC')], unique=False
+        )
+        op.create_index(
+            'idx_packet_from_node_time_us',
+            'packet',
+            ['from_node_id', sa.text('import_time_us DESC')],
+            unique=False,
+        )
+
+    # Add import_time_us to packet_seen table
+    packet_seen_columns = [col['name'] for col in inspector.get_columns('packet_seen')]
+    if 'import_time_us' not in packet_seen_columns:
+        with op.batch_alter_table('packet_seen', schema=None) as batch_op:
+            batch_op.add_column(sa.Column('import_time_us', sa.BigInteger(), nullable=True))
+        op.create_index(
+            'idx_packet_seen_import_time_us', 'packet_seen', ['import_time_us'], unique=False
+        )
+
+    # Add import_time_us to traceroute table
+    traceroute_columns = [col['name'] for col in inspector.get_columns('traceroute')]
+    if 'import_time_us' not in traceroute_columns:
+        with op.batch_alter_table('traceroute', schema=None) as batch_op:
+            batch_op.add_column(sa.Column('import_time_us', sa.BigInteger(), nullable=True))
+        op.create_index(
+            'idx_traceroute_import_time_us', 'traceroute', ['import_time_us'], unique=False
+        )
+
+
+def downgrade() -> None:
+    # Drop indexes and columns
+    op.drop_index('idx_traceroute_import_time_us', table_name='traceroute')
+    with op.batch_alter_table('traceroute', schema=None) as batch_op:
+        batch_op.drop_column('import_time_us')
+
+    op.drop_index('idx_packet_seen_import_time_us', table_name='packet_seen')
+    with op.batch_alter_table('packet_seen', schema=None) as batch_op:
+        batch_op.drop_column('import_time_us')
+
+    op.drop_index('idx_packet_from_node_time_us', table_name='packet')
+    op.drop_index('idx_packet_import_time_us', table_name='packet')
+    with op.batch_alter_table('packet', schema=None) as batch_op:
+        batch_op.drop_column('import_time_us')

alembic/versions/b7c3c2e3a1f0_add_last_update_us_to_node.py

@@ -0,0 +1,94 @@
+"""Add last_update_us to node and migrate data.
+
+Revision ID: b7c3c2e3a1f0
+Revises: 9f3b1a8d2c4f
+Create Date: 2026-01-12 10:12:00.000000
+"""
+
+from collections.abc import Sequence
+from datetime import UTC, datetime
+
+import sqlalchemy as sa
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = "b7c3c2e3a1f0"
+down_revision: str | None = "9f3b1a8d2c4f"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def _parse_datetime(value):
+    if value is None:
+        return None
+    if isinstance(value, datetime):
+        dt = value
+    elif isinstance(value, str):
+        text = value.replace("Z", "+00:00")
+        try:
+            dt = datetime.fromisoformat(text)
+        except ValueError:
+            return None
+    else:
+        return None
+
+    if dt.tzinfo is None:
+        return dt.replace(tzinfo=UTC)
+    return dt.astimezone(UTC)
+
+
+def upgrade() -> None:
+    conn = op.get_bind()
+    op.add_column("node", sa.Column("last_update_us", sa.BigInteger(), nullable=True))
+    op.create_index("idx_node_last_update_us", "node", ["last_update_us"], unique=False)
+
+    node = sa.table(
+        "node",
+        sa.column("id", sa.String()),
+        sa.column("last_update", sa.DateTime()),
+        sa.column("last_update_us", sa.BigInteger()),
+    )
+
+    rows = conn.execute(sa.select(node.c.id, node.c.last_update)).all()
+    for node_id, last_update in rows:
+        dt = _parse_datetime(last_update)
+        if dt is None:
+            continue
+        last_update_us = int(dt.timestamp() * 1_000_000)
+        conn.execute(
+            sa.update(node).where(node.c.id == node_id).values(last_update_us=last_update_us)
+        )
+
+    if conn.dialect.name == "sqlite":
+        with op.batch_alter_table("node", schema=None) as batch_op:
+            batch_op.drop_column("last_update")
+    else:
+        op.drop_column("node", "last_update")
+
+
+def downgrade() -> None:
+    conn = op.get_bind()
+    op.add_column("node", sa.Column("last_update", sa.DateTime(), nullable=True))
+
+    node = sa.table(
+        "node",
+        sa.column("id", sa.String()),
+        sa.column("last_update", sa.DateTime()),
+        sa.column("last_update_us", sa.BigInteger()),
+    )
+
+    rows = conn.execute(sa.select(node.c.id, node.c.last_update_us)).all()
+    for node_id, last_update_us in rows:
+        if last_update_us is None:
+            continue
+        dt = datetime.fromtimestamp(last_update_us / 1_000_000, tz=UTC).replace(tzinfo=None)
+        conn.execute(sa.update(node).where(node.c.id == node_id).values(last_update=dt))
+
+    if conn.dialect.name == "sqlite":
+        with op.batch_alter_table("node", schema=None) as batch_op:
+            batch_op.drop_index("idx_node_last_update_us")
+            batch_op.drop_column("last_update_us")
+    else:
+        op.drop_index("idx_node_last_update_us", table_name="node")
+        op.drop_column("node", "last_update_us")

alembic/versions/c6b1d8f2a9e3_compat_placeholder.py

@@ -0,0 +1,22 @@
+"""Compatibility placeholder for removed revision c6b1d8f2a9e3.
+
+Revision ID: c6b1d8f2a9e3
+Revises: 4f1d2a9c8b71
+Create Date: 2026-03-05 00:00:00.000000
+"""
+
+from collections.abc import Sequence
+
+# revision identifiers, used by Alembic.
+revision: str = "c6b1d8f2a9e3"
+down_revision: str | None = "4f1d2a9c8b71"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade() -> None:
+    pass
+
+
+def downgrade() -> None:
+    pass

alembic/versions/c88468b7ab0b_initial_migration.py

@@ -0,0 +1,160 @@
+"""Initial migration
+
+Revision ID: c88468b7ab0b
+Revises:
+Create Date: 2025-10-26 20:56:50.285200
+
+"""
+
+from collections.abc import Sequence
+
+import sqlalchemy as sa
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = 'c88468b7ab0b'
+down_revision: str | None = None
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    # Get connection and inspector to check what exists
+    conn = op.get_bind()
+    inspector = sa.inspect(conn)
+    existing_tables = inspector.get_table_names()
+
+    # Create node table if it doesn't exist
+    if 'node' not in existing_tables:
+        op.create_table(
+            'node',
+            sa.Column('id', sa.String(), nullable=False),
+            sa.Column('node_id', sa.BigInteger(), nullable=True),
+            sa.Column('long_name', sa.String(), nullable=True),
+            sa.Column('short_name', sa.String(), nullable=True),
+            sa.Column('hw_model', sa.String(), nullable=True),
+            sa.Column('firmware', sa.String(), nullable=True),
+            sa.Column('role', sa.String(), nullable=True),
+            sa.Column('last_lat', sa.BigInteger(), nullable=True),
+            sa.Column('last_long', sa.BigInteger(), nullable=True),
+            sa.Column('channel', sa.String(), nullable=True),
+            sa.Column('last_update', sa.DateTime(), nullable=True),
+            sa.PrimaryKeyConstraint('id'),
+            sa.UniqueConstraint('node_id'),
+        )
+        op.create_index('idx_node_node_id', 'node', ['node_id'], unique=False)
+
+    # Create packet table if it doesn't exist
+    if 'packet' not in existing_tables:
+        op.create_table(
+            'packet',
+            sa.Column('id', sa.BigInteger(), nullable=False),
+            sa.Column('portnum', sa.Integer(), nullable=True),
+            sa.Column('from_node_id', sa.BigInteger(), nullable=True),
+            sa.Column('to_node_id', sa.BigInteger(), nullable=True),
+            sa.Column('payload', sa.LargeBinary(), nullable=True),
+            sa.Column('import_time', sa.DateTime(), nullable=True),
+            sa.Column('import_time_us', sa.BigInteger(), nullable=True),
+            sa.Column('channel', sa.String(), nullable=True),
+            sa.PrimaryKeyConstraint('id'),
+        )
+        op.create_index('idx_packet_from_node_id', 'packet', ['from_node_id'], unique=False)
+        op.create_index('idx_packet_to_node_id', 'packet', ['to_node_id'], unique=False)
+        op.create_index(
+            'idx_packet_import_time', 'packet', [sa.text('import_time DESC')], unique=False
+        )
+        op.create_index(
+            'idx_packet_import_time_us', 'packet', [sa.text('import_time_us DESC')], unique=False
+        )
+        op.create_index(
+            'idx_packet_from_node_time',
+            'packet',
+            ['from_node_id', sa.text('import_time DESC')],
+            unique=False,
+        )
+        op.create_index(
+            'idx_packet_from_node_time_us',
+            'packet',
+            ['from_node_id', sa.text('import_time_us DESC')],
+            unique=False,
+        )
+
+    # Create packet_seen table if it doesn't exist
+    if 'packet_seen' not in existing_tables:
+        op.create_table(
+            'packet_seen',
+            sa.Column('packet_id', sa.BigInteger(), nullable=False),
+            sa.Column('node_id', sa.BigInteger(), nullable=False),
+            sa.Column('rx_time', sa.BigInteger(), nullable=False),
+            sa.Column('hop_limit', sa.Integer(), nullable=True),
+            sa.Column('hop_start', sa.Integer(), nullable=True),
+            sa.Column('channel', sa.String(), nullable=True),
+            sa.Column('rx_snr', sa.Float(), nullable=True),
+            sa.Column('rx_rssi', sa.Integer(), nullable=True),
+            sa.Column('topic', sa.String(), nullable=True),
+            sa.Column('import_time', sa.DateTime(), nullable=True),
+            sa.Column('import_time_us', sa.BigInteger(), nullable=True),
+            sa.ForeignKeyConstraint(
+                ['packet_id'],
+                ['packet.id'],
+            ),
+            sa.PrimaryKeyConstraint('packet_id', 'node_id', 'rx_time'),
+        )
+        op.create_index('idx_packet_seen_node_id', 'packet_seen', ['node_id'], unique=False)
+        op.create_index('idx_packet_seen_packet_id', 'packet_seen', ['packet_id'], unique=False)
+        op.create_index(
+            'idx_packet_seen_import_time_us', 'packet_seen', ['import_time_us'], unique=False
+        )
+
+    # Create traceroute table if it doesn't exist
+    if 'traceroute' not in existing_tables:
+        op.create_table(
+            'traceroute',
+            sa.Column('id', sa.Integer(), nullable=False),
+            sa.Column('packet_id', sa.BigInteger(), nullable=True),
+            sa.Column('gateway_node_id', sa.BigInteger(), nullable=True),
+            sa.Column('done', sa.Boolean(), nullable=True),
+            sa.Column('route', sa.LargeBinary(), nullable=True),
+            sa.Column('import_time', sa.DateTime(), nullable=True),
+            sa.Column('import_time_us', sa.BigInteger(), nullable=True),
+            sa.ForeignKeyConstraint(
+                ['packet_id'],
+                ['packet.id'],
+            ),
+            sa.PrimaryKeyConstraint('id'),
+        )
+        op.create_index('idx_traceroute_import_time', 'traceroute', ['import_time'], unique=False)
+        op.create_index(
+            'idx_traceroute_import_time_us', 'traceroute', ['import_time_us'], unique=False
+        )
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    # Drop traceroute table and indexes
+    op.drop_index('idx_traceroute_import_time_us', table_name='traceroute')
+    op.drop_index('idx_traceroute_import_time', table_name='traceroute')
+    op.drop_table('traceroute')
+
+    # Drop packet_seen table and indexes
+    op.drop_index('idx_packet_seen_import_time_us', table_name='packet_seen')
+    op.drop_index('idx_packet_seen_packet_id', table_name='packet_seen')
+    op.drop_index('idx_packet_seen_node_id', table_name='packet_seen')
+    op.drop_table('packet_seen')
+
+    # Drop packet table and indexes
+    op.drop_index('idx_packet_from_node_time_us', table_name='packet')
+    op.drop_index('idx_packet_from_node_time', table_name='packet')
+    op.drop_index('idx_packet_import_time_us', table_name='packet')
+    op.drop_index('idx_packet_import_time', table_name='packet')
+    op.drop_index('idx_packet_to_node_id', table_name='packet')
+    op.drop_index('idx_packet_from_node_id', table_name='packet')
+    op.drop_table('packet')
+
+    # Drop node table and indexes
+    op.drop_index('idx_node_node_id', table_name='node')
+    op.drop_table('node')
+    # ### end Alembic commands ###

alembic/versions/d4d7b0c2e1a4_drop_last_update_us_from_node.py

@@ -0,0 +1,34 @@
+"""Drop last_update_us from node.
+
+Revision ID: d4d7b0c2e1a4
+Revises: b7c3c2e3a1f0
+Create Date: 2026-01-12 10:20:00.000000
+"""
+
+from collections.abc import Sequence
+
+import sqlalchemy as sa
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = "d4d7b0c2e1a4"
+down_revision: str | None = "b7c3c2e3a1f0"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade() -> None:
+    conn = op.get_bind()
+    if conn.dialect.name == "sqlite":
+        with op.batch_alter_table("node", schema=None) as batch_op:
+            batch_op.drop_index("idx_node_last_update_us")
+            batch_op.drop_column("last_update_us")
+    else:
+        op.drop_index("idx_node_last_update_us", table_name="node")
+        op.drop_column("node", "last_update_us")
+
+
+def downgrade() -> None:
+    op.add_column("node", sa.Column("last_update_us", sa.BigInteger(), nullable=True))
+    op.create_index("idx_node_last_update_us", "node", ["last_update_us"], unique=False)

alembic/versions/e8f2c4b6d9a1_drop_node_public_key.py

@@ -0,0 +1,43 @@
+"""Drop node_public_key table
+
+Revision ID: e8f2c4b6d9a1
+Revises: c6b1d8f2a9e3
+Create Date: 2026-05-25 00:00:00.000000
+
+"""
+
+from collections.abc import Sequence
+
+import sqlalchemy as sa
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = "e8f2c4b6d9a1"
+down_revision: str | None = "c6b1d8f2a9e3"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade() -> None:
+    op.drop_index("idx_node_public_key_public_key", table_name="node_public_key")
+    op.drop_index("idx_node_public_key_node_id", table_name="node_public_key")
+    op.drop_table("node_public_key")
+
+
+def downgrade() -> None:
+    op.create_table(
+        "node_public_key",
+        sa.Column("id", sa.Integer(), primary_key=True, autoincrement=True),
+        sa.Column("node_id", sa.BigInteger(), nullable=False),
+        sa.Column("public_key", sa.String(), nullable=False),
+        sa.Column("first_seen_us", sa.BigInteger(), nullable=True),
+        sa.Column("last_seen_us", sa.BigInteger(), nullable=True),
+    )
+    op.create_index("idx_node_public_key_node_id", "node_public_key", ["node_id"], unique=False)
+    op.create_index(
+        "idx_node_public_key_public_key",
+        "node_public_key",
+        ["public_key"],
+        unique=False,
+    )

container/build-container.sh

@@ -0,0 +1,57 @@
+#!/bin/sh
+#
+# build-container.sh
+#
+# Script to build MeshView container images
+
+set -e
+
+# Default values
+IMAGE_NAME="meshview"
+TAG="latest"
+CONTAINERFILE="Containerfile"
+
+# Parse arguments
+while [ $# -gt 0 ]; do
+    case "$1" in
+        --tag|-t)
+            TAG="$2"
+            shift 2
+            ;;
+        --name|-n)
+            IMAGE_NAME="$2"
+            shift 2
+            ;;
+        --file|-f)
+            CONTAINERFILE="$2"
+            shift 2
+            ;;
+        --help|-h)
+            echo "Usage: $0 [OPTIONS]"
+            echo ""
+            echo "Options:"
+            echo "  -t, --tag TAG         Tag for the image (default: latest)"
+            echo "  -n, --name NAME       Image name (default: meshview)"
+            echo "  -f, --file FILE       Containerfile path (default: Containerfile)"
+            echo "  -h, --help            Show this help"
+            exit 0
+            ;;
+        *)
+            echo "Unknown option: $1"
+            echo "Use --help for usage information"
+            exit 1
+            ;;
+    esac
+done
+
+echo "Building MeshView container image..."
+echo "  Image: ${IMAGE_NAME}:${TAG}"
+echo "  Containerfile: ${CONTAINERFILE}"
+echo ""
+
+# Build the container
+docker build -f "${CONTAINERFILE}" -t "${IMAGE_NAME}:${TAG}" .
+
+echo ""
+echo "Build complete!"
+echo "Run with: docker run --rm -p 8081:8081 ${IMAGE_NAME}:${TAG}"

container/config.ini

@@ -0,0 +1,90 @@
+# -------------------------
+# Server Configuration
+# -------------------------
+[server]
+# The address to bind the server to. Use * to listen on all interfaces.
+bind = 0.0.0.0
+
+# Port to run the web server on.
+port = 8081
+
+# Path to TLS certificate (leave blank to disable HTTPS).
+tls_cert =
+
+# Path for the ACME challenge if using Let's Encrypt.
+acme_challenge =
+
+
+# -------------------------
+# Site Appearance & Behavior
+# -------------------------
+[site]
+domain =
+language = en
+title = Bay Area Mesh
+message = Real time data from around the bay area and beyond.
+starting = /chat
+
+nodes = True
+conversations = True
+everything = True
+graphs = True
+stats = True
+net = True
+map = True
+top = True
+
+map_top_left_lat = 39
+map_top_left_lon = -123
+map_bottom_right_lat = 36
+map_bottom_right_lon = -121
+
+map_interval = 3
+firehose_interal = 3
+
+weekly_net_message = Weekly Mesh check-in. We will keep it open on every Wednesday from 5:00pm for checkins. The message format should be (LONG NAME) - (CITY YOU ARE IN) #BayMeshNet.
+net_tag = #BayMeshNet
+
+
+# -------------------------
+# MQTT Broker Configuration
+# -------------------------
+[mqtt]
+server = mqtt.meshtastic.org
+topics = ["msh/US/bayarea/#", "msh/US/CA/mrymesh/#", "msh/US/CA/sacvalley"]
+port = 1883
+username = meshdev
+password = large4cats
+skip_node_ids =
+secondary_keys =
+
+
+# -------------------------
+# Database Configuration
+# -------------------------
+[database]
+connection_string = sqlite+aiosqlite:////var/lib/meshview/packets.db
+
+
+# -------------------------
+# Database Cleanup Configuration
+# -------------------------
+[cleanup]
+enabled = False
+days_to_keep = 14
+hour = 2
+minute = 00
+vacuum = False
+
+backup_enabled = False
+backup_dir = ./backups
+backup_hour = 2
+backup_minute = 00
+
+
+# -------------------------
+# Logging Configuration
+# -------------------------
+[logging]
+access_log = False
+db_cleanup_logfile = /var/log/meshview/dbcleanup.log

container/config.patch

@@ -0,0 +1,37 @@
+diff --git a/sample.config.ini b/sample.config.ini
+index 0e64980..494685c 100644
+--- a/sample.config.ini
++++ b/sample.config.ini
+@@ -3,7 +3,7 @@
+ # -------------------------
+ [server]
+ # The address to bind the server to. Use * to listen on all interfaces.
+-bind = *
++bind = 0.0.0.0
+ 
+ # Port to run the web server on.
+ port = 8081
+@@ -64,7 +64,7 @@ net_tag = #BayMeshNet
+ # -------------------------
+ [mqtt]
+ # MQTT server hostname or IP.
+-server = mqtt.bayme.sh
++server = mqtt.meshtastic.org
+ 
+ # Topics to subscribe to (as JSON-like list, but still a string).
+ topics = ["msh/US/bayarea/#", "msh/US/CA/mrymesh/#", "msh/US/CA/sacvalley"]
+@@ -82,7 +82,7 @@ password = large4cats
+ # -------------------------
+ [database]
+ # SQLAlchemy connection string. This one uses SQLite with asyncio support.
+-connection_string = sqlite+aiosqlite:///packets.db
++connection_string = sqlite+aiosqlite:////var/lib/meshview/packets.db
+ 
+ 
+ # -------------------------
+@@ -110,4 +110,4 @@ vacuum = False
+ # Set to True to enable, False to disable (default: False)
+ access_log = False
+ # Database cleanup logfile
+-db_cleanup_logfile = dbcleanup.log
++db_cleanup_logfile = /var/log/meshview/dbcleanup.log

create_example_migration.py

@@ -0,0 +1,52 @@
+#!/usr/bin/env python3
+"""
+Script to create a blank migration for manual editing.
+
+Usage:
+    ./env/bin/python create_example_migration.py
+
+This creates an empty migration file that you can manually edit to add
+custom migration logic (data migrations, complex schema changes, etc.)
+
+Unlike create_migration.py which auto-generates from model changes,
+this creates a blank template for you to fill in.
+"""
+
+import os
+import sys
+
+# Add current directory to path
+sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
+
+from alembic.config import Config
+
+from alembic import command
+
+# Create Alembic config
+alembic_cfg = Config("alembic.ini")
+
+# Set database URL from meshview config
+try:
+    from meshview.config import CONFIG
+
+    database_url = CONFIG["database"]["connection_string"]
+    alembic_cfg.set_main_option("sqlalchemy.url", database_url)
+    print(f"Using database URL from config: {database_url}")
+except Exception as e:
+    print(f"Warning: Could not load meshview config: {e}")
+    print("Using default database URL")
+    alembic_cfg.set_main_option("sqlalchemy.url", "sqlite+aiosqlite:///packets.db")
+
+# Generate blank migration
+try:
+    print("Creating blank migration for manual editing...")
+    command.revision(alembic_cfg, autogenerate=False, message="Manual migration")
+    print("✓ Successfully created blank migration!")
+    print("\nNow edit the generated file in alembic/versions/")
+    print("Add your custom upgrade() and downgrade() logic")
+except Exception as e:
+    print(f"✗ Error creating migration: {e}")
+    import traceback
+
+    traceback.print_exc()
+    sys.exit(1)

create_migration.py

@@ -0,0 +1,58 @@
+#!/usr/bin/env python3
+"""
+Helper script to create Alembic migrations from SQLAlchemy model changes.
+
+Usage:
+    ./env/bin/python create_migration.py
+
+This will:
+1. Load your current models from meshview/models.py
+2. Compare them to the current database schema
+3. Auto-generate a migration with the detected changes
+4. Save the migration to alembic/versions/
+
+After running this, review the generated migration file before committing!
+"""
+
+import os
+import sys
+
+# Add current directory to path
+sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
+
+from alembic.config import Config
+
+from alembic import command
+
+# Create Alembic config
+alembic_cfg = Config("alembic.ini")
+
+# Set database URL from meshview config
+try:
+    from meshview.config import CONFIG
+
+    database_url = CONFIG["database"]["connection_string"]
+    alembic_cfg.set_main_option("sqlalchemy.url", database_url)
+    print(f"Using database URL from config: {database_url}")
+except Exception as e:
+    print(f"Warning: Could not load meshview config: {e}")
+    print("Using default database URL")
+    alembic_cfg.set_main_option("sqlalchemy.url", "sqlite+aiosqlite:///packets.db")
+
+# Generate migration
+try:
+    print("\nComparing models to current database schema...")
+    print("Generating migration...\n")
+    command.revision(alembic_cfg, autogenerate=True, message="Auto-generated migration")
+    print("\n✓ Successfully created migration!")
+    print("\nNext steps:")
+    print("1. Review the generated file in alembic/versions/")
+    print("2. Edit the migration message/logic if needed")
+    print("3. Test the migration: ./env/bin/alembic upgrade head")
+    print("4. Commit the migration file to version control")
+except Exception as e:
+    print(f"\n✗ Error creating migration: {e}")
+    import traceback
+
+    traceback.print_exc()
+    sys.exit(1)

docker/Dockerfile

@@ -1,28 +0,0 @@
-FROM python:3.12-slim
-
-# Set work directory
-WORKDIR /app
-
-# Install system dependencies (graphviz required, git for cloning)
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends git graphviz && \
-    rm -rf /var/lib/apt/lists/*
-
-# Clone the repo with submodules
-RUN git clone --recurse-submodules https://github.com/pablorevilla-meshtastic/meshview.git /app
-
-# Create virtual environment
-RUN python -m venv /app/env
-
-# Upgrade pip and install requirements in venv
-RUN /app/env/bin/pip install --no-cache-dir --upgrade pip && \
-    /app/env/bin/pip install --no-cache-dir -r /app/requirements.txt
-
-# Copy sample config
-RUN cp /app/sample.config.ini /app/config.ini
-
-# Expose port
-EXPOSE 8081
-
-# Run the app via venv
-CMD ["/app/env/bin/python", "/app/mvrun.py"]

docker/README.md

@@ -1,44 +0,0 @@
-# MeshView Docker Container
-
-This Dockerfile builds a containerized version of the [MeshView](https://github.com/pablorevilla-meshtastic/meshview) application. It uses a lightweight Python environment and sets up the required virtual environment as expected by the application.
-
-## Image Details
-
-- **Base Image**: `python:3.12-slim`
-- **Working Directory**: `/app`
-- **Python Virtual Environment**: `/app/env`
-- **Exposed Port**: `8081`
-
-## Build Instructions
-
-Build the Docker image:
-
-```bash
-docker build -t meshview-docker .
-```
-
-## Run Instructions
-
-Run the container:
-
-```bash
-docker run -d --name meshview-docker -p 8081:8081 meshview-docker
-```
-
-This maps container port `8081` to your host. The application runs via:
-
-```bash
-/app/env/bin/python /app/mvrun.py
-```
-
-## Web Interface
-
-Once the container is running, you can access the MeshView web interface by visiting:
-
-http://localhost:8081
-
-If running on a remote server, replace `localhost` with the host's IP or domain name:
-
-http://<host>:8081
-
-Ensure that port `8081` is open and not blocked by a firewall or security group.

docs/ALEMBIC_SETUP.md

@@ -0,0 +1,361 @@
+# Alembic Database Migration Setup
+
+This document describes the automatic database migration system implemented for MeshView using Alembic.
+
+## Overview
+
+The system provides automatic database schema migrations with coordination between the writer app (startdb.py) and reader app (web.py):
+
+- **Writer App**: Automatically runs pending migrations on startup
+- **Reader App**: Waits for migrations to complete before starting
+
+## Architecture
+
+### Key Components
+
+1. **`meshview/migrations.py`** - Migration management utilities
+   - `run_migrations()` - Runs pending migrations (writer app)
+   - `wait_for_migrations()` - Waits for schema to be current (reader app)
+   - `is_database_up_to_date()` - Checks schema version
+   - Migration status tracking table
+
+2. **`alembic/`** - Alembic migration directory
+   - `env.py` - Configured for async SQLAlchemy support
+   - `versions/` - Migration scripts directory
+   - `alembic.ini` - Alembic configuration
+
+3. **Modified Apps**:
+   - `startdb.py` - Writer app that runs migrations before MQTT ingestion
+   - `meshview/web.py` - Reader app that waits for schema updates
+
+## How It Works - Automatic In-Place Updates
+
+### ✨ Fully Automatic Operation
+
+**No manual migration commands needed!** The database schema updates automatically when you:
+1. Deploy new code with migration files
+2. Restart the applications
+
+### Writer App (startdb.py) Startup Sequence
+
+1. Initialize database connection
+2. Create migration status tracking table
+3. Set "migration in progress" flag
+4. **🔄 Automatically run any pending Alembic migrations** (synchronously)
+   - Detects current schema version
+   - Compares to latest available migration
+   - Runs all pending migrations in sequence
+   - Updates database schema in place
+5. Clear "migration in progress" flag
+6. Start MQTT ingestion and other tasks
+
+### Reader App (web.py) Startup Sequence
+
+1. Initialize database connection
+2. **Check database schema version**
+3. If not up to date:
+   - Wait up to 60 seconds (30 retries × 2 seconds)
+   - Check every 2 seconds for schema updates
+   - Automatically proceeds once writer completes migrations
+4. Once schema is current, start web server
+
+### 🎯 Key Point: Zero Manual Steps
+
+When you deploy new code with migrations:
+```bash
+# Just start the apps - migrations happen automatically!
+./env/bin/python startdb.py  # Migrations run here automatically
+./env/bin/python main.py     # Waits for migrations, then starts
+```
+
+**The database updates itself!** No need to run `alembic upgrade` manually.
+
+### Coordination
+
+The apps coordinate using:
+- **Alembic version table** (`alembic_version`) - Tracks current schema version
+- **Migration status table** (`migration_status`) - Optional flag for "in progress" state
+
+## Creating New Migrations
+
+### Using the helper script:
+
+```bash
+./env/bin/python create_migration.py
+```
+
+### Manual creation:
+
+```bash
+./env/bin/alembic revision --autogenerate -m "Description of changes"
+```
+
+This will:
+1. Compare current database schema with SQLAlchemy models
+2. Generate a migration script in `alembic/versions/`
+3. Automatically detect most schema changes
+
+### Manual migration (advanced):
+
+```bash
+./env/bin/alembic revision -m "Manual migration"
+```
+
+Then edit the generated file to add custom migration logic.
+
+## Running Migrations
+
+### Automatic (Recommended)
+
+Migrations run automatically when the writer app starts:
+
+```bash
+./env/bin/python startdb.py
+```
+
+### Manual
+
+To run migrations manually:
+
+```bash
+./env/bin/alembic upgrade head
+```
+
+To downgrade:
+
+```bash
+./env/bin/alembic downgrade -1  # Go back one version
+./env/bin/alembic downgrade base  # Go back to beginning
+```
+
+## Checking Migration Status
+
+Check current database version:
+
+```bash
+./env/bin/alembic current
+```
+
+View migration history:
+
+```bash
+./env/bin/alembic history
+```
+
+## Benefits
+
+1. **Zero Manual Intervention**: Migrations run automatically on startup
+2. **Safe Coordination**: Reader won't connect to incompatible schema
+3. **Version Control**: All schema changes tracked in git
+4. **Rollback Capability**: Can downgrade if needed
+5. **Auto-generation**: Most migrations created automatically from model changes
+
+## Migration Workflow
+
+### Development Process
+
+1. **Modify SQLAlchemy models** in `meshview/models.py`
+2. **Create migration**:
+   ```bash
+   ./env/bin/python create_migration.py
+   ```
+3. **Review generated migration** in `alembic/versions/`
+4. **Test migration**:
+   - Stop all apps
+   - Start writer app (migrations run automatically)
+   - Start reader app (waits for schema to be current)
+5. **Commit migration** to version control
+
+### Production Deployment
+
+1. **Deploy new code** with migration scripts
+2. **Start writer app** - Migrations run automatically
+3. **Start reader app** - Waits for migrations, then starts
+4. **Monitor logs** for migration success
+
+## Troubleshooting
+
+### Migration fails
+
+Check logs in writer app for error details. To manually fix:
+
+```bash
+./env/bin/alembic current  # Check current version
+./env/bin/alembic history  # View available versions
+./env/bin/alembic upgrade head  # Try manual upgrade
+```
+
+### Reader app won't start (timeout)
+
+Check if writer app is running and has completed migrations:
+
+```bash
+./env/bin/alembic current
+```
+
+### Reset to clean state
+
+⚠️ **Warning: This will lose all data**
+
+```bash
+rm packets.db  # Or your database file
+./env/bin/alembic upgrade head  # Create fresh schema
+```
+
+## File Structure
+
+```
+meshview/
+├── alembic.ini                 # Alembic configuration
+├── alembic/
+│   ├── env.py                  # Async-enabled migration runner
+│   ├── script.py.mako          # Migration template
+│   └── versions/               # Migration scripts
+│       └── c88468b7ab0b_initial_migration.py
+├── meshview/
+│   ├── models.py               # SQLAlchemy models (source of truth)
+│   ├── migrations.py           # Migration utilities
+│   ├── mqtt_database.py        # Writer database connection
+│   └── database.py             # Reader database connection
+├── startdb.py                  # Writer app (runs migrations)
+├── main.py                     # Entry point for reader app
+└── create_migration.py         # Helper script for creating migrations
+```
+
+## Configuration
+
+Database URL is read from `config.ini`:
+
+```ini
+[database]
+connection_string = sqlite+aiosqlite:///packets.db
+```
+
+Alembic automatically uses this configuration through `meshview/migrations.py`.
+
+## Important Notes
+
+1. **Always test migrations** in development before deploying to production
+2. **Backup database** before running migrations in production
+3. **Check for data loss** - Some migrations may require data migration logic
+4. **Coordinate deployments** - Start writer before readers in multi-instance setups
+5. **Monitor logs** during first startup after deployment
+
+## Example Migrations
+
+### Example 1: Generated Initial Migration
+
+Here's what an auto-generated migration looks like (from comparing models to database):
+
+```python
+"""Initial migration
+
+Revision ID: c88468b7ab0b
+Revises: 
+Create Date: 2025-01-26 20:56:50.123456
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+# revision identifiers
+revision = 'c88468b7ab0b'
+down_revision = None
+branch_labels = None
+depends_on = None
+
+def upgrade() -> None:
+    # Upgrade operations
+    op.create_table('node',
+        sa.Column('id', sa.String(), nullable=False),
+        sa.Column('node_id', sa.BigInteger(), nullable=True),
+        # ... more columns
+        sa.PrimaryKeyConstraint('id')
+    )
+
+def downgrade() -> None:
+    # Downgrade operations
+    op.drop_table('node')
+```
+
+### Example 2: Manual Migration Adding a New Table
+
+We've included an example migration (`1717fa5c6545_add_example_table.py`) that demonstrates how to manually create a new table:
+
+```python
+"""Add example table
+
+Revision ID: 1717fa5c6545
+Revises: c88468b7ab0b
+Create Date: 2025-10-26 20:59:04.347066
+"""
+from typing import Sequence, Union
+from alembic import op
+import sqlalchemy as sa
+
+def upgrade() -> None:
+    """Create example table with sample columns."""
+    op.create_table(
+        'example',
+        sa.Column('id', sa.Integer(), nullable=False, primary_key=True, autoincrement=True),
+        sa.Column('name', sa.String(length=100), nullable=False),
+        sa.Column('description', sa.Text(), nullable=True),
+        sa.Column('value', sa.Float(), nullable=True),
+        sa.Column('is_active', sa.Boolean(), nullable=False, server_default='1'),
+        sa.Column('created_at', sa.DateTime(), nullable=False, 
+                  server_default=sa.text('CURRENT_TIMESTAMP')),
+        sa.Column('updated_at', sa.DateTime(), nullable=True),
+        sa.PrimaryKeyConstraint('id')
+    )
+    
+    # Create an index on the name column for faster lookups
+    op.create_index('idx_example_name', 'example', ['name'])
+
+def downgrade() -> None:
+    """Remove example table."""
+    op.drop_index('idx_example_name', table_name='example')
+    op.drop_table('example')
+```
+
+**Key features demonstrated:**
+- Various column types (Integer, String, Text, Float, Boolean, DateTime)
+- Primary key with autoincrement
+- Nullable and non-nullable columns
+- Server defaults (for timestamps and booleans)
+- Creating indexes
+- Proper downgrade that reverses all changes
+
+**To test this migration:**
+
+```bash
+# Apply the migration
+./env/bin/alembic upgrade head
+
+# Check it was applied
+./env/bin/alembic current
+
+# Verify table was created
+sqlite3 packetsPL.db "SELECT sql FROM sqlite_master WHERE type='table' AND name='example';"
+
+# Roll back the migration
+./env/bin/alembic downgrade -1
+
+# Verify table was removed
+sqlite3 packetsPL.db "SELECT name FROM sqlite_master WHERE type='table' AND name='example';"
+```
+
+**To remove this example migration** (after testing):
+
+```bash
+# First make sure you're not on this revision
+./env/bin/alembic downgrade c88468b7ab0b
+
+# Then delete the migration file
+rm alembic/versions/1717fa5c6545_add_example_table.py
+```
+
+## References
+
+- [Alembic Documentation](https://alembic.sqlalchemy.org/)
+- [SQLAlchemy Documentation](https://docs.sqlalchemy.org/)
+- [Async SQLAlchemy](https://docs.sqlalchemy.org/en/20/orm/extensions/asyncio.html)

docs/API_Documentation.md

@@ -0,0 +1,392 @@
+# API Documentation
+
+Base URL: `http(s)://<host>`
+
+All endpoints return JSON. Timestamps are either ISO 8601 strings or `*_us` values in
+microseconds since epoch.
+
+## 1. Nodes API
+
+### GET `/api/nodes`
+Returns a list of nodes, with optional filtering.
+
+Query Parameters
+- `node_id` (optional, int): Exact node ID.
+- `role` (optional, string): Node role.
+- `channel` (optional, string): Channel name.
+- `hw_model` (optional, string): Hardware model.
+- `days_active` (optional, int): Nodes seen within the last N days.
+
+Response Example
+```json
+{
+  "nodes": [
+    {
+      "id": 42,
+      "node_id": 1234,
+      "long_name": "Alice",
+      "short_name": "A",
+      "hw_model": "T-Beam",
+      "firmware": "1.2.3",
+      "role": "client",
+      "last_lat": 377749000,
+      "last_long": -1224194000,
+      "channel": "main",
+      "last_seen_us": 1736370123456789
+    }
+  ]
+}
+```
+
+---
+
+## 2. Packets API
+
+### GET `/api/packets`
+Returns packets with optional filters.
+
+Query Parameters
+- `packet_id` (optional, int): Return exactly one packet (overrides other filters).
+- `limit` (optional, int): Max packets to return, clamped 1-1000. Default: `50`.
+- `since` (optional, int): Only packets imported after this microsecond timestamp.
+- `portnum` (optional, int): Filter by port number.
+- `contains` (optional, string): Payload substring filter.
+- `from_node_id` (optional, int): Filter by sender node ID.
+- `to_node_id` (optional, int): Filter by recipient node ID.
+- `node_id` (optional, int): Legacy filter matching either from or to node ID.
+
+Response Example
+```json
+{
+  "packets": [
+    {
+      "id": 123,
+      "import_time_us": 1736370123456789,
+      "channel": "main",
+      "from_node_id": 5678,
+      "to_node_id": 91011,
+      "portnum": 1,
+      "long_name": "Alice",
+      "payload": "Hello, Bob!",
+      "to_long_name": "Bob",
+      "reply_id": 122
+    }
+  ],
+  "latest_import_time": 1736370123456789
+}
+```
+
+Notes
+- For `portnum=1` (text messages), packets are filtered to remove sequence-only payloads.
+- `latest_import_time` is returned when available for incremental polling (microseconds).
+
+---
+
+## 3. Channels API
+
+### GET `/api/channels`
+Returns channels seen in a time period.
+
+Query Parameters
+- `period_type` (optional, string): `hour` or `day`. Default: `hour`.
+- `length` (optional, int): Number of periods to look back. Default: `24`.
+
+Response Example
+```json
+{
+  "channels": ["LongFast", "MediumFast", "ShortFast"]
+}
+```
+
+---
+
+## 4. Stats API
+
+### GET `/api/stats`
+Returns packet statistics aggregated by time periods, with optional filtering.
+
+Query Parameters
+- `period_type` (optional, string): `hour` or `day`. Default: `hour`.
+- `length` (optional, int): Number of periods to include. Default: `24`.
+- `channel` (optional, string): Filter by channel (case-insensitive).
+- `portnum` (optional, int): Filter by port number.
+- `to_node` (optional, int): Filter by destination node ID.
+- `from_node` (optional, int): Filter by source node ID.
+- `node` (optional, int): If provided, return combined `sent` and `seen` totals for that node.
+
+Response Example (series)
+```json
+{
+  "period_type": "hour",
+  "length": 24,
+  "channel": "LongFast",
+  "portnum": 1,
+  "to_node": 12345678,
+  "from_node": 87654321,
+  "data": [
+    { "period": "2025-08-08 14:00", "count": 10 },
+    { "period": "2025-08-08 15:00", "count": 7 }
+  ]
+}
+```
+
+Response Example (`node` totals)
+```json
+{
+  "node_id": 12345678,
+  "period_type": "hour",
+  "length": 24,
+  "sent": 42,
+  "seen": 58
+}
+```
+
+---
+
+### GET `/api/stats/count`
+Returns total packet counts, optionally filtered.
+
+Query Parameters
+- `packet_id` (optional, int): Filter packet_seen by packet ID.
+- `period_type` (optional, string): `hour` or `day`.
+- `length` (optional, int): Number of periods to include.
+- `channel` (optional, string): Filter by channel.
+- `from_node` (optional, int): Filter by source node ID.
+- `to_node` (optional, int): Filter by destination node ID.
+
+Response Example
+```json
+{
+  "total_packets": 12345,
+  "total_seen": 67890
+}
+```
+
+---
+
+### GET `/api/stats/top`
+Returns nodes sorted by packets seen, with pagination.
+
+Query Parameters
+- `period_type` (optional, string): `hour` or `day`. Default: `day`.
+- `length` (optional, int): Number of periods to include. Default: `1`.
+- `channel` (optional, string): Filter by channel.
+- `limit` (optional, int): Max nodes to return. Default: `20`, max `100`.
+- `offset` (optional, int): Pagination offset. Default: `0`.
+
+Response Example
+```json
+{
+  "total": 250,
+  "limit": 20,
+  "offset": 0,
+  "nodes": [
+    {
+      "node_id": 1234,
+      "long_name": "Alice",
+      "short_name": "A",
+      "channel": "main",
+      "sent": 100,
+      "seen": 240,
+      "avg": 2.4
+    }
+  ]
+}
+```
+
+---
+
+## 5. Edges API
+
+### GET `/api/edges`
+Returns network edges (connections between nodes) based on traceroutes and neighbor info.
+Traceroute edges are collected over the last 12 hours. Neighbor edges are based on
+port 71 packets.
+
+Query Parameters
+- `type` (optional, string): `traceroute` or `neighbor`. If omitted, returns both.
+- `node_id` (optional, int): Filter edges to only those touching a node.
+
+Response Example
+```json
+{
+  "edges": [
+    { "from": 12345678, "to": 87654321, "type": "traceroute" },
+    { "from": 11111111, "to": 22222222, "type": "neighbor" }
+  ]
+}
+```
+
+---
+
+## 6. Config API
+
+### GET `/api/config`
+Returns a safe subset of server configuration.
+
+Response Example
+```json
+{
+  "site": {
+    "domain": "example.com",
+    "language": "en",
+    "title": "Meshview",
+    "message": "",
+    "starting": "/chat",
+    "nodes": "true",
+    "chat": "true",
+    "everything": "true",
+    "graphs": "true",
+    "stats": "true",
+    "net": "true",
+    "map": "true",
+    "top": "true",
+    "map_top_left_lat": 39.0,
+    "map_top_left_lon": -123.0,
+    "map_bottom_right_lat": 36.0,
+    "map_bottom_right_lon": -121.0,
+    "map_interval": 3,
+    "firehose_interval": 3,
+    "weekly_net_message": "Weekly Mesh check-in message.",
+    "net_tag": "#BayMeshNet",
+    "version": "3.0.0"
+  },
+  "mqtt": {
+    "server": "mqtt.example.com",
+    "topics": ["msh/region/#"]
+  },
+  "cleanup": {
+    "enabled": "false",
+    "days_to_keep": "14",
+    "hour": "2",
+    "minute": "0",
+    "vacuum": "false"
+  }
+}
+```
+
+---
+
+## 7. Language API
+
+### GET `/api/lang`
+Returns translation strings.
+
+Query Parameters
+- `lang` (optional, string): Language code (e.g., `en`, `es`). Default from config or `en`.
+- `section` (optional, string): Return only one section (e.g., `nodelist`, `firehose`).
+
+Response Example
+```json
+{
+  "title": "Meshview",
+  "search_placeholder": "Search..."
+}
+```
+
+---
+
+## 8. Packets Seen API
+
+### GET `/api/packets_seen/{packet_id}`
+Returns packet_seen entries for a packet.
+
+Path Parameters
+- `packet_id` (required, int): Packet ID.
+
+Response Example
+```json
+{
+  "seen": [
+    {
+      "packet_id": 123,
+      "node_id": 456,
+      "rx_time": "2025-07-22T12:45:00",
+      "hop_limit": 7,
+      "hop_start": 0,
+      "channel": "main",
+      "rx_snr": 5.0,
+      "rx_rssi": -90,
+      "topic": "msh/region/#",
+      "import_time_us": 1736370123456789
+    }
+  ]
+}
+```
+
+---
+
+## 9. Traceroute API
+
+### GET `/api/traceroute/{packet_id}`
+Returns traceroute details and derived paths for a packet.
+
+Path Parameters
+- `packet_id` (required, int): Packet ID.
+
+Response Example
+```json
+{
+  "packet": {
+    "id": 123,
+    "from": 111,
+    "to": 222,
+    "channel": "main"
+  },
+  "traceroute_packets": [
+    {
+      "index": 0,
+      "gateway_node_id": 333,
+      "done": true,
+      "forward_hops": [111, 444, 222],
+      "reverse_hops": [222, 444, 111]
+    }
+  ],
+  "unique_forward_paths": [
+    { "path": [111, 444, 222], "count": 2 }
+  ],
+  "unique_reverse_paths": [
+    [222, 444, 111]
+  ],
+  "winning_paths": [
+    [111, 444, 222]
+  ]
+}
+```
+
+---
+
+## 10. Health API
+
+### GET `/health`
+Returns service health and database status.
+
+Response Example
+```json
+{
+  "status": "healthy",
+  "timestamp": "2025-07-22T12:45:00+00:00",
+  "version": "3.0.3",
+  "git_revision": "abc1234",
+  "database": "connected",
+  "database_size": "12.34 MB",
+  "database_size_bytes": 12939444
+}
+```
+
+---
+
+## 11. Version API
+
+### GET `/version`
+Returns version metadata.
+
+Response Example
+```json
+{
+  "version": "3.0.3",
+  "release_date": "2026-1-15",
+  "git_revision": "abc1234",
+  "git_revision_short": "abc1234"
+}
+```

docs/COVERAGE.md

@@ -0,0 +1,37 @@
+# Coverage 
+
+## Predicted coverage
+
+Meshview can display a predicted coverage boundary for a node. This is a **model**
+estimate, not a guarantee of real-world performance.
+
+### How it works
+
+The coverage boundary is computed using the Longley-Rice / ITM **area mode**
+propagation model. Area mode estimates average path loss over generic terrain
+and does not use a terrain profile. This means it captures general distance
+effects, but **does not** account for terrain shadows, buildings, or foliage.
+
+### What you are seeing
+
+The UI draws a **perimeter** (not a heatmap) that represents the furthest
+distance where predicted signal strength is above a threshold (default
+`-120 dBm`). The model is run radially from the node in multiple directions,
+and the last point above the threshold forms the outline.
+
+### Key parameters
+
+- **Frequency**: default `907 MHz`
+- **Transmit power**: default `20 dBm`
+- **Antenna heights**: default `5 m` (TX) and `1.5 m` (RX)
+- **Reliability**: default `0.5` (median)
+- **Terrain irregularity**: default `90 m` (average terrain)
+
+### Limitations
+
+- No terrain or building data is used (area mode only).
+- Results are sensitive to power, height, and threshold.
+- Environmental factors can cause large real-world deviations.
+
+
+

docs/Database-Changes-With-Alembic.md

@@ -0,0 +1,146 @@
+# Database Changes With Alembic
+
+This guide explains how to make database schema changes in MeshView using Alembic migrations.
+
+## Overview
+
+When you need to add, modify, or remove columns from database tables, you must:
+1. Update the SQLAlchemy model
+2. Create an Alembic migration
+3. Let the system automatically apply the migration
+
+## Step-by-Step Process
+
+### 1. Update the Model
+
+Edit `meshview/models.py` to add/modify the column in the appropriate model class:
+
+```python
+class Traceroute(Base):
+    __tablename__ = "traceroute"
+
+    id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
+    # ... existing columns ...
+    route_return: Mapped[bytes] = mapped_column(nullable=True)  # New column
+```
+
+### 2. Create an Alembic Migration
+
+Generate a new migration file with a descriptive message:
+
+```bash
+./env/bin/alembic revision -m "add route_return to traceroute"
+```
+
+This creates a new file in `alembic/versions/` with a unique revision ID.
+
+### 3. Fill in the Migration
+
+Edit the generated migration file to implement the actual database changes:
+
+```python
+def upgrade() -> None:
+    # Add route_return column to traceroute table
+    with op.batch_alter_table('traceroute', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('route_return', sa.LargeBinary(), nullable=True))
+
+
+def downgrade() -> None:
+    # Remove route_return column from traceroute table
+    with op.batch_alter_table('traceroute', schema=None) as batch_op:
+        batch_op.drop_column('route_return')
+```
+
+### 4. Migration Runs Automatically
+
+When you restart the application with `mvrun.py`:
+
+1. The writer process (`startdb.py`) starts up
+2. It checks if the database schema is up to date
+3. If new migrations are pending, it runs them automatically
+4. The reader process (web server) waits for migrations to complete before starting
+
+**No manual migration command is needed** - the application handles this automatically on startup.
+
+### 5. Commit Both Files
+
+Add both files to git:
+
+```bash
+git add meshview/models.py
+git add alembic/versions/ac311b3782a1_add_route_return_to_traceroute.py
+git commit -m "Add route_return column to traceroute table"
+```
+
+## Important Notes
+
+### SQLite Compatibility
+
+Always use `batch_alter_table` for SQLite compatibility:
+
+```python
+with op.batch_alter_table('table_name', schema=None) as batch_op:
+    batch_op.add_column(...)
+```
+
+SQLite has limited ALTER TABLE support, and `batch_alter_table` works around these limitations.
+
+### Migration Process
+
+- **Writer process** (`startdb.py`): Runs migrations on startup
+- **Reader process** (web server in `main.py`): Waits for migrations to complete
+- Migrations are checked and applied every time the application starts
+- The system uses a migration status table to coordinate between processes
+
+### Common Column Types
+
+```python
+# Integer
+column: Mapped[int] = mapped_column(BigInteger, nullable=True)
+
+# String
+column: Mapped[str] = mapped_column(nullable=True)
+
+# Bytes/Binary
+column: Mapped[bytes] = mapped_column(nullable=True)
+
+# DateTime
+column: Mapped[datetime] = mapped_column(nullable=True)
+
+# Boolean
+column: Mapped[bool] = mapped_column(nullable=True)
+
+# Float
+column: Mapped[float] = mapped_column(nullable=True)
+```
+
+### Migration File Location
+
+Migrations are stored in: `alembic/versions/`
+
+Each migration file includes:
+- Revision ID (unique identifier)
+- Down revision (previous migration in chain)
+- Create date
+- `upgrade()` function (applies changes)
+- `downgrade()` function (reverts changes)
+
+## Troubleshooting
+
+### Migration Not Running
+
+If migrations don't run automatically:
+
+1. Check that the database is writable
+2. Look for errors in the startup logs
+3. Verify the migration chain is correct (each migration references the previous one)
+
+### Manual Migration (Not Recommended)
+
+If you need to manually run migrations for debugging:
+
+```bash
+./env/bin/alembic upgrade head
+```
+
+However, the application normally handles this automatically.

docs/README.md

@@ -0,0 +1,14 @@
+# Technical Documentation
+
+This directory contains technical documentation for MeshView that goes beyond initial setup and basic usage.
+
+These documents are intended for developers, contributors, and advanced users who need deeper insight into the system's architecture, database migrations, API endpoints, and internal workings.
+
+## Contents
+
+- [ALEMBIC_SETUP.md](ALEMBIC_SETUP.md) - Database migration setup and management
+- [TIMESTAMP_MIGRATION.md](TIMESTAMP_MIGRATION.md) - Details on timestamp schema changes
+- [API_Documentation.md](API_Documentation.md) - REST API endpoints and usage
+- [CODE_IMPROVEMENTS.md](CODE_IMPROVEMENTS.md) - Suggested code improvements and refactoring ideas
+
+For initial setup and basic usage instructions, please see the main [README.md](../README.md) in the root directory.

docs/TIMESTAMP_MIGRATION.md

@@ -0,0 +1,193 @@
+# High-Resolution Timestamp Migration
+
+This document describes the implementation of GitHub issue #55: storing high-resolution timestamps as integers in the database for improved performance and query efficiency.
+
+## Overview
+
+The meshview database now stores timestamps in two formats:
+1. **TEXT format** (`import_time`): Human-readable ISO8601 format with microseconds (e.g., `2025-03-12 04:15:56.058038`)
+2. **INTEGER format** (`import_time_us`): Microseconds since Unix epoch (1970-01-01 00:00:00 UTC)
+
+The dual format approach provides:
+- **Backward compatibility**: Existing `import_time` TEXT columns remain unchanged
+- **Performance**: Fast integer comparisons and math operations
+- **Precision**: Microsecond resolution for accurate timing
+- **Efficiency**: Compact storage and fast indexed lookups
+
+## Database Changes
+
+### New Columns Added
+
+Three tables have new `import_time_us` columns:
+
+1. **packet.import_time_us** (INTEGER)
+   - Stores when the packet was imported into the database
+   - Indexed for fast queries
+
+2. **packet_seen.import_time_us** (INTEGER)
+   - Stores when the packet_seen record was imported
+   - Indexed for performance
+
+3. **traceroute.import_time_us** (INTEGER)
+   - Stores when the traceroute was imported
+   - Indexed for fast lookups
+
+### New Indexes
+
+The following indexes were created for optimal query performance:
+
+```sql
+CREATE INDEX idx_packet_import_time_us ON packet(import_time_us DESC);
+CREATE INDEX idx_packet_from_node_time_us ON packet(from_node_id, import_time_us DESC);
+CREATE INDEX idx_packet_seen_import_time_us ON packet_seen(import_time_us);
+CREATE INDEX idx_traceroute_import_time_us ON traceroute(import_time_us);
+```
+
+## Migration Process
+
+### For Existing Databases
+
+Run the migration script to add the new columns and populate them from existing data:
+
+```bash
+python migrate_add_timestamp_us.py [database_path]
+```
+
+If no path is provided, it defaults to `packets.db` in the current directory.
+
+The migration script:
+1. Checks if migration is needed (idempotent)
+2. Adds `import_time_us` columns to the three tables
+3. Populates the new columns from existing `import_time` values
+4. Creates indexes for optimal performance
+5. Verifies the migration completed successfully
+
+### For New Databases
+
+New databases created with the updated schema will automatically include the `import_time_us` columns. The MQTT store module populates both columns when inserting new records.
+
+## Code Changes
+
+### Models (meshview/models.py)
+
+The ORM models now include the new `import_time_us` fields:
+
+```python
+class Packet(Base):
+    import_time: Mapped[datetime] = mapped_column(nullable=True)
+    import_time_us: Mapped[int] = mapped_column(BigInteger, nullable=True)
+```
+
+### MQTT Store (meshview/mqtt_store.py)
+
+The data ingestion logic now populates both timestamp columns using UTC time:
+
+```python
+now = datetime.datetime.now(datetime.timezone.utc)
+now_us = int(now.timestamp() * 1_000_000)
+
+# Both columns are populated
+import_time=now,
+import_time_us=now_us,
+```
+
+**Important**: All new timestamps use UTC (Coordinated Universal Time) for consistency across time zones.
+
+## Using the New Timestamps
+
+### Example Queries
+
+**Query packets from the last 7 days:**
+
+```sql
+-- Old way (slower)
+SELECT * FROM packet 
+WHERE import_time >= datetime('now', '-7 days');
+
+-- New way (faster)
+SELECT * FROM packet
+WHERE import_time_us >= (strftime('%s', 'now', '-7 days') * 1000000);
+```
+
+**Query packets in a specific time range:**
+
+```sql
+SELECT * FROM packet
+WHERE import_time_us BETWEEN 1759254380000000 AND 1759254390000000;
+```
+
+**Calculate time differences (in microseconds):**
+
+```sql
+SELECT 
+    id,
+    (import_time_us - LAG(import_time_us) OVER (ORDER BY import_time_us)) / 1000000.0 as seconds_since_last
+FROM packet
+LIMIT 10;
+```
+
+### Converting Timestamps
+
+**From datetime to microseconds (UTC):**
+```python
+import datetime
+now = datetime.datetime.now(datetime.timezone.utc)
+now_us = int(now.timestamp() * 1_000_000)
+```
+
+**From microseconds to datetime:**
+```python
+import datetime
+timestamp_us = 1759254380813451
+dt = datetime.datetime.fromtimestamp(timestamp_us / 1_000_000)
+```
+
+**In SQL queries:**
+```sql
+-- Datetime to microseconds
+SELECT CAST((strftime('%s', import_time) || substr(import_time, 21, 6)) AS INTEGER);
+
+-- Microseconds to datetime (approximate)
+SELECT datetime(import_time_us / 1000000, 'unixepoch');
+```
+
+## Performance Benefits
+
+The integer timestamp columns provide significant performance improvements:
+
+1. **Faster comparisons**: Integer comparisons are much faster than string/datetime comparisons
+2. **Smaller index size**: Integer indexes are more compact than datetime indexes
+3. **Range queries**: BETWEEN operations on integers are highly optimized
+4. **Math operations**: Easy to calculate time differences, averages, etc.
+5. **Sorting**: Integer sorting is faster than datetime sorting
+
+## Backward Compatibility
+
+The original `import_time` TEXT columns remain unchanged:
+- Existing code continues to work
+- Human-readable timestamps still available
+- Gradual migration to new columns possible
+- No breaking changes for existing queries
+
+## Future Work
+
+Future improvements could include:
+- Migrating queries to use `import_time_us` columns
+- Deprecating the TEXT `import_time` columns (after transition period)
+- Adding helper functions for timestamp conversion
+- Creating views that expose both formats
+
+## Testing
+
+The migration was tested on a production database with:
+- 132,466 packet records
+- 1,385,659 packet_seen records  
+- 28,414 traceroute records
+
+All records were successfully migrated with microsecond precision preserved.
+
+## References
+
+- GitHub Issue: #55 - Storing High-Resolution Timestamps in SQLite
+- SQLite datetime functions: https://www.sqlite.org/lang_datefunc.html
+- Python datetime module: https://docs.python.org/3/library/datetime.html

main.py

@@ -1,12 +1,12 @@
 import asyncio
+
 from meshview import web
 
-async def main():
 
+async def main():
     async with asyncio.TaskGroup() as tg:
-        tg.create_task(
-            web.run_server()
-        )
+        tg.create_task(web.run_server())
+
 
 if __name__ == '__main__':
     asyncio.run(main())

meshtastic/protobuf/UPSTREAM_REV.txt

@@ -0,0 +1 @@
+9ab4a1d08cb833d897aee2367013318718391f2f

meshtastic/protobuf/apponly_pb2.py

@@ -2,10 +2,10 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: meshtastic/protobuf/apponly.proto
 """Generated protocol buffer code."""
+from google.protobuf.internal import builder as _builder
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
 from google.protobuf import symbol_database as _symbol_database
-from google.protobuf.internal import builder as _builder
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -15,14 +15,14 @@ from meshtastic.protobuf import channel_pb2 as meshtastic_dot_protobuf_dot_chann
 from meshtastic.protobuf import config_pb2 as meshtastic_dot_protobuf_dot_config__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n!meshtastic/protobuf/apponly.proto\x12\x13meshtastic.protobuf\x1a!meshtastic/protobuf/channel.proto\x1a meshtastic/protobuf/config.proto\"\x81\x01\n\nChannelSet\x12\x36\n\x08settings\x18\x01 \x03(\x0b\x32$.meshtastic.protobuf.ChannelSettings\x12;\n\x0blora_config\x18\x02 \x01(\x0b\x32&.meshtastic.protobuf.Config.LoRaConfigBb\n\x13\x63om.geeksville.meshB\rAppOnlyProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n!meshtastic/protobuf/apponly.proto\x12\x13meshtastic.protobuf\x1a!meshtastic/protobuf/channel.proto\x1a meshtastic/protobuf/config.proto\"\x81\x01\n\nChannelSet\x12\x36\n\x08settings\x18\x01 \x03(\x0b\x32$.meshtastic.protobuf.ChannelSettings\x12;\n\x0blora_config\x18\x02 \x01(\x0b\x32&.meshtastic.protobuf.Config.LoRaConfigBc\n\x14org.meshtastic.protoB\rAppOnlyProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
 
-_globals = globals()
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.apponly_pb2', _globals)
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.apponly_pb2', globals())
 if _descriptor._USE_C_DESCRIPTORS == False:
+
   DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\rAppOnlyProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
-  _globals['_CHANNELSET']._serialized_start=128
-  _globals['_CHANNELSET']._serialized_end=257
+  DESCRIPTOR._serialized_options = b'\n\024org.meshtastic.protoB\rAppOnlyProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
+  _CHANNELSET._serialized_start=128
+  _CHANNELSET._serialized_end=257
 # @@protoc_insertion_point(module_scope)

meshtastic/protobuf/apponly_pb2.pyi

@@ -1,52 +1,16 @@
-"""
-@generated by mypy-protobuf.  Do not edit manually!
-isort:skip_file
-"""
+from meshtastic.protobuf import channel_pb2 as _channel_pb2
+from meshtastic.protobuf import config_pb2 as _config_pb2
+from google.protobuf.internal import containers as _containers
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from typing import ClassVar as _ClassVar, Iterable as _Iterable, Mapping as _Mapping, Optional as _Optional, Union as _Union
 
-import builtins
-import collections.abc
-import google.protobuf.descriptor
-import google.protobuf.internal.containers
-import google.protobuf.message
-import meshtastic.protobuf.channel_pb2
-import meshtastic.protobuf.config_pb2
-import typing
+DESCRIPTOR: _descriptor.FileDescriptor
 
-DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
-
-@typing.final
-class ChannelSet(google.protobuf.message.Message):
-    """
-    This is the most compact possible representation for a set of channels.
-    It includes only one PRIMARY channel (which must be first) and
-    any SECONDARY channels.
-    No DISABLED channels are included.
-    This abstraction is used only on the the 'app side' of the world (ie python, javascript and android etc) to show a group of Channels as a (long) URL
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    SETTINGS_FIELD_NUMBER: builtins.int
-    LORA_CONFIG_FIELD_NUMBER: builtins.int
-    @property
-    def settings(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[meshtastic.protobuf.channel_pb2.ChannelSettings]:
-        """
-        Channel list with settings
-        """
-
-    @property
-    def lora_config(self) -> meshtastic.protobuf.config_pb2.Config.LoRaConfig:
-        """
-        LoRa config
-        """
-
-    def __init__(
-        self,
-        *,
-        settings: collections.abc.Iterable[meshtastic.protobuf.channel_pb2.ChannelSettings] | None = ...,
-        lora_config: meshtastic.protobuf.config_pb2.Config.LoRaConfig | None = ...,
-    ) -> None: ...
-    def HasField(self, field_name: typing.Literal["lora_config", b"lora_config"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing.Literal["lora_config", b"lora_config", "settings", b"settings"]) -> None: ...
-
-global___ChannelSet = ChannelSet
+class ChannelSet(_message.Message):
+    __slots__ = ["lora_config", "settings"]
+    LORA_CONFIG_FIELD_NUMBER: _ClassVar[int]
+    SETTINGS_FIELD_NUMBER: _ClassVar[int]
+    lora_config: _config_pb2.Config.LoRaConfig
+    settings: _containers.RepeatedCompositeFieldContainer[_channel_pb2.ChannelSettings]
+    def __init__(self, settings: _Optional[_Iterable[_Union[_channel_pb2.ChannelSettings, _Mapping]]] = ..., lora_config: _Optional[_Union[_config_pb2.Config.LoRaConfig, _Mapping]] = ...) -> None: ...

meshtastic/protobuf/cannedmessages_pb2.py

@@ -2,10 +2,10 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: meshtastic/protobuf/cannedmessages.proto
 """Generated protocol buffer code."""
+from google.protobuf.internal import builder as _builder
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
 from google.protobuf import symbol_database as _symbol_database
-from google.protobuf.internal import builder as _builder
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -13,14 +13,14 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n(meshtastic/protobuf/cannedmessages.proto\x12\x13meshtastic.protobuf\"-\n\x19\x43\x61nnedMessageModuleConfig\x12\x10\n\x08messages\x18\x01 \x01(\tBn\n\x13\x63om.geeksville.meshB\x19\x43\x61nnedMessageConfigProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n(meshtastic/protobuf/cannedmessages.proto\x12\x13meshtastic.protobuf\"-\n\x19\x43\x61nnedMessageModuleConfig\x12\x10\n\x08messages\x18\x01 \x01(\tBo\n\x14org.meshtastic.protoB\x19\x43\x61nnedMessageConfigProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
 
-_globals = globals()
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.cannedmessages_pb2', _globals)
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.cannedmessages_pb2', globals())
 if _descriptor._USE_C_DESCRIPTORS == False:
+
   DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\031CannedMessageConfigProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
-  _globals['_CANNEDMESSAGEMODULECONFIG']._serialized_start=65
-  _globals['_CANNEDMESSAGEMODULECONFIG']._serialized_end=110
+  DESCRIPTOR._serialized_options = b'\n\024org.meshtastic.protoB\031CannedMessageConfigProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
+  _CANNEDMESSAGEMODULECONFIG._serialized_start=65
+  _CANNEDMESSAGEMODULECONFIG._serialized_end=110
 # @@protoc_insertion_point(module_scope)

meshtastic/protobuf/cannedmessages_pb2.pyi

@@ -1,33 +1,11 @@
-"""
-@generated by mypy-protobuf.  Do not edit manually!
-isort:skip_file
-"""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from typing import ClassVar as _ClassVar, Optional as _Optional
 
-import builtins
-import google.protobuf.descriptor
-import google.protobuf.message
-import typing
+DESCRIPTOR: _descriptor.FileDescriptor
 
-DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
-
-@typing.final
-class CannedMessageModuleConfig(google.protobuf.message.Message):
-    """
-    Canned message module configuration.
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    MESSAGES_FIELD_NUMBER: builtins.int
-    messages: builtins.str
-    """
-    Predefined messages for canned message module separated by '|' characters.
-    """
-    def __init__(
-        self,
-        *,
-        messages: builtins.str = ...,
-    ) -> None: ...
-    def ClearField(self, field_name: typing.Literal["messages", b"messages"]) -> None: ...
-
-global___CannedMessageModuleConfig = CannedMessageModuleConfig
+class CannedMessageModuleConfig(_message.Message):
+    __slots__ = ["messages"]
+    MESSAGES_FIELD_NUMBER: _ClassVar[int]
+    messages: str
+    def __init__(self, messages: _Optional[str] = ...) -> None: ...

meshtastic/protobuf/channel_pb2.py

@@ -2,10 +2,10 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: meshtastic/protobuf/channel.proto
 """Generated protocol buffer code."""
+from google.protobuf.internal import builder as _builder
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
 from google.protobuf import symbol_database as _symbol_database
-from google.protobuf.internal import builder as _builder
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -13,22 +13,22 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n!meshtastic/protobuf/channel.proto\x12\x13meshtastic.protobuf\"\xc1\x01\n\x0f\x43hannelSettings\x12\x17\n\x0b\x63hannel_num\x18\x01 \x01(\rB\x02\x18\x01\x12\x0b\n\x03psk\x18\x02 \x01(\x0c\x12\x0c\n\x04name\x18\x03 \x01(\t\x12\n\n\x02id\x18\x04 \x01(\x07\x12\x16\n\x0euplink_enabled\x18\x05 \x01(\x08\x12\x18\n\x10\x64ownlink_enabled\x18\x06 \x01(\x08\x12<\n\x0fmodule_settings\x18\x07 \x01(\x0b\x32#.meshtastic.protobuf.ModuleSettings\"E\n\x0eModuleSettings\x12\x1a\n\x12position_precision\x18\x01 \x01(\r\x12\x17\n\x0fis_client_muted\x18\x02 \x01(\x08\"\xb3\x01\n\x07\x43hannel\x12\r\n\x05index\x18\x01 \x01(\x05\x12\x36\n\x08settings\x18\x02 \x01(\x0b\x32$.meshtastic.protobuf.ChannelSettings\x12/\n\x04role\x18\x03 \x01(\x0e\x32!.meshtastic.protobuf.Channel.Role\"0\n\x04Role\x12\x0c\n\x08\x44ISABLED\x10\x00\x12\x0b\n\x07PRIMARY\x10\x01\x12\r\n\tSECONDARY\x10\x02\x42\x62\n\x13\x63om.geeksville.meshB\rChannelProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n!meshtastic/protobuf/channel.proto\x12\x13meshtastic.protobuf\"\xc1\x01\n\x0f\x43hannelSettings\x12\x17\n\x0b\x63hannel_num\x18\x01 \x01(\rB\x02\x18\x01\x12\x0b\n\x03psk\x18\x02 \x01(\x0c\x12\x0c\n\x04name\x18\x03 \x01(\t\x12\n\n\x02id\x18\x04 \x01(\x07\x12\x16\n\x0euplink_enabled\x18\x05 \x01(\x08\x12\x18\n\x10\x64ownlink_enabled\x18\x06 \x01(\x08\x12<\n\x0fmodule_settings\x18\x07 \x01(\x0b\x32#.meshtastic.protobuf.ModuleSettings\">\n\x0eModuleSettings\x12\x1a\n\x12position_precision\x18\x01 \x01(\r\x12\x10\n\x08is_muted\x18\x02 \x01(\x08\"\xb3\x01\n\x07\x43hannel\x12\r\n\x05index\x18\x01 \x01(\x05\x12\x36\n\x08settings\x18\x02 \x01(\x0b\x32$.meshtastic.protobuf.ChannelSettings\x12/\n\x04role\x18\x03 \x01(\x0e\x32!.meshtastic.protobuf.Channel.Role\"0\n\x04Role\x12\x0c\n\x08\x44ISABLED\x10\x00\x12\x0b\n\x07PRIMARY\x10\x01\x12\r\n\tSECONDARY\x10\x02\x42\x63\n\x14org.meshtastic.protoB\rChannelProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
 
-_globals = globals()
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.channel_pb2', _globals)
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.channel_pb2', globals())
 if _descriptor._USE_C_DESCRIPTORS == False:
+
   DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\rChannelProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
+  DESCRIPTOR._serialized_options = b'\n\024org.meshtastic.protoB\rChannelProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
   _CHANNELSETTINGS.fields_by_name['channel_num']._options = None
   _CHANNELSETTINGS.fields_by_name['channel_num']._serialized_options = b'\030\001'
-  _globals['_CHANNELSETTINGS']._serialized_start=59
-  _globals['_CHANNELSETTINGS']._serialized_end=252
-  _globals['_MODULESETTINGS']._serialized_start=254
-  _globals['_MODULESETTINGS']._serialized_end=323
-  _globals['_CHANNEL']._serialized_start=326
-  _globals['_CHANNEL']._serialized_end=505
-  _globals['_CHANNEL_ROLE']._serialized_start=457
-  _globals['_CHANNEL_ROLE']._serialized_end=505
+  _CHANNELSETTINGS._serialized_start=59
+  _CHANNELSETTINGS._serialized_end=252
+  _MODULESETTINGS._serialized_start=254
+  _MODULESETTINGS._serialized_end=316
+  _CHANNEL._serialized_start=319
+  _CHANNEL._serialized_end=498
+  _CHANNEL_ROLE._serialized_start=450
+  _CHANNEL_ROLE._serialized_end=498
 # @@protoc_insertion_point(module_scope)

meshtastic/protobuf/channel_pb2.pyi

@@ -1,234 +1,47 @@
-"""
-@generated by mypy-protobuf.  Do not edit manually!
-isort:skip_file
-"""
+from google.protobuf.internal import enum_type_wrapper as _enum_type_wrapper
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from typing import ClassVar as _ClassVar, Mapping as _Mapping, Optional as _Optional, Union as _Union
 
-import builtins
-import google.protobuf.descriptor
-import google.protobuf.internal.enum_type_wrapper
-import google.protobuf.message
-import sys
-import typing
+DESCRIPTOR: _descriptor.FileDescriptor
 
-if sys.version_info >= (3, 10):
-    import typing as typing_extensions
-else:
-    import typing_extensions
+class Channel(_message.Message):
+    __slots__ = ["index", "role", "settings"]
+    class Role(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
+        __slots__ = []
+    DISABLED: Channel.Role
+    INDEX_FIELD_NUMBER: _ClassVar[int]
+    PRIMARY: Channel.Role
+    ROLE_FIELD_NUMBER: _ClassVar[int]
+    SECONDARY: Channel.Role
+    SETTINGS_FIELD_NUMBER: _ClassVar[int]
+    index: int
+    role: Channel.Role
+    settings: ChannelSettings
+    def __init__(self, index: _Optional[int] = ..., settings: _Optional[_Union[ChannelSettings, _Mapping]] = ..., role: _Optional[_Union[Channel.Role, str]] = ...) -> None: ...
 
-DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
+class ChannelSettings(_message.Message):
+    __slots__ = ["channel_num", "downlink_enabled", "id", "module_settings", "name", "psk", "uplink_enabled"]
+    CHANNEL_NUM_FIELD_NUMBER: _ClassVar[int]
+    DOWNLINK_ENABLED_FIELD_NUMBER: _ClassVar[int]
+    ID_FIELD_NUMBER: _ClassVar[int]
+    MODULE_SETTINGS_FIELD_NUMBER: _ClassVar[int]
+    NAME_FIELD_NUMBER: _ClassVar[int]
+    PSK_FIELD_NUMBER: _ClassVar[int]
+    UPLINK_ENABLED_FIELD_NUMBER: _ClassVar[int]
+    channel_num: int
+    downlink_enabled: bool
+    id: int
+    module_settings: ModuleSettings
+    name: str
+    psk: bytes
+    uplink_enabled: bool
+    def __init__(self, channel_num: _Optional[int] = ..., psk: _Optional[bytes] = ..., name: _Optional[str] = ..., id: _Optional[int] = ..., uplink_enabled: bool = ..., downlink_enabled: bool = ..., module_settings: _Optional[_Union[ModuleSettings, _Mapping]] = ...) -> None: ...
 
-@typing.final
-class ChannelSettings(google.protobuf.message.Message):
-    """
-    This information can be encoded as a QRcode/url so that other users can configure
-    their radio to join the same channel.
-    A note about how channel names are shown to users: channelname-X
-    poundsymbol is a prefix used to indicate this is a channel name (idea from @professr).
-    Where X is a letter from A-Z (base 26) representing a hash of the PSK for this
-    channel - so that if the user changes anything about the channel (which does
-    force a new PSK) this letter will also change. Thus preventing user confusion if
-    two friends try to type in a channel name of "BobsChan" and then can't talk
-    because their PSKs will be different.
-    The PSK is hashed into this letter by "0x41 + [xor all bytes of the psk ] modulo 26"
-    This also allows the option of someday if people have the PSK off (zero), the
-    users COULD type in a channel name and be able to talk.
-    FIXME: Add description of multi-channel support and how primary vs secondary channels are used.
-    FIXME: explain how apps use channels for security.
-    explain how remote settings and remote gpio are managed as an example
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    CHANNEL_NUM_FIELD_NUMBER: builtins.int
-    PSK_FIELD_NUMBER: builtins.int
-    NAME_FIELD_NUMBER: builtins.int
-    ID_FIELD_NUMBER: builtins.int
-    UPLINK_ENABLED_FIELD_NUMBER: builtins.int
-    DOWNLINK_ENABLED_FIELD_NUMBER: builtins.int
-    MODULE_SETTINGS_FIELD_NUMBER: builtins.int
-    channel_num: builtins.int
-    """
-    Deprecated in favor of LoraConfig.channel_num
-    """
-    psk: builtins.bytes
-    """
-    A simple pre-shared key for now for crypto.
-    Must be either 0 bytes (no crypto), 16 bytes (AES128), or 32 bytes (AES256).
-    A special shorthand is used for 1 byte long psks.
-    These psks should be treated as only minimally secure,
-    because they are listed in this source code.
-    Those bytes are mapped using the following scheme:
-    `0` = No crypto
-    `1` = The special "default" channel key: {0xd4, 0xf1, 0xbb, 0x3a, 0x20, 0x29, 0x07, 0x59, 0xf0, 0xbc, 0xff, 0xab, 0xcf, 0x4e, 0x69, 0x01}
-    `2` through 10 = The default channel key, except with 1 through 9 added to the last byte.
-    Shown to user as simple1 through 10
-    """
-    name: builtins.str
-    """
-    A SHORT name that will be packed into the URL.
-    Less than 12 bytes.
-    Something for end users to call the channel
-    If this is the empty string it is assumed that this channel
-    is the special (minimally secure) "Default"channel.
-    In user interfaces it should be rendered as a local language translation of "X".
-    For channel_num hashing empty string will be treated as "X".
-    Where "X" is selected based on the English words listed above for ModemPreset
-    """
-    id: builtins.int
-    """
-    Used to construct a globally unique channel ID.
-    The full globally unique ID will be: "name.id" where ID is shown as base36.
-    Assuming that the number of meshtastic users is below 20K (true for a long time)
-    the chance of this 64 bit random number colliding with anyone else is super low.
-    And the penalty for collision is low as well, it just means that anyone trying to decrypt channel messages might need to
-    try multiple candidate channels.
-    Any time a non wire compatible change is made to a channel, this field should be regenerated.
-    There are a small number of 'special' globally known (and fairly) insecure standard channels.
-    Those channels do not have a numeric id included in the settings, but instead it is pulled from
-    a table of well known IDs.
-    (see Well Known Channels FIXME)
-    """
-    uplink_enabled: builtins.bool
-    """
-    If true, messages on the mesh will be sent to the *public* internet by any gateway ndoe
-    """
-    downlink_enabled: builtins.bool
-    """
-    If true, messages seen on the internet will be forwarded to the local mesh.
-    """
-    @property
-    def module_settings(self) -> global___ModuleSettings:
-        """
-        Per-channel module settings.
-        """
-
-    def __init__(
-        self,
-        *,
-        channel_num: builtins.int = ...,
-        psk: builtins.bytes = ...,
-        name: builtins.str = ...,
-        id: builtins.int = ...,
-        uplink_enabled: builtins.bool = ...,
-        downlink_enabled: builtins.bool = ...,
-        module_settings: global___ModuleSettings | None = ...,
-    ) -> None: ...
-    def HasField(self, field_name: typing.Literal["module_settings", b"module_settings"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing.Literal["channel_num", b"channel_num", "downlink_enabled", b"downlink_enabled", "id", b"id", "module_settings", b"module_settings", "name", b"name", "psk", b"psk", "uplink_enabled", b"uplink_enabled"]) -> None: ...
-
-global___ChannelSettings = ChannelSettings
-
-@typing.final
-class ModuleSettings(google.protobuf.message.Message):
-    """
-    This message is specifically for modules to store per-channel configuration data.
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    POSITION_PRECISION_FIELD_NUMBER: builtins.int
-    IS_CLIENT_MUTED_FIELD_NUMBER: builtins.int
-    position_precision: builtins.int
-    """
-    Bits of precision for the location sent in position packets.
-    """
-    is_client_muted: builtins.bool
-    """
-    Controls whether or not the phone / clients should mute the current channel
-    Useful for noisy public channels you don't necessarily want to disable
-    """
-    def __init__(
-        self,
-        *,
-        position_precision: builtins.int = ...,
-        is_client_muted: builtins.bool = ...,
-    ) -> None: ...
-    def ClearField(self, field_name: typing.Literal["is_client_muted", b"is_client_muted", "position_precision", b"position_precision"]) -> None: ...
-
-global___ModuleSettings = ModuleSettings
-
-@typing.final
-class Channel(google.protobuf.message.Message):
-    """
-    A pair of a channel number, mode and the (sharable) settings for that channel
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    class _Role:
-        ValueType = typing.NewType("ValueType", builtins.int)
-        V: typing_extensions.TypeAlias = ValueType
-
-    class _RoleEnumTypeWrapper(google.protobuf.internal.enum_type_wrapper._EnumTypeWrapper[Channel._Role.ValueType], builtins.type):
-        DESCRIPTOR: google.protobuf.descriptor.EnumDescriptor
-        DISABLED: Channel._Role.ValueType  # 0
-        """
-        This channel is not in use right now
-        """
-        PRIMARY: Channel._Role.ValueType  # 1
-        """
-        This channel is used to set the frequency for the radio - all other enabled channels must be SECONDARY
-        """
-        SECONDARY: Channel._Role.ValueType  # 2
-        """
-        Secondary channels are only used for encryption/decryption/authentication purposes.
-        Their radio settings (freq etc) are ignored, only psk is used.
-        """
-
-    class Role(_Role, metaclass=_RoleEnumTypeWrapper):
-        """
-        How this channel is being used (or not).
-        Note: this field is an enum to give us options for the future.
-        In particular, someday we might make a 'SCANNING' option.
-        SCANNING channels could have different frequencies and the radio would
-        occasionally check that freq to see if anything is being transmitted.
-        For devices that have multiple physical radios attached, we could keep multiple PRIMARY/SCANNING channels active at once to allow
-        cross band routing as needed.
-        If a device has only a single radio (the common case) only one channel can be PRIMARY at a time
-        (but any number of SECONDARY channels can't be sent received on that common frequency)
-        """
-
-    DISABLED: Channel.Role.ValueType  # 0
-    """
-    This channel is not in use right now
-    """
-    PRIMARY: Channel.Role.ValueType  # 1
-    """
-    This channel is used to set the frequency for the radio - all other enabled channels must be SECONDARY
-    """
-    SECONDARY: Channel.Role.ValueType  # 2
-    """
-    Secondary channels are only used for encryption/decryption/authentication purposes.
-    Their radio settings (freq etc) are ignored, only psk is used.
-    """
-
-    INDEX_FIELD_NUMBER: builtins.int
-    SETTINGS_FIELD_NUMBER: builtins.int
-    ROLE_FIELD_NUMBER: builtins.int
-    index: builtins.int
-    """
-    The index of this channel in the channel table (from 0 to MAX_NUM_CHANNELS-1)
-    (Someday - not currently implemented) An index of -1 could be used to mean "set by name",
-    in which case the target node will find and set the channel by settings.name.
-    """
-    role: global___Channel.Role.ValueType
-    """
-    TODO: REPLACE
-    """
-    @property
-    def settings(self) -> global___ChannelSettings:
-        """
-        The new settings, or NULL to disable that channel
-        """
-
-    def __init__(
-        self,
-        *,
-        index: builtins.int = ...,
-        settings: global___ChannelSettings | None = ...,
-        role: global___Channel.Role.ValueType = ...,
-    ) -> None: ...
-    def HasField(self, field_name: typing.Literal["settings", b"settings"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing.Literal["index", b"index", "role", b"role", "settings", b"settings"]) -> None: ...
-
-global___Channel = Channel
+class ModuleSettings(_message.Message):
+    __slots__ = ["is_muted", "position_precision"]
+    IS_MUTED_FIELD_NUMBER: _ClassVar[int]
+    POSITION_PRECISION_FIELD_NUMBER: _ClassVar[int]
+    is_muted: bool
+    position_precision: int
+    def __init__(self, position_precision: _Optional[int] = ..., is_muted: bool = ...) -> None: ...

meshtastic/protobuf/clientonly_pb2.py

@@ -2,10 +2,10 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: meshtastic/protobuf/clientonly.proto
 """Generated protocol buffer code."""
+from google.protobuf.internal import builder as _builder
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
 from google.protobuf import symbol_database as _symbol_database
-from google.protobuf.internal import builder as _builder
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -15,14 +15,14 @@ from meshtastic.protobuf import localonly_pb2 as meshtastic_dot_protobuf_dot_loc
 from meshtastic.protobuf import mesh_pb2 as meshtastic_dot_protobuf_dot_mesh__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n$meshtastic/protobuf/clientonly.proto\x12\x13meshtastic.protobuf\x1a#meshtastic/protobuf/localonly.proto\x1a\x1emeshtastic/protobuf/mesh.proto\"\xc4\x03\n\rDeviceProfile\x12\x16\n\tlong_name\x18\x01 \x01(\tH\x00\x88\x01\x01\x12\x17\n\nshort_name\x18\x02 \x01(\tH\x01\x88\x01\x01\x12\x18\n\x0b\x63hannel_url\x18\x03 \x01(\tH\x02\x88\x01\x01\x12\x35\n\x06\x63onfig\x18\x04 \x01(\x0b\x32 .meshtastic.protobuf.LocalConfigH\x03\x88\x01\x01\x12\x42\n\rmodule_config\x18\x05 \x01(\x0b\x32&.meshtastic.protobuf.LocalModuleConfigH\x04\x88\x01\x01\x12:\n\x0e\x66ixed_position\x18\x06 \x01(\x0b\x32\x1d.meshtastic.protobuf.PositionH\x05\x88\x01\x01\x12\x15\n\x08ringtone\x18\x07 \x01(\tH\x06\x88\x01\x01\x12\x1c\n\x0f\x63\x61nned_messages\x18\x08 \x01(\tH\x07\x88\x01\x01\x42\x0c\n\n_long_nameB\r\n\x0b_short_nameB\x0e\n\x0c_channel_urlB\t\n\x07_configB\x10\n\x0e_module_configB\x11\n\x0f_fixed_positionB\x0b\n\t_ringtoneB\x12\n\x10_canned_messagesBe\n\x13\x63om.geeksville.meshB\x10\x43lientOnlyProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n$meshtastic/protobuf/clientonly.proto\x12\x13meshtastic.protobuf\x1a#meshtastic/protobuf/localonly.proto\x1a\x1emeshtastic/protobuf/mesh.proto\"\xc4\x03\n\rDeviceProfile\x12\x16\n\tlong_name\x18\x01 \x01(\tH\x00\x88\x01\x01\x12\x17\n\nshort_name\x18\x02 \x01(\tH\x01\x88\x01\x01\x12\x18\n\x0b\x63hannel_url\x18\x03 \x01(\tH\x02\x88\x01\x01\x12\x35\n\x06\x63onfig\x18\x04 \x01(\x0b\x32 .meshtastic.protobuf.LocalConfigH\x03\x88\x01\x01\x12\x42\n\rmodule_config\x18\x05 \x01(\x0b\x32&.meshtastic.protobuf.LocalModuleConfigH\x04\x88\x01\x01\x12:\n\x0e\x66ixed_position\x18\x06 \x01(\x0b\x32\x1d.meshtastic.protobuf.PositionH\x05\x88\x01\x01\x12\x15\n\x08ringtone\x18\x07 \x01(\tH\x06\x88\x01\x01\x12\x1c\n\x0f\x63\x61nned_messages\x18\x08 \x01(\tH\x07\x88\x01\x01\x42\x0c\n\n_long_nameB\r\n\x0b_short_nameB\x0e\n\x0c_channel_urlB\t\n\x07_configB\x10\n\x0e_module_configB\x11\n\x0f_fixed_positionB\x0b\n\t_ringtoneB\x12\n\x10_canned_messagesBf\n\x14org.meshtastic.protoB\x10\x43lientOnlyProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
 
-_globals = globals()
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.clientonly_pb2', _globals)
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.clientonly_pb2', globals())
 if _descriptor._USE_C_DESCRIPTORS == False:
+
   DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\020ClientOnlyProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
-  _globals['_DEVICEPROFILE']._serialized_start=131
-  _globals['_DEVICEPROFILE']._serialized_end=583
+  DESCRIPTOR._serialized_options = b'\n\024org.meshtastic.protoB\020ClientOnlyProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
+  _DEVICEPROFILE._serialized_start=131
+  _DEVICEPROFILE._serialized_end=583
 # @@protoc_insertion_point(module_scope)

meshtastic/protobuf/clientonly_pb2.pyi

@@ -1,101 +1,27 @@
-"""
-@generated by mypy-protobuf.  Do not edit manually!
-isort:skip_file
-"""
+from meshtastic.protobuf import localonly_pb2 as _localonly_pb2
+from meshtastic.protobuf import mesh_pb2 as _mesh_pb2
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from typing import ClassVar as _ClassVar, Mapping as _Mapping, Optional as _Optional, Union as _Union
 
-import builtins
-import google.protobuf.descriptor
-import google.protobuf.message
-import meshtastic.protobuf.localonly_pb2
-import meshtastic.protobuf.mesh_pb2
-import typing
+DESCRIPTOR: _descriptor.FileDescriptor
 
-DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
-
-@typing.final
-class DeviceProfile(google.protobuf.message.Message):
-    """
-    This abstraction is used to contain any configuration for provisioning a node on any client.
-    It is useful for importing and exporting configurations.
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    LONG_NAME_FIELD_NUMBER: builtins.int
-    SHORT_NAME_FIELD_NUMBER: builtins.int
-    CHANNEL_URL_FIELD_NUMBER: builtins.int
-    CONFIG_FIELD_NUMBER: builtins.int
-    MODULE_CONFIG_FIELD_NUMBER: builtins.int
-    FIXED_POSITION_FIELD_NUMBER: builtins.int
-    RINGTONE_FIELD_NUMBER: builtins.int
-    CANNED_MESSAGES_FIELD_NUMBER: builtins.int
-    long_name: builtins.str
-    """
-    Long name for the node
-    """
-    short_name: builtins.str
-    """
-    Short name of the node
-    """
-    channel_url: builtins.str
-    """
-    The url of the channels from our node
-    """
-    ringtone: builtins.str
-    """
-    Ringtone for ExternalNotification
-    """
-    canned_messages: builtins.str
-    """
-    Predefined messages for CannedMessage
-    """
-    @property
-    def config(self) -> meshtastic.protobuf.localonly_pb2.LocalConfig:
-        """
-        The Config of the node
-        """
-
-    @property
-    def module_config(self) -> meshtastic.protobuf.localonly_pb2.LocalModuleConfig:
-        """
-        The ModuleConfig of the node
-        """
-
-    @property
-    def fixed_position(self) -> meshtastic.protobuf.mesh_pb2.Position:
-        """
-        Fixed position data
-        """
-
-    def __init__(
-        self,
-        *,
-        long_name: builtins.str | None = ...,
-        short_name: builtins.str | None = ...,
-        channel_url: builtins.str | None = ...,
-        config: meshtastic.protobuf.localonly_pb2.LocalConfig | None = ...,
-        module_config: meshtastic.protobuf.localonly_pb2.LocalModuleConfig | None = ...,
-        fixed_position: meshtastic.protobuf.mesh_pb2.Position | None = ...,
-        ringtone: builtins.str | None = ...,
-        canned_messages: builtins.str | None = ...,
-    ) -> None: ...
-    def HasField(self, field_name: typing.Literal["_canned_messages", b"_canned_messages", "_channel_url", b"_channel_url", "_config", b"_config", "_fixed_position", b"_fixed_position", "_long_name", b"_long_name", "_module_config", b"_module_config", "_ringtone", b"_ringtone", "_short_name", b"_short_name", "canned_messages", b"canned_messages", "channel_url", b"channel_url", "config", b"config", "fixed_position", b"fixed_position", "long_name", b"long_name", "module_config", b"module_config", "ringtone", b"ringtone", "short_name", b"short_name"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing.Literal["_canned_messages", b"_canned_messages", "_channel_url", b"_channel_url", "_config", b"_config", "_fixed_position", b"_fixed_position", "_long_name", b"_long_name", "_module_config", b"_module_config", "_ringtone", b"_ringtone", "_short_name", b"_short_name", "canned_messages", b"canned_messages", "channel_url", b"channel_url", "config", b"config", "fixed_position", b"fixed_position", "long_name", b"long_name", "module_config", b"module_config", "ringtone", b"ringtone", "short_name", b"short_name"]) -> None: ...
-    @typing.overload
-    def WhichOneof(self, oneof_group: typing.Literal["_canned_messages", b"_canned_messages"]) -> typing.Literal["canned_messages"] | None: ...
-    @typing.overload
-    def WhichOneof(self, oneof_group: typing.Literal["_channel_url", b"_channel_url"]) -> typing.Literal["channel_url"] | None: ...
-    @typing.overload
-    def WhichOneof(self, oneof_group: typing.Literal["_config", b"_config"]) -> typing.Literal["config"] | None: ...
-    @typing.overload
-    def WhichOneof(self, oneof_group: typing.Literal["_fixed_position", b"_fixed_position"]) -> typing.Literal["fixed_position"] | None: ...
-    @typing.overload
-    def WhichOneof(self, oneof_group: typing.Literal["_long_name", b"_long_name"]) -> typing.Literal["long_name"] | None: ...
-    @typing.overload
-    def WhichOneof(self, oneof_group: typing.Literal["_module_config", b"_module_config"]) -> typing.Literal["module_config"] | None: ...
-    @typing.overload
-    def WhichOneof(self, oneof_group: typing.Literal["_ringtone", b"_ringtone"]) -> typing.Literal["ringtone"] | None: ...
-    @typing.overload
-    def WhichOneof(self, oneof_group: typing.Literal["_short_name", b"_short_name"]) -> typing.Literal["short_name"] | None: ...
-
-global___DeviceProfile = DeviceProfile
+class DeviceProfile(_message.Message):
+    __slots__ = ["canned_messages", "channel_url", "config", "fixed_position", "long_name", "module_config", "ringtone", "short_name"]
+    CANNED_MESSAGES_FIELD_NUMBER: _ClassVar[int]
+    CHANNEL_URL_FIELD_NUMBER: _ClassVar[int]
+    CONFIG_FIELD_NUMBER: _ClassVar[int]
+    FIXED_POSITION_FIELD_NUMBER: _ClassVar[int]
+    LONG_NAME_FIELD_NUMBER: _ClassVar[int]
+    MODULE_CONFIG_FIELD_NUMBER: _ClassVar[int]
+    RINGTONE_FIELD_NUMBER: _ClassVar[int]
+    SHORT_NAME_FIELD_NUMBER: _ClassVar[int]
+    canned_messages: str
+    channel_url: str
+    config: _localonly_pb2.LocalConfig
+    fixed_position: _mesh_pb2.Position
+    long_name: str
+    module_config: _localonly_pb2.LocalModuleConfig
+    ringtone: str
+    short_name: str
+    def __init__(self, long_name: _Optional[str] = ..., short_name: _Optional[str] = ..., channel_url: _Optional[str] = ..., config: _Optional[_Union[_localonly_pb2.LocalConfig, _Mapping]] = ..., module_config: _Optional[_Union[_localonly_pb2.LocalModuleConfig, _Mapping]] = ..., fixed_position: _Optional[_Union[_mesh_pb2.Position, _Mapping]] = ..., ringtone: _Optional[str] = ..., canned_messages: _Optional[str] = ...) -> None: ...

meshtastic/protobuf/connection_status_pb2.py

@@ -2,10 +2,10 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: meshtastic/protobuf/connection_status.proto
 """Generated protocol buffer code."""
+from google.protobuf.internal import builder as _builder
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
 from google.protobuf import symbol_database as _symbol_database
-from google.protobuf.internal import builder as _builder
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -13,24 +13,24 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n+meshtastic/protobuf/connection_status.proto\x12\x13meshtastic.protobuf\"\xd5\x02\n\x16\x44\x65viceConnectionStatus\x12<\n\x04wifi\x18\x01 \x01(\x0b\x32).meshtastic.protobuf.WifiConnectionStatusH\x00\x88\x01\x01\x12\x44\n\x08\x65thernet\x18\x02 \x01(\x0b\x32-.meshtastic.protobuf.EthernetConnectionStatusH\x01\x88\x01\x01\x12\x46\n\tbluetooth\x18\x03 \x01(\x0b\x32..meshtastic.protobuf.BluetoothConnectionStatusH\x02\x88\x01\x01\x12@\n\x06serial\x18\x04 \x01(\x0b\x32+.meshtastic.protobuf.SerialConnectionStatusH\x03\x88\x01\x01\x42\x07\n\x05_wifiB\x0b\n\t_ethernetB\x0c\n\n_bluetoothB\t\n\x07_serial\"p\n\x14WifiConnectionStatus\x12<\n\x06status\x18\x01 \x01(\x0b\x32,.meshtastic.protobuf.NetworkConnectionStatus\x12\x0c\n\x04ssid\x18\x02 \x01(\t\x12\x0c\n\x04rssi\x18\x03 \x01(\x05\"X\n\x18\x45thernetConnectionStatus\x12<\n\x06status\x18\x01 \x01(\x0b\x32,.meshtastic.protobuf.NetworkConnectionStatus\"{\n\x17NetworkConnectionStatus\x12\x12\n\nip_address\x18\x01 \x01(\x07\x12\x14\n\x0cis_connected\x18\x02 \x01(\x08\x12\x19\n\x11is_mqtt_connected\x18\x03 \x01(\x08\x12\x1b\n\x13is_syslog_connected\x18\x04 \x01(\x08\"L\n\x19\x42luetoothConnectionStatus\x12\x0b\n\x03pin\x18\x01 \x01(\r\x12\x0c\n\x04rssi\x18\x02 \x01(\x05\x12\x14\n\x0cis_connected\x18\x03 \x01(\x08\"<\n\x16SerialConnectionStatus\x12\x0c\n\x04\x62\x61ud\x18\x01 \x01(\r\x12\x14\n\x0cis_connected\x18\x02 \x01(\x08\x42\x65\n\x13\x63om.geeksville.meshB\x10\x43onnStatusProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n+meshtastic/protobuf/connection_status.proto\x12\x13meshtastic.protobuf\"\xd5\x02\n\x16\x44\x65viceConnectionStatus\x12<\n\x04wifi\x18\x01 \x01(\x0b\x32).meshtastic.protobuf.WifiConnectionStatusH\x00\x88\x01\x01\x12\x44\n\x08\x65thernet\x18\x02 \x01(\x0b\x32-.meshtastic.protobuf.EthernetConnectionStatusH\x01\x88\x01\x01\x12\x46\n\tbluetooth\x18\x03 \x01(\x0b\x32..meshtastic.protobuf.BluetoothConnectionStatusH\x02\x88\x01\x01\x12@\n\x06serial\x18\x04 \x01(\x0b\x32+.meshtastic.protobuf.SerialConnectionStatusH\x03\x88\x01\x01\x42\x07\n\x05_wifiB\x0b\n\t_ethernetB\x0c\n\n_bluetoothB\t\n\x07_serial\"p\n\x14WifiConnectionStatus\x12<\n\x06status\x18\x01 \x01(\x0b\x32,.meshtastic.protobuf.NetworkConnectionStatus\x12\x0c\n\x04ssid\x18\x02 \x01(\t\x12\x0c\n\x04rssi\x18\x03 \x01(\x05\"X\n\x18\x45thernetConnectionStatus\x12<\n\x06status\x18\x01 \x01(\x0b\x32,.meshtastic.protobuf.NetworkConnectionStatus\"{\n\x17NetworkConnectionStatus\x12\x12\n\nip_address\x18\x01 \x01(\x07\x12\x14\n\x0cis_connected\x18\x02 \x01(\x08\x12\x19\n\x11is_mqtt_connected\x18\x03 \x01(\x08\x12\x1b\n\x13is_syslog_connected\x18\x04 \x01(\x08\"L\n\x19\x42luetoothConnectionStatus\x12\x0b\n\x03pin\x18\x01 \x01(\r\x12\x0c\n\x04rssi\x18\x02 \x01(\x05\x12\x14\n\x0cis_connected\x18\x03 \x01(\x08\"<\n\x16SerialConnectionStatus\x12\x0c\n\x04\x62\x61ud\x18\x01 \x01(\r\x12\x14\n\x0cis_connected\x18\x02 \x01(\x08\x42\x66\n\x14org.meshtastic.protoB\x10\x43onnStatusProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
 
-_globals = globals()
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.connection_status_pb2', _globals)
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.connection_status_pb2', globals())
 if _descriptor._USE_C_DESCRIPTORS == False:
+
   DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\020ConnStatusProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
-  _globals['_DEVICECONNECTIONSTATUS']._serialized_start=69
-  _globals['_DEVICECONNECTIONSTATUS']._serialized_end=410
-  _globals['_WIFICONNECTIONSTATUS']._serialized_start=412
-  _globals['_WIFICONNECTIONSTATUS']._serialized_end=524
-  _globals['_ETHERNETCONNECTIONSTATUS']._serialized_start=526
-  _globals['_ETHERNETCONNECTIONSTATUS']._serialized_end=614
-  _globals['_NETWORKCONNECTIONSTATUS']._serialized_start=616
-  _globals['_NETWORKCONNECTIONSTATUS']._serialized_end=739
-  _globals['_BLUETOOTHCONNECTIONSTATUS']._serialized_start=741
-  _globals['_BLUETOOTHCONNECTIONSTATUS']._serialized_end=817
-  _globals['_SERIALCONNECTIONSTATUS']._serialized_start=819
-  _globals['_SERIALCONNECTIONSTATUS']._serialized_end=879
+  DESCRIPTOR._serialized_options = b'\n\024org.meshtastic.protoB\020ConnStatusProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
+  _DEVICECONNECTIONSTATUS._serialized_start=69
+  _DEVICECONNECTIONSTATUS._serialized_end=410
+  _WIFICONNECTIONSTATUS._serialized_start=412
+  _WIFICONNECTIONSTATUS._serialized_end=524
+  _ETHERNETCONNECTIONSTATUS._serialized_start=526
+  _ETHERNETCONNECTIONSTATUS._serialized_end=614
+  _NETWORKCONNECTIONSTATUS._serialized_start=616
+  _NETWORKCONNECTIONSTATUS._serialized_end=739
+  _BLUETOOTHCONNECTIONSTATUS._serialized_start=741
+  _BLUETOOTHCONNECTIONSTATUS._serialized_end=817
+  _SERIALCONNECTIONSTATUS._serialized_start=819
+  _SERIALCONNECTIONSTATUS._serialized_end=879
 # @@protoc_insertion_point(module_scope)

meshtastic/protobuf/connection_status_pb2.pyi

@@ -1,228 +1,63 @@
-"""
-@generated by mypy-protobuf.  Do not edit manually!
-isort:skip_file
-"""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from typing import ClassVar as _ClassVar, Mapping as _Mapping, Optional as _Optional, Union as _Union
 
-import builtins
-import google.protobuf.descriptor
-import google.protobuf.message
-import typing
+DESCRIPTOR: _descriptor.FileDescriptor
 
-DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
+class BluetoothConnectionStatus(_message.Message):
+    __slots__ = ["is_connected", "pin", "rssi"]
+    IS_CONNECTED_FIELD_NUMBER: _ClassVar[int]
+    PIN_FIELD_NUMBER: _ClassVar[int]
+    RSSI_FIELD_NUMBER: _ClassVar[int]
+    is_connected: bool
+    pin: int
+    rssi: int
+    def __init__(self, pin: _Optional[int] = ..., rssi: _Optional[int] = ..., is_connected: bool = ...) -> None: ...
 
-@typing.final
-class DeviceConnectionStatus(google.protobuf.message.Message):
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+class DeviceConnectionStatus(_message.Message):
+    __slots__ = ["bluetooth", "ethernet", "serial", "wifi"]
+    BLUETOOTH_FIELD_NUMBER: _ClassVar[int]
+    ETHERNET_FIELD_NUMBER: _ClassVar[int]
+    SERIAL_FIELD_NUMBER: _ClassVar[int]
+    WIFI_FIELD_NUMBER: _ClassVar[int]
+    bluetooth: BluetoothConnectionStatus
+    ethernet: EthernetConnectionStatus
+    serial: SerialConnectionStatus
+    wifi: WifiConnectionStatus
+    def __init__(self, wifi: _Optional[_Union[WifiConnectionStatus, _Mapping]] = ..., ethernet: _Optional[_Union[EthernetConnectionStatus, _Mapping]] = ..., bluetooth: _Optional[_Union[BluetoothConnectionStatus, _Mapping]] = ..., serial: _Optional[_Union[SerialConnectionStatus, _Mapping]] = ...) -> None: ...
 
-    WIFI_FIELD_NUMBER: builtins.int
-    ETHERNET_FIELD_NUMBER: builtins.int
-    BLUETOOTH_FIELD_NUMBER: builtins.int
-    SERIAL_FIELD_NUMBER: builtins.int
-    @property
-    def wifi(self) -> global___WifiConnectionStatus:
-        """
-        WiFi Status
-        """
+class EthernetConnectionStatus(_message.Message):
+    __slots__ = ["status"]
+    STATUS_FIELD_NUMBER: _ClassVar[int]
+    status: NetworkConnectionStatus
+    def __init__(self, status: _Optional[_Union[NetworkConnectionStatus, _Mapping]] = ...) -> None: ...
 
-    @property
-    def ethernet(self) -> global___EthernetConnectionStatus:
-        """
-        WiFi Status
-        """
+class NetworkConnectionStatus(_message.Message):
+    __slots__ = ["ip_address", "is_connected", "is_mqtt_connected", "is_syslog_connected"]
+    IP_ADDRESS_FIELD_NUMBER: _ClassVar[int]
+    IS_CONNECTED_FIELD_NUMBER: _ClassVar[int]
+    IS_MQTT_CONNECTED_FIELD_NUMBER: _ClassVar[int]
+    IS_SYSLOG_CONNECTED_FIELD_NUMBER: _ClassVar[int]
+    ip_address: int
+    is_connected: bool
+    is_mqtt_connected: bool
+    is_syslog_connected: bool
+    def __init__(self, ip_address: _Optional[int] = ..., is_connected: bool = ..., is_mqtt_connected: bool = ..., is_syslog_connected: bool = ...) -> None: ...
 
-    @property
-    def bluetooth(self) -> global___BluetoothConnectionStatus:
-        """
-        Bluetooth Status
-        """
+class SerialConnectionStatus(_message.Message):
+    __slots__ = ["baud", "is_connected"]
+    BAUD_FIELD_NUMBER: _ClassVar[int]
+    IS_CONNECTED_FIELD_NUMBER: _ClassVar[int]
+    baud: int
+    is_connected: bool
+    def __init__(self, baud: _Optional[int] = ..., is_connected: bool = ...) -> None: ...
 
-    @property
-    def serial(self) -> global___SerialConnectionStatus:
-        """
-        Serial Status
-        """
-
-    def __init__(
-        self,
-        *,
-        wifi: global___WifiConnectionStatus | None = ...,
-        ethernet: global___EthernetConnectionStatus | None = ...,
-        bluetooth: global___BluetoothConnectionStatus | None = ...,
-        serial: global___SerialConnectionStatus | None = ...,
-    ) -> None: ...
-    def HasField(self, field_name: typing.Literal["_bluetooth", b"_bluetooth", "_ethernet", b"_ethernet", "_serial", b"_serial", "_wifi", b"_wifi", "bluetooth", b"bluetooth", "ethernet", b"ethernet", "serial", b"serial", "wifi", b"wifi"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing.Literal["_bluetooth", b"_bluetooth", "_ethernet", b"_ethernet", "_serial", b"_serial", "_wifi", b"_wifi", "bluetooth", b"bluetooth", "ethernet", b"ethernet", "serial", b"serial", "wifi", b"wifi"]) -> None: ...
-    @typing.overload
-    def WhichOneof(self, oneof_group: typing.Literal["_bluetooth", b"_bluetooth"]) -> typing.Literal["bluetooth"] | None: ...
-    @typing.overload
-    def WhichOneof(self, oneof_group: typing.Literal["_ethernet", b"_ethernet"]) -> typing.Literal["ethernet"] | None: ...
-    @typing.overload
-    def WhichOneof(self, oneof_group: typing.Literal["_serial", b"_serial"]) -> typing.Literal["serial"] | None: ...
-    @typing.overload
-    def WhichOneof(self, oneof_group: typing.Literal["_wifi", b"_wifi"]) -> typing.Literal["wifi"] | None: ...
-
-global___DeviceConnectionStatus = DeviceConnectionStatus
-
-@typing.final
-class WifiConnectionStatus(google.protobuf.message.Message):
-    """
-    WiFi connection status
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    STATUS_FIELD_NUMBER: builtins.int
-    SSID_FIELD_NUMBER: builtins.int
-    RSSI_FIELD_NUMBER: builtins.int
-    ssid: builtins.str
-    """
-    WiFi access point SSID
-    """
-    rssi: builtins.int
-    """
-    RSSI of wireless connection
-    """
-    @property
-    def status(self) -> global___NetworkConnectionStatus:
-        """
-        Connection status
-        """
-
-    def __init__(
-        self,
-        *,
-        status: global___NetworkConnectionStatus | None = ...,
-        ssid: builtins.str = ...,
-        rssi: builtins.int = ...,
-    ) -> None: ...
-    def HasField(self, field_name: typing.Literal["status", b"status"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing.Literal["rssi", b"rssi", "ssid", b"ssid", "status", b"status"]) -> None: ...
-
-global___WifiConnectionStatus = WifiConnectionStatus
-
-@typing.final
-class EthernetConnectionStatus(google.protobuf.message.Message):
-    """
-    Ethernet connection status
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    STATUS_FIELD_NUMBER: builtins.int
-    @property
-    def status(self) -> global___NetworkConnectionStatus:
-        """
-        Connection status
-        """
-
-    def __init__(
-        self,
-        *,
-        status: global___NetworkConnectionStatus | None = ...,
-    ) -> None: ...
-    def HasField(self, field_name: typing.Literal["status", b"status"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing.Literal["status", b"status"]) -> None: ...
-
-global___EthernetConnectionStatus = EthernetConnectionStatus
-
-@typing.final
-class NetworkConnectionStatus(google.protobuf.message.Message):
-    """
-    Ethernet or WiFi connection status
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    IP_ADDRESS_FIELD_NUMBER: builtins.int
-    IS_CONNECTED_FIELD_NUMBER: builtins.int
-    IS_MQTT_CONNECTED_FIELD_NUMBER: builtins.int
-    IS_SYSLOG_CONNECTED_FIELD_NUMBER: builtins.int
-    ip_address: builtins.int
-    """
-    IP address of device
-    """
-    is_connected: builtins.bool
-    """
-    Whether the device has an active connection or not
-    """
-    is_mqtt_connected: builtins.bool
-    """
-    Whether the device has an active connection to an MQTT broker or not
-    """
-    is_syslog_connected: builtins.bool
-    """
-    Whether the device is actively remote syslogging or not
-    """
-    def __init__(
-        self,
-        *,
-        ip_address: builtins.int = ...,
-        is_connected: builtins.bool = ...,
-        is_mqtt_connected: builtins.bool = ...,
-        is_syslog_connected: builtins.bool = ...,
-    ) -> None: ...
-    def ClearField(self, field_name: typing.Literal["ip_address", b"ip_address", "is_connected", b"is_connected", "is_mqtt_connected", b"is_mqtt_connected", "is_syslog_connected", b"is_syslog_connected"]) -> None: ...
-
-global___NetworkConnectionStatus = NetworkConnectionStatus
-
-@typing.final
-class BluetoothConnectionStatus(google.protobuf.message.Message):
-    """
-    Bluetooth connection status
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    PIN_FIELD_NUMBER: builtins.int
-    RSSI_FIELD_NUMBER: builtins.int
-    IS_CONNECTED_FIELD_NUMBER: builtins.int
-    pin: builtins.int
-    """
-    The pairing PIN for bluetooth
-    """
-    rssi: builtins.int
-    """
-    RSSI of bluetooth connection
-    """
-    is_connected: builtins.bool
-    """
-    Whether the device has an active connection or not
-    """
-    def __init__(
-        self,
-        *,
-        pin: builtins.int = ...,
-        rssi: builtins.int = ...,
-        is_connected: builtins.bool = ...,
-    ) -> None: ...
-    def ClearField(self, field_name: typing.Literal["is_connected", b"is_connected", "pin", b"pin", "rssi", b"rssi"]) -> None: ...
-
-global___BluetoothConnectionStatus = BluetoothConnectionStatus
-
-@typing.final
-class SerialConnectionStatus(google.protobuf.message.Message):
-    """
-    Serial connection status
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    BAUD_FIELD_NUMBER: builtins.int
-    IS_CONNECTED_FIELD_NUMBER: builtins.int
-    baud: builtins.int
-    """
-    Serial baud rate
-    """
-    is_connected: builtins.bool
-    """
-    Whether the device has an active connection or not
-    """
-    def __init__(
-        self,
-        *,
-        baud: builtins.int = ...,
-        is_connected: builtins.bool = ...,
-    ) -> None: ...
-    def ClearField(self, field_name: typing.Literal["baud", b"baud", "is_connected", b"is_connected"]) -> None: ...
-
-global___SerialConnectionStatus = SerialConnectionStatus
+class WifiConnectionStatus(_message.Message):
+    __slots__ = ["rssi", "ssid", "status"]
+    RSSI_FIELD_NUMBER: _ClassVar[int]
+    SSID_FIELD_NUMBER: _ClassVar[int]
+    STATUS_FIELD_NUMBER: _ClassVar[int]
+    rssi: int
+    ssid: str
+    status: NetworkConnectionStatus
+    def __init__(self, status: _Optional[_Union[NetworkConnectionStatus, _Mapping]] = ..., ssid: _Optional[str] = ..., rssi: _Optional[int] = ...) -> None: ...

meshtastic/protobuf/device_ui_pb2.py

@@ -2,10 +2,10 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: meshtastic/protobuf/device_ui.proto
 """Generated protocol buffer code."""
+from google.protobuf.internal import builder as _builder
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
 from google.protobuf import symbol_database as _symbol_database
-from google.protobuf.internal import builder as _builder
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -13,28 +13,30 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n#meshtastic/protobuf/device_ui.proto\x12\x13meshtastic.protobuf\"\xda\x04\n\x0e\x44\x65viceUIConfig\x12\x0f\n\x07version\x18\x01 \x01(\r\x12\x19\n\x11screen_brightness\x18\x02 \x01(\r\x12\x16\n\x0escreen_timeout\x18\x03 \x01(\r\x12\x13\n\x0bscreen_lock\x18\x04 \x01(\x08\x12\x15\n\rsettings_lock\x18\x05 \x01(\x08\x12\x10\n\x08pin_code\x18\x06 \x01(\r\x12)\n\x05theme\x18\x07 \x01(\x0e\x32\x1a.meshtastic.protobuf.Theme\x12\x15\n\ralert_enabled\x18\x08 \x01(\x08\x12\x16\n\x0e\x62\x61nner_enabled\x18\t \x01(\x08\x12\x14\n\x0cring_tone_id\x18\n \x01(\r\x12/\n\x08language\x18\x0b \x01(\x0e\x32\x1d.meshtastic.protobuf.Language\x12\x34\n\x0bnode_filter\x18\x0c \x01(\x0b\x32\x1f.meshtastic.protobuf.NodeFilter\x12:\n\x0enode_highlight\x18\r \x01(\x0b\x32\".meshtastic.protobuf.NodeHighlight\x12\x18\n\x10\x63\x61libration_data\x18\x0e \x01(\x0c\x12*\n\x08map_data\x18\x0f \x01(\x0b\x32\x18.meshtastic.protobuf.Map\x12\x36\n\x0c\x63ompass_mode\x18\x10 \x01(\x0e\x32 .meshtastic.protobuf.CompassMode\x12\x18\n\x10screen_rgb_color\x18\x11 \x01(\r\x12\x1b\n\x13is_clockface_analog\x18\x12 \x01(\x08\"\xa7\x01\n\nNodeFilter\x12\x16\n\x0eunknown_switch\x18\x01 \x01(\x08\x12\x16\n\x0eoffline_switch\x18\x02 \x01(\x08\x12\x19\n\x11public_key_switch\x18\x03 \x01(\x08\x12\x11\n\thops_away\x18\x04 \x01(\x05\x12\x17\n\x0fposition_switch\x18\x05 \x01(\x08\x12\x11\n\tnode_name\x18\x06 \x01(\t\x12\x0f\n\x07\x63hannel\x18\x07 \x01(\x05\"~\n\rNodeHighlight\x12\x13\n\x0b\x63hat_switch\x18\x01 \x01(\x08\x12\x17\n\x0fposition_switch\x18\x02 \x01(\x08\x12\x18\n\x10telemetry_switch\x18\x03 \x01(\x08\x12\x12\n\niaq_switch\x18\x04 \x01(\x08\x12\x11\n\tnode_name\x18\x05 \x01(\t\"=\n\x08GeoPoint\x12\x0c\n\x04zoom\x18\x01 \x01(\x05\x12\x10\n\x08latitude\x18\x02 \x01(\x05\x12\x11\n\tlongitude\x18\x03 \x01(\x05\"U\n\x03Map\x12+\n\x04home\x18\x01 \x01(\x0b\x32\x1d.meshtastic.protobuf.GeoPoint\x12\r\n\x05style\x18\x02 \x01(\t\x12\x12\n\nfollow_gps\x18\x03 \x01(\x08*>\n\x0b\x43ompassMode\x12\x0b\n\x07\x44YNAMIC\x10\x00\x12\x0e\n\nFIXED_RING\x10\x01\x12\x12\n\x0e\x46REEZE_HEADING\x10\x02*%\n\x05Theme\x12\x08\n\x04\x44\x41RK\x10\x00\x12\t\n\x05LIGHT\x10\x01\x12\x07\n\x03RED\x10\x02*\xa9\x02\n\x08Language\x12\x0b\n\x07\x45NGLISH\x10\x00\x12\n\n\x06\x46RENCH\x10\x01\x12\n\n\x06GERMAN\x10\x02\x12\x0b\n\x07ITALIAN\x10\x03\x12\x0e\n\nPORTUGUESE\x10\x04\x12\x0b\n\x07SPANISH\x10\x05\x12\x0b\n\x07SWEDISH\x10\x06\x12\x0b\n\x07\x46INNISH\x10\x07\x12\n\n\x06POLISH\x10\x08\x12\x0b\n\x07TURKISH\x10\t\x12\x0b\n\x07SERBIAN\x10\n\x12\x0b\n\x07RUSSIAN\x10\x0b\x12\t\n\x05\x44UTCH\x10\x0c\x12\t\n\x05GREEK\x10\r\x12\r\n\tNORWEGIAN\x10\x0e\x12\r\n\tSLOVENIAN\x10\x0f\x12\r\n\tUKRAINIAN\x10\x10\x12\r\n\tBULGARIAN\x10\x11\x12\x16\n\x12SIMPLIFIED_CHINESE\x10\x1e\x12\x17\n\x13TRADITIONAL_CHINESE\x10\x1f\x42\x63\n\x13\x63om.geeksville.meshB\x0e\x44\x65viceUIProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n#meshtastic/protobuf/device_ui.proto\x12\x13meshtastic.protobuf\"\xff\x05\n\x0e\x44\x65viceUIConfig\x12\x0f\n\x07version\x18\x01 \x01(\r\x12\x19\n\x11screen_brightness\x18\x02 \x01(\r\x12\x16\n\x0escreen_timeout\x18\x03 \x01(\r\x12\x13\n\x0bscreen_lock\x18\x04 \x01(\x08\x12\x15\n\rsettings_lock\x18\x05 \x01(\x08\x12\x10\n\x08pin_code\x18\x06 \x01(\r\x12)\n\x05theme\x18\x07 \x01(\x0e\x32\x1a.meshtastic.protobuf.Theme\x12\x15\n\ralert_enabled\x18\x08 \x01(\x08\x12\x16\n\x0e\x62\x61nner_enabled\x18\t \x01(\x08\x12\x14\n\x0cring_tone_id\x18\n \x01(\r\x12/\n\x08language\x18\x0b \x01(\x0e\x32\x1d.meshtastic.protobuf.Language\x12\x34\n\x0bnode_filter\x18\x0c \x01(\x0b\x32\x1f.meshtastic.protobuf.NodeFilter\x12:\n\x0enode_highlight\x18\r \x01(\x0b\x32\".meshtastic.protobuf.NodeHighlight\x12\x18\n\x10\x63\x61libration_data\x18\x0e \x01(\x0c\x12*\n\x08map_data\x18\x0f \x01(\x0b\x32\x18.meshtastic.protobuf.Map\x12\x36\n\x0c\x63ompass_mode\x18\x10 \x01(\x0e\x32 .meshtastic.protobuf.CompassMode\x12\x18\n\x10screen_rgb_color\x18\x11 \x01(\r\x12\x1b\n\x13is_clockface_analog\x18\x12 \x01(\x08\x12K\n\ngps_format\x18\x13 \x01(\x0e\x32\x37.meshtastic.protobuf.DeviceUIConfig.GpsCoordinateFormat\"V\n\x13GpsCoordinateFormat\x12\x07\n\x03\x44\x45\x43\x10\x00\x12\x07\n\x03\x44MS\x10\x01\x12\x07\n\x03UTM\x10\x02\x12\x08\n\x04MGRS\x10\x03\x12\x07\n\x03OLC\x10\x04\x12\x08\n\x04OSGR\x10\x05\x12\x07\n\x03MLS\x10\x06\"\xa7\x01\n\nNodeFilter\x12\x16\n\x0eunknown_switch\x18\x01 \x01(\x08\x12\x16\n\x0eoffline_switch\x18\x02 \x01(\x08\x12\x19\n\x11public_key_switch\x18\x03 \x01(\x08\x12\x11\n\thops_away\x18\x04 \x01(\x05\x12\x17\n\x0fposition_switch\x18\x05 \x01(\x08\x12\x11\n\tnode_name\x18\x06 \x01(\t\x12\x0f\n\x07\x63hannel\x18\x07 \x01(\x05\"~\n\rNodeHighlight\x12\x13\n\x0b\x63hat_switch\x18\x01 \x01(\x08\x12\x17\n\x0fposition_switch\x18\x02 \x01(\x08\x12\x18\n\x10telemetry_switch\x18\x03 \x01(\x08\x12\x12\n\niaq_switch\x18\x04 \x01(\x08\x12\x11\n\tnode_name\x18\x05 \x01(\t\"=\n\x08GeoPoint\x12\x0c\n\x04zoom\x18\x01 \x01(\x05\x12\x10\n\x08latitude\x18\x02 \x01(\x05\x12\x11\n\tlongitude\x18\x03 \x01(\x05\"U\n\x03Map\x12+\n\x04home\x18\x01 \x01(\x0b\x32\x1d.meshtastic.protobuf.GeoPoint\x12\r\n\x05style\x18\x02 \x01(\t\x12\x12\n\nfollow_gps\x18\x03 \x01(\x08*>\n\x0b\x43ompassMode\x12\x0b\n\x07\x44YNAMIC\x10\x00\x12\x0e\n\nFIXED_RING\x10\x01\x12\x12\n\x0e\x46REEZE_HEADING\x10\x02*%\n\x05Theme\x12\x08\n\x04\x44\x41RK\x10\x00\x12\t\n\x05LIGHT\x10\x01\x12\x07\n\x03RED\x10\x02*\xc0\x02\n\x08Language\x12\x0b\n\x07\x45NGLISH\x10\x00\x12\n\n\x06\x46RENCH\x10\x01\x12\n\n\x06GERMAN\x10\x02\x12\x0b\n\x07ITALIAN\x10\x03\x12\x0e\n\nPORTUGUESE\x10\x04\x12\x0b\n\x07SPANISH\x10\x05\x12\x0b\n\x07SWEDISH\x10\x06\x12\x0b\n\x07\x46INNISH\x10\x07\x12\n\n\x06POLISH\x10\x08\x12\x0b\n\x07TURKISH\x10\t\x12\x0b\n\x07SERBIAN\x10\n\x12\x0b\n\x07RUSSIAN\x10\x0b\x12\t\n\x05\x44UTCH\x10\x0c\x12\t\n\x05GREEK\x10\r\x12\r\n\tNORWEGIAN\x10\x0e\x12\r\n\tSLOVENIAN\x10\x0f\x12\r\n\tUKRAINIAN\x10\x10\x12\r\n\tBULGARIAN\x10\x11\x12\t\n\x05\x43ZECH\x10\x12\x12\n\n\x06\x44\x41NISH\x10\x13\x12\x16\n\x12SIMPLIFIED_CHINESE\x10\x1e\x12\x17\n\x13TRADITIONAL_CHINESE\x10\x1f\x42\x64\n\x14org.meshtastic.protoB\x0e\x44\x65viceUIProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
 
-_globals = globals()
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.device_ui_pb2', _globals)
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.device_ui_pb2', globals())
 if _descriptor._USE_C_DESCRIPTORS == False:
+
   DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\016DeviceUIProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
-  _globals['_COMPASSMODE']._serialized_start=1113
-  _globals['_COMPASSMODE']._serialized_end=1175
-  _globals['_THEME']._serialized_start=1177
-  _globals['_THEME']._serialized_end=1214
-  _globals['_LANGUAGE']._serialized_start=1217
-  _globals['_LANGUAGE']._serialized_end=1514
-  _globals['_DEVICEUICONFIG']._serialized_start=61
-  _globals['_DEVICEUICONFIG']._serialized_end=663
-  _globals['_NODEFILTER']._serialized_start=666
-  _globals['_NODEFILTER']._serialized_end=833
-  _globals['_NODEHIGHLIGHT']._serialized_start=835
-  _globals['_NODEHIGHLIGHT']._serialized_end=961
-  _globals['_GEOPOINT']._serialized_start=963
-  _globals['_GEOPOINT']._serialized_end=1024
-  _globals['_MAP']._serialized_start=1026
-  _globals['_MAP']._serialized_end=1111
+  DESCRIPTOR._serialized_options = b'\n\024org.meshtastic.protoB\016DeviceUIProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
+  _COMPASSMODE._serialized_start=1278
+  _COMPASSMODE._serialized_end=1340
+  _THEME._serialized_start=1342
+  _THEME._serialized_end=1379
+  _LANGUAGE._serialized_start=1382
+  _LANGUAGE._serialized_end=1702
+  _DEVICEUICONFIG._serialized_start=61
+  _DEVICEUICONFIG._serialized_end=828
+  _DEVICEUICONFIG_GPSCOORDINATEFORMAT._serialized_start=742
+  _DEVICEUICONFIG_GPSCOORDINATEFORMAT._serialized_end=828
+  _NODEFILTER._serialized_start=831
+  _NODEFILTER._serialized_end=998
+  _NODEHIGHLIGHT._serialized_start=1000
+  _NODEHIGHLIGHT._serialized_end=1126
+  _GEOPOINT._serialized_start=1128
+  _GEOPOINT._serialized_end=1189
+  _MAP._serialized_start=1191
+  _MAP._serialized_end=1276
 # @@protoc_insertion_point(module_scope)

meshtastic/protobuf/device_ui_pb2.pyi

@@ -1,542 +1,146 @@
-"""
-@generated by mypy-protobuf.  Do not edit manually!
-isort:skip_file
-"""
+from google.protobuf.internal import enum_type_wrapper as _enum_type_wrapper
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from typing import ClassVar as _ClassVar, Mapping as _Mapping, Optional as _Optional, Union as _Union
 
-import builtins
-import google.protobuf.descriptor
-import google.protobuf.internal.enum_type_wrapper
-import google.protobuf.message
-import sys
-import typing
+BULGARIAN: Language
+CZECH: Language
+DANISH: Language
+DARK: Theme
+DESCRIPTOR: _descriptor.FileDescriptor
+DUTCH: Language
+DYNAMIC: CompassMode
+ENGLISH: Language
+FINNISH: Language
+FIXED_RING: CompassMode
+FREEZE_HEADING: CompassMode
+FRENCH: Language
+GERMAN: Language
+GREEK: Language
+ITALIAN: Language
+LIGHT: Theme
+NORWEGIAN: Language
+POLISH: Language
+PORTUGUESE: Language
+RED: Theme
+RUSSIAN: Language
+SERBIAN: Language
+SIMPLIFIED_CHINESE: Language
+SLOVENIAN: Language
+SPANISH: Language
+SWEDISH: Language
+TRADITIONAL_CHINESE: Language
+TURKISH: Language
+UKRAINIAN: Language
 
-if sys.version_info >= (3, 10):
-    import typing as typing_extensions
-else:
-    import typing_extensions
+class DeviceUIConfig(_message.Message):
+    __slots__ = ["alert_enabled", "banner_enabled", "calibration_data", "compass_mode", "gps_format", "is_clockface_analog", "language", "map_data", "node_filter", "node_highlight", "pin_code", "ring_tone_id", "screen_brightness", "screen_lock", "screen_rgb_color", "screen_timeout", "settings_lock", "theme", "version"]
+    class GpsCoordinateFormat(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
+        __slots__ = []
+    ALERT_ENABLED_FIELD_NUMBER: _ClassVar[int]
+    BANNER_ENABLED_FIELD_NUMBER: _ClassVar[int]
+    CALIBRATION_DATA_FIELD_NUMBER: _ClassVar[int]
+    COMPASS_MODE_FIELD_NUMBER: _ClassVar[int]
+    DEC: DeviceUIConfig.GpsCoordinateFormat
+    DMS: DeviceUIConfig.GpsCoordinateFormat
+    GPS_FORMAT_FIELD_NUMBER: _ClassVar[int]
+    IS_CLOCKFACE_ANALOG_FIELD_NUMBER: _ClassVar[int]
+    LANGUAGE_FIELD_NUMBER: _ClassVar[int]
+    MAP_DATA_FIELD_NUMBER: _ClassVar[int]
+    MGRS: DeviceUIConfig.GpsCoordinateFormat
+    MLS: DeviceUIConfig.GpsCoordinateFormat
+    NODE_FILTER_FIELD_NUMBER: _ClassVar[int]
+    NODE_HIGHLIGHT_FIELD_NUMBER: _ClassVar[int]
+    OLC: DeviceUIConfig.GpsCoordinateFormat
+    OSGR: DeviceUIConfig.GpsCoordinateFormat
+    PIN_CODE_FIELD_NUMBER: _ClassVar[int]
+    RING_TONE_ID_FIELD_NUMBER: _ClassVar[int]
+    SCREEN_BRIGHTNESS_FIELD_NUMBER: _ClassVar[int]
+    SCREEN_LOCK_FIELD_NUMBER: _ClassVar[int]
+    SCREEN_RGB_COLOR_FIELD_NUMBER: _ClassVar[int]
+    SCREEN_TIMEOUT_FIELD_NUMBER: _ClassVar[int]
+    SETTINGS_LOCK_FIELD_NUMBER: _ClassVar[int]
+    THEME_FIELD_NUMBER: _ClassVar[int]
+    UTM: DeviceUIConfig.GpsCoordinateFormat
+    VERSION_FIELD_NUMBER: _ClassVar[int]
+    alert_enabled: bool
+    banner_enabled: bool
+    calibration_data: bytes
+    compass_mode: CompassMode
+    gps_format: DeviceUIConfig.GpsCoordinateFormat
+    is_clockface_analog: bool
+    language: Language
+    map_data: Map
+    node_filter: NodeFilter
+    node_highlight: NodeHighlight
+    pin_code: int
+    ring_tone_id: int
+    screen_brightness: int
+    screen_lock: bool
+    screen_rgb_color: int
+    screen_timeout: int
+    settings_lock: bool
+    theme: Theme
+    version: int
+    def __init__(self, version: _Optional[int] = ..., screen_brightness: _Optional[int] = ..., screen_timeout: _Optional[int] = ..., screen_lock: bool = ..., settings_lock: bool = ..., pin_code: _Optional[int] = ..., theme: _Optional[_Union[Theme, str]] = ..., alert_enabled: bool = ..., banner_enabled: bool = ..., ring_tone_id: _Optional[int] = ..., language: _Optional[_Union[Language, str]] = ..., node_filter: _Optional[_Union[NodeFilter, _Mapping]] = ..., node_highlight: _Optional[_Union[NodeHighlight, _Mapping]] = ..., calibration_data: _Optional[bytes] = ..., map_data: _Optional[_Union[Map, _Mapping]] = ..., compass_mode: _Optional[_Union[CompassMode, str]] = ..., screen_rgb_color: _Optional[int] = ..., is_clockface_analog: bool = ..., gps_format: _Optional[_Union[DeviceUIConfig.GpsCoordinateFormat, str]] = ...) -> None: ...
 
-DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
+class GeoPoint(_message.Message):
+    __slots__ = ["latitude", "longitude", "zoom"]
+    LATITUDE_FIELD_NUMBER: _ClassVar[int]
+    LONGITUDE_FIELD_NUMBER: _ClassVar[int]
+    ZOOM_FIELD_NUMBER: _ClassVar[int]
+    latitude: int
+    longitude: int
+    zoom: int
+    def __init__(self, zoom: _Optional[int] = ..., latitude: _Optional[int] = ..., longitude: _Optional[int] = ...) -> None: ...
 
-class _CompassMode:
-    ValueType = typing.NewType("ValueType", builtins.int)
-    V: typing_extensions.TypeAlias = ValueType
+class Map(_message.Message):
+    __slots__ = ["follow_gps", "home", "style"]
+    FOLLOW_GPS_FIELD_NUMBER: _ClassVar[int]
+    HOME_FIELD_NUMBER: _ClassVar[int]
+    STYLE_FIELD_NUMBER: _ClassVar[int]
+    follow_gps: bool
+    home: GeoPoint
+    style: str
+    def __init__(self, home: _Optional[_Union[GeoPoint, _Mapping]] = ..., style: _Optional[str] = ..., follow_gps: bool = ...) -> None: ...
 
-class _CompassModeEnumTypeWrapper(google.protobuf.internal.enum_type_wrapper._EnumTypeWrapper[_CompassMode.ValueType], builtins.type):
-    DESCRIPTOR: google.protobuf.descriptor.EnumDescriptor
-    DYNAMIC: _CompassMode.ValueType  # 0
-    """
-    Compass with dynamic ring and heading
-    """
-    FIXED_RING: _CompassMode.ValueType  # 1
-    """
-    Compass with fixed ring and heading
-    """
-    FREEZE_HEADING: _CompassMode.ValueType  # 2
-    """
-    Compass with heading and freeze option
-    """
+class NodeFilter(_message.Message):
+    __slots__ = ["channel", "hops_away", "node_name", "offline_switch", "position_switch", "public_key_switch", "unknown_switch"]
+    CHANNEL_FIELD_NUMBER: _ClassVar[int]
+    HOPS_AWAY_FIELD_NUMBER: _ClassVar[int]
+    NODE_NAME_FIELD_NUMBER: _ClassVar[int]
+    OFFLINE_SWITCH_FIELD_NUMBER: _ClassVar[int]
+    POSITION_SWITCH_FIELD_NUMBER: _ClassVar[int]
+    PUBLIC_KEY_SWITCH_FIELD_NUMBER: _ClassVar[int]
+    UNKNOWN_SWITCH_FIELD_NUMBER: _ClassVar[int]
+    channel: int
+    hops_away: int
+    node_name: str
+    offline_switch: bool
+    position_switch: bool
+    public_key_switch: bool
+    unknown_switch: bool
+    def __init__(self, unknown_switch: bool = ..., offline_switch: bool = ..., public_key_switch: bool = ..., hops_away: _Optional[int] = ..., position_switch: bool = ..., node_name: _Optional[str] = ..., channel: _Optional[int] = ...) -> None: ...
 
-class CompassMode(_CompassMode, metaclass=_CompassModeEnumTypeWrapper): ...
+class NodeHighlight(_message.Message):
+    __slots__ = ["chat_switch", "iaq_switch", "node_name", "position_switch", "telemetry_switch"]
+    CHAT_SWITCH_FIELD_NUMBER: _ClassVar[int]
+    IAQ_SWITCH_FIELD_NUMBER: _ClassVar[int]
+    NODE_NAME_FIELD_NUMBER: _ClassVar[int]
+    POSITION_SWITCH_FIELD_NUMBER: _ClassVar[int]
+    TELEMETRY_SWITCH_FIELD_NUMBER: _ClassVar[int]
+    chat_switch: bool
+    iaq_switch: bool
+    node_name: str
+    position_switch: bool
+    telemetry_switch: bool
+    def __init__(self, chat_switch: bool = ..., position_switch: bool = ..., telemetry_switch: bool = ..., iaq_switch: bool = ..., node_name: _Optional[str] = ...) -> None: ...
 
-DYNAMIC: CompassMode.ValueType  # 0
-"""
-Compass with dynamic ring and heading
-"""
-FIXED_RING: CompassMode.ValueType  # 1
-"""
-Compass with fixed ring and heading
-"""
-FREEZE_HEADING: CompassMode.ValueType  # 2
-"""
-Compass with heading and freeze option
-"""
-global___CompassMode = CompassMode
+class CompassMode(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
+    __slots__ = []
 
-class _Theme:
-    ValueType = typing.NewType("ValueType", builtins.int)
-    V: typing_extensions.TypeAlias = ValueType
+class Theme(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
+    __slots__ = []
 
-class _ThemeEnumTypeWrapper(google.protobuf.internal.enum_type_wrapper._EnumTypeWrapper[_Theme.ValueType], builtins.type):
-    DESCRIPTOR: google.protobuf.descriptor.EnumDescriptor
-    DARK: _Theme.ValueType  # 0
-    """
-    Dark
-    """
-    LIGHT: _Theme.ValueType  # 1
-    """
-    Light
-    """
-    RED: _Theme.ValueType  # 2
-    """
-    Red
-    """
-
-class Theme(_Theme, metaclass=_ThemeEnumTypeWrapper): ...
-
-DARK: Theme.ValueType  # 0
-"""
-Dark
-"""
-LIGHT: Theme.ValueType  # 1
-"""
-Light
-"""
-RED: Theme.ValueType  # 2
-"""
-Red
-"""
-global___Theme = Theme
-
-class _Language:
-    ValueType = typing.NewType("ValueType", builtins.int)
-    V: typing_extensions.TypeAlias = ValueType
-
-class _LanguageEnumTypeWrapper(google.protobuf.internal.enum_type_wrapper._EnumTypeWrapper[_Language.ValueType], builtins.type):
-    DESCRIPTOR: google.protobuf.descriptor.EnumDescriptor
-    ENGLISH: _Language.ValueType  # 0
-    """
-    English
-    """
-    FRENCH: _Language.ValueType  # 1
-    """
-    French
-    """
-    GERMAN: _Language.ValueType  # 2
-    """
-    German
-    """
-    ITALIAN: _Language.ValueType  # 3
-    """
-    Italian
-    """
-    PORTUGUESE: _Language.ValueType  # 4
-    """
-    Portuguese
-    """
-    SPANISH: _Language.ValueType  # 5
-    """
-    Spanish
-    """
-    SWEDISH: _Language.ValueType  # 6
-    """
-    Swedish
-    """
-    FINNISH: _Language.ValueType  # 7
-    """
-    Finnish
-    """
-    POLISH: _Language.ValueType  # 8
-    """
-    Polish
-    """
-    TURKISH: _Language.ValueType  # 9
-    """
-    Turkish
-    """
-    SERBIAN: _Language.ValueType  # 10
-    """
-    Serbian
-    """
-    RUSSIAN: _Language.ValueType  # 11
-    """
-    Russian
-    """
-    DUTCH: _Language.ValueType  # 12
-    """
-    Dutch
-    """
-    GREEK: _Language.ValueType  # 13
-    """
-    Greek
-    """
-    NORWEGIAN: _Language.ValueType  # 14
-    """
-    Norwegian
-    """
-    SLOVENIAN: _Language.ValueType  # 15
-    """
-    Slovenian
-    """
-    UKRAINIAN: _Language.ValueType  # 16
-    """
-    Ukrainian
-    """
-    BULGARIAN: _Language.ValueType  # 17
-    """
-    Bulgarian
-    """
-    SIMPLIFIED_CHINESE: _Language.ValueType  # 30
-    """
-    Simplified Chinese (experimental)
-    """
-    TRADITIONAL_CHINESE: _Language.ValueType  # 31
-    """
-    Traditional Chinese (experimental)
-    """
-
-class Language(_Language, metaclass=_LanguageEnumTypeWrapper):
-    """
-    Localization
-    """
-
-ENGLISH: Language.ValueType  # 0
-"""
-English
-"""
-FRENCH: Language.ValueType  # 1
-"""
-French
-"""
-GERMAN: Language.ValueType  # 2
-"""
-German
-"""
-ITALIAN: Language.ValueType  # 3
-"""
-Italian
-"""
-PORTUGUESE: Language.ValueType  # 4
-"""
-Portuguese
-"""
-SPANISH: Language.ValueType  # 5
-"""
-Spanish
-"""
-SWEDISH: Language.ValueType  # 6
-"""
-Swedish
-"""
-FINNISH: Language.ValueType  # 7
-"""
-Finnish
-"""
-POLISH: Language.ValueType  # 8
-"""
-Polish
-"""
-TURKISH: Language.ValueType  # 9
-"""
-Turkish
-"""
-SERBIAN: Language.ValueType  # 10
-"""
-Serbian
-"""
-RUSSIAN: Language.ValueType  # 11
-"""
-Russian
-"""
-DUTCH: Language.ValueType  # 12
-"""
-Dutch
-"""
-GREEK: Language.ValueType  # 13
-"""
-Greek
-"""
-NORWEGIAN: Language.ValueType  # 14
-"""
-Norwegian
-"""
-SLOVENIAN: Language.ValueType  # 15
-"""
-Slovenian
-"""
-UKRAINIAN: Language.ValueType  # 16
-"""
-Ukrainian
-"""
-BULGARIAN: Language.ValueType  # 17
-"""
-Bulgarian
-"""
-SIMPLIFIED_CHINESE: Language.ValueType  # 30
-"""
-Simplified Chinese (experimental)
-"""
-TRADITIONAL_CHINESE: Language.ValueType  # 31
-"""
-Traditional Chinese (experimental)
-"""
-global___Language = Language
-
-@typing.final
-class DeviceUIConfig(google.protobuf.message.Message):
-    """
-    Protobuf structures for device-ui persistency
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    VERSION_FIELD_NUMBER: builtins.int
-    SCREEN_BRIGHTNESS_FIELD_NUMBER: builtins.int
-    SCREEN_TIMEOUT_FIELD_NUMBER: builtins.int
-    SCREEN_LOCK_FIELD_NUMBER: builtins.int
-    SETTINGS_LOCK_FIELD_NUMBER: builtins.int
-    PIN_CODE_FIELD_NUMBER: builtins.int
-    THEME_FIELD_NUMBER: builtins.int
-    ALERT_ENABLED_FIELD_NUMBER: builtins.int
-    BANNER_ENABLED_FIELD_NUMBER: builtins.int
-    RING_TONE_ID_FIELD_NUMBER: builtins.int
-    LANGUAGE_FIELD_NUMBER: builtins.int
-    NODE_FILTER_FIELD_NUMBER: builtins.int
-    NODE_HIGHLIGHT_FIELD_NUMBER: builtins.int
-    CALIBRATION_DATA_FIELD_NUMBER: builtins.int
-    MAP_DATA_FIELD_NUMBER: builtins.int
-    COMPASS_MODE_FIELD_NUMBER: builtins.int
-    SCREEN_RGB_COLOR_FIELD_NUMBER: builtins.int
-    IS_CLOCKFACE_ANALOG_FIELD_NUMBER: builtins.int
-    version: builtins.int
-    """
-    A version integer used to invalidate saved files when we make incompatible changes.
-    """
-    screen_brightness: builtins.int
-    """
-    TFT display brightness 1..255
-    """
-    screen_timeout: builtins.int
-    """
-    Screen timeout 0..900
-    """
-    screen_lock: builtins.bool
-    """
-    Screen/Settings lock enabled
-    """
-    settings_lock: builtins.bool
-    pin_code: builtins.int
-    theme: global___Theme.ValueType
-    """
-    Color theme
-    """
-    alert_enabled: builtins.bool
-    """
-    Audible message, banner and ring tone
-    """
-    banner_enabled: builtins.bool
-    ring_tone_id: builtins.int
-    language: global___Language.ValueType
-    """
-    Localization
-    """
-    calibration_data: builtins.bytes
-    """
-    8 integers for screen calibration data
-    """
-    compass_mode: global___CompassMode.ValueType
-    """
-    Compass mode
-    """
-    screen_rgb_color: builtins.int
-    """
-    RGB color for BaseUI
-    0xRRGGBB format, e.g. 0xFF0000 for red
-    """
-    is_clockface_analog: builtins.bool
-    """
-    Clockface analog style
-    true for analog clockface, false for digital clockface
-    """
-    @property
-    def node_filter(self) -> global___NodeFilter:
-        """
-        Node list filter
-        """
-
-    @property
-    def node_highlight(self) -> global___NodeHighlight:
-        """
-        Node list highlightening
-        """
-
-    @property
-    def map_data(self) -> global___Map:
-        """
-        Map related data
-        """
-
-    def __init__(
-        self,
-        *,
-        version: builtins.int = ...,
-        screen_brightness: builtins.int = ...,
-        screen_timeout: builtins.int = ...,
-        screen_lock: builtins.bool = ...,
-        settings_lock: builtins.bool = ...,
-        pin_code: builtins.int = ...,
-        theme: global___Theme.ValueType = ...,
-        alert_enabled: builtins.bool = ...,
-        banner_enabled: builtins.bool = ...,
-        ring_tone_id: builtins.int = ...,
-        language: global___Language.ValueType = ...,
-        node_filter: global___NodeFilter | None = ...,
-        node_highlight: global___NodeHighlight | None = ...,
-        calibration_data: builtins.bytes = ...,
-        map_data: global___Map | None = ...,
-        compass_mode: global___CompassMode.ValueType = ...,
-        screen_rgb_color: builtins.int = ...,
-        is_clockface_analog: builtins.bool = ...,
-    ) -> None: ...
-    def HasField(self, field_name: typing.Literal["map_data", b"map_data", "node_filter", b"node_filter", "node_highlight", b"node_highlight"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing.Literal["alert_enabled", b"alert_enabled", "banner_enabled", b"banner_enabled", "calibration_data", b"calibration_data", "compass_mode", b"compass_mode", "is_clockface_analog", b"is_clockface_analog", "language", b"language", "map_data", b"map_data", "node_filter", b"node_filter", "node_highlight", b"node_highlight", "pin_code", b"pin_code", "ring_tone_id", b"ring_tone_id", "screen_brightness", b"screen_brightness", "screen_lock", b"screen_lock", "screen_rgb_color", b"screen_rgb_color", "screen_timeout", b"screen_timeout", "settings_lock", b"settings_lock", "theme", b"theme", "version", b"version"]) -> None: ...
-
-global___DeviceUIConfig = DeviceUIConfig
-
-@typing.final
-class NodeFilter(google.protobuf.message.Message):
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    UNKNOWN_SWITCH_FIELD_NUMBER: builtins.int
-    OFFLINE_SWITCH_FIELD_NUMBER: builtins.int
-    PUBLIC_KEY_SWITCH_FIELD_NUMBER: builtins.int
-    HOPS_AWAY_FIELD_NUMBER: builtins.int
-    POSITION_SWITCH_FIELD_NUMBER: builtins.int
-    NODE_NAME_FIELD_NUMBER: builtins.int
-    CHANNEL_FIELD_NUMBER: builtins.int
-    unknown_switch: builtins.bool
-    """
-    Filter unknown nodes
-    """
-    offline_switch: builtins.bool
-    """
-    Filter offline nodes
-    """
-    public_key_switch: builtins.bool
-    """
-    Filter nodes w/o public key
-    """
-    hops_away: builtins.int
-    """
-    Filter based on hops away
-    """
-    position_switch: builtins.bool
-    """
-    Filter nodes w/o position
-    """
-    node_name: builtins.str
-    """
-    Filter nodes by matching name string
-    """
-    channel: builtins.int
-    """
-    Filter based on channel
-    """
-    def __init__(
-        self,
-        *,
-        unknown_switch: builtins.bool = ...,
-        offline_switch: builtins.bool = ...,
-        public_key_switch: builtins.bool = ...,
-        hops_away: builtins.int = ...,
-        position_switch: builtins.bool = ...,
-        node_name: builtins.str = ...,
-        channel: builtins.int = ...,
-    ) -> None: ...
-    def ClearField(self, field_name: typing.Literal["channel", b"channel", "hops_away", b"hops_away", "node_name", b"node_name", "offline_switch", b"offline_switch", "position_switch", b"position_switch", "public_key_switch", b"public_key_switch", "unknown_switch", b"unknown_switch"]) -> None: ...
-
-global___NodeFilter = NodeFilter
-
-@typing.final
-class NodeHighlight(google.protobuf.message.Message):
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    CHAT_SWITCH_FIELD_NUMBER: builtins.int
-    POSITION_SWITCH_FIELD_NUMBER: builtins.int
-    TELEMETRY_SWITCH_FIELD_NUMBER: builtins.int
-    IAQ_SWITCH_FIELD_NUMBER: builtins.int
-    NODE_NAME_FIELD_NUMBER: builtins.int
-    chat_switch: builtins.bool
-    """
-    Hightlight nodes w/ active chat
-    """
-    position_switch: builtins.bool
-    """
-    Highlight nodes w/ position
-    """
-    telemetry_switch: builtins.bool
-    """
-    Highlight nodes w/ telemetry data
-    """
-    iaq_switch: builtins.bool
-    """
-    Highlight nodes w/ iaq data
-    """
-    node_name: builtins.str
-    """
-    Highlight nodes by matching name string
-    """
-    def __init__(
-        self,
-        *,
-        chat_switch: builtins.bool = ...,
-        position_switch: builtins.bool = ...,
-        telemetry_switch: builtins.bool = ...,
-        iaq_switch: builtins.bool = ...,
-        node_name: builtins.str = ...,
-    ) -> None: ...
-    def ClearField(self, field_name: typing.Literal["chat_switch", b"chat_switch", "iaq_switch", b"iaq_switch", "node_name", b"node_name", "position_switch", b"position_switch", "telemetry_switch", b"telemetry_switch"]) -> None: ...
-
-global___NodeHighlight = NodeHighlight
-
-@typing.final
-class GeoPoint(google.protobuf.message.Message):
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    ZOOM_FIELD_NUMBER: builtins.int
-    LATITUDE_FIELD_NUMBER: builtins.int
-    LONGITUDE_FIELD_NUMBER: builtins.int
-    zoom: builtins.int
-    """
-    Zoom level
-    """
-    latitude: builtins.int
-    """
-    Coordinate: latitude
-    """
-    longitude: builtins.int
-    """
-    Coordinate: longitude
-    """
-    def __init__(
-        self,
-        *,
-        zoom: builtins.int = ...,
-        latitude: builtins.int = ...,
-        longitude: builtins.int = ...,
-    ) -> None: ...
-    def ClearField(self, field_name: typing.Literal["latitude", b"latitude", "longitude", b"longitude", "zoom", b"zoom"]) -> None: ...
-
-global___GeoPoint = GeoPoint
-
-@typing.final
-class Map(google.protobuf.message.Message):
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    HOME_FIELD_NUMBER: builtins.int
-    STYLE_FIELD_NUMBER: builtins.int
-    FOLLOW_GPS_FIELD_NUMBER: builtins.int
-    style: builtins.str
-    """
-    Map tile style
-    """
-    follow_gps: builtins.bool
-    """
-    Map scroll follows GPS
-    """
-    @property
-    def home(self) -> global___GeoPoint:
-        """
-        Home coordinates
-        """
-
-    def __init__(
-        self,
-        *,
-        home: global___GeoPoint | None = ...,
-        style: builtins.str = ...,
-        follow_gps: builtins.bool = ...,
-    ) -> None: ...
-    def HasField(self, field_name: typing.Literal["home", b"home"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing.Literal["follow_gps", b"follow_gps", "home", b"home", "style", b"style"]) -> None: ...
-
-global___Map = Map
+class Language(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
+    __slots__ = []

meshtastic/protobuf/deviceonly_pb2.py

@@ -2,10 +2,10 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: meshtastic/protobuf/deviceonly.proto
 """Generated protocol buffer code."""
+from google.protobuf.internal import builder as _builder
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
 from google.protobuf import symbol_database as _symbol_database
-from google.protobuf.internal import builder as _builder
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -19,14 +19,14 @@ from meshtastic.protobuf import telemetry_pb2 as meshtastic_dot_protobuf_dot_tel
 from meshtastic.protobuf import nanopb_pb2 as meshtastic_dot_protobuf_dot_nanopb__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n$meshtastic/protobuf/deviceonly.proto\x12\x13meshtastic.protobuf\x1a!meshtastic/protobuf/channel.proto\x1a meshtastic/protobuf/config.proto\x1a#meshtastic/protobuf/localonly.proto\x1a\x1emeshtastic/protobuf/mesh.proto\x1a#meshtastic/protobuf/telemetry.proto\x1a meshtastic/protobuf/nanopb.proto\"\x99\x01\n\x0cPositionLite\x12\x12\n\nlatitude_i\x18\x01 \x01(\x0f\x12\x13\n\x0blongitude_i\x18\x02 \x01(\x0f\x12\x10\n\x08\x61ltitude\x18\x03 \x01(\x05\x12\x0c\n\x04time\x18\x04 \x01(\x07\x12@\n\x0flocation_source\x18\x05 \x01(\x0e\x32\'.meshtastic.protobuf.Position.LocSource\"\x94\x02\n\x08UserLite\x12\x13\n\x07macaddr\x18\x01 \x01(\x0c\x42\x02\x18\x01\x12\x11\n\tlong_name\x18\x02 \x01(\t\x12\x12\n\nshort_name\x18\x03 \x01(\t\x12\x34\n\x08hw_model\x18\x04 \x01(\x0e\x32\".meshtastic.protobuf.HardwareModel\x12\x13\n\x0bis_licensed\x18\x05 \x01(\x08\x12;\n\x04role\x18\x06 \x01(\x0e\x32-.meshtastic.protobuf.Config.DeviceConfig.Role\x12\x12\n\npublic_key\x18\x07 \x01(\x0c\x12\x1c\n\x0fis_unmessagable\x18\t \x01(\x08H\x00\x88\x01\x01\x42\x12\n\x10_is_unmessagable\"\xf0\x02\n\x0cNodeInfoLite\x12\x0b\n\x03num\x18\x01 \x01(\r\x12+\n\x04user\x18\x02 \x01(\x0b\x32\x1d.meshtastic.protobuf.UserLite\x12\x33\n\x08position\x18\x03 \x01(\x0b\x32!.meshtastic.protobuf.PositionLite\x12\x0b\n\x03snr\x18\x04 \x01(\x02\x12\x12\n\nlast_heard\x18\x05 \x01(\x07\x12:\n\x0e\x64\x65vice_metrics\x18\x06 \x01(\x0b\x32\".meshtastic.protobuf.DeviceMetrics\x12\x0f\n\x07\x63hannel\x18\x07 \x01(\r\x12\x10\n\x08via_mqtt\x18\x08 \x01(\x08\x12\x16\n\thops_away\x18\t \x01(\rH\x00\x88\x01\x01\x12\x13\n\x0bis_favorite\x18\n \x01(\x08\x12\x12\n\nis_ignored\x18\x0b \x01(\x08\x12\x10\n\x08next_hop\x18\x0c \x01(\r\x12\x10\n\x08\x62itfield\x18\r \x01(\rB\x0c\n\n_hops_away\"\xa1\x03\n\x0b\x44\x65viceState\x12\x30\n\x07my_node\x18\x02 \x01(\x0b\x32\x1f.meshtastic.protobuf.MyNodeInfo\x12(\n\x05owner\x18\x03 \x01(\x0b\x32\x19.meshtastic.protobuf.User\x12\x36\n\rreceive_queue\x18\x05 \x03(\x0b\x32\x1f.meshtastic.protobuf.MeshPacket\x12\x0f\n\x07version\x18\x08 \x01(\r\x12\x38\n\x0frx_text_message\x18\x07 \x01(\x0b\x32\x1f.meshtastic.protobuf.MeshPacket\x12\x13\n\x07no_save\x18\t \x01(\x08\x42\x02\x18\x01\x12\x19\n\rdid_gps_reset\x18\x0b \x01(\x08\x42\x02\x18\x01\x12\x34\n\x0brx_waypoint\x18\x0c \x01(\x0b\x32\x1f.meshtastic.protobuf.MeshPacket\x12M\n\x19node_remote_hardware_pins\x18\r \x03(\x0b\x32*.meshtastic.protobuf.NodeRemoteHardwarePin\"}\n\x0cNodeDatabase\x12\x0f\n\x07version\x18\x01 \x01(\r\x12\\\n\x05nodes\x18\x02 \x03(\x0b\x32!.meshtastic.protobuf.NodeInfoLiteB*\x92?\'\x92\x01$std::vector<meshtastic_NodeInfoLite>\"N\n\x0b\x43hannelFile\x12.\n\x08\x63hannels\x18\x01 \x03(\x0b\x32\x1c.meshtastic.protobuf.Channel\x12\x0f\n\x07version\x18\x02 \x01(\r\"\x86\x02\n\x11\x42\x61\x63kupPreferences\x12\x0f\n\x07version\x18\x01 \x01(\r\x12\x11\n\ttimestamp\x18\x02 \x01(\x07\x12\x30\n\x06\x63onfig\x18\x03 \x01(\x0b\x32 .meshtastic.protobuf.LocalConfig\x12=\n\rmodule_config\x18\x04 \x01(\x0b\x32&.meshtastic.protobuf.LocalModuleConfig\x12\x32\n\x08\x63hannels\x18\x05 \x01(\x0b\x32 .meshtastic.protobuf.ChannelFile\x12(\n\x05owner\x18\x06 \x01(\x0b\x32\x19.meshtastic.protobuf.UserBm\n\x13\x63om.geeksville.meshB\nDeviceOnlyZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x92?\x0b\xc2\x01\x08<vector>b\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n$meshtastic/protobuf/deviceonly.proto\x12\x13meshtastic.protobuf\x1a!meshtastic/protobuf/channel.proto\x1a meshtastic/protobuf/config.proto\x1a#meshtastic/protobuf/localonly.proto\x1a\x1emeshtastic/protobuf/mesh.proto\x1a#meshtastic/protobuf/telemetry.proto\x1a meshtastic/protobuf/nanopb.proto\"\x99\x01\n\x0cPositionLite\x12\x12\n\nlatitude_i\x18\x01 \x01(\x0f\x12\x13\n\x0blongitude_i\x18\x02 \x01(\x0f\x12\x10\n\x08\x61ltitude\x18\x03 \x01(\x05\x12\x0c\n\x04time\x18\x04 \x01(\x07\x12@\n\x0flocation_source\x18\x05 \x01(\x0e\x32\'.meshtastic.protobuf.Position.LocSource\"\x94\x02\n\x08UserLite\x12\x13\n\x07macaddr\x18\x01 \x01(\x0c\x42\x02\x18\x01\x12\x11\n\tlong_name\x18\x02 \x01(\t\x12\x12\n\nshort_name\x18\x03 \x01(\t\x12\x34\n\x08hw_model\x18\x04 \x01(\x0e\x32\".meshtastic.protobuf.HardwareModel\x12\x13\n\x0bis_licensed\x18\x05 \x01(\x08\x12;\n\x04role\x18\x06 \x01(\x0e\x32-.meshtastic.protobuf.Config.DeviceConfig.Role\x12\x12\n\npublic_key\x18\x07 \x01(\x0c\x12\x1c\n\x0fis_unmessagable\x18\t \x01(\x08H\x00\x88\x01\x01\x42\x12\n\x10_is_unmessagable\"\xf0\x02\n\x0cNodeInfoLite\x12\x0b\n\x03num\x18\x01 \x01(\r\x12+\n\x04user\x18\x02 \x01(\x0b\x32\x1d.meshtastic.protobuf.UserLite\x12\x33\n\x08position\x18\x03 \x01(\x0b\x32!.meshtastic.protobuf.PositionLite\x12\x0b\n\x03snr\x18\x04 \x01(\x02\x12\x12\n\nlast_heard\x18\x05 \x01(\x07\x12:\n\x0e\x64\x65vice_metrics\x18\x06 \x01(\x0b\x32\".meshtastic.protobuf.DeviceMetrics\x12\x0f\n\x07\x63hannel\x18\x07 \x01(\r\x12\x10\n\x08via_mqtt\x18\x08 \x01(\x08\x12\x16\n\thops_away\x18\t \x01(\rH\x00\x88\x01\x01\x12\x13\n\x0bis_favorite\x18\n \x01(\x08\x12\x12\n\nis_ignored\x18\x0b \x01(\x08\x12\x10\n\x08next_hop\x18\x0c \x01(\r\x12\x10\n\x08\x62itfield\x18\r \x01(\rB\x0c\n\n_hops_away\"\xa1\x03\n\x0b\x44\x65viceState\x12\x30\n\x07my_node\x18\x02 \x01(\x0b\x32\x1f.meshtastic.protobuf.MyNodeInfo\x12(\n\x05owner\x18\x03 \x01(\x0b\x32\x19.meshtastic.protobuf.User\x12\x36\n\rreceive_queue\x18\x05 \x03(\x0b\x32\x1f.meshtastic.protobuf.MeshPacket\x12\x0f\n\x07version\x18\x08 \x01(\r\x12\x38\n\x0frx_text_message\x18\x07 \x01(\x0b\x32\x1f.meshtastic.protobuf.MeshPacket\x12\x13\n\x07no_save\x18\t \x01(\x08\x42\x02\x18\x01\x12\x19\n\rdid_gps_reset\x18\x0b \x01(\x08\x42\x02\x18\x01\x12\x34\n\x0brx_waypoint\x18\x0c \x01(\x0b\x32\x1f.meshtastic.protobuf.MeshPacket\x12M\n\x19node_remote_hardware_pins\x18\r \x03(\x0b\x32*.meshtastic.protobuf.NodeRemoteHardwarePin\"}\n\x0cNodeDatabase\x12\x0f\n\x07version\x18\x01 \x01(\r\x12\\\n\x05nodes\x18\x02 \x03(\x0b\x32!.meshtastic.protobuf.NodeInfoLiteB*\x92?\'\x92\x01$std::vector<meshtastic_NodeInfoLite>\"N\n\x0b\x43hannelFile\x12.\n\x08\x63hannels\x18\x01 \x03(\x0b\x32\x1c.meshtastic.protobuf.Channel\x12\x0f\n\x07version\x18\x02 \x01(\r\"\x86\x02\n\x11\x42\x61\x63kupPreferences\x12\x0f\n\x07version\x18\x01 \x01(\r\x12\x11\n\ttimestamp\x18\x02 \x01(\x07\x12\x30\n\x06\x63onfig\x18\x03 \x01(\x0b\x32 .meshtastic.protobuf.LocalConfig\x12=\n\rmodule_config\x18\x04 \x01(\x0b\x32&.meshtastic.protobuf.LocalModuleConfig\x12\x32\n\x08\x63hannels\x18\x05 \x01(\x0b\x32 .meshtastic.protobuf.ChannelFile\x12(\n\x05owner\x18\x06 \x01(\x0b\x32\x19.meshtastic.protobuf.UserBn\n\x14org.meshtastic.protoB\nDeviceOnlyZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x92?\x0b\xc2\x01\x08<vector>b\x06proto3')
 
-_globals = globals()
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.deviceonly_pb2', _globals)
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.deviceonly_pb2', globals())
 if _descriptor._USE_C_DESCRIPTORS == False:
+
   DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\nDeviceOnlyZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000\222?\013\302\001\010<vector>'
+  DESCRIPTOR._serialized_options = b'\n\024org.meshtastic.protoB\nDeviceOnlyZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000\222?\013\302\001\010<vector>'
   _USERLITE.fields_by_name['macaddr']._options = None
   _USERLITE.fields_by_name['macaddr']._serialized_options = b'\030\001'
   _DEVICESTATE.fields_by_name['no_save']._options = None
@@ -35,18 +35,18 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _DEVICESTATE.fields_by_name['did_gps_reset']._serialized_options = b'\030\001'
   _NODEDATABASE.fields_by_name['nodes']._options = None
   _NODEDATABASE.fields_by_name['nodes']._serialized_options = b'\222?\'\222\001$std::vector<meshtastic_NodeInfoLite>'
-  _globals['_POSITIONLITE']._serialized_start=271
-  _globals['_POSITIONLITE']._serialized_end=424
-  _globals['_USERLITE']._serialized_start=427
-  _globals['_USERLITE']._serialized_end=703
-  _globals['_NODEINFOLITE']._serialized_start=706
-  _globals['_NODEINFOLITE']._serialized_end=1074
-  _globals['_DEVICESTATE']._serialized_start=1077
-  _globals['_DEVICESTATE']._serialized_end=1494
-  _globals['_NODEDATABASE']._serialized_start=1496
-  _globals['_NODEDATABASE']._serialized_end=1621
-  _globals['_CHANNELFILE']._serialized_start=1623
-  _globals['_CHANNELFILE']._serialized_end=1701
-  _globals['_BACKUPPREFERENCES']._serialized_start=1704
-  _globals['_BACKUPPREFERENCES']._serialized_end=1966
+  _POSITIONLITE._serialized_start=271
+  _POSITIONLITE._serialized_end=424
+  _USERLITE._serialized_start=427
+  _USERLITE._serialized_end=703
+  _NODEINFOLITE._serialized_start=706
+  _NODEINFOLITE._serialized_end=1074
+  _DEVICESTATE._serialized_start=1077
+  _DEVICESTATE._serialized_end=1494
+  _NODEDATABASE._serialized_start=1496
+  _NODEDATABASE._serialized_end=1621
+  _CHANNELFILE._serialized_start=1623
+  _CHANNELFILE._serialized_end=1701
+  _BACKUPPREFERENCES._serialized_start=1704
+  _BACKUPPREFERENCES._serialized_end=1966
 # @@protoc_insertion_point(module_scope)

meshtastic/protobuf/deviceonly_pb2.pyi

@@ -1,458 +1,130 @@
-"""
-@generated by mypy-protobuf.  Do not edit manually!
-isort:skip_file
-"""
+from meshtastic.protobuf import channel_pb2 as _channel_pb2
+from meshtastic.protobuf import config_pb2 as _config_pb2
+from meshtastic.protobuf import localonly_pb2 as _localonly_pb2
+from meshtastic.protobuf import mesh_pb2 as _mesh_pb2
+from meshtastic.protobuf import telemetry_pb2 as _telemetry_pb2
+from meshtastic.protobuf import nanopb_pb2 as _nanopb_pb2
+from google.protobuf.internal import containers as _containers
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from typing import ClassVar as _ClassVar, Iterable as _Iterable, Mapping as _Mapping, Optional as _Optional, Union as _Union
 
-import builtins
-import collections.abc
-import google.protobuf.descriptor
-import google.protobuf.internal.containers
-import google.protobuf.message
-import meshtastic.protobuf.channel_pb2
-import meshtastic.protobuf.config_pb2
-import meshtastic.protobuf.localonly_pb2
-import meshtastic.protobuf.mesh_pb2
-import meshtastic.protobuf.telemetry_pb2
-import typing
+DESCRIPTOR: _descriptor.FileDescriptor
 
-DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
+class BackupPreferences(_message.Message):
+    __slots__ = ["channels", "config", "module_config", "owner", "timestamp", "version"]
+    CHANNELS_FIELD_NUMBER: _ClassVar[int]
+    CONFIG_FIELD_NUMBER: _ClassVar[int]
+    MODULE_CONFIG_FIELD_NUMBER: _ClassVar[int]
+    OWNER_FIELD_NUMBER: _ClassVar[int]
+    TIMESTAMP_FIELD_NUMBER: _ClassVar[int]
+    VERSION_FIELD_NUMBER: _ClassVar[int]
+    channels: ChannelFile
+    config: _localonly_pb2.LocalConfig
+    module_config: _localonly_pb2.LocalModuleConfig
+    owner: _mesh_pb2.User
+    timestamp: int
+    version: int
+    def __init__(self, version: _Optional[int] = ..., timestamp: _Optional[int] = ..., config: _Optional[_Union[_localonly_pb2.LocalConfig, _Mapping]] = ..., module_config: _Optional[_Union[_localonly_pb2.LocalModuleConfig, _Mapping]] = ..., channels: _Optional[_Union[ChannelFile, _Mapping]] = ..., owner: _Optional[_Union[_mesh_pb2.User, _Mapping]] = ...) -> None: ...
 
-@typing.final
-class PositionLite(google.protobuf.message.Message):
-    """
-    Position with static location information only for NodeDBLite
-    """
+class ChannelFile(_message.Message):
+    __slots__ = ["channels", "version"]
+    CHANNELS_FIELD_NUMBER: _ClassVar[int]
+    VERSION_FIELD_NUMBER: _ClassVar[int]
+    channels: _containers.RepeatedCompositeFieldContainer[_channel_pb2.Channel]
+    version: int
+    def __init__(self, channels: _Optional[_Iterable[_Union[_channel_pb2.Channel, _Mapping]]] = ..., version: _Optional[int] = ...) -> None: ...
 
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+class DeviceState(_message.Message):
+    __slots__ = ["did_gps_reset", "my_node", "no_save", "node_remote_hardware_pins", "owner", "receive_queue", "rx_text_message", "rx_waypoint", "version"]
+    DID_GPS_RESET_FIELD_NUMBER: _ClassVar[int]
+    MY_NODE_FIELD_NUMBER: _ClassVar[int]
+    NODE_REMOTE_HARDWARE_PINS_FIELD_NUMBER: _ClassVar[int]
+    NO_SAVE_FIELD_NUMBER: _ClassVar[int]
+    OWNER_FIELD_NUMBER: _ClassVar[int]
+    RECEIVE_QUEUE_FIELD_NUMBER: _ClassVar[int]
+    RX_TEXT_MESSAGE_FIELD_NUMBER: _ClassVar[int]
+    RX_WAYPOINT_FIELD_NUMBER: _ClassVar[int]
+    VERSION_FIELD_NUMBER: _ClassVar[int]
+    did_gps_reset: bool
+    my_node: _mesh_pb2.MyNodeInfo
+    no_save: bool
+    node_remote_hardware_pins: _containers.RepeatedCompositeFieldContainer[_mesh_pb2.NodeRemoteHardwarePin]
+    owner: _mesh_pb2.User
+    receive_queue: _containers.RepeatedCompositeFieldContainer[_mesh_pb2.MeshPacket]
+    rx_text_message: _mesh_pb2.MeshPacket
+    rx_waypoint: _mesh_pb2.MeshPacket
+    version: int
+    def __init__(self, my_node: _Optional[_Union[_mesh_pb2.MyNodeInfo, _Mapping]] = ..., owner: _Optional[_Union[_mesh_pb2.User, _Mapping]] = ..., receive_queue: _Optional[_Iterable[_Union[_mesh_pb2.MeshPacket, _Mapping]]] = ..., version: _Optional[int] = ..., rx_text_message: _Optional[_Union[_mesh_pb2.MeshPacket, _Mapping]] = ..., no_save: bool = ..., did_gps_reset: bool = ..., rx_waypoint: _Optional[_Union[_mesh_pb2.MeshPacket, _Mapping]] = ..., node_remote_hardware_pins: _Optional[_Iterable[_Union[_mesh_pb2.NodeRemoteHardwarePin, _Mapping]]] = ...) -> None: ...
 
-    LATITUDE_I_FIELD_NUMBER: builtins.int
-    LONGITUDE_I_FIELD_NUMBER: builtins.int
-    ALTITUDE_FIELD_NUMBER: builtins.int
-    TIME_FIELD_NUMBER: builtins.int
-    LOCATION_SOURCE_FIELD_NUMBER: builtins.int
-    latitude_i: builtins.int
-    """
-    The new preferred location encoding, multiply by 1e-7 to get degrees
-    in floating point
-    """
-    longitude_i: builtins.int
-    """
-    TODO: REPLACE
-    """
-    altitude: builtins.int
-    """
-    In meters above MSL (but see issue #359)
-    """
-    time: builtins.int
-    """
-    This is usually not sent over the mesh (to save space), but it is sent
-    from the phone so that the local device can set its RTC If it is sent over
-    the mesh (because there are devices on the mesh without GPS), it will only
-    be sent by devices which has a hardware GPS clock.
-    seconds since 1970
-    """
-    location_source: meshtastic.protobuf.mesh_pb2.Position.LocSource.ValueType
-    """
-    TODO: REPLACE
-    """
-    def __init__(
-        self,
-        *,
-        latitude_i: builtins.int = ...,
-        longitude_i: builtins.int = ...,
-        altitude: builtins.int = ...,
-        time: builtins.int = ...,
-        location_source: meshtastic.protobuf.mesh_pb2.Position.LocSource.ValueType = ...,
-    ) -> None: ...
-    def ClearField(self, field_name: typing.Literal["altitude", b"altitude", "latitude_i", b"latitude_i", "location_source", b"location_source", "longitude_i", b"longitude_i", "time", b"time"]) -> None: ...
+class NodeDatabase(_message.Message):
+    __slots__ = ["nodes", "version"]
+    NODES_FIELD_NUMBER: _ClassVar[int]
+    VERSION_FIELD_NUMBER: _ClassVar[int]
+    nodes: _containers.RepeatedCompositeFieldContainer[NodeInfoLite]
+    version: int
+    def __init__(self, version: _Optional[int] = ..., nodes: _Optional[_Iterable[_Union[NodeInfoLite, _Mapping]]] = ...) -> None: ...
 
-global___PositionLite = PositionLite
+class NodeInfoLite(_message.Message):
+    __slots__ = ["bitfield", "channel", "device_metrics", "hops_away", "is_favorite", "is_ignored", "last_heard", "next_hop", "num", "position", "snr", "user", "via_mqtt"]
+    BITFIELD_FIELD_NUMBER: _ClassVar[int]
+    CHANNEL_FIELD_NUMBER: _ClassVar[int]
+    DEVICE_METRICS_FIELD_NUMBER: _ClassVar[int]
+    HOPS_AWAY_FIELD_NUMBER: _ClassVar[int]
+    IS_FAVORITE_FIELD_NUMBER: _ClassVar[int]
+    IS_IGNORED_FIELD_NUMBER: _ClassVar[int]
+    LAST_HEARD_FIELD_NUMBER: _ClassVar[int]
+    NEXT_HOP_FIELD_NUMBER: _ClassVar[int]
+    NUM_FIELD_NUMBER: _ClassVar[int]
+    POSITION_FIELD_NUMBER: _ClassVar[int]
+    SNR_FIELD_NUMBER: _ClassVar[int]
+    USER_FIELD_NUMBER: _ClassVar[int]
+    VIA_MQTT_FIELD_NUMBER: _ClassVar[int]
+    bitfield: int
+    channel: int
+    device_metrics: _telemetry_pb2.DeviceMetrics
+    hops_away: int
+    is_favorite: bool
+    is_ignored: bool
+    last_heard: int
+    next_hop: int
+    num: int
+    position: PositionLite
+    snr: float
+    user: UserLite
+    via_mqtt: bool
+    def __init__(self, num: _Optional[int] = ..., user: _Optional[_Union[UserLite, _Mapping]] = ..., position: _Optional[_Union[PositionLite, _Mapping]] = ..., snr: _Optional[float] = ..., last_heard: _Optional[int] = ..., device_metrics: _Optional[_Union[_telemetry_pb2.DeviceMetrics, _Mapping]] = ..., channel: _Optional[int] = ..., via_mqtt: bool = ..., hops_away: _Optional[int] = ..., is_favorite: bool = ..., is_ignored: bool = ..., next_hop: _Optional[int] = ..., bitfield: _Optional[int] = ...) -> None: ...
 
-@typing.final
-class UserLite(google.protobuf.message.Message):
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+class PositionLite(_message.Message):
+    __slots__ = ["altitude", "latitude_i", "location_source", "longitude_i", "time"]
+    ALTITUDE_FIELD_NUMBER: _ClassVar[int]
+    LATITUDE_I_FIELD_NUMBER: _ClassVar[int]
+    LOCATION_SOURCE_FIELD_NUMBER: _ClassVar[int]
+    LONGITUDE_I_FIELD_NUMBER: _ClassVar[int]
+    TIME_FIELD_NUMBER: _ClassVar[int]
+    altitude: int
+    latitude_i: int
+    location_source: _mesh_pb2.Position.LocSource
+    longitude_i: int
+    time: int
+    def __init__(self, latitude_i: _Optional[int] = ..., longitude_i: _Optional[int] = ..., altitude: _Optional[int] = ..., time: _Optional[int] = ..., location_source: _Optional[_Union[_mesh_pb2.Position.LocSource, str]] = ...) -> None: ...
 
-    MACADDR_FIELD_NUMBER: builtins.int
-    LONG_NAME_FIELD_NUMBER: builtins.int
-    SHORT_NAME_FIELD_NUMBER: builtins.int
-    HW_MODEL_FIELD_NUMBER: builtins.int
-    IS_LICENSED_FIELD_NUMBER: builtins.int
-    ROLE_FIELD_NUMBER: builtins.int
-    PUBLIC_KEY_FIELD_NUMBER: builtins.int
-    IS_UNMESSAGABLE_FIELD_NUMBER: builtins.int
-    macaddr: builtins.bytes
-    """
-    This is the addr of the radio.
-    """
-    long_name: builtins.str
-    """
-    A full name for this user, i.e. "Kevin Hester"
-    """
-    short_name: builtins.str
-    """
-    A VERY short name, ideally two characters.
-    Suitable for a tiny OLED screen
-    """
-    hw_model: meshtastic.protobuf.mesh_pb2.HardwareModel.ValueType
-    """
-    TBEAM, HELTEC, etc...
-    Starting in 1.2.11 moved to hw_model enum in the NodeInfo object.
-    Apps will still need the string here for older builds
-    (so OTA update can find the right image), but if the enum is available it will be used instead.
-    """
-    is_licensed: builtins.bool
-    """
-    In some regions Ham radio operators have different bandwidth limitations than others.
-    If this user is a licensed operator, set this flag.
-    Also, "long_name" should be their licence number.
-    """
-    role: meshtastic.protobuf.config_pb2.Config.DeviceConfig.Role.ValueType
-    """
-    Indicates that the user's role in the mesh
-    """
-    public_key: builtins.bytes
-    """
-    The public key of the user's device.
-    This is sent out to other nodes on the mesh to allow them to compute a shared secret key.
-    """
-    is_unmessagable: builtins.bool
-    """
-    Whether or not the node can be messaged
-    """
-    def __init__(
-        self,
-        *,
-        macaddr: builtins.bytes = ...,
-        long_name: builtins.str = ...,
-        short_name: builtins.str = ...,
-        hw_model: meshtastic.protobuf.mesh_pb2.HardwareModel.ValueType = ...,
-        is_licensed: builtins.bool = ...,
-        role: meshtastic.protobuf.config_pb2.Config.DeviceConfig.Role.ValueType = ...,
-        public_key: builtins.bytes = ...,
-        is_unmessagable: builtins.bool | None = ...,
-    ) -> None: ...
-    def HasField(self, field_name: typing.Literal["_is_unmessagable", b"_is_unmessagable", "is_unmessagable", b"is_unmessagable"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing.Literal["_is_unmessagable", b"_is_unmessagable", "hw_model", b"hw_model", "is_licensed", b"is_licensed", "is_unmessagable", b"is_unmessagable", "long_name", b"long_name", "macaddr", b"macaddr", "public_key", b"public_key", "role", b"role", "short_name", b"short_name"]) -> None: ...
-    def WhichOneof(self, oneof_group: typing.Literal["_is_unmessagable", b"_is_unmessagable"]) -> typing.Literal["is_unmessagable"] | None: ...
-
-global___UserLite = UserLite
-
-@typing.final
-class NodeInfoLite(google.protobuf.message.Message):
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    NUM_FIELD_NUMBER: builtins.int
-    USER_FIELD_NUMBER: builtins.int
-    POSITION_FIELD_NUMBER: builtins.int
-    SNR_FIELD_NUMBER: builtins.int
-    LAST_HEARD_FIELD_NUMBER: builtins.int
-    DEVICE_METRICS_FIELD_NUMBER: builtins.int
-    CHANNEL_FIELD_NUMBER: builtins.int
-    VIA_MQTT_FIELD_NUMBER: builtins.int
-    HOPS_AWAY_FIELD_NUMBER: builtins.int
-    IS_FAVORITE_FIELD_NUMBER: builtins.int
-    IS_IGNORED_FIELD_NUMBER: builtins.int
-    NEXT_HOP_FIELD_NUMBER: builtins.int
-    BITFIELD_FIELD_NUMBER: builtins.int
-    num: builtins.int
-    """
-    The node number
-    """
-    snr: builtins.float
-    """
-    Returns the Signal-to-noise ratio (SNR) of the last received message,
-    as measured by the receiver. Return SNR of the last received message in dB
-    """
-    last_heard: builtins.int
-    """
-    Set to indicate the last time we received a packet from this node
-    """
-    channel: builtins.int
-    """
-    local channel index we heard that node on. Only populated if its not the default channel.
-    """
-    via_mqtt: builtins.bool
-    """
-    True if we witnessed the node over MQTT instead of LoRA transport
-    """
-    hops_away: builtins.int
-    """
-    Number of hops away from us this node is (0 if direct neighbor)
-    """
-    is_favorite: builtins.bool
-    """
-    True if node is in our favorites list
-    Persists between NodeDB internal clean ups
-    """
-    is_ignored: builtins.bool
-    """
-    True if node is in our ignored list
-    Persists between NodeDB internal clean ups
-    """
-    next_hop: builtins.int
-    """
-    Last byte of the node number of the node that should be used as the next hop to reach this node.
-    """
-    bitfield: builtins.int
-    """
-    Bitfield for storing booleans.
-    LSB 0 is_key_manually_verified
-    """
-    @property
-    def user(self) -> global___UserLite:
-        """
-        The user info for this node
-        """
-
-    @property
-    def position(self) -> global___PositionLite:
-        """
-        This position data. Note: before 1.2.14 we would also store the last time we've heard from this node in position.time, that is no longer true.
-        Position.time now indicates the last time we received a POSITION from that node.
-        """
-
-    @property
-    def device_metrics(self) -> meshtastic.protobuf.telemetry_pb2.DeviceMetrics:
-        """
-        The latest device metrics for the node.
-        """
-
-    def __init__(
-        self,
-        *,
-        num: builtins.int = ...,
-        user: global___UserLite | None = ...,
-        position: global___PositionLite | None = ...,
-        snr: builtins.float = ...,
-        last_heard: builtins.int = ...,
-        device_metrics: meshtastic.protobuf.telemetry_pb2.DeviceMetrics | None = ...,
-        channel: builtins.int = ...,
-        via_mqtt: builtins.bool = ...,
-        hops_away: builtins.int | None = ...,
-        is_favorite: builtins.bool = ...,
-        is_ignored: builtins.bool = ...,
-        next_hop: builtins.int = ...,
-        bitfield: builtins.int = ...,
-    ) -> None: ...
-    def HasField(self, field_name: typing.Literal["_hops_away", b"_hops_away", "device_metrics", b"device_metrics", "hops_away", b"hops_away", "position", b"position", "user", b"user"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing.Literal["_hops_away", b"_hops_away", "bitfield", b"bitfield", "channel", b"channel", "device_metrics", b"device_metrics", "hops_away", b"hops_away", "is_favorite", b"is_favorite", "is_ignored", b"is_ignored", "last_heard", b"last_heard", "next_hop", b"next_hop", "num", b"num", "position", b"position", "snr", b"snr", "user", b"user", "via_mqtt", b"via_mqtt"]) -> None: ...
-    def WhichOneof(self, oneof_group: typing.Literal["_hops_away", b"_hops_away"]) -> typing.Literal["hops_away"] | None: ...
-
-global___NodeInfoLite = NodeInfoLite
-
-@typing.final
-class DeviceState(google.protobuf.message.Message):
-    """
-    This message is never sent over the wire, but it is used for serializing DB
-    state to flash in the device code
-    FIXME, since we write this each time we enter deep sleep (and have infinite
-    flash) it would be better to use some sort of append only data structure for
-    the receive queue and use the preferences store for the other stuff
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    MY_NODE_FIELD_NUMBER: builtins.int
-    OWNER_FIELD_NUMBER: builtins.int
-    RECEIVE_QUEUE_FIELD_NUMBER: builtins.int
-    VERSION_FIELD_NUMBER: builtins.int
-    RX_TEXT_MESSAGE_FIELD_NUMBER: builtins.int
-    NO_SAVE_FIELD_NUMBER: builtins.int
-    DID_GPS_RESET_FIELD_NUMBER: builtins.int
-    RX_WAYPOINT_FIELD_NUMBER: builtins.int
-    NODE_REMOTE_HARDWARE_PINS_FIELD_NUMBER: builtins.int
-    version: builtins.int
-    """
-    A version integer used to invalidate old save files when we make
-    incompatible changes This integer is set at build time and is private to
-    NodeDB.cpp in the device code.
-    """
-    no_save: builtins.bool
-    """
-    Used only during development.
-    Indicates developer is testing and changes should never be saved to flash.
-    Deprecated in 2.3.1
-    """
-    did_gps_reset: builtins.bool
-    """
-    Previously used to manage GPS factory resets.
-    Deprecated in 2.5.23
-    """
-    @property
-    def my_node(self) -> meshtastic.protobuf.mesh_pb2.MyNodeInfo:
-        """
-        Read only settings/info about this node
-        """
-
-    @property
-    def owner(self) -> meshtastic.protobuf.mesh_pb2.User:
-        """
-        My owner info
-        """
-
-    @property
-    def receive_queue(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[meshtastic.protobuf.mesh_pb2.MeshPacket]:
-        """
-        Received packets saved for delivery to the phone
-        """
-
-    @property
-    def rx_text_message(self) -> meshtastic.protobuf.mesh_pb2.MeshPacket:
-        """
-        We keep the last received text message (only) stored in the device flash,
-        so we can show it on the screen.
-        Might be null
-        """
-
-    @property
-    def rx_waypoint(self) -> meshtastic.protobuf.mesh_pb2.MeshPacket:
-        """
-        We keep the last received waypoint stored in the device flash,
-        so we can show it on the screen.
-        Might be null
-        """
-
-    @property
-    def node_remote_hardware_pins(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[meshtastic.protobuf.mesh_pb2.NodeRemoteHardwarePin]:
-        """
-        The mesh's nodes with their available gpio pins for RemoteHardware module
-        """
-
-    def __init__(
-        self,
-        *,
-        my_node: meshtastic.protobuf.mesh_pb2.MyNodeInfo | None = ...,
-        owner: meshtastic.protobuf.mesh_pb2.User | None = ...,
-        receive_queue: collections.abc.Iterable[meshtastic.protobuf.mesh_pb2.MeshPacket] | None = ...,
-        version: builtins.int = ...,
-        rx_text_message: meshtastic.protobuf.mesh_pb2.MeshPacket | None = ...,
-        no_save: builtins.bool = ...,
-        did_gps_reset: builtins.bool = ...,
-        rx_waypoint: meshtastic.protobuf.mesh_pb2.MeshPacket | None = ...,
-        node_remote_hardware_pins: collections.abc.Iterable[meshtastic.protobuf.mesh_pb2.NodeRemoteHardwarePin] | None = ...,
-    ) -> None: ...
-    def HasField(self, field_name: typing.Literal["my_node", b"my_node", "owner", b"owner", "rx_text_message", b"rx_text_message", "rx_waypoint", b"rx_waypoint"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing.Literal["did_gps_reset", b"did_gps_reset", "my_node", b"my_node", "no_save", b"no_save", "node_remote_hardware_pins", b"node_remote_hardware_pins", "owner", b"owner", "receive_queue", b"receive_queue", "rx_text_message", b"rx_text_message", "rx_waypoint", b"rx_waypoint", "version", b"version"]) -> None: ...
-
-global___DeviceState = DeviceState
-
-@typing.final
-class NodeDatabase(google.protobuf.message.Message):
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    VERSION_FIELD_NUMBER: builtins.int
-    NODES_FIELD_NUMBER: builtins.int
-    version: builtins.int
-    """
-    A version integer used to invalidate old save files when we make
-    incompatible changes This integer is set at build time and is private to
-    NodeDB.cpp in the device code.
-    """
-    @property
-    def nodes(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[global___NodeInfoLite]:
-        """
-        New lite version of NodeDB to decrease memory footprint
-        """
-
-    def __init__(
-        self,
-        *,
-        version: builtins.int = ...,
-        nodes: collections.abc.Iterable[global___NodeInfoLite] | None = ...,
-    ) -> None: ...
-    def ClearField(self, field_name: typing.Literal["nodes", b"nodes", "version", b"version"]) -> None: ...
-
-global___NodeDatabase = NodeDatabase
-
-@typing.final
-class ChannelFile(google.protobuf.message.Message):
-    """
-    The on-disk saved channels
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    CHANNELS_FIELD_NUMBER: builtins.int
-    VERSION_FIELD_NUMBER: builtins.int
-    version: builtins.int
-    """
-    A version integer used to invalidate old save files when we make
-    incompatible changes This integer is set at build time and is private to
-    NodeDB.cpp in the device code.
-    """
-    @property
-    def channels(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[meshtastic.protobuf.channel_pb2.Channel]:
-        """
-        The channels our node knows about
-        """
-
-    def __init__(
-        self,
-        *,
-        channels: collections.abc.Iterable[meshtastic.protobuf.channel_pb2.Channel] | None = ...,
-        version: builtins.int = ...,
-    ) -> None: ...
-    def ClearField(self, field_name: typing.Literal["channels", b"channels", "version", b"version"]) -> None: ...
-
-global___ChannelFile = ChannelFile
-
-@typing.final
-class BackupPreferences(google.protobuf.message.Message):
-    """
-    The on-disk backup of the node's preferences
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    VERSION_FIELD_NUMBER: builtins.int
-    TIMESTAMP_FIELD_NUMBER: builtins.int
-    CONFIG_FIELD_NUMBER: builtins.int
-    MODULE_CONFIG_FIELD_NUMBER: builtins.int
-    CHANNELS_FIELD_NUMBER: builtins.int
-    OWNER_FIELD_NUMBER: builtins.int
-    version: builtins.int
-    """
-    The version of the backup
-    """
-    timestamp: builtins.int
-    """
-    The timestamp of the backup (if node has time)
-    """
-    @property
-    def config(self) -> meshtastic.protobuf.localonly_pb2.LocalConfig:
-        """
-        The node's configuration
-        """
-
-    @property
-    def module_config(self) -> meshtastic.protobuf.localonly_pb2.LocalModuleConfig:
-        """
-        The node's module configuration
-        """
-
-    @property
-    def channels(self) -> global___ChannelFile:
-        """
-        The node's channels
-        """
-
-    @property
-    def owner(self) -> meshtastic.protobuf.mesh_pb2.User:
-        """
-        The node's user (owner) information
-        """
-
-    def __init__(
-        self,
-        *,
-        version: builtins.int = ...,
-        timestamp: builtins.int = ...,
-        config: meshtastic.protobuf.localonly_pb2.LocalConfig | None = ...,
-        module_config: meshtastic.protobuf.localonly_pb2.LocalModuleConfig | None = ...,
-        channels: global___ChannelFile | None = ...,
-        owner: meshtastic.protobuf.mesh_pb2.User | None = ...,
-    ) -> None: ...
-    def HasField(self, field_name: typing.Literal["channels", b"channels", "config", b"config", "module_config", b"module_config", "owner", b"owner"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing.Literal["channels", b"channels", "config", b"config", "module_config", b"module_config", "owner", b"owner", "timestamp", b"timestamp", "version", b"version"]) -> None: ...
-
-global___BackupPreferences = BackupPreferences
+class UserLite(_message.Message):
+    __slots__ = ["hw_model", "is_licensed", "is_unmessagable", "long_name", "macaddr", "public_key", "role", "short_name"]
+    HW_MODEL_FIELD_NUMBER: _ClassVar[int]
+    IS_LICENSED_FIELD_NUMBER: _ClassVar[int]
+    IS_UNMESSAGABLE_FIELD_NUMBER: _ClassVar[int]
+    LONG_NAME_FIELD_NUMBER: _ClassVar[int]
+    MACADDR_FIELD_NUMBER: _ClassVar[int]
+    PUBLIC_KEY_FIELD_NUMBER: _ClassVar[int]
+    ROLE_FIELD_NUMBER: _ClassVar[int]
+    SHORT_NAME_FIELD_NUMBER: _ClassVar[int]
+    hw_model: _mesh_pb2.HardwareModel
+    is_licensed: bool
+    is_unmessagable: bool
+    long_name: str
+    macaddr: bytes
+    public_key: bytes
+    role: _config_pb2.Config.DeviceConfig.Role
+    short_name: str
+    def __init__(self, macaddr: _Optional[bytes] = ..., long_name: _Optional[str] = ..., short_name: _Optional[str] = ..., hw_model: _Optional[_Union[_mesh_pb2.HardwareModel, str]] = ..., is_licensed: bool = ..., role: _Optional[_Union[_config_pb2.Config.DeviceConfig.Role, str]] = ..., public_key: _Optional[bytes] = ..., is_unmessagable: bool = ...) -> None: ...

meshtastic/protobuf/interdevice_pb2.py

@@ -2,10 +2,10 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: meshtastic/protobuf/interdevice.proto
 """Generated protocol buffer code."""
+from google.protobuf.internal import builder as _builder
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
 from google.protobuf import symbol_database as _symbol_database
-from google.protobuf.internal import builder as _builder
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -13,18 +13,18 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n%meshtastic/protobuf/interdevice.proto\x12\x13meshtastic.protobuf\"s\n\nSensorData\x12.\n\x04type\x18\x01 \x01(\x0e\x32 .meshtastic.protobuf.MessageType\x12\x15\n\x0b\x66loat_value\x18\x02 \x01(\x02H\x00\x12\x16\n\x0cuint32_value\x18\x03 \x01(\rH\x00\x42\x06\n\x04\x64\x61ta\"_\n\x12InterdeviceMessage\x12\x0e\n\x04nmea\x18\x01 \x01(\tH\x00\x12\x31\n\x06sensor\x18\x02 \x01(\x0b\x32\x1f.meshtastic.protobuf.SensorDataH\x00\x42\x06\n\x04\x64\x61ta*\xd5\x01\n\x0bMessageType\x12\x07\n\x03\x41\x43K\x10\x00\x12\x15\n\x10\x43OLLECT_INTERVAL\x10\xa0\x01\x12\x0c\n\x07\x42\x45\x45P_ON\x10\xa1\x01\x12\r\n\x08\x42\x45\x45P_OFF\x10\xa2\x01\x12\r\n\x08SHUTDOWN\x10\xa3\x01\x12\r\n\x08POWER_ON\x10\xa4\x01\x12\x0f\n\nSCD41_TEMP\x10\xb0\x01\x12\x13\n\x0eSCD41_HUMIDITY\x10\xb1\x01\x12\x0e\n\tSCD41_CO2\x10\xb2\x01\x12\x0f\n\nAHT20_TEMP\x10\xb3\x01\x12\x13\n\x0e\x41HT20_HUMIDITY\x10\xb4\x01\x12\x0f\n\nTVOC_INDEX\x10\xb5\x01\x42\x66\n\x13\x63om.geeksville.meshB\x11InterdeviceProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n%meshtastic/protobuf/interdevice.proto\x12\x13meshtastic.protobuf\"s\n\nSensorData\x12.\n\x04type\x18\x01 \x01(\x0e\x32 .meshtastic.protobuf.MessageType\x12\x15\n\x0b\x66loat_value\x18\x02 \x01(\x02H\x00\x12\x16\n\x0cuint32_value\x18\x03 \x01(\rH\x00\x42\x06\n\x04\x64\x61ta\"_\n\x12InterdeviceMessage\x12\x0e\n\x04nmea\x18\x01 \x01(\tH\x00\x12\x31\n\x06sensor\x18\x02 \x01(\x0b\x32\x1f.meshtastic.protobuf.SensorDataH\x00\x42\x06\n\x04\x64\x61ta*\xd5\x01\n\x0bMessageType\x12\x07\n\x03\x41\x43K\x10\x00\x12\x15\n\x10\x43OLLECT_INTERVAL\x10\xa0\x01\x12\x0c\n\x07\x42\x45\x45P_ON\x10\xa1\x01\x12\r\n\x08\x42\x45\x45P_OFF\x10\xa2\x01\x12\r\n\x08SHUTDOWN\x10\xa3\x01\x12\r\n\x08POWER_ON\x10\xa4\x01\x12\x0f\n\nSCD41_TEMP\x10\xb0\x01\x12\x13\n\x0eSCD41_HUMIDITY\x10\xb1\x01\x12\x0e\n\tSCD41_CO2\x10\xb2\x01\x12\x0f\n\nAHT20_TEMP\x10\xb3\x01\x12\x13\n\x0e\x41HT20_HUMIDITY\x10\xb4\x01\x12\x0f\n\nTVOC_INDEX\x10\xb5\x01\x42g\n\x14org.meshtastic.protoB\x11InterdeviceProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
 
-_globals = globals()
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.interdevice_pb2', _globals)
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.interdevice_pb2', globals())
 if _descriptor._USE_C_DESCRIPTORS == False:
+
   DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\021InterdeviceProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
-  _globals['_MESSAGETYPE']._serialized_start=277
-  _globals['_MESSAGETYPE']._serialized_end=490
-  _globals['_SENSORDATA']._serialized_start=62
-  _globals['_SENSORDATA']._serialized_end=177
-  _globals['_INTERDEVICEMESSAGE']._serialized_start=179
-  _globals['_INTERDEVICEMESSAGE']._serialized_end=274
+  DESCRIPTOR._serialized_options = b'\n\024org.meshtastic.protoB\021InterdeviceProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
+  _MESSAGETYPE._serialized_start=277
+  _MESSAGETYPE._serialized_end=490
+  _SENSORDATA._serialized_start=62
+  _SENSORDATA._serialized_end=177
+  _INTERDEVICEMESSAGE._serialized_start=179
+  _INTERDEVICEMESSAGE._serialized_end=274
 # @@protoc_insertion_point(module_scope)

meshtastic/protobuf/interdevice_pb2.pyi

@@ -1,105 +1,39 @@
-"""
-@generated by mypy-protobuf.  Do not edit manually!
-isort:skip_file
-"""
+from google.protobuf.internal import enum_type_wrapper as _enum_type_wrapper
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from typing import ClassVar as _ClassVar, Mapping as _Mapping, Optional as _Optional, Union as _Union
 
-import builtins
-import google.protobuf.descriptor
-import google.protobuf.internal.enum_type_wrapper
-import google.protobuf.message
-import sys
-import typing
+ACK: MessageType
+AHT20_HUMIDITY: MessageType
+AHT20_TEMP: MessageType
+BEEP_OFF: MessageType
+BEEP_ON: MessageType
+COLLECT_INTERVAL: MessageType
+DESCRIPTOR: _descriptor.FileDescriptor
+POWER_ON: MessageType
+SCD41_CO2: MessageType
+SCD41_HUMIDITY: MessageType
+SCD41_TEMP: MessageType
+SHUTDOWN: MessageType
+TVOC_INDEX: MessageType
 
-if sys.version_info >= (3, 10):
-    import typing as typing_extensions
-else:
-    import typing_extensions
+class InterdeviceMessage(_message.Message):
+    __slots__ = ["nmea", "sensor"]
+    NMEA_FIELD_NUMBER: _ClassVar[int]
+    SENSOR_FIELD_NUMBER: _ClassVar[int]
+    nmea: str
+    sensor: SensorData
+    def __init__(self, nmea: _Optional[str] = ..., sensor: _Optional[_Union[SensorData, _Mapping]] = ...) -> None: ...
 
-DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
+class SensorData(_message.Message):
+    __slots__ = ["float_value", "type", "uint32_value"]
+    FLOAT_VALUE_FIELD_NUMBER: _ClassVar[int]
+    TYPE_FIELD_NUMBER: _ClassVar[int]
+    UINT32_VALUE_FIELD_NUMBER: _ClassVar[int]
+    float_value: float
+    type: MessageType
+    uint32_value: int
+    def __init__(self, type: _Optional[_Union[MessageType, str]] = ..., float_value: _Optional[float] = ..., uint32_value: _Optional[int] = ...) -> None: ...
 
-class _MessageType:
-    ValueType = typing.NewType("ValueType", builtins.int)
-    V: typing_extensions.TypeAlias = ValueType
-
-class _MessageTypeEnumTypeWrapper(google.protobuf.internal.enum_type_wrapper._EnumTypeWrapper[_MessageType.ValueType], builtins.type):
-    DESCRIPTOR: google.protobuf.descriptor.EnumDescriptor
-    ACK: _MessageType.ValueType  # 0
-    COLLECT_INTERVAL: _MessageType.ValueType  # 160
-    """in ms"""
-    BEEP_ON: _MessageType.ValueType  # 161
-    """duration ms"""
-    BEEP_OFF: _MessageType.ValueType  # 162
-    """cancel prematurely"""
-    SHUTDOWN: _MessageType.ValueType  # 163
-    POWER_ON: _MessageType.ValueType  # 164
-    SCD41_TEMP: _MessageType.ValueType  # 176
-    SCD41_HUMIDITY: _MessageType.ValueType  # 177
-    SCD41_CO2: _MessageType.ValueType  # 178
-    AHT20_TEMP: _MessageType.ValueType  # 179
-    AHT20_HUMIDITY: _MessageType.ValueType  # 180
-    TVOC_INDEX: _MessageType.ValueType  # 181
-
-class MessageType(_MessageType, metaclass=_MessageTypeEnumTypeWrapper):
-    """encapsulate up to 1k of NMEA string data"""
-
-ACK: MessageType.ValueType  # 0
-COLLECT_INTERVAL: MessageType.ValueType  # 160
-"""in ms"""
-BEEP_ON: MessageType.ValueType  # 161
-"""duration ms"""
-BEEP_OFF: MessageType.ValueType  # 162
-"""cancel prematurely"""
-SHUTDOWN: MessageType.ValueType  # 163
-POWER_ON: MessageType.ValueType  # 164
-SCD41_TEMP: MessageType.ValueType  # 176
-SCD41_HUMIDITY: MessageType.ValueType  # 177
-SCD41_CO2: MessageType.ValueType  # 178
-AHT20_TEMP: MessageType.ValueType  # 179
-AHT20_HUMIDITY: MessageType.ValueType  # 180
-TVOC_INDEX: MessageType.ValueType  # 181
-global___MessageType = MessageType
-
-@typing.final
-class SensorData(google.protobuf.message.Message):
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    TYPE_FIELD_NUMBER: builtins.int
-    FLOAT_VALUE_FIELD_NUMBER: builtins.int
-    UINT32_VALUE_FIELD_NUMBER: builtins.int
-    type: global___MessageType.ValueType
-    """The message type"""
-    float_value: builtins.float
-    uint32_value: builtins.int
-    def __init__(
-        self,
-        *,
-        type: global___MessageType.ValueType = ...,
-        float_value: builtins.float = ...,
-        uint32_value: builtins.int = ...,
-    ) -> None: ...
-    def HasField(self, field_name: typing.Literal["data", b"data", "float_value", b"float_value", "uint32_value", b"uint32_value"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing.Literal["data", b"data", "float_value", b"float_value", "type", b"type", "uint32_value", b"uint32_value"]) -> None: ...
-    def WhichOneof(self, oneof_group: typing.Literal["data", b"data"]) -> typing.Literal["float_value", "uint32_value"] | None: ...
-
-global___SensorData = SensorData
-
-@typing.final
-class InterdeviceMessage(google.protobuf.message.Message):
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    NMEA_FIELD_NUMBER: builtins.int
-    SENSOR_FIELD_NUMBER: builtins.int
-    nmea: builtins.str
-    @property
-    def sensor(self) -> global___SensorData: ...
-    def __init__(
-        self,
-        *,
-        nmea: builtins.str = ...,
-        sensor: global___SensorData | None = ...,
-    ) -> None: ...
-    def HasField(self, field_name: typing.Literal["data", b"data", "nmea", b"nmea", "sensor", b"sensor"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing.Literal["data", b"data", "nmea", b"nmea", "sensor", b"sensor"]) -> None: ...
-    def WhichOneof(self, oneof_group: typing.Literal["data", b"data"]) -> typing.Literal["nmea", "sensor"] | None: ...
-
-global___InterdeviceMessage = InterdeviceMessage
+class MessageType(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
+    __slots__ = []

meshtastic/protobuf/localonly_pb2.py

@@ -2,10 +2,10 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: meshtastic/protobuf/localonly.proto
 """Generated protocol buffer code."""
+from google.protobuf.internal import builder as _builder
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
 from google.protobuf import symbol_database as _symbol_database
-from google.protobuf.internal import builder as _builder
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -15,16 +15,16 @@ from meshtastic.protobuf import config_pb2 as meshtastic_dot_protobuf_dot_config
 from meshtastic.protobuf import module_config_pb2 as meshtastic_dot_protobuf_dot_module__config__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n#meshtastic/protobuf/localonly.proto\x12\x13meshtastic.protobuf\x1a meshtastic/protobuf/config.proto\x1a\'meshtastic/protobuf/module_config.proto\"\xfa\x03\n\x0bLocalConfig\x12\x38\n\x06\x64\x65vice\x18\x01 \x01(\x0b\x32(.meshtastic.protobuf.Config.DeviceConfig\x12<\n\x08position\x18\x02 \x01(\x0b\x32*.meshtastic.protobuf.Config.PositionConfig\x12\x36\n\x05power\x18\x03 \x01(\x0b\x32\'.meshtastic.protobuf.Config.PowerConfig\x12:\n\x07network\x18\x04 \x01(\x0b\x32).meshtastic.protobuf.Config.NetworkConfig\x12:\n\x07\x64isplay\x18\x05 \x01(\x0b\x32).meshtastic.protobuf.Config.DisplayConfig\x12\x34\n\x04lora\x18\x06 \x01(\x0b\x32&.meshtastic.protobuf.Config.LoRaConfig\x12>\n\tbluetooth\x18\x07 \x01(\x0b\x32+.meshtastic.protobuf.Config.BluetoothConfig\x12\x0f\n\x07version\x18\x08 \x01(\r\x12<\n\x08security\x18\t \x01(\x0b\x32*.meshtastic.protobuf.Config.SecurityConfig\"\xf0\x07\n\x11LocalModuleConfig\x12:\n\x04mqtt\x18\x01 \x01(\x0b\x32,.meshtastic.protobuf.ModuleConfig.MQTTConfig\x12>\n\x06serial\x18\x02 \x01(\x0b\x32..meshtastic.protobuf.ModuleConfig.SerialConfig\x12[\n\x15\x65xternal_notification\x18\x03 \x01(\x0b\x32<.meshtastic.protobuf.ModuleConfig.ExternalNotificationConfig\x12K\n\rstore_forward\x18\x04 \x01(\x0b\x32\x34.meshtastic.protobuf.ModuleConfig.StoreForwardConfig\x12\x45\n\nrange_test\x18\x05 \x01(\x0b\x32\x31.meshtastic.protobuf.ModuleConfig.RangeTestConfig\x12\x44\n\ttelemetry\x18\x06 \x01(\x0b\x32\x31.meshtastic.protobuf.ModuleConfig.TelemetryConfig\x12M\n\x0e\x63\x61nned_message\x18\x07 \x01(\x0b\x32\x35.meshtastic.protobuf.ModuleConfig.CannedMessageConfig\x12<\n\x05\x61udio\x18\t \x01(\x0b\x32-.meshtastic.protobuf.ModuleConfig.AudioConfig\x12O\n\x0fremote_hardware\x18\n \x01(\x0b\x32\x36.meshtastic.protobuf.ModuleConfig.RemoteHardwareConfig\x12K\n\rneighbor_info\x18\x0b \x01(\x0b\x32\x34.meshtastic.protobuf.ModuleConfig.NeighborInfoConfig\x12Q\n\x10\x61mbient_lighting\x18\x0c \x01(\x0b\x32\x37.meshtastic.protobuf.ModuleConfig.AmbientLightingConfig\x12Q\n\x10\x64\x65tection_sensor\x18\r \x01(\x0b\x32\x37.meshtastic.protobuf.ModuleConfig.DetectionSensorConfig\x12\x46\n\npaxcounter\x18\x0e \x01(\x0b\x32\x32.meshtastic.protobuf.ModuleConfig.PaxcounterConfig\x12\x0f\n\x07version\x18\x08 \x01(\rBd\n\x13\x63om.geeksville.meshB\x0fLocalOnlyProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n#meshtastic/protobuf/localonly.proto\x12\x13meshtastic.protobuf\x1a meshtastic/protobuf/config.proto\x1a\'meshtastic/protobuf/module_config.proto\"\xfa\x03\n\x0bLocalConfig\x12\x38\n\x06\x64\x65vice\x18\x01 \x01(\x0b\x32(.meshtastic.protobuf.Config.DeviceConfig\x12<\n\x08position\x18\x02 \x01(\x0b\x32*.meshtastic.protobuf.Config.PositionConfig\x12\x36\n\x05power\x18\x03 \x01(\x0b\x32\'.meshtastic.protobuf.Config.PowerConfig\x12:\n\x07network\x18\x04 \x01(\x0b\x32).meshtastic.protobuf.Config.NetworkConfig\x12:\n\x07\x64isplay\x18\x05 \x01(\x0b\x32).meshtastic.protobuf.Config.DisplayConfig\x12\x34\n\x04lora\x18\x06 \x01(\x0b\x32&.meshtastic.protobuf.Config.LoRaConfig\x12>\n\tbluetooth\x18\x07 \x01(\x0b\x32+.meshtastic.protobuf.Config.BluetoothConfig\x12\x0f\n\x07version\x18\x08 \x01(\r\x12<\n\x08security\x18\t \x01(\x0b\x32*.meshtastic.protobuf.Config.SecurityConfig\"\xcf\t\n\x11LocalModuleConfig\x12:\n\x04mqtt\x18\x01 \x01(\x0b\x32,.meshtastic.protobuf.ModuleConfig.MQTTConfig\x12>\n\x06serial\x18\x02 \x01(\x0b\x32..meshtastic.protobuf.ModuleConfig.SerialConfig\x12[\n\x15\x65xternal_notification\x18\x03 \x01(\x0b\x32<.meshtastic.protobuf.ModuleConfig.ExternalNotificationConfig\x12K\n\rstore_forward\x18\x04 \x01(\x0b\x32\x34.meshtastic.protobuf.ModuleConfig.StoreForwardConfig\x12\x45\n\nrange_test\x18\x05 \x01(\x0b\x32\x31.meshtastic.protobuf.ModuleConfig.RangeTestConfig\x12\x44\n\ttelemetry\x18\x06 \x01(\x0b\x32\x31.meshtastic.protobuf.ModuleConfig.TelemetryConfig\x12M\n\x0e\x63\x61nned_message\x18\x07 \x01(\x0b\x32\x35.meshtastic.protobuf.ModuleConfig.CannedMessageConfig\x12<\n\x05\x61udio\x18\t \x01(\x0b\x32-.meshtastic.protobuf.ModuleConfig.AudioConfig\x12O\n\x0fremote_hardware\x18\n \x01(\x0b\x32\x36.meshtastic.protobuf.ModuleConfig.RemoteHardwareConfig\x12K\n\rneighbor_info\x18\x0b \x01(\x0b\x32\x34.meshtastic.protobuf.ModuleConfig.NeighborInfoConfig\x12Q\n\x10\x61mbient_lighting\x18\x0c \x01(\x0b\x32\x37.meshtastic.protobuf.ModuleConfig.AmbientLightingConfig\x12Q\n\x10\x64\x65tection_sensor\x18\r \x01(\x0b\x32\x37.meshtastic.protobuf.ModuleConfig.DetectionSensorConfig\x12\x46\n\npaxcounter\x18\x0e \x01(\x0b\x32\x32.meshtastic.protobuf.ModuleConfig.PaxcounterConfig\x12L\n\rstatusmessage\x18\x0f \x01(\x0b\x32\x35.meshtastic.protobuf.ModuleConfig.StatusMessageConfig\x12U\n\x12traffic_management\x18\x10 \x01(\x0b\x32\x39.meshtastic.protobuf.ModuleConfig.TrafficManagementConfig\x12\x38\n\x03tak\x18\x11 \x01(\x0b\x32+.meshtastic.protobuf.ModuleConfig.TAKConfig\x12\x0f\n\x07version\x18\x08 \x01(\rBe\n\x14org.meshtastic.protoB\x0fLocalOnlyProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
 
-_globals = globals()
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.localonly_pb2', _globals)
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.localonly_pb2', globals())
 if _descriptor._USE_C_DESCRIPTORS == False:
+
   DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\017LocalOnlyProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
-  _globals['_LOCALCONFIG']._serialized_start=136
-  _globals['_LOCALCONFIG']._serialized_end=642
-  _globals['_LOCALMODULECONFIG']._serialized_start=645
-  _globals['_LOCALMODULECONFIG']._serialized_end=1653
+  DESCRIPTOR._serialized_options = b'\n\024org.meshtastic.protoB\017LocalOnlyProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
+  _LOCALCONFIG._serialized_start=136
+  _LOCALCONFIG._serialized_end=642
+  _LOCALMODULECONFIG._serialized_start=645
+  _LOCALMODULECONFIG._serialized_end=1876
 # @@protoc_insertion_point(module_scope)

meshtastic/protobuf/localonly_pb2.pyi

@@ -1,228 +1,67 @@
-"""
-@generated by mypy-protobuf.  Do not edit manually!
-isort:skip_file
-"""
+from meshtastic.protobuf import config_pb2 as _config_pb2
+from meshtastic.protobuf import module_config_pb2 as _module_config_pb2
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from typing import ClassVar as _ClassVar, Mapping as _Mapping, Optional as _Optional, Union as _Union
 
-import builtins
-import google.protobuf.descriptor
-import google.protobuf.message
-import meshtastic.protobuf.config_pb2
-import meshtastic.protobuf.module_config_pb2
-import typing
+DESCRIPTOR: _descriptor.FileDescriptor
 
-DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
+class LocalConfig(_message.Message):
+    __slots__ = ["bluetooth", "device", "display", "lora", "network", "position", "power", "security", "version"]
+    BLUETOOTH_FIELD_NUMBER: _ClassVar[int]
+    DEVICE_FIELD_NUMBER: _ClassVar[int]
+    DISPLAY_FIELD_NUMBER: _ClassVar[int]
+    LORA_FIELD_NUMBER: _ClassVar[int]
+    NETWORK_FIELD_NUMBER: _ClassVar[int]
+    POSITION_FIELD_NUMBER: _ClassVar[int]
+    POWER_FIELD_NUMBER: _ClassVar[int]
+    SECURITY_FIELD_NUMBER: _ClassVar[int]
+    VERSION_FIELD_NUMBER: _ClassVar[int]
+    bluetooth: _config_pb2.Config.BluetoothConfig
+    device: _config_pb2.Config.DeviceConfig
+    display: _config_pb2.Config.DisplayConfig
+    lora: _config_pb2.Config.LoRaConfig
+    network: _config_pb2.Config.NetworkConfig
+    position: _config_pb2.Config.PositionConfig
+    power: _config_pb2.Config.PowerConfig
+    security: _config_pb2.Config.SecurityConfig
+    version: int
+    def __init__(self, device: _Optional[_Union[_config_pb2.Config.DeviceConfig, _Mapping]] = ..., position: _Optional[_Union[_config_pb2.Config.PositionConfig, _Mapping]] = ..., power: _Optional[_Union[_config_pb2.Config.PowerConfig, _Mapping]] = ..., network: _Optional[_Union[_config_pb2.Config.NetworkConfig, _Mapping]] = ..., display: _Optional[_Union[_config_pb2.Config.DisplayConfig, _Mapping]] = ..., lora: _Optional[_Union[_config_pb2.Config.LoRaConfig, _Mapping]] = ..., bluetooth: _Optional[_Union[_config_pb2.Config.BluetoothConfig, _Mapping]] = ..., version: _Optional[int] = ..., security: _Optional[_Union[_config_pb2.Config.SecurityConfig, _Mapping]] = ...) -> None: ...
 
-@typing.final
-class LocalConfig(google.protobuf.message.Message):
-    """
-    Protobuf structures common to apponly.proto and deviceonly.proto
-    This is never sent over the wire, only for local use
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    DEVICE_FIELD_NUMBER: builtins.int
-    POSITION_FIELD_NUMBER: builtins.int
-    POWER_FIELD_NUMBER: builtins.int
-    NETWORK_FIELD_NUMBER: builtins.int
-    DISPLAY_FIELD_NUMBER: builtins.int
-    LORA_FIELD_NUMBER: builtins.int
-    BLUETOOTH_FIELD_NUMBER: builtins.int
-    VERSION_FIELD_NUMBER: builtins.int
-    SECURITY_FIELD_NUMBER: builtins.int
-    version: builtins.int
-    """
-    A version integer used to invalidate old save files when we make
-    incompatible changes This integer is set at build time and is private to
-    NodeDB.cpp in the device code.
-    """
-    @property
-    def device(self) -> meshtastic.protobuf.config_pb2.Config.DeviceConfig:
-        """
-        The part of the config that is specific to the Device
-        """
-
-    @property
-    def position(self) -> meshtastic.protobuf.config_pb2.Config.PositionConfig:
-        """
-        The part of the config that is specific to the GPS Position
-        """
-
-    @property
-    def power(self) -> meshtastic.protobuf.config_pb2.Config.PowerConfig:
-        """
-        The part of the config that is specific to the Power settings
-        """
-
-    @property
-    def network(self) -> meshtastic.protobuf.config_pb2.Config.NetworkConfig:
-        """
-        The part of the config that is specific to the Wifi Settings
-        """
-
-    @property
-    def display(self) -> meshtastic.protobuf.config_pb2.Config.DisplayConfig:
-        """
-        The part of the config that is specific to the Display
-        """
-
-    @property
-    def lora(self) -> meshtastic.protobuf.config_pb2.Config.LoRaConfig:
-        """
-        The part of the config that is specific to the Lora Radio
-        """
-
-    @property
-    def bluetooth(self) -> meshtastic.protobuf.config_pb2.Config.BluetoothConfig:
-        """
-        The part of the config that is specific to the Bluetooth settings
-        """
-
-    @property
-    def security(self) -> meshtastic.protobuf.config_pb2.Config.SecurityConfig:
-        """
-        The part of the config that is specific to Security settings
-        """
-
-    def __init__(
-        self,
-        *,
-        device: meshtastic.protobuf.config_pb2.Config.DeviceConfig | None = ...,
-        position: meshtastic.protobuf.config_pb2.Config.PositionConfig | None = ...,
-        power: meshtastic.protobuf.config_pb2.Config.PowerConfig | None = ...,
-        network: meshtastic.protobuf.config_pb2.Config.NetworkConfig | None = ...,
-        display: meshtastic.protobuf.config_pb2.Config.DisplayConfig | None = ...,
-        lora: meshtastic.protobuf.config_pb2.Config.LoRaConfig | None = ...,
-        bluetooth: meshtastic.protobuf.config_pb2.Config.BluetoothConfig | None = ...,
-        version: builtins.int = ...,
-        security: meshtastic.protobuf.config_pb2.Config.SecurityConfig | None = ...,
-    ) -> None: ...
-    def HasField(self, field_name: typing.Literal["bluetooth", b"bluetooth", "device", b"device", "display", b"display", "lora", b"lora", "network", b"network", "position", b"position", "power", b"power", "security", b"security"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing.Literal["bluetooth", b"bluetooth", "device", b"device", "display", b"display", "lora", b"lora", "network", b"network", "position", b"position", "power", b"power", "security", b"security", "version", b"version"]) -> None: ...
-
-global___LocalConfig = LocalConfig
-
-@typing.final
-class LocalModuleConfig(google.protobuf.message.Message):
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    MQTT_FIELD_NUMBER: builtins.int
-    SERIAL_FIELD_NUMBER: builtins.int
-    EXTERNAL_NOTIFICATION_FIELD_NUMBER: builtins.int
-    STORE_FORWARD_FIELD_NUMBER: builtins.int
-    RANGE_TEST_FIELD_NUMBER: builtins.int
-    TELEMETRY_FIELD_NUMBER: builtins.int
-    CANNED_MESSAGE_FIELD_NUMBER: builtins.int
-    AUDIO_FIELD_NUMBER: builtins.int
-    REMOTE_HARDWARE_FIELD_NUMBER: builtins.int
-    NEIGHBOR_INFO_FIELD_NUMBER: builtins.int
-    AMBIENT_LIGHTING_FIELD_NUMBER: builtins.int
-    DETECTION_SENSOR_FIELD_NUMBER: builtins.int
-    PAXCOUNTER_FIELD_NUMBER: builtins.int
-    VERSION_FIELD_NUMBER: builtins.int
-    version: builtins.int
-    """
-    A version integer used to invalidate old save files when we make
-    incompatible changes This integer is set at build time and is private to
-    NodeDB.cpp in the device code.
-    """
-    @property
-    def mqtt(self) -> meshtastic.protobuf.module_config_pb2.ModuleConfig.MQTTConfig:
-        """
-        The part of the config that is specific to the MQTT module
-        """
-
-    @property
-    def serial(self) -> meshtastic.protobuf.module_config_pb2.ModuleConfig.SerialConfig:
-        """
-        The part of the config that is specific to the Serial module
-        """
-
-    @property
-    def external_notification(self) -> meshtastic.protobuf.module_config_pb2.ModuleConfig.ExternalNotificationConfig:
-        """
-        The part of the config that is specific to the ExternalNotification module
-        """
-
-    @property
-    def store_forward(self) -> meshtastic.protobuf.module_config_pb2.ModuleConfig.StoreForwardConfig:
-        """
-        The part of the config that is specific to the Store & Forward module
-        """
-
-    @property
-    def range_test(self) -> meshtastic.protobuf.module_config_pb2.ModuleConfig.RangeTestConfig:
-        """
-        The part of the config that is specific to the RangeTest module
-        """
-
-    @property
-    def telemetry(self) -> meshtastic.protobuf.module_config_pb2.ModuleConfig.TelemetryConfig:
-        """
-        The part of the config that is specific to the Telemetry module
-        """
-
-    @property
-    def canned_message(self) -> meshtastic.protobuf.module_config_pb2.ModuleConfig.CannedMessageConfig:
-        """
-        The part of the config that is specific to the Canned Message module
-        """
-
-    @property
-    def audio(self) -> meshtastic.protobuf.module_config_pb2.ModuleConfig.AudioConfig:
-        """
-        The part of the config that is specific to the Audio module
-        """
-
-    @property
-    def remote_hardware(self) -> meshtastic.protobuf.module_config_pb2.ModuleConfig.RemoteHardwareConfig:
-        """
-        The part of the config that is specific to the Remote Hardware module
-        """
-
-    @property
-    def neighbor_info(self) -> meshtastic.protobuf.module_config_pb2.ModuleConfig.NeighborInfoConfig:
-        """
-        The part of the config that is specific to the Neighbor Info module
-        """
-
-    @property
-    def ambient_lighting(self) -> meshtastic.protobuf.module_config_pb2.ModuleConfig.AmbientLightingConfig:
-        """
-        The part of the config that is specific to the Ambient Lighting module
-        """
-
-    @property
-    def detection_sensor(self) -> meshtastic.protobuf.module_config_pb2.ModuleConfig.DetectionSensorConfig:
-        """
-        The part of the config that is specific to the Detection Sensor module
-        """
-
-    @property
-    def paxcounter(self) -> meshtastic.protobuf.module_config_pb2.ModuleConfig.PaxcounterConfig:
-        """
-        Paxcounter Config
-        """
-
-    def __init__(
-        self,
-        *,
-        mqtt: meshtastic.protobuf.module_config_pb2.ModuleConfig.MQTTConfig | None = ...,
-        serial: meshtastic.protobuf.module_config_pb2.ModuleConfig.SerialConfig | None = ...,
-        external_notification: meshtastic.protobuf.module_config_pb2.ModuleConfig.ExternalNotificationConfig | None = ...,
-        store_forward: meshtastic.protobuf.module_config_pb2.ModuleConfig.StoreForwardConfig | None = ...,
-        range_test: meshtastic.protobuf.module_config_pb2.ModuleConfig.RangeTestConfig | None = ...,
-        telemetry: meshtastic.protobuf.module_config_pb2.ModuleConfig.TelemetryConfig | None = ...,
-        canned_message: meshtastic.protobuf.module_config_pb2.ModuleConfig.CannedMessageConfig | None = ...,
-        audio: meshtastic.protobuf.module_config_pb2.ModuleConfig.AudioConfig | None = ...,
-        remote_hardware: meshtastic.protobuf.module_config_pb2.ModuleConfig.RemoteHardwareConfig | None = ...,
-        neighbor_info: meshtastic.protobuf.module_config_pb2.ModuleConfig.NeighborInfoConfig | None = ...,
-        ambient_lighting: meshtastic.protobuf.module_config_pb2.ModuleConfig.AmbientLightingConfig | None = ...,
-        detection_sensor: meshtastic.protobuf.module_config_pb2.ModuleConfig.DetectionSensorConfig | None = ...,
-        paxcounter: meshtastic.protobuf.module_config_pb2.ModuleConfig.PaxcounterConfig | None = ...,
-        version: builtins.int = ...,
-    ) -> None: ...
-    def HasField(self, field_name: typing.Literal["ambient_lighting", b"ambient_lighting", "audio", b"audio", "canned_message", b"canned_message", "detection_sensor", b"detection_sensor", "external_notification", b"external_notification", "mqtt", b"mqtt", "neighbor_info", b"neighbor_info", "paxcounter", b"paxcounter", "range_test", b"range_test", "remote_hardware", b"remote_hardware", "serial", b"serial", "store_forward", b"store_forward", "telemetry", b"telemetry"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing.Literal["ambient_lighting", b"ambient_lighting", "audio", b"audio", "canned_message", b"canned_message", "detection_sensor", b"detection_sensor", "external_notification", b"external_notification", "mqtt", b"mqtt", "neighbor_info", b"neighbor_info", "paxcounter", b"paxcounter", "range_test", b"range_test", "remote_hardware", b"remote_hardware", "serial", b"serial", "store_forward", b"store_forward", "telemetry", b"telemetry", "version", b"version"]) -> None: ...
-
-global___LocalModuleConfig = LocalModuleConfig
+class LocalModuleConfig(_message.Message):
+    __slots__ = ["ambient_lighting", "audio", "canned_message", "detection_sensor", "external_notification", "mqtt", "neighbor_info", "paxcounter", "range_test", "remote_hardware", "serial", "statusmessage", "store_forward", "tak", "telemetry", "traffic_management", "version"]
+    AMBIENT_LIGHTING_FIELD_NUMBER: _ClassVar[int]
+    AUDIO_FIELD_NUMBER: _ClassVar[int]
+    CANNED_MESSAGE_FIELD_NUMBER: _ClassVar[int]
+    DETECTION_SENSOR_FIELD_NUMBER: _ClassVar[int]
+    EXTERNAL_NOTIFICATION_FIELD_NUMBER: _ClassVar[int]
+    MQTT_FIELD_NUMBER: _ClassVar[int]
+    NEIGHBOR_INFO_FIELD_NUMBER: _ClassVar[int]
+    PAXCOUNTER_FIELD_NUMBER: _ClassVar[int]
+    RANGE_TEST_FIELD_NUMBER: _ClassVar[int]
+    REMOTE_HARDWARE_FIELD_NUMBER: _ClassVar[int]
+    SERIAL_FIELD_NUMBER: _ClassVar[int]
+    STATUSMESSAGE_FIELD_NUMBER: _ClassVar[int]
+    STORE_FORWARD_FIELD_NUMBER: _ClassVar[int]
+    TAK_FIELD_NUMBER: _ClassVar[int]
+    TELEMETRY_FIELD_NUMBER: _ClassVar[int]
+    TRAFFIC_MANAGEMENT_FIELD_NUMBER: _ClassVar[int]
+    VERSION_FIELD_NUMBER: _ClassVar[int]
+    ambient_lighting: _module_config_pb2.ModuleConfig.AmbientLightingConfig
+    audio: _module_config_pb2.ModuleConfig.AudioConfig
+    canned_message: _module_config_pb2.ModuleConfig.CannedMessageConfig
+    detection_sensor: _module_config_pb2.ModuleConfig.DetectionSensorConfig
+    external_notification: _module_config_pb2.ModuleConfig.ExternalNotificationConfig
+    mqtt: _module_config_pb2.ModuleConfig.MQTTConfig
+    neighbor_info: _module_config_pb2.ModuleConfig.NeighborInfoConfig
+    paxcounter: _module_config_pb2.ModuleConfig.PaxcounterConfig
+    range_test: _module_config_pb2.ModuleConfig.RangeTestConfig
+    remote_hardware: _module_config_pb2.ModuleConfig.RemoteHardwareConfig
+    serial: _module_config_pb2.ModuleConfig.SerialConfig
+    statusmessage: _module_config_pb2.ModuleConfig.StatusMessageConfig
+    store_forward: _module_config_pb2.ModuleConfig.StoreForwardConfig
+    tak: _module_config_pb2.ModuleConfig.TAKConfig
+    telemetry: _module_config_pb2.ModuleConfig.TelemetryConfig
+    traffic_management: _module_config_pb2.ModuleConfig.TrafficManagementConfig
+    version: int
+    def __init__(self, mqtt: _Optional[_Union[_module_config_pb2.ModuleConfig.MQTTConfig, _Mapping]] = ..., serial: _Optional[_Union[_module_config_pb2.ModuleConfig.SerialConfig, _Mapping]] = ..., external_notification: _Optional[_Union[_module_config_pb2.ModuleConfig.ExternalNotificationConfig, _Mapping]] = ..., store_forward: _Optional[_Union[_module_config_pb2.ModuleConfig.StoreForwardConfig, _Mapping]] = ..., range_test: _Optional[_Union[_module_config_pb2.ModuleConfig.RangeTestConfig, _Mapping]] = ..., telemetry: _Optional[_Union[_module_config_pb2.ModuleConfig.TelemetryConfig, _Mapping]] = ..., canned_message: _Optional[_Union[_module_config_pb2.ModuleConfig.CannedMessageConfig, _Mapping]] = ..., audio: _Optional[_Union[_module_config_pb2.ModuleConfig.AudioConfig, _Mapping]] = ..., remote_hardware: _Optional[_Union[_module_config_pb2.ModuleConfig.RemoteHardwareConfig, _Mapping]] = ..., neighbor_info: _Optional[_Union[_module_config_pb2.ModuleConfig.NeighborInfoConfig, _Mapping]] = ..., ambient_lighting: _Optional[_Union[_module_config_pb2.ModuleConfig.AmbientLightingConfig, _Mapping]] = ..., detection_sensor: _Optional[_Union[_module_config_pb2.ModuleConfig.DetectionSensorConfig, _Mapping]] = ..., paxcounter: _Optional[_Union[_module_config_pb2.ModuleConfig.PaxcounterConfig, _Mapping]] = ..., statusmessage: _Optional[_Union[_module_config_pb2.ModuleConfig.StatusMessageConfig, _Mapping]] = ..., traffic_management: _Optional[_Union[_module_config_pb2.ModuleConfig.TrafficManagementConfig, _Mapping]] = ..., tak: _Optional[_Union[_module_config_pb2.ModuleConfig.TAKConfig, _Mapping]] = ..., version: _Optional[int] = ...) -> None: ...

meshtastic/protobuf/mqtt_pb2.py

@@ -2,10 +2,10 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: meshtastic/protobuf/mqtt.proto
 """Generated protocol buffer code."""
+from google.protobuf.internal import builder as _builder
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
 from google.protobuf import symbol_database as _symbol_database
-from google.protobuf.internal import builder as _builder
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -15,16 +15,16 @@ from meshtastic.protobuf import config_pb2 as meshtastic_dot_protobuf_dot_config
 from meshtastic.protobuf import mesh_pb2 as meshtastic_dot_protobuf_dot_mesh__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1emeshtastic/protobuf/mqtt.proto\x12\x13meshtastic.protobuf\x1a meshtastic/protobuf/config.proto\x1a\x1emeshtastic/protobuf/mesh.proto\"j\n\x0fServiceEnvelope\x12/\n\x06packet\x18\x01 \x01(\x0b\x32\x1f.meshtastic.protobuf.MeshPacket\x12\x12\n\nchannel_id\x18\x02 \x01(\t\x12\x12\n\ngateway_id\x18\x03 \x01(\t\"\x83\x04\n\tMapReport\x12\x11\n\tlong_name\x18\x01 \x01(\t\x12\x12\n\nshort_name\x18\x02 \x01(\t\x12;\n\x04role\x18\x03 \x01(\x0e\x32-.meshtastic.protobuf.Config.DeviceConfig.Role\x12\x34\n\x08hw_model\x18\x04 \x01(\x0e\x32\".meshtastic.protobuf.HardwareModel\x12\x18\n\x10\x66irmware_version\x18\x05 \x01(\t\x12\x41\n\x06region\x18\x06 \x01(\x0e\x32\x31.meshtastic.protobuf.Config.LoRaConfig.RegionCode\x12H\n\x0cmodem_preset\x18\x07 \x01(\x0e\x32\x32.meshtastic.protobuf.Config.LoRaConfig.ModemPreset\x12\x1b\n\x13has_default_channel\x18\x08 \x01(\x08\x12\x12\n\nlatitude_i\x18\t \x01(\x0f\x12\x13\n\x0blongitude_i\x18\n \x01(\x0f\x12\x10\n\x08\x61ltitude\x18\x0b \x01(\x05\x12\x1a\n\x12position_precision\x18\x0c \x01(\r\x12\x1e\n\x16num_online_local_nodes\x18\r \x01(\r\x12!\n\x19has_opted_report_location\x18\x0e \x01(\x08\x42_\n\x13\x63om.geeksville.meshB\nMQTTProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1emeshtastic/protobuf/mqtt.proto\x12\x13meshtastic.protobuf\x1a meshtastic/protobuf/config.proto\x1a\x1emeshtastic/protobuf/mesh.proto\"j\n\x0fServiceEnvelope\x12/\n\x06packet\x18\x01 \x01(\x0b\x32\x1f.meshtastic.protobuf.MeshPacket\x12\x12\n\nchannel_id\x18\x02 \x01(\t\x12\x12\n\ngateway_id\x18\x03 \x01(\t\"\x83\x04\n\tMapReport\x12\x11\n\tlong_name\x18\x01 \x01(\t\x12\x12\n\nshort_name\x18\x02 \x01(\t\x12;\n\x04role\x18\x03 \x01(\x0e\x32-.meshtastic.protobuf.Config.DeviceConfig.Role\x12\x34\n\x08hw_model\x18\x04 \x01(\x0e\x32\".meshtastic.protobuf.HardwareModel\x12\x18\n\x10\x66irmware_version\x18\x05 \x01(\t\x12\x41\n\x06region\x18\x06 \x01(\x0e\x32\x31.meshtastic.protobuf.Config.LoRaConfig.RegionCode\x12H\n\x0cmodem_preset\x18\x07 \x01(\x0e\x32\x32.meshtastic.protobuf.Config.LoRaConfig.ModemPreset\x12\x1b\n\x13has_default_channel\x18\x08 \x01(\x08\x12\x12\n\nlatitude_i\x18\t \x01(\x0f\x12\x13\n\x0blongitude_i\x18\n \x01(\x0f\x12\x10\n\x08\x61ltitude\x18\x0b \x01(\x05\x12\x1a\n\x12position_precision\x18\x0c \x01(\r\x12\x1e\n\x16num_online_local_nodes\x18\r \x01(\r\x12!\n\x19has_opted_report_location\x18\x0e \x01(\x08\x42`\n\x14org.meshtastic.protoB\nMQTTProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
 
-_globals = globals()
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.mqtt_pb2', _globals)
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.mqtt_pb2', globals())
 if _descriptor._USE_C_DESCRIPTORS == False:
+
   DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\nMQTTProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
-  _globals['_SERVICEENVELOPE']._serialized_start=121
-  _globals['_SERVICEENVELOPE']._serialized_end=227
-  _globals['_MAPREPORT']._serialized_start=230
-  _globals['_MAPREPORT']._serialized_end=745
+  DESCRIPTOR._serialized_options = b'\n\024org.meshtastic.protoB\nMQTTProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
+  _SERVICEENVELOPE._serialized_start=121
+  _SERVICEENVELOPE._serialized_end=227
+  _MAPREPORT._serialized_start=230
+  _MAPREPORT._serialized_end=745
 # @@protoc_insertion_point(module_scope)

meshtastic/protobuf/mqtt_pb2.pyi

@@ -1,155 +1,49 @@
-"""
-@generated by mypy-protobuf.  Do not edit manually!
-isort:skip_file
-"""
+from meshtastic.protobuf import config_pb2 as _config_pb2
+from meshtastic.protobuf import mesh_pb2 as _mesh_pb2
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from typing import ClassVar as _ClassVar, Mapping as _Mapping, Optional as _Optional, Union as _Union
 
-import builtins
-import google.protobuf.descriptor
-import google.protobuf.message
-import meshtastic.protobuf.config_pb2
-import meshtastic.protobuf.mesh_pb2
-import typing
+DESCRIPTOR: _descriptor.FileDescriptor
 
-DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
+class MapReport(_message.Message):
+    __slots__ = ["altitude", "firmware_version", "has_default_channel", "has_opted_report_location", "hw_model", "latitude_i", "long_name", "longitude_i", "modem_preset", "num_online_local_nodes", "position_precision", "region", "role", "short_name"]
+    ALTITUDE_FIELD_NUMBER: _ClassVar[int]
+    FIRMWARE_VERSION_FIELD_NUMBER: _ClassVar[int]
+    HAS_DEFAULT_CHANNEL_FIELD_NUMBER: _ClassVar[int]
+    HAS_OPTED_REPORT_LOCATION_FIELD_NUMBER: _ClassVar[int]
+    HW_MODEL_FIELD_NUMBER: _ClassVar[int]
+    LATITUDE_I_FIELD_NUMBER: _ClassVar[int]
+    LONGITUDE_I_FIELD_NUMBER: _ClassVar[int]
+    LONG_NAME_FIELD_NUMBER: _ClassVar[int]
+    MODEM_PRESET_FIELD_NUMBER: _ClassVar[int]
+    NUM_ONLINE_LOCAL_NODES_FIELD_NUMBER: _ClassVar[int]
+    POSITION_PRECISION_FIELD_NUMBER: _ClassVar[int]
+    REGION_FIELD_NUMBER: _ClassVar[int]
+    ROLE_FIELD_NUMBER: _ClassVar[int]
+    SHORT_NAME_FIELD_NUMBER: _ClassVar[int]
+    altitude: int
+    firmware_version: str
+    has_default_channel: bool
+    has_opted_report_location: bool
+    hw_model: _mesh_pb2.HardwareModel
+    latitude_i: int
+    long_name: str
+    longitude_i: int
+    modem_preset: _config_pb2.Config.LoRaConfig.ModemPreset
+    num_online_local_nodes: int
+    position_precision: int
+    region: _config_pb2.Config.LoRaConfig.RegionCode
+    role: _config_pb2.Config.DeviceConfig.Role
+    short_name: str
+    def __init__(self, long_name: _Optional[str] = ..., short_name: _Optional[str] = ..., role: _Optional[_Union[_config_pb2.Config.DeviceConfig.Role, str]] = ..., hw_model: _Optional[_Union[_mesh_pb2.HardwareModel, str]] = ..., firmware_version: _Optional[str] = ..., region: _Optional[_Union[_config_pb2.Config.LoRaConfig.RegionCode, str]] = ..., modem_preset: _Optional[_Union[_config_pb2.Config.LoRaConfig.ModemPreset, str]] = ..., has_default_channel: bool = ..., latitude_i: _Optional[int] = ..., longitude_i: _Optional[int] = ..., altitude: _Optional[int] = ..., position_precision: _Optional[int] = ..., num_online_local_nodes: _Optional[int] = ..., has_opted_report_location: bool = ...) -> None: ...
 
-@typing.final
-class ServiceEnvelope(google.protobuf.message.Message):
-    """
-    This message wraps a MeshPacket with extra metadata about the sender and how it arrived.
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    PACKET_FIELD_NUMBER: builtins.int
-    CHANNEL_ID_FIELD_NUMBER: builtins.int
-    GATEWAY_ID_FIELD_NUMBER: builtins.int
-    channel_id: builtins.str
-    """
-    The global channel ID it was sent on
-    """
-    gateway_id: builtins.str
-    """
-    The sending gateway node ID. Can we use this to authenticate/prevent fake
-    nodeid impersonation for senders? - i.e. use gateway/mesh id (which is authenticated) + local node id as
-    the globally trusted nodenum
-    """
-    @property
-    def packet(self) -> meshtastic.protobuf.mesh_pb2.MeshPacket:
-        """
-        The (probably encrypted) packet
-        """
-
-    def __init__(
-        self,
-        *,
-        packet: meshtastic.protobuf.mesh_pb2.MeshPacket | None = ...,
-        channel_id: builtins.str = ...,
-        gateway_id: builtins.str = ...,
-    ) -> None: ...
-    def HasField(self, field_name: typing.Literal["packet", b"packet"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing.Literal["channel_id", b"channel_id", "gateway_id", b"gateway_id", "packet", b"packet"]) -> None: ...
-
-global___ServiceEnvelope = ServiceEnvelope
-
-@typing.final
-class MapReport(google.protobuf.message.Message):
-    """
-    Information about a node intended to be reported unencrypted to a map using MQTT.
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    LONG_NAME_FIELD_NUMBER: builtins.int
-    SHORT_NAME_FIELD_NUMBER: builtins.int
-    ROLE_FIELD_NUMBER: builtins.int
-    HW_MODEL_FIELD_NUMBER: builtins.int
-    FIRMWARE_VERSION_FIELD_NUMBER: builtins.int
-    REGION_FIELD_NUMBER: builtins.int
-    MODEM_PRESET_FIELD_NUMBER: builtins.int
-    HAS_DEFAULT_CHANNEL_FIELD_NUMBER: builtins.int
-    LATITUDE_I_FIELD_NUMBER: builtins.int
-    LONGITUDE_I_FIELD_NUMBER: builtins.int
-    ALTITUDE_FIELD_NUMBER: builtins.int
-    POSITION_PRECISION_FIELD_NUMBER: builtins.int
-    NUM_ONLINE_LOCAL_NODES_FIELD_NUMBER: builtins.int
-    HAS_OPTED_REPORT_LOCATION_FIELD_NUMBER: builtins.int
-    long_name: builtins.str
-    """
-    A full name for this user, i.e. "Kevin Hester"
-    """
-    short_name: builtins.str
-    """
-    A VERY short name, ideally two characters.
-    Suitable for a tiny OLED screen
-    """
-    role: meshtastic.protobuf.config_pb2.Config.DeviceConfig.Role.ValueType
-    """
-    Role of the node that applies specific settings for a particular use-case
-    """
-    hw_model: meshtastic.protobuf.mesh_pb2.HardwareModel.ValueType
-    """
-    Hardware model of the node, i.e. T-Beam, Heltec V3, etc...
-    """
-    firmware_version: builtins.str
-    """
-    Device firmware version string
-    """
-    region: meshtastic.protobuf.config_pb2.Config.LoRaConfig.RegionCode.ValueType
-    """
-    The region code for the radio (US, CN, EU433, etc...)
-    """
-    modem_preset: meshtastic.protobuf.config_pb2.Config.LoRaConfig.ModemPreset.ValueType
-    """
-    Modem preset used by the radio (LongFast, MediumSlow, etc...)
-    """
-    has_default_channel: builtins.bool
-    """
-    Whether the node has a channel with default PSK and name (LongFast, MediumSlow, etc...)
-    and it uses the default frequency slot given the region and modem preset.
-    """
-    latitude_i: builtins.int
-    """
-    Latitude: multiply by 1e-7 to get degrees in floating point
-    """
-    longitude_i: builtins.int
-    """
-    Longitude: multiply by 1e-7 to get degrees in floating point
-    """
-    altitude: builtins.int
-    """
-    Altitude in meters above MSL
-    """
-    position_precision: builtins.int
-    """
-    Indicates the bits of precision for latitude and longitude set by the sending node
-    """
-    num_online_local_nodes: builtins.int
-    """
-    Number of online nodes (heard in the last 2 hours) this node has in its list that were received locally (not via MQTT)
-    """
-    has_opted_report_location: builtins.bool
-    """
-    User has opted in to share their location (map report) with the mqtt server
-    Controlled by map_report.should_report_location
-    """
-    def __init__(
-        self,
-        *,
-        long_name: builtins.str = ...,
-        short_name: builtins.str = ...,
-        role: meshtastic.protobuf.config_pb2.Config.DeviceConfig.Role.ValueType = ...,
-        hw_model: meshtastic.protobuf.mesh_pb2.HardwareModel.ValueType = ...,
-        firmware_version: builtins.str = ...,
-        region: meshtastic.protobuf.config_pb2.Config.LoRaConfig.RegionCode.ValueType = ...,
-        modem_preset: meshtastic.protobuf.config_pb2.Config.LoRaConfig.ModemPreset.ValueType = ...,
-        has_default_channel: builtins.bool = ...,
-        latitude_i: builtins.int = ...,
-        longitude_i: builtins.int = ...,
-        altitude: builtins.int = ...,
-        position_precision: builtins.int = ...,
-        num_online_local_nodes: builtins.int = ...,
-        has_opted_report_location: builtins.bool = ...,
-    ) -> None: ...
-    def ClearField(self, field_name: typing.Literal["altitude", b"altitude", "firmware_version", b"firmware_version", "has_default_channel", b"has_default_channel", "has_opted_report_location", b"has_opted_report_location", "hw_model", b"hw_model", "latitude_i", b"latitude_i", "long_name", b"long_name", "longitude_i", b"longitude_i", "modem_preset", b"modem_preset", "num_online_local_nodes", b"num_online_local_nodes", "position_precision", b"position_precision", "region", b"region", "role", b"role", "short_name", b"short_name"]) -> None: ...
-
-global___MapReport = MapReport
+class ServiceEnvelope(_message.Message):
+    __slots__ = ["channel_id", "gateway_id", "packet"]
+    CHANNEL_ID_FIELD_NUMBER: _ClassVar[int]
+    GATEWAY_ID_FIELD_NUMBER: _ClassVar[int]
+    PACKET_FIELD_NUMBER: _ClassVar[int]
+    channel_id: str
+    gateway_id: str
+    packet: _mesh_pb2.MeshPacket
+    def __init__(self, packet: _Optional[_Union[_mesh_pb2.MeshPacket, _Mapping]] = ..., channel_id: _Optional[str] = ..., gateway_id: _Optional[str] = ...) -> None: ...

meshtastic/protobuf/nanopb_pb2.py

@@ -2,10 +2,10 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: meshtastic/protobuf/nanopb.proto
 """Generated protocol buffer code."""
+from google.protobuf.internal import builder as _builder
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
 from google.protobuf import symbol_database as _symbol_database
-from google.protobuf.internal import builder as _builder
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -16,20 +16,24 @@ from google.protobuf import descriptor_pb2 as google_dot_protobuf_dot_descriptor
 
 DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n meshtastic/protobuf/nanopb.proto\x1a google/protobuf/descriptor.proto\"\xa4\x07\n\rNanoPBOptions\x12\x10\n\x08max_size\x18\x01 \x01(\x05\x12\x12\n\nmax_length\x18\x0e \x01(\x05\x12\x11\n\tmax_count\x18\x02 \x01(\x05\x12&\n\x08int_size\x18\x07 \x01(\x0e\x32\x08.IntSize:\nIS_DEFAULT\x12$\n\x04type\x18\x03 \x01(\x0e\x32\n.FieldType:\nFT_DEFAULT\x12\x18\n\nlong_names\x18\x04 \x01(\x08:\x04true\x12\x1c\n\rpacked_struct\x18\x05 \x01(\x08:\x05\x66\x61lse\x12\x1a\n\x0bpacked_enum\x18\n \x01(\x08:\x05\x66\x61lse\x12\x1b\n\x0cskip_message\x18\x06 \x01(\x08:\x05\x66\x61lse\x12\x18\n\tno_unions\x18\x08 \x01(\x08:\x05\x66\x61lse\x12\r\n\x05msgid\x18\t \x01(\r\x12\x1e\n\x0f\x61nonymous_oneof\x18\x0b \x01(\x08:\x05\x66\x61lse\x12\x15\n\x06proto3\x18\x0c \x01(\x08:\x05\x66\x61lse\x12#\n\x14proto3_singular_msgs\x18\x15 \x01(\x08:\x05\x66\x61lse\x12\x1d\n\x0e\x65num_to_string\x18\r \x01(\x08:\x05\x66\x61lse\x12\x1b\n\x0c\x66ixed_length\x18\x0f \x01(\x08:\x05\x66\x61lse\x12\x1a\n\x0b\x66ixed_count\x18\x10 \x01(\x08:\x05\x66\x61lse\x12\x1e\n\x0fsubmsg_callback\x18\x16 \x01(\x08:\x05\x66\x61lse\x12/\n\x0cmangle_names\x18\x11 \x01(\x0e\x32\x11.TypenameMangling:\x06M_NONE\x12(\n\x11\x63\x61llback_datatype\x18\x12 \x01(\t:\rpb_callback_t\x12\x34\n\x11\x63\x61llback_function\x18\x13 \x01(\t:\x19pb_default_field_callback\x12\x30\n\x0e\x64\x65scriptorsize\x18\x14 \x01(\x0e\x32\x0f.DescriptorSize:\x07\x44S_AUTO\x12\x1a\n\x0b\x64\x65\x66\x61ult_has\x18\x17 \x01(\x08:\x05\x66\x61lse\x12\x0f\n\x07include\x18\x18 \x03(\t\x12\x0f\n\x07\x65xclude\x18\x1a \x03(\t\x12\x0f\n\x07package\x18\x19 \x01(\t\x12\x41\n\rtype_override\x18\x1b \x01(\x0e\x32*.google.protobuf.FieldDescriptorProto.Type\x12\x19\n\x0bsort_by_tag\x18\x1c \x01(\x08:\x04true\x12.\n\rfallback_type\x18\x1d \x01(\x0e\x32\n.FieldType:\x0b\x46T_CALLBACK*i\n\tFieldType\x12\x0e\n\nFT_DEFAULT\x10\x00\x12\x0f\n\x0b\x46T_CALLBACK\x10\x01\x12\x0e\n\nFT_POINTER\x10\x04\x12\r\n\tFT_STATIC\x10\x02\x12\r\n\tFT_IGNORE\x10\x03\x12\r\n\tFT_INLINE\x10\x05*D\n\x07IntSize\x12\x0e\n\nIS_DEFAULT\x10\x00\x12\x08\n\x04IS_8\x10\x08\x12\t\n\x05IS_16\x10\x10\x12\t\n\x05IS_32\x10 \x12\t\n\x05IS_64\x10@*Z\n\x10TypenameMangling\x12\n\n\x06M_NONE\x10\x00\x12\x13\n\x0fM_STRIP_PACKAGE\x10\x01\x12\r\n\tM_FLATTEN\x10\x02\x12\x16\n\x12M_PACKAGE_INITIALS\x10\x03*E\n\x0e\x44\x65scriptorSize\x12\x0b\n\x07\x44S_AUTO\x10\x00\x12\x08\n\x04\x44S_1\x10\x01\x12\x08\n\x04\x44S_2\x10\x02\x12\x08\n\x04\x44S_4\x10\x04\x12\x08\n\x04\x44S_8\x10\x08:E\n\x0enanopb_fileopt\x12\x1c.google.protobuf.FileOptions\x18\xf2\x07 \x01(\x0b\x32\x0e.NanoPBOptions:G\n\rnanopb_msgopt\x12\x1f.google.protobuf.MessageOptions\x18\xf2\x07 \x01(\x0b\x32\x0e.NanoPBOptions:E\n\x0enanopb_enumopt\x12\x1c.google.protobuf.EnumOptions\x18\xf2\x07 \x01(\x0b\x32\x0e.NanoPBOptions:>\n\x06nanopb\x12\x1d.google.protobuf.FieldOptions\x18\xf2\x07 \x01(\x0b\x32\x0e.NanoPBOptionsB>\n\x18\x66i.kapsi.koti.jpa.nanopbZ\"github.com/meshtastic/go/generated')
 
-_globals = globals()
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.nanopb_pb2', _globals)
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.nanopb_pb2', globals())
 if _descriptor._USE_C_DESCRIPTORS == False:
+  google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(nanopb_fileopt)
+  google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(nanopb_msgopt)
+  google_dot_protobuf_dot_descriptor__pb2.EnumOptions.RegisterExtension(nanopb_enumopt)
+  google_dot_protobuf_dot_descriptor__pb2.FieldOptions.RegisterExtension(nanopb)
+
   DESCRIPTOR._options = None
   DESCRIPTOR._serialized_options = b'\n\030fi.kapsi.koti.jpa.nanopbZ\"github.com/meshtastic/go/generated'
-  _globals['_FIELDTYPE']._serialized_start=1005
-  _globals['_FIELDTYPE']._serialized_end=1110
-  _globals['_INTSIZE']._serialized_start=1112
-  _globals['_INTSIZE']._serialized_end=1180
-  _globals['_TYPENAMEMANGLING']._serialized_start=1182
-  _globals['_TYPENAMEMANGLING']._serialized_end=1272
-  _globals['_DESCRIPTORSIZE']._serialized_start=1274
-  _globals['_DESCRIPTORSIZE']._serialized_end=1343
-  _globals['_NANOPBOPTIONS']._serialized_start=71
-  _globals['_NANOPBOPTIONS']._serialized_end=1003
+  _FIELDTYPE._serialized_start=1005
+  _FIELDTYPE._serialized_end=1110
+  _INTSIZE._serialized_start=1112
+  _INTSIZE._serialized_end=1180
+  _TYPENAMEMANGLING._serialized_start=1182
+  _TYPENAMEMANGLING._serialized_end=1272
+  _DESCRIPTORSIZE._serialized_start=1274
+  _DESCRIPTORSIZE._serialized_end=1343
+  _NANOPBOPTIONS._serialized_start=71
+  _NANOPBOPTIONS._serialized_end=1003
 # @@protoc_insertion_point(module_scope)

meshtastic/protobuf/nanopb_pb2.pyi

@@ -1,324 +1,110 @@
-"""
-@generated by mypy-protobuf.  Do not edit manually!
-isort:skip_file
-Custom options for defining:
-- Maximum size of string/bytes
-- Maximum number of elements in array
+from google.protobuf import descriptor_pb2 as _descriptor_pb2
+from google.protobuf.internal import containers as _containers
+from google.protobuf.internal import enum_type_wrapper as _enum_type_wrapper
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from typing import ClassVar as _ClassVar, Iterable as _Iterable, Optional as _Optional, Union as _Union
 
-These are used by nanopb to generate statically allocable structures
-for memory-limited environments.
-"""
+DESCRIPTOR: _descriptor.FileDescriptor
+DS_1: DescriptorSize
+DS_2: DescriptorSize
+DS_4: DescriptorSize
+DS_8: DescriptorSize
+DS_AUTO: DescriptorSize
+FT_CALLBACK: FieldType
+FT_DEFAULT: FieldType
+FT_IGNORE: FieldType
+FT_INLINE: FieldType
+FT_POINTER: FieldType
+FT_STATIC: FieldType
+IS_16: IntSize
+IS_32: IntSize
+IS_64: IntSize
+IS_8: IntSize
+IS_DEFAULT: IntSize
+M_FLATTEN: TypenameMangling
+M_NONE: TypenameMangling
+M_PACKAGE_INITIALS: TypenameMangling
+M_STRIP_PACKAGE: TypenameMangling
+NANOPB_ENUMOPT_FIELD_NUMBER: _ClassVar[int]
+NANOPB_FIELD_NUMBER: _ClassVar[int]
+NANOPB_FILEOPT_FIELD_NUMBER: _ClassVar[int]
+NANOPB_MSGOPT_FIELD_NUMBER: _ClassVar[int]
+nanopb: _descriptor.FieldDescriptor
+nanopb_enumopt: _descriptor.FieldDescriptor
+nanopb_fileopt: _descriptor.FieldDescriptor
+nanopb_msgopt: _descriptor.FieldDescriptor
 
-import builtins
-import collections.abc
-import google.protobuf.descriptor
-import google.protobuf.descriptor_pb2
-import google.protobuf.internal.containers
-import google.protobuf.internal.enum_type_wrapper
-import google.protobuf.internal.extension_dict
-import google.protobuf.message
-import sys
-import typing
+class NanoPBOptions(_message.Message):
+    __slots__ = ["anonymous_oneof", "callback_datatype", "callback_function", "default_has", "descriptorsize", "enum_to_string", "exclude", "fallback_type", "fixed_count", "fixed_length", "include", "int_size", "long_names", "mangle_names", "max_count", "max_length", "max_size", "msgid", "no_unions", "package", "packed_enum", "packed_struct", "proto3", "proto3_singular_msgs", "skip_message", "sort_by_tag", "submsg_callback", "type", "type_override"]
+    ANONYMOUS_ONEOF_FIELD_NUMBER: _ClassVar[int]
+    CALLBACK_DATATYPE_FIELD_NUMBER: _ClassVar[int]
+    CALLBACK_FUNCTION_FIELD_NUMBER: _ClassVar[int]
+    DEFAULT_HAS_FIELD_NUMBER: _ClassVar[int]
+    DESCRIPTORSIZE_FIELD_NUMBER: _ClassVar[int]
+    ENUM_TO_STRING_FIELD_NUMBER: _ClassVar[int]
+    EXCLUDE_FIELD_NUMBER: _ClassVar[int]
+    FALLBACK_TYPE_FIELD_NUMBER: _ClassVar[int]
+    FIXED_COUNT_FIELD_NUMBER: _ClassVar[int]
+    FIXED_LENGTH_FIELD_NUMBER: _ClassVar[int]
+    INCLUDE_FIELD_NUMBER: _ClassVar[int]
+    INT_SIZE_FIELD_NUMBER: _ClassVar[int]
+    LONG_NAMES_FIELD_NUMBER: _ClassVar[int]
+    MANGLE_NAMES_FIELD_NUMBER: _ClassVar[int]
+    MAX_COUNT_FIELD_NUMBER: _ClassVar[int]
+    MAX_LENGTH_FIELD_NUMBER: _ClassVar[int]
+    MAX_SIZE_FIELD_NUMBER: _ClassVar[int]
+    MSGID_FIELD_NUMBER: _ClassVar[int]
+    NO_UNIONS_FIELD_NUMBER: _ClassVar[int]
+    PACKAGE_FIELD_NUMBER: _ClassVar[int]
+    PACKED_ENUM_FIELD_NUMBER: _ClassVar[int]
+    PACKED_STRUCT_FIELD_NUMBER: _ClassVar[int]
+    PROTO3_FIELD_NUMBER: _ClassVar[int]
+    PROTO3_SINGULAR_MSGS_FIELD_NUMBER: _ClassVar[int]
+    SKIP_MESSAGE_FIELD_NUMBER: _ClassVar[int]
+    SORT_BY_TAG_FIELD_NUMBER: _ClassVar[int]
+    SUBMSG_CALLBACK_FIELD_NUMBER: _ClassVar[int]
+    TYPE_FIELD_NUMBER: _ClassVar[int]
+    TYPE_OVERRIDE_FIELD_NUMBER: _ClassVar[int]
+    anonymous_oneof: bool
+    callback_datatype: str
+    callback_function: str
+    default_has: bool
+    descriptorsize: DescriptorSize
+    enum_to_string: bool
+    exclude: _containers.RepeatedScalarFieldContainer[str]
+    fallback_type: FieldType
+    fixed_count: bool
+    fixed_length: bool
+    include: _containers.RepeatedScalarFieldContainer[str]
+    int_size: IntSize
+    long_names: bool
+    mangle_names: TypenameMangling
+    max_count: int
+    max_length: int
+    max_size: int
+    msgid: int
+    no_unions: bool
+    package: str
+    packed_enum: bool
+    packed_struct: bool
+    proto3: bool
+    proto3_singular_msgs: bool
+    skip_message: bool
+    sort_by_tag: bool
+    submsg_callback: bool
+    type: FieldType
+    type_override: _descriptor_pb2.FieldDescriptorProto.Type
+    def __init__(self, max_size: _Optional[int] = ..., max_length: _Optional[int] = ..., max_count: _Optional[int] = ..., int_size: _Optional[_Union[IntSize, str]] = ..., type: _Optional[_Union[FieldType, str]] = ..., long_names: bool = ..., packed_struct: bool = ..., packed_enum: bool = ..., skip_message: bool = ..., no_unions: bool = ..., msgid: _Optional[int] = ..., anonymous_oneof: bool = ..., proto3: bool = ..., proto3_singular_msgs: bool = ..., enum_to_string: bool = ..., fixed_length: bool = ..., fixed_count: bool = ..., submsg_callback: bool = ..., mangle_names: _Optional[_Union[TypenameMangling, str]] = ..., callback_datatype: _Optional[str] = ..., callback_function: _Optional[str] = ..., descriptorsize: _Optional[_Union[DescriptorSize, str]] = ..., default_has: bool = ..., include: _Optional[_Iterable[str]] = ..., exclude: _Optional[_Iterable[str]] = ..., package: _Optional[str] = ..., type_override: _Optional[_Union[_descriptor_pb2.FieldDescriptorProto.Type, str]] = ..., sort_by_tag: bool = ..., fallback_type: _Optional[_Union[FieldType, str]] = ...) -> None: ...
 
-if sys.version_info >= (3, 10):
-    import typing as typing_extensions
-else:
-    import typing_extensions
+class FieldType(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
+    __slots__ = []
 
-DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
+class IntSize(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
+    __slots__ = []
 
-class _FieldType:
-    ValueType = typing.NewType("ValueType", builtins.int)
-    V: typing_extensions.TypeAlias = ValueType
+class TypenameMangling(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
+    __slots__ = []
 
-class _FieldTypeEnumTypeWrapper(google.protobuf.internal.enum_type_wrapper._EnumTypeWrapper[_FieldType.ValueType], builtins.type):
-    DESCRIPTOR: google.protobuf.descriptor.EnumDescriptor
-    FT_DEFAULT: _FieldType.ValueType  # 0
-    """Automatically decide field type, generate static field if possible."""
-    FT_CALLBACK: _FieldType.ValueType  # 1
-    """Always generate a callback field."""
-    FT_POINTER: _FieldType.ValueType  # 4
-    """Always generate a dynamically allocated field."""
-    FT_STATIC: _FieldType.ValueType  # 2
-    """Generate a static field or raise an exception if not possible."""
-    FT_IGNORE: _FieldType.ValueType  # 3
-    """Ignore the field completely."""
-    FT_INLINE: _FieldType.ValueType  # 5
-    """Legacy option, use the separate 'fixed_length' option instead"""
-
-class FieldType(_FieldType, metaclass=_FieldTypeEnumTypeWrapper): ...
-
-FT_DEFAULT: FieldType.ValueType  # 0
-"""Automatically decide field type, generate static field if possible."""
-FT_CALLBACK: FieldType.ValueType  # 1
-"""Always generate a callback field."""
-FT_POINTER: FieldType.ValueType  # 4
-"""Always generate a dynamically allocated field."""
-FT_STATIC: FieldType.ValueType  # 2
-"""Generate a static field or raise an exception if not possible."""
-FT_IGNORE: FieldType.ValueType  # 3
-"""Ignore the field completely."""
-FT_INLINE: FieldType.ValueType  # 5
-"""Legacy option, use the separate 'fixed_length' option instead"""
-global___FieldType = FieldType
-
-class _IntSize:
-    ValueType = typing.NewType("ValueType", builtins.int)
-    V: typing_extensions.TypeAlias = ValueType
-
-class _IntSizeEnumTypeWrapper(google.protobuf.internal.enum_type_wrapper._EnumTypeWrapper[_IntSize.ValueType], builtins.type):
-    DESCRIPTOR: google.protobuf.descriptor.EnumDescriptor
-    IS_DEFAULT: _IntSize.ValueType  # 0
-    """Default, 32/64bit based on type in .proto"""
-    IS_8: _IntSize.ValueType  # 8
-    IS_16: _IntSize.ValueType  # 16
-    IS_32: _IntSize.ValueType  # 32
-    IS_64: _IntSize.ValueType  # 64
-
-class IntSize(_IntSize, metaclass=_IntSizeEnumTypeWrapper): ...
-
-IS_DEFAULT: IntSize.ValueType  # 0
-"""Default, 32/64bit based on type in .proto"""
-IS_8: IntSize.ValueType  # 8
-IS_16: IntSize.ValueType  # 16
-IS_32: IntSize.ValueType  # 32
-IS_64: IntSize.ValueType  # 64
-global___IntSize = IntSize
-
-class _TypenameMangling:
-    ValueType = typing.NewType("ValueType", builtins.int)
-    V: typing_extensions.TypeAlias = ValueType
-
-class _TypenameManglingEnumTypeWrapper(google.protobuf.internal.enum_type_wrapper._EnumTypeWrapper[_TypenameMangling.ValueType], builtins.type):
-    DESCRIPTOR: google.protobuf.descriptor.EnumDescriptor
-    M_NONE: _TypenameMangling.ValueType  # 0
-    """Default, no typename mangling"""
-    M_STRIP_PACKAGE: _TypenameMangling.ValueType  # 1
-    """Strip current package name"""
-    M_FLATTEN: _TypenameMangling.ValueType  # 2
-    """Only use last path component"""
-    M_PACKAGE_INITIALS: _TypenameMangling.ValueType  # 3
-    """Replace the package name by the initials"""
-
-class TypenameMangling(_TypenameMangling, metaclass=_TypenameManglingEnumTypeWrapper): ...
-
-M_NONE: TypenameMangling.ValueType  # 0
-"""Default, no typename mangling"""
-M_STRIP_PACKAGE: TypenameMangling.ValueType  # 1
-"""Strip current package name"""
-M_FLATTEN: TypenameMangling.ValueType  # 2
-"""Only use last path component"""
-M_PACKAGE_INITIALS: TypenameMangling.ValueType  # 3
-"""Replace the package name by the initials"""
-global___TypenameMangling = TypenameMangling
-
-class _DescriptorSize:
-    ValueType = typing.NewType("ValueType", builtins.int)
-    V: typing_extensions.TypeAlias = ValueType
-
-class _DescriptorSizeEnumTypeWrapper(google.protobuf.internal.enum_type_wrapper._EnumTypeWrapper[_DescriptorSize.ValueType], builtins.type):
-    DESCRIPTOR: google.protobuf.descriptor.EnumDescriptor
-    DS_AUTO: _DescriptorSize.ValueType  # 0
-    """Select minimal size based on field type"""
-    DS_1: _DescriptorSize.ValueType  # 1
-    """1 word; up to 15 byte fields, no arrays"""
-    DS_2: _DescriptorSize.ValueType  # 2
-    """2 words; up to 4095 byte fields, 4095 entry arrays"""
-    DS_4: _DescriptorSize.ValueType  # 4
-    """4 words; up to 2^32-1 byte fields, 2^16-1 entry arrays"""
-    DS_8: _DescriptorSize.ValueType  # 8
-    """8 words; up to 2^32-1 entry arrays"""
-
-class DescriptorSize(_DescriptorSize, metaclass=_DescriptorSizeEnumTypeWrapper): ...
-
-DS_AUTO: DescriptorSize.ValueType  # 0
-"""Select minimal size based on field type"""
-DS_1: DescriptorSize.ValueType  # 1
-"""1 word; up to 15 byte fields, no arrays"""
-DS_2: DescriptorSize.ValueType  # 2
-"""2 words; up to 4095 byte fields, 4095 entry arrays"""
-DS_4: DescriptorSize.ValueType  # 4
-"""4 words; up to 2^32-1 byte fields, 2^16-1 entry arrays"""
-DS_8: DescriptorSize.ValueType  # 8
-"""8 words; up to 2^32-1 entry arrays"""
-global___DescriptorSize = DescriptorSize
-
-@typing.final
-class NanoPBOptions(google.protobuf.message.Message):
-    """This is the inner options message, which basically defines options for
-    a field. When it is used in message or file scope, it applies to all
-    fields.
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    MAX_SIZE_FIELD_NUMBER: builtins.int
-    MAX_LENGTH_FIELD_NUMBER: builtins.int
-    MAX_COUNT_FIELD_NUMBER: builtins.int
-    INT_SIZE_FIELD_NUMBER: builtins.int
-    TYPE_FIELD_NUMBER: builtins.int
-    LONG_NAMES_FIELD_NUMBER: builtins.int
-    PACKED_STRUCT_FIELD_NUMBER: builtins.int
-    PACKED_ENUM_FIELD_NUMBER: builtins.int
-    SKIP_MESSAGE_FIELD_NUMBER: builtins.int
-    NO_UNIONS_FIELD_NUMBER: builtins.int
-    MSGID_FIELD_NUMBER: builtins.int
-    ANONYMOUS_ONEOF_FIELD_NUMBER: builtins.int
-    PROTO3_FIELD_NUMBER: builtins.int
-    PROTO3_SINGULAR_MSGS_FIELD_NUMBER: builtins.int
-    ENUM_TO_STRING_FIELD_NUMBER: builtins.int
-    FIXED_LENGTH_FIELD_NUMBER: builtins.int
-    FIXED_COUNT_FIELD_NUMBER: builtins.int
-    SUBMSG_CALLBACK_FIELD_NUMBER: builtins.int
-    MANGLE_NAMES_FIELD_NUMBER: builtins.int
-    CALLBACK_DATATYPE_FIELD_NUMBER: builtins.int
-    CALLBACK_FUNCTION_FIELD_NUMBER: builtins.int
-    DESCRIPTORSIZE_FIELD_NUMBER: builtins.int
-    DEFAULT_HAS_FIELD_NUMBER: builtins.int
-    INCLUDE_FIELD_NUMBER: builtins.int
-    EXCLUDE_FIELD_NUMBER: builtins.int
-    PACKAGE_FIELD_NUMBER: builtins.int
-    TYPE_OVERRIDE_FIELD_NUMBER: builtins.int
-    SORT_BY_TAG_FIELD_NUMBER: builtins.int
-    FALLBACK_TYPE_FIELD_NUMBER: builtins.int
-    max_size: builtins.int
-    """Allocated size for 'bytes' and 'string' fields.
-    For string fields, this should include the space for null terminator.
-    """
-    max_length: builtins.int
-    """Maximum length for 'string' fields. Setting this is equivalent
-    to setting max_size to a value of length+1.
-    """
-    max_count: builtins.int
-    """Allocated number of entries in arrays ('repeated' fields)"""
-    int_size: global___IntSize.ValueType
-    """Size of integer fields. Can save some memory if you don't need
-    full 32 bits for the value.
-    """
-    type: global___FieldType.ValueType
-    """Force type of field (callback or static allocation)"""
-    long_names: builtins.bool
-    """Use long names for enums, i.e. EnumName_EnumValue."""
-    packed_struct: builtins.bool
-    """Add 'packed' attribute to generated structs.
-    Note: this cannot be used on CPUs that break on unaligned
-    accesses to variables.
-    """
-    packed_enum: builtins.bool
-    """Add 'packed' attribute to generated enums."""
-    skip_message: builtins.bool
-    """Skip this message"""
-    no_unions: builtins.bool
-    """Generate oneof fields as normal optional fields instead of union."""
-    msgid: builtins.int
-    """integer type tag for a message"""
-    anonymous_oneof: builtins.bool
-    """decode oneof as anonymous union"""
-    proto3: builtins.bool
-    """Proto3 singular field does not generate a "has_" flag"""
-    proto3_singular_msgs: builtins.bool
-    """Force proto3 messages to have no "has_" flag.
-    This was default behavior until nanopb-0.4.0.
-    """
-    enum_to_string: builtins.bool
-    """Generate an enum->string mapping function (can take up lots of space)."""
-    fixed_length: builtins.bool
-    """Generate bytes arrays with fixed length"""
-    fixed_count: builtins.bool
-    """Generate repeated field with fixed count"""
-    submsg_callback: builtins.bool
-    """Generate message-level callback that is called before decoding submessages.
-    This can be used to set callback fields for submsgs inside oneofs.
-    """
-    mangle_names: global___TypenameMangling.ValueType
-    """Shorten or remove package names from type names.
-    This option applies only on the file level.
-    """
-    callback_datatype: builtins.str
-    """Data type for storage associated with callback fields."""
-    callback_function: builtins.str
-    """Callback function used for encoding and decoding.
-    Prior to nanopb-0.4.0, the callback was specified in per-field pb_callback_t
-    structure. This is still supported, but does not work inside e.g. oneof or pointer
-    fields. Instead, a new method allows specifying a per-message callback that
-    will be called for all callback fields in a message type.
-    """
-    descriptorsize: global___DescriptorSize.ValueType
-    """Select the size of field descriptors. This option has to be defined
-    for the whole message, not per-field. Usually automatic selection is
-    ok, but if it results in compilation errors you can increase the field
-    size here.
-    """
-    default_has: builtins.bool
-    """Set default value for has_ fields."""
-    package: builtins.str
-    """Package name that applies only for nanopb."""
-    type_override: google.protobuf.descriptor_pb2.FieldDescriptorProto.Type.ValueType
-    """Override type of the field in generated C code. Only to be used with related field types"""
-    sort_by_tag: builtins.bool
-    """Due to historical reasons, nanopb orders fields in structs by their tag number
-    instead of the order in .proto. Set this to false to keep the .proto order.
-    The default value will probably change to false in nanopb-0.5.0.
-    """
-    fallback_type: global___FieldType.ValueType
-    """Set the FT_DEFAULT field conversion strategy.
-    A field that can become a static member of a c struct (e.g. int, bool, etc)
-    will be a a static field.
-    Fields with dynamic length are converted to either a pointer or a callback.
-    """
-    @property
-    def include(self) -> google.protobuf.internal.containers.RepeatedScalarFieldContainer[builtins.str]:
-        """Extra files to include in generated `.pb.h`"""
-
-    @property
-    def exclude(self) -> google.protobuf.internal.containers.RepeatedScalarFieldContainer[builtins.str]:
-        """Automatic includes to exclude from generated `.pb.h`
-        Same as nanopb_generator.py command line flag -x.
-        """
-
-    def __init__(
-        self,
-        *,
-        max_size: builtins.int | None = ...,
-        max_length: builtins.int | None = ...,
-        max_count: builtins.int | None = ...,
-        int_size: global___IntSize.ValueType | None = ...,
-        type: global___FieldType.ValueType | None = ...,
-        long_names: builtins.bool | None = ...,
-        packed_struct: builtins.bool | None = ...,
-        packed_enum: builtins.bool | None = ...,
-        skip_message: builtins.bool | None = ...,
-        no_unions: builtins.bool | None = ...,
-        msgid: builtins.int | None = ...,
-        anonymous_oneof: builtins.bool | None = ...,
-        proto3: builtins.bool | None = ...,
-        proto3_singular_msgs: builtins.bool | None = ...,
-        enum_to_string: builtins.bool | None = ...,
-        fixed_length: builtins.bool | None = ...,
-        fixed_count: builtins.bool | None = ...,
-        submsg_callback: builtins.bool | None = ...,
-        mangle_names: global___TypenameMangling.ValueType | None = ...,
-        callback_datatype: builtins.str | None = ...,
-        callback_function: builtins.str | None = ...,
-        descriptorsize: global___DescriptorSize.ValueType | None = ...,
-        default_has: builtins.bool | None = ...,
-        include: collections.abc.Iterable[builtins.str] | None = ...,
-        exclude: collections.abc.Iterable[builtins.str] | None = ...,
-        package: builtins.str | None = ...,
-        type_override: google.protobuf.descriptor_pb2.FieldDescriptorProto.Type.ValueType | None = ...,
-        sort_by_tag: builtins.bool | None = ...,
-        fallback_type: global___FieldType.ValueType | None = ...,
-    ) -> None: ...
-    def HasField(self, field_name: typing.Literal["anonymous_oneof", b"anonymous_oneof", "callback_datatype", b"callback_datatype", "callback_function", b"callback_function", "default_has", b"default_has", "descriptorsize", b"descriptorsize", "enum_to_string", b"enum_to_string", "fallback_type", b"fallback_type", "fixed_count", b"fixed_count", "fixed_length", b"fixed_length", "int_size", b"int_size", "long_names", b"long_names", "mangle_names", b"mangle_names", "max_count", b"max_count", "max_length", b"max_length", "max_size", b"max_size", "msgid", b"msgid", "no_unions", b"no_unions", "package", b"package", "packed_enum", b"packed_enum", "packed_struct", b"packed_struct", "proto3", b"proto3", "proto3_singular_msgs", b"proto3_singular_msgs", "skip_message", b"skip_message", "sort_by_tag", b"sort_by_tag", "submsg_callback", b"submsg_callback", "type", b"type", "type_override", b"type_override"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing.Literal["anonymous_oneof", b"anonymous_oneof", "callback_datatype", b"callback_datatype", "callback_function", b"callback_function", "default_has", b"default_has", "descriptorsize", b"descriptorsize", "enum_to_string", b"enum_to_string", "exclude", b"exclude", "fallback_type", b"fallback_type", "fixed_count", b"fixed_count", "fixed_length", b"fixed_length", "include", b"include", "int_size", b"int_size", "long_names", b"long_names", "mangle_names", b"mangle_names", "max_count", b"max_count", "max_length", b"max_length", "max_size", b"max_size", "msgid", b"msgid", "no_unions", b"no_unions", "package", b"package", "packed_enum", b"packed_enum", "packed_struct", b"packed_struct", "proto3", b"proto3", "proto3_singular_msgs", b"proto3_singular_msgs", "skip_message", b"skip_message", "sort_by_tag", b"sort_by_tag", "submsg_callback", b"submsg_callback", "type", b"type", "type_override", b"type_override"]) -> None: ...
-
-global___NanoPBOptions = NanoPBOptions
-
-NANOPB_FILEOPT_FIELD_NUMBER: builtins.int
-NANOPB_MSGOPT_FIELD_NUMBER: builtins.int
-NANOPB_ENUMOPT_FIELD_NUMBER: builtins.int
-NANOPB_FIELD_NUMBER: builtins.int
-nanopb_fileopt: google.protobuf.internal.extension_dict._ExtensionFieldDescriptor[google.protobuf.descriptor_pb2.FileOptions, global___NanoPBOptions]
-nanopb_msgopt: google.protobuf.internal.extension_dict._ExtensionFieldDescriptor[google.protobuf.descriptor_pb2.MessageOptions, global___NanoPBOptions]
-nanopb_enumopt: google.protobuf.internal.extension_dict._ExtensionFieldDescriptor[google.protobuf.descriptor_pb2.EnumOptions, global___NanoPBOptions]
-nanopb: google.protobuf.internal.extension_dict._ExtensionFieldDescriptor[google.protobuf.descriptor_pb2.FieldOptions, global___NanoPBOptions]
+class DescriptorSize(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
+    __slots__ = []

meshtastic/protobuf/paxcount_pb2.py

@@ -2,10 +2,10 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: meshtastic/protobuf/paxcount.proto
 """Generated protocol buffer code."""
+from google.protobuf.internal import builder as _builder
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
 from google.protobuf import symbol_database as _symbol_database
-from google.protobuf.internal import builder as _builder
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -13,14 +13,14 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\"meshtastic/protobuf/paxcount.proto\x12\x13meshtastic.protobuf\"5\n\x08Paxcount\x12\x0c\n\x04wifi\x18\x01 \x01(\r\x12\x0b\n\x03\x62le\x18\x02 \x01(\r\x12\x0e\n\x06uptime\x18\x03 \x01(\rBc\n\x13\x63om.geeksville.meshB\x0ePaxcountProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\"meshtastic/protobuf/paxcount.proto\x12\x13meshtastic.protobuf\"5\n\x08Paxcount\x12\x0c\n\x04wifi\x18\x01 \x01(\r\x12\x0b\n\x03\x62le\x18\x02 \x01(\r\x12\x0e\n\x06uptime\x18\x03 \x01(\rBd\n\x14org.meshtastic.protoB\x0ePaxcountProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
 
-_globals = globals()
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.paxcount_pb2', _globals)
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.paxcount_pb2', globals())
 if _descriptor._USE_C_DESCRIPTORS == False:
+
   DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\016PaxcountProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
-  _globals['_PAXCOUNT']._serialized_start=59
-  _globals['_PAXCOUNT']._serialized_end=112
+  DESCRIPTOR._serialized_options = b'\n\024org.meshtastic.protoB\016PaxcountProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
+  _PAXCOUNT._serialized_start=59
+  _PAXCOUNT._serialized_end=112
 # @@protoc_insertion_point(module_scope)

meshtastic/protobuf/paxcount_pb2.pyi

@@ -1,45 +1,15 @@
-"""
-@generated by mypy-protobuf.  Do not edit manually!
-isort:skip_file
-"""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from typing import ClassVar as _ClassVar, Optional as _Optional
 
-import builtins
-import google.protobuf.descriptor
-import google.protobuf.message
-import typing
+DESCRIPTOR: _descriptor.FileDescriptor
 
-DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
-
-@typing.final
-class Paxcount(google.protobuf.message.Message):
-    """
-    TODO: REPLACE
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    WIFI_FIELD_NUMBER: builtins.int
-    BLE_FIELD_NUMBER: builtins.int
-    UPTIME_FIELD_NUMBER: builtins.int
-    wifi: builtins.int
-    """
-    seen Wifi devices
-    """
-    ble: builtins.int
-    """
-    Seen BLE devices
-    """
-    uptime: builtins.int
-    """
-    Uptime in seconds
-    """
-    def __init__(
-        self,
-        *,
-        wifi: builtins.int = ...,
-        ble: builtins.int = ...,
-        uptime: builtins.int = ...,
-    ) -> None: ...
-    def ClearField(self, field_name: typing.Literal["ble", b"ble", "uptime", b"uptime", "wifi", b"wifi"]) -> None: ...
-
-global___Paxcount = Paxcount
+class Paxcount(_message.Message):
+    __slots__ = ["ble", "uptime", "wifi"]
+    BLE_FIELD_NUMBER: _ClassVar[int]
+    UPTIME_FIELD_NUMBER: _ClassVar[int]
+    WIFI_FIELD_NUMBER: _ClassVar[int]
+    ble: int
+    uptime: int
+    wifi: int
+    def __init__(self, wifi: _Optional[int] = ..., ble: _Optional[int] = ..., uptime: _Optional[int] = ...) -> None: ...

meshtastic/protobuf/portnums_pb2.py

@@ -2,10 +2,10 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: meshtastic/protobuf/portnums.proto
 """Generated protocol buffer code."""
+from google.protobuf.internal import builder as _builder
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
 from google.protobuf import symbol_database as _symbol_database
-from google.protobuf.internal import builder as _builder
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -13,14 +13,14 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\"meshtastic/protobuf/portnums.proto\x12\x13meshtastic.protobuf*\xf6\x04\n\x07PortNum\x12\x0f\n\x0bUNKNOWN_APP\x10\x00\x12\x14\n\x10TEXT_MESSAGE_APP\x10\x01\x12\x17\n\x13REMOTE_HARDWARE_APP\x10\x02\x12\x10\n\x0cPOSITION_APP\x10\x03\x12\x10\n\x0cNODEINFO_APP\x10\x04\x12\x0f\n\x0bROUTING_APP\x10\x05\x12\r\n\tADMIN_APP\x10\x06\x12\x1f\n\x1bTEXT_MESSAGE_COMPRESSED_APP\x10\x07\x12\x10\n\x0cWAYPOINT_APP\x10\x08\x12\r\n\tAUDIO_APP\x10\t\x12\x18\n\x14\x44\x45TECTION_SENSOR_APP\x10\n\x12\r\n\tALERT_APP\x10\x0b\x12\x18\n\x14KEY_VERIFICATION_APP\x10\x0c\x12\r\n\tREPLY_APP\x10 \x12\x11\n\rIP_TUNNEL_APP\x10!\x12\x12\n\x0ePAXCOUNTER_APP\x10\"\x12\x0e\n\nSERIAL_APP\x10@\x12\x15\n\x11STORE_FORWARD_APP\x10\x41\x12\x12\n\x0eRANGE_TEST_APP\x10\x42\x12\x11\n\rTELEMETRY_APP\x10\x43\x12\x0b\n\x07ZPS_APP\x10\x44\x12\x11\n\rSIMULATOR_APP\x10\x45\x12\x12\n\x0eTRACEROUTE_APP\x10\x46\x12\x14\n\x10NEIGHBORINFO_APP\x10G\x12\x0f\n\x0b\x41TAK_PLUGIN\x10H\x12\x12\n\x0eMAP_REPORT_APP\x10I\x12\x13\n\x0fPOWERSTRESS_APP\x10J\x12\x18\n\x14RETICULUM_TUNNEL_APP\x10L\x12\x0f\n\x0b\x43\x41YENNE_APP\x10M\x12\x10\n\x0bPRIVATE_APP\x10\x80\x02\x12\x13\n\x0e\x41TAK_FORWARDER\x10\x81\x02\x12\x08\n\x03MAX\x10\xff\x03\x42]\n\x13\x63om.geeksville.meshB\x08PortnumsZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\"meshtastic/protobuf/portnums.proto\x12\x13meshtastic.protobuf*\xfd\x05\n\x07PortNum\x12\x0f\n\x0bUNKNOWN_APP\x10\x00\x12\x14\n\x10TEXT_MESSAGE_APP\x10\x01\x12\x17\n\x13REMOTE_HARDWARE_APP\x10\x02\x12\x10\n\x0cPOSITION_APP\x10\x03\x12\x10\n\x0cNODEINFO_APP\x10\x04\x12\x0f\n\x0bROUTING_APP\x10\x05\x12\r\n\tADMIN_APP\x10\x06\x12\x1f\n\x1bTEXT_MESSAGE_COMPRESSED_APP\x10\x07\x12\x10\n\x0cWAYPOINT_APP\x10\x08\x12\r\n\tAUDIO_APP\x10\t\x12\x18\n\x14\x44\x45TECTION_SENSOR_APP\x10\n\x12\r\n\tALERT_APP\x10\x0b\x12\x18\n\x14KEY_VERIFICATION_APP\x10\x0c\x12\x14\n\x10REMOTE_SHELL_APP\x10\r\x12\r\n\tREPLY_APP\x10 \x12\x11\n\rIP_TUNNEL_APP\x10!\x12\x12\n\x0ePAXCOUNTER_APP\x10\"\x12\x1e\n\x1aSTORE_FORWARD_PLUSPLUS_APP\x10#\x12\x13\n\x0fNODE_STATUS_APP\x10$\x12\x0e\n\nSERIAL_APP\x10@\x12\x15\n\x11STORE_FORWARD_APP\x10\x41\x12\x12\n\x0eRANGE_TEST_APP\x10\x42\x12\x11\n\rTELEMETRY_APP\x10\x43\x12\x0b\n\x07ZPS_APP\x10\x44\x12\x11\n\rSIMULATOR_APP\x10\x45\x12\x12\n\x0eTRACEROUTE_APP\x10\x46\x12\x14\n\x10NEIGHBORINFO_APP\x10G\x12\x0f\n\x0b\x41TAK_PLUGIN\x10H\x12\x12\n\x0eMAP_REPORT_APP\x10I\x12\x13\n\x0fPOWERSTRESS_APP\x10J\x12\x12\n\x0eLORAWAN_BRIDGE\x10K\x12\x18\n\x14RETICULUM_TUNNEL_APP\x10L\x12\x0f\n\x0b\x43\x41YENNE_APP\x10M\x12\x12\n\x0e\x41TAK_PLUGIN_V2\x10N\x12\x12\n\x0eGROUPALARM_APP\x10p\x12\x10\n\x0bPRIVATE_APP\x10\x80\x02\x12\x13\n\x0e\x41TAK_FORWARDER\x10\x81\x02\x12\x08\n\x03MAX\x10\xff\x03\x42^\n\x14org.meshtastic.protoB\x08PortnumsZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
 
-_globals = globals()
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.portnums_pb2', _globals)
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.portnums_pb2', globals())
 if _descriptor._USE_C_DESCRIPTORS == False:
+
   DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\010PortnumsZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
-  _globals['_PORTNUM']._serialized_start=60
-  _globals['_PORTNUM']._serialized_end=690
+  DESCRIPTOR._serialized_options = b'\n\024org.meshtastic.protoB\010PortnumsZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
+  _PORTNUM._serialized_start=60
+  _PORTNUM._serialized_end=825
 # @@protoc_insertion_point(module_scope)

meshtastic/protobuf/portnums_pb2.pyi

@@ -1,416 +1,46 @@
-"""
-@generated by mypy-protobuf.  Do not edit manually!
-isort:skip_file
-"""
+from google.protobuf.internal import enum_type_wrapper as _enum_type_wrapper
+from google.protobuf import descriptor as _descriptor
+from typing import ClassVar as _ClassVar
 
-import builtins
-import google.protobuf.descriptor
-import google.protobuf.internal.enum_type_wrapper
-import sys
-import typing
+ADMIN_APP: PortNum
+ALERT_APP: PortNum
+ATAK_FORWARDER: PortNum
+ATAK_PLUGIN: PortNum
+ATAK_PLUGIN_V2: PortNum
+AUDIO_APP: PortNum
+CAYENNE_APP: PortNum
+DESCRIPTOR: _descriptor.FileDescriptor
+DETECTION_SENSOR_APP: PortNum
+GROUPALARM_APP: PortNum
+IP_TUNNEL_APP: PortNum
+KEY_VERIFICATION_APP: PortNum
+LORAWAN_BRIDGE: PortNum
+MAP_REPORT_APP: PortNum
+MAX: PortNum
+NEIGHBORINFO_APP: PortNum
+NODEINFO_APP: PortNum
+NODE_STATUS_APP: PortNum
+PAXCOUNTER_APP: PortNum
+POSITION_APP: PortNum
+POWERSTRESS_APP: PortNum
+PRIVATE_APP: PortNum
+RANGE_TEST_APP: PortNum
+REMOTE_HARDWARE_APP: PortNum
+REMOTE_SHELL_APP: PortNum
+REPLY_APP: PortNum
+RETICULUM_TUNNEL_APP: PortNum
+ROUTING_APP: PortNum
+SERIAL_APP: PortNum
+SIMULATOR_APP: PortNum
+STORE_FORWARD_APP: PortNum
+STORE_FORWARD_PLUSPLUS_APP: PortNum
+TELEMETRY_APP: PortNum
+TEXT_MESSAGE_APP: PortNum
+TEXT_MESSAGE_COMPRESSED_APP: PortNum
+TRACEROUTE_APP: PortNum
+UNKNOWN_APP: PortNum
+WAYPOINT_APP: PortNum
+ZPS_APP: PortNum
 
-if sys.version_info >= (3, 10):
-    import typing as typing_extensions
-else:
-    import typing_extensions
-
-DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
-
-class _PortNum:
-    ValueType = typing.NewType("ValueType", builtins.int)
-    V: typing_extensions.TypeAlias = ValueType
-
-class _PortNumEnumTypeWrapper(google.protobuf.internal.enum_type_wrapper._EnumTypeWrapper[_PortNum.ValueType], builtins.type):
-    DESCRIPTOR: google.protobuf.descriptor.EnumDescriptor
-    UNKNOWN_APP: _PortNum.ValueType  # 0
-    """
-    Deprecated: do not use in new code (formerly called OPAQUE)
-    A message sent from a device outside of the mesh, in a form the mesh does not understand
-    NOTE: This must be 0, because it is documented in IMeshService.aidl to be so
-    ENCODING: binary undefined
-    """
-    TEXT_MESSAGE_APP: _PortNum.ValueType  # 1
-    """
-    A simple UTF-8 text message, which even the little micros in the mesh
-    can understand and show on their screen eventually in some circumstances
-    even signal might send messages in this form (see below)
-    ENCODING: UTF-8 Plaintext (?)
-    """
-    REMOTE_HARDWARE_APP: _PortNum.ValueType  # 2
-    """
-    Reserved for built-in GPIO/example app.
-    See remote_hardware.proto/HardwareMessage for details on the message sent/received to this port number
-    ENCODING: Protobuf
-    """
-    POSITION_APP: _PortNum.ValueType  # 3
-    """
-    The built-in position messaging app.
-    Payload is a Position message.
-    ENCODING: Protobuf
-    """
-    NODEINFO_APP: _PortNum.ValueType  # 4
-    """
-    The built-in user info app.
-    Payload is a User message.
-    ENCODING: Protobuf
-    """
-    ROUTING_APP: _PortNum.ValueType  # 5
-    """
-    Protocol control packets for mesh protocol use.
-    Payload is a Routing message.
-    ENCODING: Protobuf
-    """
-    ADMIN_APP: _PortNum.ValueType  # 6
-    """
-    Admin control packets.
-    Payload is a AdminMessage message.
-    ENCODING: Protobuf
-    """
-    TEXT_MESSAGE_COMPRESSED_APP: _PortNum.ValueType  # 7
-    """
-    Compressed TEXT_MESSAGE payloads.
-    ENCODING: UTF-8 Plaintext (?) with Unishox2 Compression
-    NOTE: The Device Firmware converts a TEXT_MESSAGE_APP to TEXT_MESSAGE_COMPRESSED_APP if the compressed
-    payload is shorter. There's no need for app developers to do this themselves. Also the firmware will decompress
-    any incoming TEXT_MESSAGE_COMPRESSED_APP payload and convert to TEXT_MESSAGE_APP.
-    """
-    WAYPOINT_APP: _PortNum.ValueType  # 8
-    """
-    Waypoint payloads.
-    Payload is a Waypoint message.
-    ENCODING: Protobuf
-    """
-    AUDIO_APP: _PortNum.ValueType  # 9
-    """
-    Audio Payloads.
-    Encapsulated codec2 packets. On 2.4 GHZ Bandwidths only for now
-    ENCODING: codec2 audio frames
-    NOTE: audio frames contain a 3 byte header (0xc0 0xde 0xc2) and a one byte marker for the decompressed bitrate.
-    This marker comes from the 'moduleConfig.audio.bitrate' enum minus one.
-    """
-    DETECTION_SENSOR_APP: _PortNum.ValueType  # 10
-    """
-    Same as Text Message but originating from Detection Sensor Module.
-    NOTE: This portnum traffic is not sent to the public MQTT starting at firmware version 2.2.9
-    """
-    ALERT_APP: _PortNum.ValueType  # 11
-    """
-    Same as Text Message but used for critical alerts.
-    """
-    KEY_VERIFICATION_APP: _PortNum.ValueType  # 12
-    """
-    Module/port for handling key verification requests.
-    """
-    REPLY_APP: _PortNum.ValueType  # 32
-    """
-    Provides a 'ping' service that replies to any packet it receives.
-    Also serves as a small example module.
-    ENCODING: ASCII Plaintext
-    """
-    IP_TUNNEL_APP: _PortNum.ValueType  # 33
-    """
-    Used for the python IP tunnel feature
-    ENCODING: IP Packet. Handled by the python API, firmware ignores this one and pases on.
-    """
-    PAXCOUNTER_APP: _PortNum.ValueType  # 34
-    """
-    Paxcounter lib included in the firmware
-    ENCODING: protobuf
-    """
-    SERIAL_APP: _PortNum.ValueType  # 64
-    """
-    Provides a hardware serial interface to send and receive from the Meshtastic network.
-    Connect to the RX/TX pins of a device with 38400 8N1. Packets received from the Meshtastic
-    network is forwarded to the RX pin while sending a packet to TX will go out to the Mesh network.
-    Maximum packet size of 240 bytes.
-    Module is disabled by default can be turned on by setting SERIAL_MODULE_ENABLED = 1 in SerialPlugh.cpp.
-    ENCODING: binary undefined
-    """
-    STORE_FORWARD_APP: _PortNum.ValueType  # 65
-    """
-    STORE_FORWARD_APP (Work in Progress)
-    Maintained by Jm Casler (MC Hamster) : jm@casler.org
-    ENCODING: Protobuf
-    """
-    RANGE_TEST_APP: _PortNum.ValueType  # 66
-    """
-    Optional port for messages for the range test module.
-    ENCODING: ASCII Plaintext
-    NOTE: This portnum traffic is not sent to the public MQTT starting at firmware version 2.2.9
-    """
-    TELEMETRY_APP: _PortNum.ValueType  # 67
-    """
-    Provides a format to send and receive telemetry data from the Meshtastic network.
-    Maintained by Charles Crossan (crossan007) : crossan007@gmail.com
-    ENCODING: Protobuf
-    """
-    ZPS_APP: _PortNum.ValueType  # 68
-    """
-    Experimental tools for estimating node position without a GPS
-    Maintained by Github user a-f-G-U-C (a Meshtastic contributor)
-    Project files at https://github.com/a-f-G-U-C/Meshtastic-ZPS
-    ENCODING: arrays of int64 fields
-    """
-    SIMULATOR_APP: _PortNum.ValueType  # 69
-    """
-    Used to let multiple instances of Linux native applications communicate
-    as if they did using their LoRa chip.
-    Maintained by GitHub user GUVWAF.
-    Project files at https://github.com/GUVWAF/Meshtasticator
-    ENCODING: Protobuf (?)
-    """
-    TRACEROUTE_APP: _PortNum.ValueType  # 70
-    """
-    Provides a traceroute functionality to show the route a packet towards
-    a certain destination would take on the mesh. Contains a RouteDiscovery message as payload.
-    ENCODING: Protobuf
-    """
-    NEIGHBORINFO_APP: _PortNum.ValueType  # 71
-    """
-    Aggregates edge info for the network by sending out a list of each node's neighbors
-    ENCODING: Protobuf
-    """
-    ATAK_PLUGIN: _PortNum.ValueType  # 72
-    """
-    ATAK Plugin
-    Portnum for payloads from the official Meshtastic ATAK plugin
-    """
-    MAP_REPORT_APP: _PortNum.ValueType  # 73
-    """
-    Provides unencrypted information about a node for consumption by a map via MQTT
-    """
-    POWERSTRESS_APP: _PortNum.ValueType  # 74
-    """
-    PowerStress based monitoring support (for automated power consumption testing)
-    """
-    RETICULUM_TUNNEL_APP: _PortNum.ValueType  # 76
-    """
-    Reticulum Network Stack Tunnel App
-    ENCODING: Fragmented RNS Packet. Handled by Meshtastic RNS interface
-    """
-    CAYENNE_APP: _PortNum.ValueType  # 77
-    """
-    App for transporting Cayenne Low Power Payload, popular for LoRaWAN sensor nodes. Offers ability to send
-    arbitrary telemetry over meshtastic that is not covered by telemetry.proto
-    ENCODING: CayenneLLP
-    """
-    PRIVATE_APP: _PortNum.ValueType  # 256
-    """
-    Private applications should use portnums >= 256.
-    To simplify initial development and testing you can use "PRIVATE_APP"
-    in your code without needing to rebuild protobuf files (via [regen-protos.sh](https://github.com/meshtastic/firmware/blob/master/bin/regen-protos.sh))
-    """
-    ATAK_FORWARDER: _PortNum.ValueType  # 257
-    """
-    ATAK Forwarder Module https://github.com/paulmandal/atak-forwarder
-    ENCODING: libcotshrink
-    """
-    MAX: _PortNum.ValueType  # 511
-    """
-    Currently we limit port nums to no higher than this value
-    """
-
-class PortNum(_PortNum, metaclass=_PortNumEnumTypeWrapper):
-    """
-    For any new 'apps' that run on the device or via sister apps on phones/PCs they should pick and use a
-    unique 'portnum' for their application.
-    If you are making a new app using meshtastic, please send in a pull request to add your 'portnum' to this
-    master table.
-    PortNums should be assigned in the following range:
-    0-63   Core Meshtastic use, do not use for third party apps
-    64-127 Registered 3rd party apps, send in a pull request that adds a new entry to portnums.proto to  register your application
-    256-511 Use one of these portnums for your private applications that you don't want to register publically
-    All other values are reserved.
-    Note: This was formerly a Type enum named 'typ' with the same id #
-    We have change to this 'portnum' based scheme for specifying app handlers for particular payloads.
-    This change is backwards compatible by treating the legacy OPAQUE/CLEAR_TEXT values identically.
-    """
-
-UNKNOWN_APP: PortNum.ValueType  # 0
-"""
-Deprecated: do not use in new code (formerly called OPAQUE)
-A message sent from a device outside of the mesh, in a form the mesh does not understand
-NOTE: This must be 0, because it is documented in IMeshService.aidl to be so
-ENCODING: binary undefined
-"""
-TEXT_MESSAGE_APP: PortNum.ValueType  # 1
-"""
-A simple UTF-8 text message, which even the little micros in the mesh
-can understand and show on their screen eventually in some circumstances
-even signal might send messages in this form (see below)
-ENCODING: UTF-8 Plaintext (?)
-"""
-REMOTE_HARDWARE_APP: PortNum.ValueType  # 2
-"""
-Reserved for built-in GPIO/example app.
-See remote_hardware.proto/HardwareMessage for details on the message sent/received to this port number
-ENCODING: Protobuf
-"""
-POSITION_APP: PortNum.ValueType  # 3
-"""
-The built-in position messaging app.
-Payload is a Position message.
-ENCODING: Protobuf
-"""
-NODEINFO_APP: PortNum.ValueType  # 4
-"""
-The built-in user info app.
-Payload is a User message.
-ENCODING: Protobuf
-"""
-ROUTING_APP: PortNum.ValueType  # 5
-"""
-Protocol control packets for mesh protocol use.
-Payload is a Routing message.
-ENCODING: Protobuf
-"""
-ADMIN_APP: PortNum.ValueType  # 6
-"""
-Admin control packets.
-Payload is a AdminMessage message.
-ENCODING: Protobuf
-"""
-TEXT_MESSAGE_COMPRESSED_APP: PortNum.ValueType  # 7
-"""
-Compressed TEXT_MESSAGE payloads.
-ENCODING: UTF-8 Plaintext (?) with Unishox2 Compression
-NOTE: The Device Firmware converts a TEXT_MESSAGE_APP to TEXT_MESSAGE_COMPRESSED_APP if the compressed
-payload is shorter. There's no need for app developers to do this themselves. Also the firmware will decompress
-any incoming TEXT_MESSAGE_COMPRESSED_APP payload and convert to TEXT_MESSAGE_APP.
-"""
-WAYPOINT_APP: PortNum.ValueType  # 8
-"""
-Waypoint payloads.
-Payload is a Waypoint message.
-ENCODING: Protobuf
-"""
-AUDIO_APP: PortNum.ValueType  # 9
-"""
-Audio Payloads.
-Encapsulated codec2 packets. On 2.4 GHZ Bandwidths only for now
-ENCODING: codec2 audio frames
-NOTE: audio frames contain a 3 byte header (0xc0 0xde 0xc2) and a one byte marker for the decompressed bitrate.
-This marker comes from the 'moduleConfig.audio.bitrate' enum minus one.
-"""
-DETECTION_SENSOR_APP: PortNum.ValueType  # 10
-"""
-Same as Text Message but originating from Detection Sensor Module.
-NOTE: This portnum traffic is not sent to the public MQTT starting at firmware version 2.2.9
-"""
-ALERT_APP: PortNum.ValueType  # 11
-"""
-Same as Text Message but used for critical alerts.
-"""
-KEY_VERIFICATION_APP: PortNum.ValueType  # 12
-"""
-Module/port for handling key verification requests.
-"""
-REPLY_APP: PortNum.ValueType  # 32
-"""
-Provides a 'ping' service that replies to any packet it receives.
-Also serves as a small example module.
-ENCODING: ASCII Plaintext
-"""
-IP_TUNNEL_APP: PortNum.ValueType  # 33
-"""
-Used for the python IP tunnel feature
-ENCODING: IP Packet. Handled by the python API, firmware ignores this one and pases on.
-"""
-PAXCOUNTER_APP: PortNum.ValueType  # 34
-"""
-Paxcounter lib included in the firmware
-ENCODING: protobuf
-"""
-SERIAL_APP: PortNum.ValueType  # 64
-"""
-Provides a hardware serial interface to send and receive from the Meshtastic network.
-Connect to the RX/TX pins of a device with 38400 8N1. Packets received from the Meshtastic
-network is forwarded to the RX pin while sending a packet to TX will go out to the Mesh network.
-Maximum packet size of 240 bytes.
-Module is disabled by default can be turned on by setting SERIAL_MODULE_ENABLED = 1 in SerialPlugh.cpp.
-ENCODING: binary undefined
-"""
-STORE_FORWARD_APP: PortNum.ValueType  # 65
-"""
-STORE_FORWARD_APP (Work in Progress)
-Maintained by Jm Casler (MC Hamster) : jm@casler.org
-ENCODING: Protobuf
-"""
-RANGE_TEST_APP: PortNum.ValueType  # 66
-"""
-Optional port for messages for the range test module.
-ENCODING: ASCII Plaintext
-NOTE: This portnum traffic is not sent to the public MQTT starting at firmware version 2.2.9
-"""
-TELEMETRY_APP: PortNum.ValueType  # 67
-"""
-Provides a format to send and receive telemetry data from the Meshtastic network.
-Maintained by Charles Crossan (crossan007) : crossan007@gmail.com
-ENCODING: Protobuf
-"""
-ZPS_APP: PortNum.ValueType  # 68
-"""
-Experimental tools for estimating node position without a GPS
-Maintained by Github user a-f-G-U-C (a Meshtastic contributor)
-Project files at https://github.com/a-f-G-U-C/Meshtastic-ZPS
-ENCODING: arrays of int64 fields
-"""
-SIMULATOR_APP: PortNum.ValueType  # 69
-"""
-Used to let multiple instances of Linux native applications communicate
-as if they did using their LoRa chip.
-Maintained by GitHub user GUVWAF.
-Project files at https://github.com/GUVWAF/Meshtasticator
-ENCODING: Protobuf (?)
-"""
-TRACEROUTE_APP: PortNum.ValueType  # 70
-"""
-Provides a traceroute functionality to show the route a packet towards
-a certain destination would take on the mesh. Contains a RouteDiscovery message as payload.
-ENCODING: Protobuf
-"""
-NEIGHBORINFO_APP: PortNum.ValueType  # 71
-"""
-Aggregates edge info for the network by sending out a list of each node's neighbors
-ENCODING: Protobuf
-"""
-ATAK_PLUGIN: PortNum.ValueType  # 72
-"""
-ATAK Plugin
-Portnum for payloads from the official Meshtastic ATAK plugin
-"""
-MAP_REPORT_APP: PortNum.ValueType  # 73
-"""
-Provides unencrypted information about a node for consumption by a map via MQTT
-"""
-POWERSTRESS_APP: PortNum.ValueType  # 74
-"""
-PowerStress based monitoring support (for automated power consumption testing)
-"""
-RETICULUM_TUNNEL_APP: PortNum.ValueType  # 76
-"""
-Reticulum Network Stack Tunnel App
-ENCODING: Fragmented RNS Packet. Handled by Meshtastic RNS interface
-"""
-CAYENNE_APP: PortNum.ValueType  # 77
-"""
-App for transporting Cayenne Low Power Payload, popular for LoRaWAN sensor nodes. Offers ability to send
-arbitrary telemetry over meshtastic that is not covered by telemetry.proto
-ENCODING: CayenneLLP
-"""
-PRIVATE_APP: PortNum.ValueType  # 256
-"""
-Private applications should use portnums >= 256.
-To simplify initial development and testing you can use "PRIVATE_APP"
-in your code without needing to rebuild protobuf files (via [regen-protos.sh](https://github.com/meshtastic/firmware/blob/master/bin/regen-protos.sh))
-"""
-ATAK_FORWARDER: PortNum.ValueType  # 257
-"""
-ATAK Forwarder Module https://github.com/paulmandal/atak-forwarder
-ENCODING: libcotshrink
-"""
-MAX: PortNum.ValueType  # 511
-"""
-Currently we limit port nums to no higher than this value
-"""
-global___PortNum = PortNum
+class PortNum(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
+    __slots__ = []

meshtastic/protobuf/powermon_pb2.py

@@ -2,10 +2,10 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: meshtastic/protobuf/powermon.proto
 """Generated protocol buffer code."""
+from google.protobuf.internal import builder as _builder
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
 from google.protobuf import symbol_database as _symbol_database
-from google.protobuf.internal import builder as _builder
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -13,20 +13,20 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\"meshtastic/protobuf/powermon.proto\x12\x13meshtastic.protobuf\"\xe0\x01\n\x08PowerMon\"\xd3\x01\n\x05State\x12\x08\n\x04None\x10\x00\x12\x11\n\rCPU_DeepSleep\x10\x01\x12\x12\n\x0e\x43PU_LightSleep\x10\x02\x12\x0c\n\x08Vext1_On\x10\x04\x12\r\n\tLora_RXOn\x10\x08\x12\r\n\tLora_TXOn\x10\x10\x12\x11\n\rLora_RXActive\x10 \x12\t\n\x05\x42T_On\x10@\x12\x0b\n\x06LED_On\x10\x80\x01\x12\x0e\n\tScreen_On\x10\x80\x02\x12\x13\n\x0eScreen_Drawing\x10\x80\x04\x12\x0c\n\x07Wifi_On\x10\x80\x08\x12\x0f\n\nGPS_Active\x10\x80\x10\"\x88\x03\n\x12PowerStressMessage\x12;\n\x03\x63md\x18\x01 \x01(\x0e\x32..meshtastic.protobuf.PowerStressMessage.Opcode\x12\x13\n\x0bnum_seconds\x18\x02 \x01(\x02\"\x9f\x02\n\x06Opcode\x12\t\n\x05UNSET\x10\x00\x12\x0e\n\nPRINT_INFO\x10\x01\x12\x0f\n\x0b\x46ORCE_QUIET\x10\x02\x12\r\n\tEND_QUIET\x10\x03\x12\r\n\tSCREEN_ON\x10\x10\x12\x0e\n\nSCREEN_OFF\x10\x11\x12\x0c\n\x08\x43PU_IDLE\x10 \x12\x11\n\rCPU_DEEPSLEEP\x10!\x12\x0e\n\nCPU_FULLON\x10\"\x12\n\n\x06LED_ON\x10\x30\x12\x0b\n\x07LED_OFF\x10\x31\x12\x0c\n\x08LORA_OFF\x10@\x12\x0b\n\x07LORA_TX\x10\x41\x12\x0b\n\x07LORA_RX\x10\x42\x12\n\n\x06\x42T_OFF\x10P\x12\t\n\x05\x42T_ON\x10Q\x12\x0c\n\x08WIFI_OFF\x10`\x12\x0b\n\x07WIFI_ON\x10\x61\x12\x0b\n\x07GPS_OFF\x10p\x12\n\n\x06GPS_ON\x10qBc\n\x13\x63om.geeksville.meshB\x0ePowerMonProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\"meshtastic/protobuf/powermon.proto\x12\x13meshtastic.protobuf\"\xe0\x01\n\x08PowerMon\"\xd3\x01\n\x05State\x12\x08\n\x04None\x10\x00\x12\x11\n\rCPU_DeepSleep\x10\x01\x12\x12\n\x0e\x43PU_LightSleep\x10\x02\x12\x0c\n\x08Vext1_On\x10\x04\x12\r\n\tLora_RXOn\x10\x08\x12\r\n\tLora_TXOn\x10\x10\x12\x11\n\rLora_RXActive\x10 \x12\t\n\x05\x42T_On\x10@\x12\x0b\n\x06LED_On\x10\x80\x01\x12\x0e\n\tScreen_On\x10\x80\x02\x12\x13\n\x0eScreen_Drawing\x10\x80\x04\x12\x0c\n\x07Wifi_On\x10\x80\x08\x12\x0f\n\nGPS_Active\x10\x80\x10\"\x88\x03\n\x12PowerStressMessage\x12;\n\x03\x63md\x18\x01 \x01(\x0e\x32..meshtastic.protobuf.PowerStressMessage.Opcode\x12\x13\n\x0bnum_seconds\x18\x02 \x01(\x02\"\x9f\x02\n\x06Opcode\x12\t\n\x05UNSET\x10\x00\x12\x0e\n\nPRINT_INFO\x10\x01\x12\x0f\n\x0b\x46ORCE_QUIET\x10\x02\x12\r\n\tEND_QUIET\x10\x03\x12\r\n\tSCREEN_ON\x10\x10\x12\x0e\n\nSCREEN_OFF\x10\x11\x12\x0c\n\x08\x43PU_IDLE\x10 \x12\x11\n\rCPU_DEEPSLEEP\x10!\x12\x0e\n\nCPU_FULLON\x10\"\x12\n\n\x06LED_ON\x10\x30\x12\x0b\n\x07LED_OFF\x10\x31\x12\x0c\n\x08LORA_OFF\x10@\x12\x0b\n\x07LORA_TX\x10\x41\x12\x0b\n\x07LORA_RX\x10\x42\x12\n\n\x06\x42T_OFF\x10P\x12\t\n\x05\x42T_ON\x10Q\x12\x0c\n\x08WIFI_OFF\x10`\x12\x0b\n\x07WIFI_ON\x10\x61\x12\x0b\n\x07GPS_OFF\x10p\x12\n\n\x06GPS_ON\x10qBd\n\x14org.meshtastic.protoB\x0ePowerMonProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
 
-_globals = globals()
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.powermon_pb2', _globals)
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.powermon_pb2', globals())
 if _descriptor._USE_C_DESCRIPTORS == False:
+
   DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\016PowerMonProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
-  _globals['_POWERMON']._serialized_start=60
-  _globals['_POWERMON']._serialized_end=284
-  _globals['_POWERMON_STATE']._serialized_start=73
-  _globals['_POWERMON_STATE']._serialized_end=284
-  _globals['_POWERSTRESSMESSAGE']._serialized_start=287
-  _globals['_POWERSTRESSMESSAGE']._serialized_end=679
-  _globals['_POWERSTRESSMESSAGE_OPCODE']._serialized_start=392
-  _globals['_POWERSTRESSMESSAGE_OPCODE']._serialized_end=679
+  DESCRIPTOR._serialized_options = b'\n\024org.meshtastic.protoB\016PowerMonProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
+  _POWERMON._serialized_start=60
+  _POWERMON._serialized_end=284
+  _POWERMON_STATE._serialized_start=73
+  _POWERMON_STATE._serialized_end=284
+  _POWERSTRESSMESSAGE._serialized_start=287
+  _POWERSTRESSMESSAGE._serialized_end=679
+  _POWERSTRESSMESSAGE_OPCODE._serialized_start=392
+  _POWERSTRESSMESSAGE_OPCODE._serialized_end=679
 # @@protoc_insertion_point(module_scope)

meshtastic/protobuf/powermon_pb2.pyi

@@ -1,221 +1,55 @@
-"""
-@generated by mypy-protobuf.  Do not edit manually!
-isort:skip_file
-"""
+from google.protobuf.internal import enum_type_wrapper as _enum_type_wrapper
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from typing import ClassVar as _ClassVar, Optional as _Optional, Union as _Union
 
-import builtins
-import google.protobuf.descriptor
-import google.protobuf.internal.enum_type_wrapper
-import google.protobuf.message
-import sys
-import typing
+DESCRIPTOR: _descriptor.FileDescriptor
 
-if sys.version_info >= (3, 10):
-    import typing as typing_extensions
-else:
-    import typing_extensions
+class PowerMon(_message.Message):
+    __slots__ = []
+    class State(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
+        __slots__ = []
+    BT_On: PowerMon.State
+    CPU_DeepSleep: PowerMon.State
+    CPU_LightSleep: PowerMon.State
+    GPS_Active: PowerMon.State
+    LED_On: PowerMon.State
+    Lora_RXActive: PowerMon.State
+    Lora_RXOn: PowerMon.State
+    Lora_TXOn: PowerMon.State
+    None: PowerMon.State
+    Screen_Drawing: PowerMon.State
+    Screen_On: PowerMon.State
+    Vext1_On: PowerMon.State
+    Wifi_On: PowerMon.State
+    def __init__(self) -> None: ...
 
-DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
-
-@typing.final
-class PowerMon(google.protobuf.message.Message):
-    """Note: There are no 'PowerMon' messages normally in use (PowerMons are sent only as structured logs - slogs).
-    But we wrap our State enum in this message to effectively nest a namespace (without our linter yelling at us)
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    class _State:
-        ValueType = typing.NewType("ValueType", builtins.int)
-        V: typing_extensions.TypeAlias = ValueType
-
-    class _StateEnumTypeWrapper(google.protobuf.internal.enum_type_wrapper._EnumTypeWrapper[PowerMon._State.ValueType], builtins.type):
-        DESCRIPTOR: google.protobuf.descriptor.EnumDescriptor
-        CPU_DeepSleep: PowerMon._State.ValueType  # 1
-        CPU_LightSleep: PowerMon._State.ValueType  # 2
-        Vext1_On: PowerMon._State.ValueType  # 4
-        """
-        The external Vext1 power is on.  Many boards have auxillary power rails that the CPU turns on only
-        occasionally.  In cases where that rail has multiple devices on it we usually want to have logging on
-        the state of that rail as an independent record.
-        For instance on the Heltec Tracker 1.1 board, this rail is the power source for the GPS and screen.
-
-        The log messages will be short and complete (see PowerMon.Event in the protobufs for details).
-        something like "S:PM:C,0x00001234,REASON" where the hex number is the bitmask of all current states.
-        (We use a bitmask for states so that if a log message gets lost it won't be fatal)
-        """
-        Lora_RXOn: PowerMon._State.ValueType  # 8
-        Lora_TXOn: PowerMon._State.ValueType  # 16
-        Lora_RXActive: PowerMon._State.ValueType  # 32
-        BT_On: PowerMon._State.ValueType  # 64
-        LED_On: PowerMon._State.ValueType  # 128
-        Screen_On: PowerMon._State.ValueType  # 256
-        Screen_Drawing: PowerMon._State.ValueType  # 512
-        Wifi_On: PowerMon._State.ValueType  # 1024
-        GPS_Active: PowerMon._State.ValueType  # 2048
-        """
-        GPS is actively trying to find our location
-        See GPSPowerState for more details
-        """
-
-    class State(_State, metaclass=_StateEnumTypeWrapper):
-        """Any significant power changing event in meshtastic should be tagged with a powermon state transition.
-        If you are making new meshtastic features feel free to add new entries at the end of this definition.
-        """
-
-    CPU_DeepSleep: PowerMon.State.ValueType  # 1
-    CPU_LightSleep: PowerMon.State.ValueType  # 2
-    Vext1_On: PowerMon.State.ValueType  # 4
-    """
-    The external Vext1 power is on.  Many boards have auxillary power rails that the CPU turns on only
-    occasionally.  In cases where that rail has multiple devices on it we usually want to have logging on
-    the state of that rail as an independent record.
-    For instance on the Heltec Tracker 1.1 board, this rail is the power source for the GPS and screen.
-
-    The log messages will be short and complete (see PowerMon.Event in the protobufs for details).
-    something like "S:PM:C,0x00001234,REASON" where the hex number is the bitmask of all current states.
-    (We use a bitmask for states so that if a log message gets lost it won't be fatal)
-    """
-    Lora_RXOn: PowerMon.State.ValueType  # 8
-    Lora_TXOn: PowerMon.State.ValueType  # 16
-    Lora_RXActive: PowerMon.State.ValueType  # 32
-    BT_On: PowerMon.State.ValueType  # 64
-    LED_On: PowerMon.State.ValueType  # 128
-    Screen_On: PowerMon.State.ValueType  # 256
-    Screen_Drawing: PowerMon.State.ValueType  # 512
-    Wifi_On: PowerMon.State.ValueType  # 1024
-    GPS_Active: PowerMon.State.ValueType  # 2048
-    """
-    GPS is actively trying to find our location
-    See GPSPowerState for more details
-    """
-
-    def __init__(
-        self,
-    ) -> None: ...
-
-global___PowerMon = PowerMon
-
-@typing.final
-class PowerStressMessage(google.protobuf.message.Message):
-    """
-    PowerStress testing support via the C++ PowerStress module
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    class _Opcode:
-        ValueType = typing.NewType("ValueType", builtins.int)
-        V: typing_extensions.TypeAlias = ValueType
-
-    class _OpcodeEnumTypeWrapper(google.protobuf.internal.enum_type_wrapper._EnumTypeWrapper[PowerStressMessage._Opcode.ValueType], builtins.type):
-        DESCRIPTOR: google.protobuf.descriptor.EnumDescriptor
-        UNSET: PowerStressMessage._Opcode.ValueType  # 0
-        """
-        Unset/unused
-        """
-        PRINT_INFO: PowerStressMessage._Opcode.ValueType  # 1
-        """Print board version slog and send an ack that we are alive and ready to process commands"""
-        FORCE_QUIET: PowerStressMessage._Opcode.ValueType  # 2
-        """Try to turn off all automatic processing of packets, screen, sleeping, etc (to make it easier to measure in isolation)"""
-        END_QUIET: PowerStressMessage._Opcode.ValueType  # 3
-        """Stop powerstress processing - probably by just rebooting the board"""
-        SCREEN_ON: PowerStressMessage._Opcode.ValueType  # 16
-        """Turn the screen on"""
-        SCREEN_OFF: PowerStressMessage._Opcode.ValueType  # 17
-        """Turn the screen off"""
-        CPU_IDLE: PowerStressMessage._Opcode.ValueType  # 32
-        """Let the CPU run but we assume mostly idling for num_seconds"""
-        CPU_DEEPSLEEP: PowerStressMessage._Opcode.ValueType  # 33
-        """Force deep sleep for FIXME seconds"""
-        CPU_FULLON: PowerStressMessage._Opcode.ValueType  # 34
-        """Spin the CPU as fast as possible for num_seconds"""
-        LED_ON: PowerStressMessage._Opcode.ValueType  # 48
-        """Turn the LED on for num_seconds (and leave it on - for baseline power measurement purposes)"""
-        LED_OFF: PowerStressMessage._Opcode.ValueType  # 49
-        """Force the LED off for num_seconds"""
-        LORA_OFF: PowerStressMessage._Opcode.ValueType  # 64
-        """Completely turn off the LORA radio for num_seconds"""
-        LORA_TX: PowerStressMessage._Opcode.ValueType  # 65
-        """Send Lora packets for num_seconds"""
-        LORA_RX: PowerStressMessage._Opcode.ValueType  # 66
-        """Receive Lora packets for num_seconds (node will be mostly just listening, unless an external agent is helping stress this by sending packets on the current channel)"""
-        BT_OFF: PowerStressMessage._Opcode.ValueType  # 80
-        """Turn off the BT radio for num_seconds"""
-        BT_ON: PowerStressMessage._Opcode.ValueType  # 81
-        """Turn on the BT radio for num_seconds"""
-        WIFI_OFF: PowerStressMessage._Opcode.ValueType  # 96
-        """Turn off the WIFI radio for num_seconds"""
-        WIFI_ON: PowerStressMessage._Opcode.ValueType  # 97
-        """Turn on the WIFI radio for num_seconds"""
-        GPS_OFF: PowerStressMessage._Opcode.ValueType  # 112
-        """Turn off the GPS radio for num_seconds"""
-        GPS_ON: PowerStressMessage._Opcode.ValueType  # 113
-        """Turn on the GPS radio for num_seconds"""
-
-    class Opcode(_Opcode, metaclass=_OpcodeEnumTypeWrapper):
-        """
-        What operation would we like the UUT to perform.
-        note: senders should probably set want_response in their request packets, so that they can know when the state
-        machine has started processing their request
-        """
-
-    UNSET: PowerStressMessage.Opcode.ValueType  # 0
-    """
-    Unset/unused
-    """
-    PRINT_INFO: PowerStressMessage.Opcode.ValueType  # 1
-    """Print board version slog and send an ack that we are alive and ready to process commands"""
-    FORCE_QUIET: PowerStressMessage.Opcode.ValueType  # 2
-    """Try to turn off all automatic processing of packets, screen, sleeping, etc (to make it easier to measure in isolation)"""
-    END_QUIET: PowerStressMessage.Opcode.ValueType  # 3
-    """Stop powerstress processing - probably by just rebooting the board"""
-    SCREEN_ON: PowerStressMessage.Opcode.ValueType  # 16
-    """Turn the screen on"""
-    SCREEN_OFF: PowerStressMessage.Opcode.ValueType  # 17
-    """Turn the screen off"""
-    CPU_IDLE: PowerStressMessage.Opcode.ValueType  # 32
-    """Let the CPU run but we assume mostly idling for num_seconds"""
-    CPU_DEEPSLEEP: PowerStressMessage.Opcode.ValueType  # 33
-    """Force deep sleep for FIXME seconds"""
-    CPU_FULLON: PowerStressMessage.Opcode.ValueType  # 34
-    """Spin the CPU as fast as possible for num_seconds"""
-    LED_ON: PowerStressMessage.Opcode.ValueType  # 48
-    """Turn the LED on for num_seconds (and leave it on - for baseline power measurement purposes)"""
-    LED_OFF: PowerStressMessage.Opcode.ValueType  # 49
-    """Force the LED off for num_seconds"""
-    LORA_OFF: PowerStressMessage.Opcode.ValueType  # 64
-    """Completely turn off the LORA radio for num_seconds"""
-    LORA_TX: PowerStressMessage.Opcode.ValueType  # 65
-    """Send Lora packets for num_seconds"""
-    LORA_RX: PowerStressMessage.Opcode.ValueType  # 66
-    """Receive Lora packets for num_seconds (node will be mostly just listening, unless an external agent is helping stress this by sending packets on the current channel)"""
-    BT_OFF: PowerStressMessage.Opcode.ValueType  # 80
-    """Turn off the BT radio for num_seconds"""
-    BT_ON: PowerStressMessage.Opcode.ValueType  # 81
-    """Turn on the BT radio for num_seconds"""
-    WIFI_OFF: PowerStressMessage.Opcode.ValueType  # 96
-    """Turn off the WIFI radio for num_seconds"""
-    WIFI_ON: PowerStressMessage.Opcode.ValueType  # 97
-    """Turn on the WIFI radio for num_seconds"""
-    GPS_OFF: PowerStressMessage.Opcode.ValueType  # 112
-    """Turn off the GPS radio for num_seconds"""
-    GPS_ON: PowerStressMessage.Opcode.ValueType  # 113
-    """Turn on the GPS radio for num_seconds"""
-
-    CMD_FIELD_NUMBER: builtins.int
-    NUM_SECONDS_FIELD_NUMBER: builtins.int
-    cmd: global___PowerStressMessage.Opcode.ValueType
-    """
-    What type of HardwareMessage is this?
-    """
-    num_seconds: builtins.float
-    def __init__(
-        self,
-        *,
-        cmd: global___PowerStressMessage.Opcode.ValueType = ...,
-        num_seconds: builtins.float = ...,
-    ) -> None: ...
-    def ClearField(self, field_name: typing.Literal["cmd", b"cmd", "num_seconds", b"num_seconds"]) -> None: ...
-
-global___PowerStressMessage = PowerStressMessage
+class PowerStressMessage(_message.Message):
+    __slots__ = ["cmd", "num_seconds"]
+    class Opcode(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
+        __slots__ = []
+    BT_OFF: PowerStressMessage.Opcode
+    BT_ON: PowerStressMessage.Opcode
+    CMD_FIELD_NUMBER: _ClassVar[int]
+    CPU_DEEPSLEEP: PowerStressMessage.Opcode
+    CPU_FULLON: PowerStressMessage.Opcode
+    CPU_IDLE: PowerStressMessage.Opcode
+    END_QUIET: PowerStressMessage.Opcode
+    FORCE_QUIET: PowerStressMessage.Opcode
+    GPS_OFF: PowerStressMessage.Opcode
+    GPS_ON: PowerStressMessage.Opcode
+    LED_OFF: PowerStressMessage.Opcode
+    LED_ON: PowerStressMessage.Opcode
+    LORA_OFF: PowerStressMessage.Opcode
+    LORA_RX: PowerStressMessage.Opcode
+    LORA_TX: PowerStressMessage.Opcode
+    NUM_SECONDS_FIELD_NUMBER: _ClassVar[int]
+    PRINT_INFO: PowerStressMessage.Opcode
+    SCREEN_OFF: PowerStressMessage.Opcode
+    SCREEN_ON: PowerStressMessage.Opcode
+    UNSET: PowerStressMessage.Opcode
+    WIFI_OFF: PowerStressMessage.Opcode
+    WIFI_ON: PowerStressMessage.Opcode
+    cmd: PowerStressMessage.Opcode
+    num_seconds: float
+    def __init__(self, cmd: _Optional[_Union[PowerStressMessage.Opcode, str]] = ..., num_seconds: _Optional[float] = ...) -> None: ...

meshtastic/protobuf/remote_hardware_pb2.py

@@ -2,10 +2,10 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: meshtastic/protobuf/remote_hardware.proto
 """Generated protocol buffer code."""
+from google.protobuf.internal import builder as _builder
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
 from google.protobuf import symbol_database as _symbol_database
-from google.protobuf.internal import builder as _builder
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -13,16 +13,16 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n)meshtastic/protobuf/remote_hardware.proto\x12\x13meshtastic.protobuf\"\xdf\x01\n\x0fHardwareMessage\x12\x37\n\x04type\x18\x01 \x01(\x0e\x32).meshtastic.protobuf.HardwareMessage.Type\x12\x11\n\tgpio_mask\x18\x02 \x01(\x04\x12\x12\n\ngpio_value\x18\x03 \x01(\x04\"l\n\x04Type\x12\t\n\x05UNSET\x10\x00\x12\x0f\n\x0bWRITE_GPIOS\x10\x01\x12\x0f\n\x0bWATCH_GPIOS\x10\x02\x12\x11\n\rGPIOS_CHANGED\x10\x03\x12\x0e\n\nREAD_GPIOS\x10\x04\x12\x14\n\x10READ_GPIOS_REPLY\x10\x05\x42\x63\n\x13\x63om.geeksville.meshB\x0eRemoteHardwareZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n)meshtastic/protobuf/remote_hardware.proto\x12\x13meshtastic.protobuf\"\xdf\x01\n\x0fHardwareMessage\x12\x37\n\x04type\x18\x01 \x01(\x0e\x32).meshtastic.protobuf.HardwareMessage.Type\x12\x11\n\tgpio_mask\x18\x02 \x01(\x04\x12\x12\n\ngpio_value\x18\x03 \x01(\x04\"l\n\x04Type\x12\t\n\x05UNSET\x10\x00\x12\x0f\n\x0bWRITE_GPIOS\x10\x01\x12\x0f\n\x0bWATCH_GPIOS\x10\x02\x12\x11\n\rGPIOS_CHANGED\x10\x03\x12\x0e\n\nREAD_GPIOS\x10\x04\x12\x14\n\x10READ_GPIOS_REPLY\x10\x05\x42\x64\n\x14org.meshtastic.protoB\x0eRemoteHardwareZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
 
-_globals = globals()
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.remote_hardware_pb2', _globals)
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.remote_hardware_pb2', globals())
 if _descriptor._USE_C_DESCRIPTORS == False:
+
   DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\016RemoteHardwareZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
-  _globals['_HARDWAREMESSAGE']._serialized_start=67
-  _globals['_HARDWAREMESSAGE']._serialized_end=290
-  _globals['_HARDWAREMESSAGE_TYPE']._serialized_start=182
-  _globals['_HARDWAREMESSAGE_TYPE']._serialized_end=290
+  DESCRIPTOR._serialized_options = b'\n\024org.meshtastic.protoB\016RemoteHardwareZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
+  _HARDWAREMESSAGE._serialized_start=67
+  _HARDWAREMESSAGE._serialized_end=290
+  _HARDWAREMESSAGE_TYPE._serialized_start=182
+  _HARDWAREMESSAGE_TYPE._serialized_end=290
 # @@protoc_insertion_point(module_scope)

meshtastic/protobuf/remote_hardware_pb2.pyi

@@ -1,126 +1,24 @@
-"""
-@generated by mypy-protobuf.  Do not edit manually!
-isort:skip_file
-"""
+from google.protobuf.internal import enum_type_wrapper as _enum_type_wrapper
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from typing import ClassVar as _ClassVar, Optional as _Optional, Union as _Union
 
-import builtins
-import google.protobuf.descriptor
-import google.protobuf.internal.enum_type_wrapper
-import google.protobuf.message
-import sys
-import typing
+DESCRIPTOR: _descriptor.FileDescriptor
 
-if sys.version_info >= (3, 10):
-    import typing as typing_extensions
-else:
-    import typing_extensions
-
-DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
-
-@typing.final
-class HardwareMessage(google.protobuf.message.Message):
-    """
-    An example app to show off the module system. This message is used for
-    REMOTE_HARDWARE_APP PortNums.
-    Also provides easy remote access to any GPIO.
-    In the future other remote hardware operations can be added based on user interest
-    (i.e. serial output, spi/i2c input/output).
-    FIXME - currently this feature is turned on by default which is dangerous
-    because no security yet (beyond the channel mechanism).
-    It should be off by default and then protected based on some TBD mechanism
-    (a special channel once multichannel support is included?)
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    class _Type:
-        ValueType = typing.NewType("ValueType", builtins.int)
-        V: typing_extensions.TypeAlias = ValueType
-
-    class _TypeEnumTypeWrapper(google.protobuf.internal.enum_type_wrapper._EnumTypeWrapper[HardwareMessage._Type.ValueType], builtins.type):
-        DESCRIPTOR: google.protobuf.descriptor.EnumDescriptor
-        UNSET: HardwareMessage._Type.ValueType  # 0
-        """
-        Unset/unused
-        """
-        WRITE_GPIOS: HardwareMessage._Type.ValueType  # 1
-        """
-        Set gpio gpios based on gpio_mask/gpio_value
-        """
-        WATCH_GPIOS: HardwareMessage._Type.ValueType  # 2
-        """
-        We are now interested in watching the gpio_mask gpios.
-        If the selected gpios change, please broadcast GPIOS_CHANGED.
-        Will implicitly change the gpios requested to be INPUT gpios.
-        """
-        GPIOS_CHANGED: HardwareMessage._Type.ValueType  # 3
-        """
-        The gpios listed in gpio_mask have changed, the new values are listed in gpio_value
-        """
-        READ_GPIOS: HardwareMessage._Type.ValueType  # 4
-        """
-        Read the gpios specified in gpio_mask, send back a READ_GPIOS_REPLY reply with gpio_value populated
-        """
-        READ_GPIOS_REPLY: HardwareMessage._Type.ValueType  # 5
-        """
-        A reply to READ_GPIOS. gpio_mask and gpio_value will be populated
-        """
-
-    class Type(_Type, metaclass=_TypeEnumTypeWrapper):
-        """
-        TODO: REPLACE
-        """
-
-    UNSET: HardwareMessage.Type.ValueType  # 0
-    """
-    Unset/unused
-    """
-    WRITE_GPIOS: HardwareMessage.Type.ValueType  # 1
-    """
-    Set gpio gpios based on gpio_mask/gpio_value
-    """
-    WATCH_GPIOS: HardwareMessage.Type.ValueType  # 2
-    """
-    We are now interested in watching the gpio_mask gpios.
-    If the selected gpios change, please broadcast GPIOS_CHANGED.
-    Will implicitly change the gpios requested to be INPUT gpios.
-    """
-    GPIOS_CHANGED: HardwareMessage.Type.ValueType  # 3
-    """
-    The gpios listed in gpio_mask have changed, the new values are listed in gpio_value
-    """
-    READ_GPIOS: HardwareMessage.Type.ValueType  # 4
-    """
-    Read the gpios specified in gpio_mask, send back a READ_GPIOS_REPLY reply with gpio_value populated
-    """
-    READ_GPIOS_REPLY: HardwareMessage.Type.ValueType  # 5
-    """
-    A reply to READ_GPIOS. gpio_mask and gpio_value will be populated
-    """
-
-    TYPE_FIELD_NUMBER: builtins.int
-    GPIO_MASK_FIELD_NUMBER: builtins.int
-    GPIO_VALUE_FIELD_NUMBER: builtins.int
-    type: global___HardwareMessage.Type.ValueType
-    """
-    What type of HardwareMessage is this?
-    """
-    gpio_mask: builtins.int
-    """
-    What gpios are we changing. Not used for all MessageTypes, see MessageType for details
-    """
-    gpio_value: builtins.int
-    """
-    For gpios that were listed in gpio_mask as valid, what are the signal levels for those gpios.
-    Not used for all MessageTypes, see MessageType for details
-    """
-    def __init__(
-        self,
-        *,
-        type: global___HardwareMessage.Type.ValueType = ...,
-        gpio_mask: builtins.int = ...,
-        gpio_value: builtins.int = ...,
-    ) -> None: ...
-    def ClearField(self, field_name: typing.Literal["gpio_mask", b"gpio_mask", "gpio_value", b"gpio_value", "type", b"type"]) -> None: ...
-
-global___HardwareMessage = HardwareMessage
+class HardwareMessage(_message.Message):
+    __slots__ = ["gpio_mask", "gpio_value", "type"]
+    class Type(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
+        __slots__ = []
+    GPIOS_CHANGED: HardwareMessage.Type
+    GPIO_MASK_FIELD_NUMBER: _ClassVar[int]
+    GPIO_VALUE_FIELD_NUMBER: _ClassVar[int]
+    READ_GPIOS: HardwareMessage.Type
+    READ_GPIOS_REPLY: HardwareMessage.Type
+    TYPE_FIELD_NUMBER: _ClassVar[int]
+    UNSET: HardwareMessage.Type
+    WATCH_GPIOS: HardwareMessage.Type
+    WRITE_GPIOS: HardwareMessage.Type
+    gpio_mask: int
+    gpio_value: int
+    type: HardwareMessage.Type
+    def __init__(self, type: _Optional[_Union[HardwareMessage.Type, str]] = ..., gpio_mask: _Optional[int] = ..., gpio_value: _Optional[int] = ...) -> None: ...

meshtastic/protobuf/rtttl_pb2.py

@@ -2,10 +2,10 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: meshtastic/protobuf/rtttl.proto
 """Generated protocol buffer code."""
+from google.protobuf.internal import builder as _builder
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
 from google.protobuf import symbol_database as _symbol_database
-from google.protobuf.internal import builder as _builder
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -13,14 +13,14 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1fmeshtastic/protobuf/rtttl.proto\x12\x13meshtastic.protobuf\"\x1f\n\x0bRTTTLConfig\x12\x10\n\x08ringtone\x18\x01 \x01(\tBf\n\x13\x63om.geeksville.meshB\x11RTTTLConfigProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1fmeshtastic/protobuf/rtttl.proto\x12\x13meshtastic.protobuf\"\x1f\n\x0bRTTTLConfig\x12\x10\n\x08ringtone\x18\x01 \x01(\tBg\n\x14org.meshtastic.protoB\x11RTTTLConfigProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
 
-_globals = globals()
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.rtttl_pb2', _globals)
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.rtttl_pb2', globals())
 if _descriptor._USE_C_DESCRIPTORS == False:
+
   DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\021RTTTLConfigProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
-  _globals['_RTTTLCONFIG']._serialized_start=56
-  _globals['_RTTTLCONFIG']._serialized_end=87
+  DESCRIPTOR._serialized_options = b'\n\024org.meshtastic.protoB\021RTTTLConfigProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
+  _RTTTLCONFIG._serialized_start=56
+  _RTTTLCONFIG._serialized_end=87
 # @@protoc_insertion_point(module_scope)

meshtastic/protobuf/rtttl_pb2.pyi

@@ -1,33 +1,11 @@
-"""
-@generated by mypy-protobuf.  Do not edit manually!
-isort:skip_file
-"""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from typing import ClassVar as _ClassVar, Optional as _Optional
 
-import builtins
-import google.protobuf.descriptor
-import google.protobuf.message
-import typing
+DESCRIPTOR: _descriptor.FileDescriptor
 
-DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
-
-@typing.final
-class RTTTLConfig(google.protobuf.message.Message):
-    """
-    Canned message module configuration.
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    RINGTONE_FIELD_NUMBER: builtins.int
-    ringtone: builtins.str
-    """
-    Ringtone for PWM Buzzer in RTTTL Format.
-    """
-    def __init__(
-        self,
-        *,
-        ringtone: builtins.str = ...,
-    ) -> None: ...
-    def ClearField(self, field_name: typing.Literal["ringtone", b"ringtone"]) -> None: ...
-
-global___RTTTLConfig = RTTTLConfig
+class RTTTLConfig(_message.Message):
+    __slots__ = ["ringtone"]
+    RINGTONE_FIELD_NUMBER: _ClassVar[int]
+    ringtone: str
+    def __init__(self, ringtone: _Optional[str] = ...) -> None: ...

meshtastic/protobuf/serial_hal_pb2.py

@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: meshtastic/protobuf/serial_hal.proto
+"""Generated protocol buffer code."""
+from google.protobuf.internal import builder as _builder
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import symbol_database as _symbol_database
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n$meshtastic/protobuf/serial_hal.proto\x12\x13meshtastic.protobuf\"\xab\x02\n\x10SerialHalCommand\x12\x16\n\x0etransaction_id\x18\x01 \x01(\r\x12\x38\n\x04type\x18\x02 \x01(\x0e\x32*.meshtastic.protobuf.SerialHalCommand.Type\x12\x0b\n\x03pin\x18\x03 \x01(\r\x12\r\n\x05value\x18\x04 \x01(\r\x12\x0c\n\x04mode\x18\x05 \x01(\r\x12\x0c\n\x04\x64\x61ta\x18\x06 \x01(\x0c\"\x8c\x01\n\x04Type\x12\t\n\x05UNSET\x10\x00\x12\x0c\n\x08PIN_MODE\x10\x01\x12\x11\n\rDIGITAL_WRITE\x10\x02\x12\x10\n\x0c\x44IGITAL_READ\x10\x03\x12\x14\n\x10\x41TTACH_INTERRUPT\x10\x04\x12\x14\n\x10\x44\x45TACH_INTERRUPT\x10\x05\x12\x10\n\x0cSPI_TRANSFER\x10\x06\x12\x08\n\x04NOOP\x10\x07\"\xd5\x01\n\x11SerialHalResponse\x12\x16\n\x0etransaction_id\x18\x01 \x01(\r\x12=\n\x06result\x18\x02 \x01(\x0e\x32-.meshtastic.protobuf.SerialHalResponse.Result\x12\r\n\x05value\x18\x03 \x01(\r\x12\x0c\n\x04\x64\x61ta\x18\x04 \x01(\x0c\x12\r\n\x05\x65rror\x18\x05 \x01(\t\"=\n\x06Result\x12\x06\n\x02OK\x10\x00\x12\t\n\x05\x45RROR\x10\x01\x12\x0f\n\x0b\x42\x41\x44_REQUEST\x10\x02\x12\x0f\n\x0bUNSUPPORTED\x10\x03\x42_\n\x14org.meshtastic.protoB\tSerialHalZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
+
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.serial_hal_pb2', globals())
+if _descriptor._USE_C_DESCRIPTORS == False:
+
+  DESCRIPTOR._options = None
+  DESCRIPTOR._serialized_options = b'\n\024org.meshtastic.protoB\tSerialHalZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
+  _SERIALHALCOMMAND._serialized_start=62
+  _SERIALHALCOMMAND._serialized_end=361
+  _SERIALHALCOMMAND_TYPE._serialized_start=221
+  _SERIALHALCOMMAND_TYPE._serialized_end=361
+  _SERIALHALRESPONSE._serialized_start=364
+  _SERIALHALRESPONSE._serialized_end=577
+  _SERIALHALRESPONSE_RESULT._serialized_start=516
+  _SERIALHALRESPONSE_RESULT._serialized_end=577
+# @@protoc_insertion_point(module_scope)

meshtastic/protobuf/serial_hal_pb2.pyi

@@ -0,0 +1,52 @@
+from google.protobuf.internal import enum_type_wrapper as _enum_type_wrapper
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from typing import ClassVar as _ClassVar, Optional as _Optional, Union as _Union
+
+DESCRIPTOR: _descriptor.FileDescriptor
+
+class SerialHalCommand(_message.Message):
+    __slots__ = ["data", "mode", "pin", "transaction_id", "type", "value"]
+    class Type(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
+        __slots__ = []
+    ATTACH_INTERRUPT: SerialHalCommand.Type
+    DATA_FIELD_NUMBER: _ClassVar[int]
+    DETACH_INTERRUPT: SerialHalCommand.Type
+    DIGITAL_READ: SerialHalCommand.Type
+    DIGITAL_WRITE: SerialHalCommand.Type
+    MODE_FIELD_NUMBER: _ClassVar[int]
+    NOOP: SerialHalCommand.Type
+    PIN_FIELD_NUMBER: _ClassVar[int]
+    PIN_MODE: SerialHalCommand.Type
+    SPI_TRANSFER: SerialHalCommand.Type
+    TRANSACTION_ID_FIELD_NUMBER: _ClassVar[int]
+    TYPE_FIELD_NUMBER: _ClassVar[int]
+    UNSET: SerialHalCommand.Type
+    VALUE_FIELD_NUMBER: _ClassVar[int]
+    data: bytes
+    mode: int
+    pin: int
+    transaction_id: int
+    type: SerialHalCommand.Type
+    value: int
+    def __init__(self, transaction_id: _Optional[int] = ..., type: _Optional[_Union[SerialHalCommand.Type, str]] = ..., pin: _Optional[int] = ..., value: _Optional[int] = ..., mode: _Optional[int] = ..., data: _Optional[bytes] = ...) -> None: ...
+
+class SerialHalResponse(_message.Message):
+    __slots__ = ["data", "error", "result", "transaction_id", "value"]
+    class Result(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
+        __slots__ = []
+    BAD_REQUEST: SerialHalResponse.Result
+    DATA_FIELD_NUMBER: _ClassVar[int]
+    ERROR: SerialHalResponse.Result
+    ERROR_FIELD_NUMBER: _ClassVar[int]
+    OK: SerialHalResponse.Result
+    RESULT_FIELD_NUMBER: _ClassVar[int]
+    TRANSACTION_ID_FIELD_NUMBER: _ClassVar[int]
+    UNSUPPORTED: SerialHalResponse.Result
+    VALUE_FIELD_NUMBER: _ClassVar[int]
+    data: bytes
+    error: str
+    result: SerialHalResponse.Result
+    transaction_id: int
+    value: int
+    def __init__(self, transaction_id: _Optional[int] = ..., result: _Optional[_Union[SerialHalResponse.Result, str]] = ..., value: _Optional[int] = ..., data: _Optional[bytes] = ..., error: _Optional[str] = ...) -> None: ...

meshtastic/protobuf/storeforward_pb2.py

@@ -2,10 +2,10 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: meshtastic/protobuf/storeforward.proto
 """Generated protocol buffer code."""
+from google.protobuf.internal import builder as _builder
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
 from google.protobuf import symbol_database as _symbol_database
-from google.protobuf.internal import builder as _builder
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -13,22 +13,22 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n&meshtastic/protobuf/storeforward.proto\x12\x13meshtastic.protobuf\"\xc0\x07\n\x0fStoreAndForward\x12@\n\x02rr\x18\x01 \x01(\x0e\x32\x34.meshtastic.protobuf.StoreAndForward.RequestResponse\x12@\n\x05stats\x18\x02 \x01(\x0b\x32/.meshtastic.protobuf.StoreAndForward.StatisticsH\x00\x12?\n\x07history\x18\x03 \x01(\x0b\x32,.meshtastic.protobuf.StoreAndForward.HistoryH\x00\x12\x43\n\theartbeat\x18\x04 \x01(\x0b\x32..meshtastic.protobuf.StoreAndForward.HeartbeatH\x00\x12\x0e\n\x04text\x18\x05 \x01(\x0cH\x00\x1a\xcd\x01\n\nStatistics\x12\x16\n\x0emessages_total\x18\x01 \x01(\r\x12\x16\n\x0emessages_saved\x18\x02 \x01(\r\x12\x14\n\x0cmessages_max\x18\x03 \x01(\r\x12\x0f\n\x07up_time\x18\x04 \x01(\r\x12\x10\n\x08requests\x18\x05 \x01(\r\x12\x18\n\x10requests_history\x18\x06 \x01(\r\x12\x11\n\theartbeat\x18\x07 \x01(\x08\x12\x12\n\nreturn_max\x18\x08 \x01(\r\x12\x15\n\rreturn_window\x18\t \x01(\r\x1aI\n\x07History\x12\x18\n\x10history_messages\x18\x01 \x01(\r\x12\x0e\n\x06window\x18\x02 \x01(\r\x12\x14\n\x0clast_request\x18\x03 \x01(\r\x1a.\n\tHeartbeat\x12\x0e\n\x06period\x18\x01 \x01(\r\x12\x11\n\tsecondary\x18\x02 \x01(\r\"\xbc\x02\n\x0fRequestResponse\x12\t\n\x05UNSET\x10\x00\x12\x10\n\x0cROUTER_ERROR\x10\x01\x12\x14\n\x10ROUTER_HEARTBEAT\x10\x02\x12\x0f\n\x0bROUTER_PING\x10\x03\x12\x0f\n\x0bROUTER_PONG\x10\x04\x12\x0f\n\x0bROUTER_BUSY\x10\x05\x12\x12\n\x0eROUTER_HISTORY\x10\x06\x12\x10\n\x0cROUTER_STATS\x10\x07\x12\x16\n\x12ROUTER_TEXT_DIRECT\x10\x08\x12\x19\n\x15ROUTER_TEXT_BROADCAST\x10\t\x12\x10\n\x0c\x43LIENT_ERROR\x10@\x12\x12\n\x0e\x43LIENT_HISTORY\x10\x41\x12\x10\n\x0c\x43LIENT_STATS\x10\x42\x12\x0f\n\x0b\x43LIENT_PING\x10\x43\x12\x0f\n\x0b\x43LIENT_PONG\x10\x44\x12\x10\n\x0c\x43LIENT_ABORT\x10jB\t\n\x07variantBj\n\x13\x63om.geeksville.meshB\x15StoreAndForwardProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n&meshtastic/protobuf/storeforward.proto\x12\x13meshtastic.protobuf\"\xc0\x07\n\x0fStoreAndForward\x12@\n\x02rr\x18\x01 \x01(\x0e\x32\x34.meshtastic.protobuf.StoreAndForward.RequestResponse\x12@\n\x05stats\x18\x02 \x01(\x0b\x32/.meshtastic.protobuf.StoreAndForward.StatisticsH\x00\x12?\n\x07history\x18\x03 \x01(\x0b\x32,.meshtastic.protobuf.StoreAndForward.HistoryH\x00\x12\x43\n\theartbeat\x18\x04 \x01(\x0b\x32..meshtastic.protobuf.StoreAndForward.HeartbeatH\x00\x12\x0e\n\x04text\x18\x05 \x01(\x0cH\x00\x1a\xcd\x01\n\nStatistics\x12\x16\n\x0emessages_total\x18\x01 \x01(\r\x12\x16\n\x0emessages_saved\x18\x02 \x01(\r\x12\x14\n\x0cmessages_max\x18\x03 \x01(\r\x12\x0f\n\x07up_time\x18\x04 \x01(\r\x12\x10\n\x08requests\x18\x05 \x01(\r\x12\x18\n\x10requests_history\x18\x06 \x01(\r\x12\x11\n\theartbeat\x18\x07 \x01(\x08\x12\x12\n\nreturn_max\x18\x08 \x01(\r\x12\x15\n\rreturn_window\x18\t \x01(\r\x1aI\n\x07History\x12\x18\n\x10history_messages\x18\x01 \x01(\r\x12\x0e\n\x06window\x18\x02 \x01(\r\x12\x14\n\x0clast_request\x18\x03 \x01(\r\x1a.\n\tHeartbeat\x12\x0e\n\x06period\x18\x01 \x01(\r\x12\x11\n\tsecondary\x18\x02 \x01(\r\"\xbc\x02\n\x0fRequestResponse\x12\t\n\x05UNSET\x10\x00\x12\x10\n\x0cROUTER_ERROR\x10\x01\x12\x14\n\x10ROUTER_HEARTBEAT\x10\x02\x12\x0f\n\x0bROUTER_PING\x10\x03\x12\x0f\n\x0bROUTER_PONG\x10\x04\x12\x0f\n\x0bROUTER_BUSY\x10\x05\x12\x12\n\x0eROUTER_HISTORY\x10\x06\x12\x10\n\x0cROUTER_STATS\x10\x07\x12\x16\n\x12ROUTER_TEXT_DIRECT\x10\x08\x12\x19\n\x15ROUTER_TEXT_BROADCAST\x10\t\x12\x10\n\x0c\x43LIENT_ERROR\x10@\x12\x12\n\x0e\x43LIENT_HISTORY\x10\x41\x12\x10\n\x0c\x43LIENT_STATS\x10\x42\x12\x0f\n\x0b\x43LIENT_PING\x10\x43\x12\x0f\n\x0b\x43LIENT_PONG\x10\x44\x12\x10\n\x0c\x43LIENT_ABORT\x10jB\t\n\x07variantBk\n\x14org.meshtastic.protoB\x15StoreAndForwardProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
 
-_globals = globals()
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.storeforward_pb2', _globals)
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.storeforward_pb2', globals())
 if _descriptor._USE_C_DESCRIPTORS == False:
+
   DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\025StoreAndForwardProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
-  _globals['_STOREANDFORWARD']._serialized_start=64
-  _globals['_STOREANDFORWARD']._serialized_end=1024
-  _globals['_STOREANDFORWARD_STATISTICS']._serialized_start=366
-  _globals['_STOREANDFORWARD_STATISTICS']._serialized_end=571
-  _globals['_STOREANDFORWARD_HISTORY']._serialized_start=573
-  _globals['_STOREANDFORWARD_HISTORY']._serialized_end=646
-  _globals['_STOREANDFORWARD_HEARTBEAT']._serialized_start=648
-  _globals['_STOREANDFORWARD_HEARTBEAT']._serialized_end=694
-  _globals['_STOREANDFORWARD_REQUESTRESPONSE']._serialized_start=697
-  _globals['_STOREANDFORWARD_REQUESTRESPONSE']._serialized_end=1013
+  DESCRIPTOR._serialized_options = b'\n\024org.meshtastic.protoB\025StoreAndForwardProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
+  _STOREANDFORWARD._serialized_start=64
+  _STOREANDFORWARD._serialized_end=1024
+  _STOREANDFORWARD_STATISTICS._serialized_start=366
+  _STOREANDFORWARD_STATISTICS._serialized_end=571
+  _STOREANDFORWARD_HISTORY._serialized_start=573
+  _STOREANDFORWARD_HISTORY._serialized_end=646
+  _STOREANDFORWARD_HEARTBEAT._serialized_start=648
+  _STOREANDFORWARD_HEARTBEAT._serialized_end=694
+  _STOREANDFORWARD_REQUESTRESPONSE._serialized_start=697
+  _STOREANDFORWARD_REQUESTRESPONSE._serialized_end=1013
 # @@protoc_insertion_point(module_scope)

meshtastic/protobuf/storeforward_pb2.pyi

@@ -1,345 +1,75 @@
-"""
-@generated by mypy-protobuf.  Do not edit manually!
-isort:skip_file
-"""
+from google.protobuf.internal import enum_type_wrapper as _enum_type_wrapper
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from typing import ClassVar as _ClassVar, Mapping as _Mapping, Optional as _Optional, Union as _Union
 
-import builtins
-import google.protobuf.descriptor
-import google.protobuf.internal.enum_type_wrapper
-import google.protobuf.message
-import sys
-import typing
+DESCRIPTOR: _descriptor.FileDescriptor
 
-if sys.version_info >= (3, 10):
-    import typing as typing_extensions
-else:
-    import typing_extensions
-
-DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
-
-@typing.final
-class StoreAndForward(google.protobuf.message.Message):
-    """
-    TODO: REPLACE
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    class _RequestResponse:
-        ValueType = typing.NewType("ValueType", builtins.int)
-        V: typing_extensions.TypeAlias = ValueType
-
-    class _RequestResponseEnumTypeWrapper(google.protobuf.internal.enum_type_wrapper._EnumTypeWrapper[StoreAndForward._RequestResponse.ValueType], builtins.type):
-        DESCRIPTOR: google.protobuf.descriptor.EnumDescriptor
-        UNSET: StoreAndForward._RequestResponse.ValueType  # 0
-        """
-        Unset/unused
-        """
-        ROUTER_ERROR: StoreAndForward._RequestResponse.ValueType  # 1
-        """
-        Router is an in error state.
-        """
-        ROUTER_HEARTBEAT: StoreAndForward._RequestResponse.ValueType  # 2
-        """
-        Router heartbeat
-        """
-        ROUTER_PING: StoreAndForward._RequestResponse.ValueType  # 3
-        """
-        Router has requested the client respond. This can work as a
-        "are you there" message.
-        """
-        ROUTER_PONG: StoreAndForward._RequestResponse.ValueType  # 4
-        """
-        The response to a "Ping"
-        """
-        ROUTER_BUSY: StoreAndForward._RequestResponse.ValueType  # 5
-        """
-        Router is currently busy. Please try again later.
-        """
-        ROUTER_HISTORY: StoreAndForward._RequestResponse.ValueType  # 6
-        """
-        Router is responding to a request for history.
-        """
-        ROUTER_STATS: StoreAndForward._RequestResponse.ValueType  # 7
-        """
-        Router is responding to a request for stats.
-        """
-        ROUTER_TEXT_DIRECT: StoreAndForward._RequestResponse.ValueType  # 8
-        """
-        Router sends a text message from its history that was a direct message.
-        """
-        ROUTER_TEXT_BROADCAST: StoreAndForward._RequestResponse.ValueType  # 9
-        """
-        Router sends a text message from its history that was a broadcast.
-        """
-        CLIENT_ERROR: StoreAndForward._RequestResponse.ValueType  # 64
-        """
-        Client is an in error state.
-        """
-        CLIENT_HISTORY: StoreAndForward._RequestResponse.ValueType  # 65
-        """
-        Client has requested a replay from the router.
-        """
-        CLIENT_STATS: StoreAndForward._RequestResponse.ValueType  # 66
-        """
-        Client has requested stats from the router.
-        """
-        CLIENT_PING: StoreAndForward._RequestResponse.ValueType  # 67
-        """
-        Client has requested the router respond. This can work as a
-        "are you there" message.
-        """
-        CLIENT_PONG: StoreAndForward._RequestResponse.ValueType  # 68
-        """
-        The response to a "Ping"
-        """
-        CLIENT_ABORT: StoreAndForward._RequestResponse.ValueType  # 106
-        """
-        Client has requested that the router abort processing the client's request
-        """
-
-    class RequestResponse(_RequestResponse, metaclass=_RequestResponseEnumTypeWrapper):
-        """
-        001 - 063 = From Router
-        064 - 127 = From Client
-        """
-
-    UNSET: StoreAndForward.RequestResponse.ValueType  # 0
-    """
-    Unset/unused
-    """
-    ROUTER_ERROR: StoreAndForward.RequestResponse.ValueType  # 1
-    """
-    Router is an in error state.
-    """
-    ROUTER_HEARTBEAT: StoreAndForward.RequestResponse.ValueType  # 2
-    """
-    Router heartbeat
-    """
-    ROUTER_PING: StoreAndForward.RequestResponse.ValueType  # 3
-    """
-    Router has requested the client respond. This can work as a
-    "are you there" message.
-    """
-    ROUTER_PONG: StoreAndForward.RequestResponse.ValueType  # 4
-    """
-    The response to a "Ping"
-    """
-    ROUTER_BUSY: StoreAndForward.RequestResponse.ValueType  # 5
-    """
-    Router is currently busy. Please try again later.
-    """
-    ROUTER_HISTORY: StoreAndForward.RequestResponse.ValueType  # 6
-    """
-    Router is responding to a request for history.
-    """
-    ROUTER_STATS: StoreAndForward.RequestResponse.ValueType  # 7
-    """
-    Router is responding to a request for stats.
-    """
-    ROUTER_TEXT_DIRECT: StoreAndForward.RequestResponse.ValueType  # 8
-    """
-    Router sends a text message from its history that was a direct message.
-    """
-    ROUTER_TEXT_BROADCAST: StoreAndForward.RequestResponse.ValueType  # 9
-    """
-    Router sends a text message from its history that was a broadcast.
-    """
-    CLIENT_ERROR: StoreAndForward.RequestResponse.ValueType  # 64
-    """
-    Client is an in error state.
-    """
-    CLIENT_HISTORY: StoreAndForward.RequestResponse.ValueType  # 65
-    """
-    Client has requested a replay from the router.
-    """
-    CLIENT_STATS: StoreAndForward.RequestResponse.ValueType  # 66
-    """
-    Client has requested stats from the router.
-    """
-    CLIENT_PING: StoreAndForward.RequestResponse.ValueType  # 67
-    """
-    Client has requested the router respond. This can work as a
-    "are you there" message.
-    """
-    CLIENT_PONG: StoreAndForward.RequestResponse.ValueType  # 68
-    """
-    The response to a "Ping"
-    """
-    CLIENT_ABORT: StoreAndForward.RequestResponse.ValueType  # 106
-    """
-    Client has requested that the router abort processing the client's request
-    """
-
-    @typing.final
-    class Statistics(google.protobuf.message.Message):
-        """
-        TODO: REPLACE
-        """
-
-        DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-        MESSAGES_TOTAL_FIELD_NUMBER: builtins.int
-        MESSAGES_SAVED_FIELD_NUMBER: builtins.int
-        MESSAGES_MAX_FIELD_NUMBER: builtins.int
-        UP_TIME_FIELD_NUMBER: builtins.int
-        REQUESTS_FIELD_NUMBER: builtins.int
-        REQUESTS_HISTORY_FIELD_NUMBER: builtins.int
-        HEARTBEAT_FIELD_NUMBER: builtins.int
-        RETURN_MAX_FIELD_NUMBER: builtins.int
-        RETURN_WINDOW_FIELD_NUMBER: builtins.int
-        messages_total: builtins.int
-        """
-        Number of messages we have ever seen
-        """
-        messages_saved: builtins.int
-        """
-        Number of messages we have currently saved our history.
-        """
-        messages_max: builtins.int
-        """
-        Maximum number of messages we will save
-        """
-        up_time: builtins.int
-        """
-        Router uptime in seconds
-        """
-        requests: builtins.int
-        """
-        Number of times any client sent a request to the S&F.
-        """
-        requests_history: builtins.int
-        """
-        Number of times the history was requested.
-        """
-        heartbeat: builtins.bool
-        """
-        Is the heartbeat enabled on the server?
-        """
-        return_max: builtins.int
-        """
-        Maximum number of messages the server will return.
-        """
-        return_window: builtins.int
-        """
-        Maximum history window in minutes the server will return messages from.
-        """
-        def __init__(
-            self,
-            *,
-            messages_total: builtins.int = ...,
-            messages_saved: builtins.int = ...,
-            messages_max: builtins.int = ...,
-            up_time: builtins.int = ...,
-            requests: builtins.int = ...,
-            requests_history: builtins.int = ...,
-            heartbeat: builtins.bool = ...,
-            return_max: builtins.int = ...,
-            return_window: builtins.int = ...,
-        ) -> None: ...
-        def ClearField(self, field_name: typing.Literal["heartbeat", b"heartbeat", "messages_max", b"messages_max", "messages_saved", b"messages_saved", "messages_total", b"messages_total", "requests", b"requests", "requests_history", b"requests_history", "return_max", b"return_max", "return_window", b"return_window", "up_time", b"up_time"]) -> None: ...
-
-    @typing.final
-    class History(google.protobuf.message.Message):
-        """
-        TODO: REPLACE
-        """
-
-        DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-        HISTORY_MESSAGES_FIELD_NUMBER: builtins.int
-        WINDOW_FIELD_NUMBER: builtins.int
-        LAST_REQUEST_FIELD_NUMBER: builtins.int
-        history_messages: builtins.int
-        """
-        Number of that will be sent to the client
-        """
-        window: builtins.int
-        """
-        The window of messages that was used to filter the history client requested
-        """
-        last_request: builtins.int
-        """
-        Index in the packet history of the last message sent in a previous request to the server.
-        Will be sent to the client before sending the history and can be set in a subsequent request to avoid getting packets the server already sent to the client.
-        """
-        def __init__(
-            self,
-            *,
-            history_messages: builtins.int = ...,
-            window: builtins.int = ...,
-            last_request: builtins.int = ...,
-        ) -> None: ...
-        def ClearField(self, field_name: typing.Literal["history_messages", b"history_messages", "last_request", b"last_request", "window", b"window"]) -> None: ...
-
-    @typing.final
-    class Heartbeat(google.protobuf.message.Message):
-        """
-        TODO: REPLACE
-        """
-
-        DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-        PERIOD_FIELD_NUMBER: builtins.int
-        SECONDARY_FIELD_NUMBER: builtins.int
-        period: builtins.int
-        """
-        Period in seconds that the heartbeat is sent out that will be sent to the client
-        """
-        secondary: builtins.int
-        """
-        If set, this is not the primary Store & Forward router on the mesh
-        """
-        def __init__(
-            self,
-            *,
-            period: builtins.int = ...,
-            secondary: builtins.int = ...,
-        ) -> None: ...
-        def ClearField(self, field_name: typing.Literal["period", b"period", "secondary", b"secondary"]) -> None: ...
-
-    RR_FIELD_NUMBER: builtins.int
-    STATS_FIELD_NUMBER: builtins.int
-    HISTORY_FIELD_NUMBER: builtins.int
-    HEARTBEAT_FIELD_NUMBER: builtins.int
-    TEXT_FIELD_NUMBER: builtins.int
-    rr: global___StoreAndForward.RequestResponse.ValueType
-    """
-    TODO: REPLACE
-    """
-    text: builtins.bytes
-    """
-    Text from history message.
-    """
-    @property
-    def stats(self) -> global___StoreAndForward.Statistics:
-        """
-        TODO: REPLACE
-        """
-
-    @property
-    def history(self) -> global___StoreAndForward.History:
-        """
-        TODO: REPLACE
-        """
-
-    @property
-    def heartbeat(self) -> global___StoreAndForward.Heartbeat:
-        """
-        TODO: REPLACE
-        """
-
-    def __init__(
-        self,
-        *,
-        rr: global___StoreAndForward.RequestResponse.ValueType = ...,
-        stats: global___StoreAndForward.Statistics | None = ...,
-        history: global___StoreAndForward.History | None = ...,
-        heartbeat: global___StoreAndForward.Heartbeat | None = ...,
-        text: builtins.bytes = ...,
-    ) -> None: ...
-    def HasField(self, field_name: typing.Literal["heartbeat", b"heartbeat", "history", b"history", "stats", b"stats", "text", b"text", "variant", b"variant"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing.Literal["heartbeat", b"heartbeat", "history", b"history", "rr", b"rr", "stats", b"stats", "text", b"text", "variant", b"variant"]) -> None: ...
-    def WhichOneof(self, oneof_group: typing.Literal["variant", b"variant"]) -> typing.Literal["stats", "history", "heartbeat", "text"] | None: ...
-
-global___StoreAndForward = StoreAndForward
+class StoreAndForward(_message.Message):
+    __slots__ = ["heartbeat", "history", "rr", "stats", "text"]
+    class RequestResponse(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
+        __slots__ = []
+    class Heartbeat(_message.Message):
+        __slots__ = ["period", "secondary"]
+        PERIOD_FIELD_NUMBER: _ClassVar[int]
+        SECONDARY_FIELD_NUMBER: _ClassVar[int]
+        period: int
+        secondary: int
+        def __init__(self, period: _Optional[int] = ..., secondary: _Optional[int] = ...) -> None: ...
+    class History(_message.Message):
+        __slots__ = ["history_messages", "last_request", "window"]
+        HISTORY_MESSAGES_FIELD_NUMBER: _ClassVar[int]
+        LAST_REQUEST_FIELD_NUMBER: _ClassVar[int]
+        WINDOW_FIELD_NUMBER: _ClassVar[int]
+        history_messages: int
+        last_request: int
+        window: int
+        def __init__(self, history_messages: _Optional[int] = ..., window: _Optional[int] = ..., last_request: _Optional[int] = ...) -> None: ...
+    class Statistics(_message.Message):
+        __slots__ = ["heartbeat", "messages_max", "messages_saved", "messages_total", "requests", "requests_history", "return_max", "return_window", "up_time"]
+        HEARTBEAT_FIELD_NUMBER: _ClassVar[int]
+        MESSAGES_MAX_FIELD_NUMBER: _ClassVar[int]
+        MESSAGES_SAVED_FIELD_NUMBER: _ClassVar[int]
+        MESSAGES_TOTAL_FIELD_NUMBER: _ClassVar[int]
+        REQUESTS_FIELD_NUMBER: _ClassVar[int]
+        REQUESTS_HISTORY_FIELD_NUMBER: _ClassVar[int]
+        RETURN_MAX_FIELD_NUMBER: _ClassVar[int]
+        RETURN_WINDOW_FIELD_NUMBER: _ClassVar[int]
+        UP_TIME_FIELD_NUMBER: _ClassVar[int]
+        heartbeat: bool
+        messages_max: int
+        messages_saved: int
+        messages_total: int
+        requests: int
+        requests_history: int
+        return_max: int
+        return_window: int
+        up_time: int
+        def __init__(self, messages_total: _Optional[int] = ..., messages_saved: _Optional[int] = ..., messages_max: _Optional[int] = ..., up_time: _Optional[int] = ..., requests: _Optional[int] = ..., requests_history: _Optional[int] = ..., heartbeat: bool = ..., return_max: _Optional[int] = ..., return_window: _Optional[int] = ...) -> None: ...
+    CLIENT_ABORT: StoreAndForward.RequestResponse
+    CLIENT_ERROR: StoreAndForward.RequestResponse
+    CLIENT_HISTORY: StoreAndForward.RequestResponse
+    CLIENT_PING: StoreAndForward.RequestResponse
+    CLIENT_PONG: StoreAndForward.RequestResponse
+    CLIENT_STATS: StoreAndForward.RequestResponse
+    HEARTBEAT_FIELD_NUMBER: _ClassVar[int]
+    HISTORY_FIELD_NUMBER: _ClassVar[int]
+    ROUTER_BUSY: StoreAndForward.RequestResponse
+    ROUTER_ERROR: StoreAndForward.RequestResponse
+    ROUTER_HEARTBEAT: StoreAndForward.RequestResponse
+    ROUTER_HISTORY: StoreAndForward.RequestResponse
+    ROUTER_PING: StoreAndForward.RequestResponse
+    ROUTER_PONG: StoreAndForward.RequestResponse
+    ROUTER_STATS: StoreAndForward.RequestResponse
+    ROUTER_TEXT_BROADCAST: StoreAndForward.RequestResponse
+    ROUTER_TEXT_DIRECT: StoreAndForward.RequestResponse
+    RR_FIELD_NUMBER: _ClassVar[int]
+    STATS_FIELD_NUMBER: _ClassVar[int]
+    TEXT_FIELD_NUMBER: _ClassVar[int]
+    UNSET: StoreAndForward.RequestResponse
+    heartbeat: StoreAndForward.Heartbeat
+    history: StoreAndForward.History
+    rr: StoreAndForward.RequestResponse
+    stats: StoreAndForward.Statistics
+    text: bytes
+    def __init__(self, rr: _Optional[_Union[StoreAndForward.RequestResponse, str]] = ..., stats: _Optional[_Union[StoreAndForward.Statistics, _Mapping]] = ..., history: _Optional[_Union[StoreAndForward.History, _Mapping]] = ..., heartbeat: _Optional[_Union[StoreAndForward.Heartbeat, _Mapping]] = ..., text: _Optional[bytes] = ...) -> None: ...

meshtastic/protobuf/xmodem_pb2.py

@@ -2,10 +2,10 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: meshtastic/protobuf/xmodem.proto
 """Generated protocol buffer code."""
+from google.protobuf.internal import builder as _builder
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
 from google.protobuf import symbol_database as _symbol_database
-from google.protobuf.internal import builder as _builder
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -13,16 +13,16 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n meshtastic/protobuf/xmodem.proto\x12\x13meshtastic.protobuf\"\xbf\x01\n\x06XModem\x12\x34\n\x07\x63ontrol\x18\x01 \x01(\x0e\x32#.meshtastic.protobuf.XModem.Control\x12\x0b\n\x03seq\x18\x02 \x01(\r\x12\r\n\x05\x63rc16\x18\x03 \x01(\r\x12\x0e\n\x06\x62uffer\x18\x04 \x01(\x0c\"S\n\x07\x43ontrol\x12\x07\n\x03NUL\x10\x00\x12\x07\n\x03SOH\x10\x01\x12\x07\n\x03STX\x10\x02\x12\x07\n\x03\x45OT\x10\x04\x12\x07\n\x03\x41\x43K\x10\x06\x12\x07\n\x03NAK\x10\x15\x12\x07\n\x03\x43\x41N\x10\x18\x12\t\n\x05\x43TRLZ\x10\x1a\x42\x61\n\x13\x63om.geeksville.meshB\x0cXmodemProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n meshtastic/protobuf/xmodem.proto\x12\x13meshtastic.protobuf\"\xbf\x01\n\x06XModem\x12\x34\n\x07\x63ontrol\x18\x01 \x01(\x0e\x32#.meshtastic.protobuf.XModem.Control\x12\x0b\n\x03seq\x18\x02 \x01(\r\x12\r\n\x05\x63rc16\x18\x03 \x01(\r\x12\x0e\n\x06\x62uffer\x18\x04 \x01(\x0c\"S\n\x07\x43ontrol\x12\x07\n\x03NUL\x10\x00\x12\x07\n\x03SOH\x10\x01\x12\x07\n\x03STX\x10\x02\x12\x07\n\x03\x45OT\x10\x04\x12\x07\n\x03\x41\x43K\x10\x06\x12\x07\n\x03NAK\x10\x15\x12\x07\n\x03\x43\x41N\x10\x18\x12\t\n\x05\x43TRLZ\x10\x1a\x42\x62\n\x14org.meshtastic.protoB\x0cXmodemProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
 
-_globals = globals()
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.xmodem_pb2', _globals)
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.xmodem_pb2', globals())
 if _descriptor._USE_C_DESCRIPTORS == False:
+
   DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\014XmodemProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
-  _globals['_XMODEM']._serialized_start=58
-  _globals['_XMODEM']._serialized_end=249
-  _globals['_XMODEM_CONTROL']._serialized_start=166
-  _globals['_XMODEM_CONTROL']._serialized_end=249
+  DESCRIPTOR._serialized_options = b'\n\024org.meshtastic.protoB\014XmodemProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
+  _XMODEM._serialized_start=58
+  _XMODEM._serialized_end=249
+  _XMODEM_CONTROL._serialized_start=166
+  _XMODEM_CONTROL._serialized_end=249
 # @@protoc_insertion_point(module_scope)

meshtastic/protobuf/xmodem_pb2.pyi

@@ -1,67 +1,28 @@
-"""
-@generated by mypy-protobuf.  Do not edit manually!
-isort:skip_file
-"""
+from google.protobuf.internal import enum_type_wrapper as _enum_type_wrapper
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from typing import ClassVar as _ClassVar, Optional as _Optional, Union as _Union
 
-import builtins
-import google.protobuf.descriptor
-import google.protobuf.internal.enum_type_wrapper
-import google.protobuf.message
-import sys
-import typing
+DESCRIPTOR: _descriptor.FileDescriptor
 
-if sys.version_info >= (3, 10):
-    import typing as typing_extensions
-else:
-    import typing_extensions
-
-DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
-
-@typing.final
-class XModem(google.protobuf.message.Message):
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    class _Control:
-        ValueType = typing.NewType("ValueType", builtins.int)
-        V: typing_extensions.TypeAlias = ValueType
-
-    class _ControlEnumTypeWrapper(google.protobuf.internal.enum_type_wrapper._EnumTypeWrapper[XModem._Control.ValueType], builtins.type):
-        DESCRIPTOR: google.protobuf.descriptor.EnumDescriptor
-        NUL: XModem._Control.ValueType  # 0
-        SOH: XModem._Control.ValueType  # 1
-        STX: XModem._Control.ValueType  # 2
-        EOT: XModem._Control.ValueType  # 4
-        ACK: XModem._Control.ValueType  # 6
-        NAK: XModem._Control.ValueType  # 21
-        CAN: XModem._Control.ValueType  # 24
-        CTRLZ: XModem._Control.ValueType  # 26
-
-    class Control(_Control, metaclass=_ControlEnumTypeWrapper): ...
-    NUL: XModem.Control.ValueType  # 0
-    SOH: XModem.Control.ValueType  # 1
-    STX: XModem.Control.ValueType  # 2
-    EOT: XModem.Control.ValueType  # 4
-    ACK: XModem.Control.ValueType  # 6
-    NAK: XModem.Control.ValueType  # 21
-    CAN: XModem.Control.ValueType  # 24
-    CTRLZ: XModem.Control.ValueType  # 26
-
-    CONTROL_FIELD_NUMBER: builtins.int
-    SEQ_FIELD_NUMBER: builtins.int
-    CRC16_FIELD_NUMBER: builtins.int
-    BUFFER_FIELD_NUMBER: builtins.int
-    control: global___XModem.Control.ValueType
-    seq: builtins.int
-    crc16: builtins.int
-    buffer: builtins.bytes
-    def __init__(
-        self,
-        *,
-        control: global___XModem.Control.ValueType = ...,
-        seq: builtins.int = ...,
-        crc16: builtins.int = ...,
-        buffer: builtins.bytes = ...,
-    ) -> None: ...
-    def ClearField(self, field_name: typing.Literal["buffer", b"buffer", "control", b"control", "crc16", b"crc16", "seq", b"seq"]) -> None: ...
-
-global___XModem = XModem
+class XModem(_message.Message):
+    __slots__ = ["buffer", "control", "crc16", "seq"]
+    class Control(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
+        __slots__ = []
+    ACK: XModem.Control
+    BUFFER_FIELD_NUMBER: _ClassVar[int]
+    CAN: XModem.Control
+    CONTROL_FIELD_NUMBER: _ClassVar[int]
+    CRC16_FIELD_NUMBER: _ClassVar[int]
+    CTRLZ: XModem.Control
+    EOT: XModem.Control
+    NAK: XModem.Control
+    NUL: XModem.Control
+    SEQ_FIELD_NUMBER: _ClassVar[int]
+    SOH: XModem.Control
+    STX: XModem.Control
+    buffer: bytes
+    control: XModem.Control
+    crc16: int
+    seq: int
+    def __init__(self, control: _Optional[_Union[XModem.Control, str]] = ..., seq: _Optional[int] = ..., crc16: _Optional[int] = ..., buffer: _Optional[bytes] = ...) -> None: ...

meshview/__version__.py

@@ -0,0 +1,57 @@
+"""Version information for MeshView."""
+
+import subprocess
+from pathlib import Path
+
+__version__ = "3.0.7"
+__release_date__ = "2026-5-12"
+
+
+def get_git_revision():
+    """Get the current git revision hash."""
+    try:
+        repo_dir = Path(__file__).parent.parent
+        result = subprocess.run(
+            ["git", "rev-parse", "HEAD"],
+            capture_output=True,
+            text=True,
+            check=True,
+            cwd=repo_dir,
+        )
+        return result.stdout.strip()
+    except (subprocess.CalledProcessError, FileNotFoundError):
+        return "unknown"
+
+
+def get_git_revision_short():
+    """Get the short git revision hash."""
+    try:
+        repo_dir = Path(__file__).parent.parent
+        result = subprocess.run(
+            ["git", "rev-parse", "--short", "HEAD"],
+            capture_output=True,
+            text=True,
+            check=True,
+            cwd=repo_dir,
+        )
+        return result.stdout.strip()
+    except (subprocess.CalledProcessError, FileNotFoundError):
+        return "unknown"
+
+
+def get_version_info():
+    """Get complete version information."""
+    return {
+        "version": __version__,
+        "release_date": __release_date__,
+        "git_revision": get_git_revision(),
+        "git_revision_short": get_git_revision_short(),
+    }
+
+
+# Cache git info at import time for performance
+_git_revision = get_git_revision()
+_git_revision_short = get_git_revision_short()
+
+# Full version string for display
+__version_string__ = f"{__version__} ~ {__release_date__}"

meshview/config.py

@@ -1,10 +1,12 @@
-import configparser
 import argparse
+import configparser
 
 # Parse command-line arguments
 parser = argparse.ArgumentParser(description="MeshView Configuration Loader")
-parser.add_argument("--config", type=str, default="config.ini", help="Path to config.ini file (default: config.ini)")
-args = parser.parse_args()
+parser.add_argument(
+    "--config", type=str, default="config.ini", help="Path to config.ini file (default: config.ini)"
+)
+args, _ = parser.parse_known_args()
 
 # Initialize config parser
 config_parser = configparser.ConfigParser()
@@ -12,4 +14,3 @@ if not config_parser.read(args.config):
     raise FileNotFoundError(f"Config file '{args.config}' not found! Ensure the file exists.")
 
 CONFIG = {section: dict(config_parser.items(section)) for section in config_parser.sections()}
-

meshview/database.py

@@ -1,32 +1,34 @@
+from sqlalchemy.engine.url import make_url
+from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker, create_async_engine
+
 from meshview import models
-from sqlalchemy.ext.asyncio import async_sessionmaker
-from sqlalchemy.ext.asyncio import create_async_engine, AsyncSession
 
 engine = None
 async_session = None
 
 
-def init_database(database_connection_string, read_only=False):
+def init_database(database_connection_string):
     global engine, async_session
-
     kwargs = {"echo": False}
+    url = make_url(database_connection_string)
+    connect_args = {}
 
-    if database_connection_string.startswith("sqlite"):
-        if read_only:
-            # Ensure SQLite is opened in read-only mode
-            database_connection_string += "?mode=ro"
-            kwargs["connect_args"] = {"uri": True}
-        else:
-            kwargs["connect_args"] = {"timeout": 60}
-    else:
-        kwargs["pool_size"] = 20
-        kwargs["max_overflow"] = 50
+    if url.drivername.startswith("sqlite"):
+        query = dict(url.query)
+        query.setdefault("mode", "ro")
+        url = url.set(query=query)
+        connect_args["uri"] = True
+
+    if connect_args:
+        kwargs["connect_args"] = connect_args
+
+    engine = create_async_engine(url, **kwargs)
+    async_session = async_sessionmaker(
+        bind=engine,
+        class_=AsyncSession,
+        expire_on_commit=False,
+    )
 
-    engine = create_async_engine(database_connection_string, **kwargs)
-    async_session = async_sessionmaker( bind=engine,
-    class_=AsyncSession,
-    expire_on_commit=False,
-)
 
 async def create_tables():
     async with engine.begin() as conn:

meshview/decode_payload.py

@@ -1,16 +1,16 @@
-from meshtastic.protobuf.mqtt_pb2 import MapReport
-from meshtastic.protobuf.portnums_pb2 import PortNum
+from google.protobuf.message import DecodeError
+
 from meshtastic.protobuf.mesh_pb2 import (
-    Position,
+    MeshPacket,
     NeighborInfo,
-    NodeInfo,
-    User,
+    Position,
     RouteDiscovery,
     Routing,
-    MeshPacket,
+    User,
 )
+from meshtastic.protobuf.mqtt_pb2 import MapReport
+from meshtastic.protobuf.portnums_pb2 import PortNum
 from meshtastic.protobuf.telemetry_pb2 import Telemetry
-from google.protobuf.message import DecodeError
 
 
 def text_message(payload):
@@ -25,7 +25,7 @@ DECODE_MAP = {
     PortNum.TRACEROUTE_APP: RouteDiscovery.FromString,
     PortNum.ROUTING_APP: Routing.FromString,
     PortNum.TEXT_MESSAGE_APP: text_message,
-    PortNum.MAP_REPORT_APP: MapReport.FromString
+    PortNum.MAP_REPORT_APP: MapReport.FromString,
 }