Merge dev into main — Geo‑Auth sessions + Wardrive queue/heartbeat + Auto‑Power + Noise Floor + RX‑Only + Public channel support + UI/Map optimizations

.github/copilot-instructions.md

@@ -9,10 +9,11 @@ Browser-based Progressive Web App for wardriving with MeshCore mesh network devi
 **Tech Stack**: Vanilla JavaScript (ES6 modules), Web Bluetooth API, Geolocation API, Tailwind CSS v4
 
 **Critical Files**:
-- `content/wardrive.js` (4500+ lines) - Main application logic
+- `content/wardrive.js` (5200+ lines) - Main application logic
+- `content/device-models.json` - Device model database for auto-power selection
 - `content/mc/` - MeshCore BLE protocol library (Connection classes, Packet parsing, Buffer utilities)
 - `index.html` - Single-page UI with embedded Leaflet map
-- `docs/` - Comprehensive workflow documentation (CONNECTION_WORKFLOW.md, PING_WORKFLOW.md, etc.)
+- `docs/` - Comprehensive workflow documentation (CONNECTION_WORKFLOW.md, PING_WORKFLOW.md, DEVICE_MODEL_MAPPING.md, etc.)
 
 ## Architecture & Data Flow
 
@@ -22,9 +23,19 @@ Three-layer connection system:
 - **Protocol Layer**: `Connection.js` (2200+ lines) implements MeshCore companion protocol - packet framing, encryption, channel management, device queries
 - **App Layer**: `wardrive.js` orchestrates connect/disconnect workflows with 10-step sequences (see `docs/CONNECTION_WORKFLOW.md`)
 
-**Connect Sequence**: BLE GATT → Protocol Handshake → Device Info → Time Sync → Capacity Check (API slot acquisition) → Channel Setup → GPS Init → Connected
+**Connect Sequence**: BLE GATT → Protocol Handshake → Device Info → Device Model Auto-Power → Time Sync → Capacity Check (API slot acquisition) → Channel Setup → GPS Init → Connected
 
-### 2. Ping Lifecycle & API Queue System
+### 2. Device Model Auto-Power Selection (NEW)
+Automatic power configuration based on detected hardware:
+- **Database**: `device-models.json` contains 32+ MeshCore device variants with recommended power levels
+- **Detection**: `deviceQuery()` returns manufacturer string (e.g., "Ikoka Stick-E22-30dBm (Xiao_nrf52)nightly-e31c46f")
+- **Parsing**: `parseDeviceModel()` strips build suffix ("nightly-COMMIT") for database matching
+- **Lookup**: `findDeviceConfig()` searches database for exact/partial match
+- **Auto-Set**: `autoSetPowerLevel()` configures radio power after successful deviceQuery()
+- **Critical Safety**: PA amplifier models (33dBm, 30dBm) require specific input power to avoid hardware damage
+- See `docs/DEVICE_MODEL_MAPPING.md` for complete architecture
+
+### 3. Ping Lifecycle & API Queue System
 Two independent data flows merge into a unified API batch queue:
 
 **TX Flow** (Transmit):
@@ -51,14 +62,18 @@ Two independent data flows merge into a unified API batch queue:
 - **Ottawa Geofence**: 150km radius from Parliament Hill (45.4215, -75.6972) - hard boundary
 - **Min Distance Filter**: 25m between pings (prevents spam, separate from 25m RX batch trigger)
 
-### 4. State Management
+### 5. State Management
 Global `state` object tracks:
 - `connection`: Active BLE connection instance
 - `wardrivingChannel`: Channel object for ping sends
 - `txRxAutoRunning` / `autoTimerId` / `nextAutoPingTime`: Auto-ping state
 - `lastPingLat/Lon`: For distance validation
 - `cooldownEndTime`: 7-second cooldown after each ping
 - `sessionId`: UUID for correlating TX/RX events per wardrive session
+- `deviceModel`: Full manufacturer string from deviceQuery()
+- `autoPowerSet`: Boolean tracking if power was automatically configured
+
+**Device Model Database**: `DEVICE_MODELS` global array loaded from JSON on page load
 
 **RX Batch Buffer**: `Map` keyed by repeater node ID → `{rxEvents: [], bufferedSince, lastFlushed, flushTimerId}`
 
@@ -105,9 +120,14 @@ Used by `startAutoCountdown()`, `startRxListeningCountdown()`, cooldown logic.
 ### 2. Channel Hash & Decryption
 **Pre-computed at startup**:
 ```javascript
-WARDRIVING_CHANNEL_KEY = await deriveChannelKey("#wardriving");  // PBKDF2 SHA-256
+WARDRIVING_CHANNEL_KEY = await deriveChannelKey("#wardriving");  // SHA-256 for hashtag channels
 WARDRIVING_CHANNEL_HASH = await computeChannelHash(key);        // PSK channel identifier
 ```
+
+**Channel Key Types**:
+- **Hashtag channels** (`#wardriving`, `#testing`, `#ottawa`): Keys derived via SHA-256 of channel name
+- **Public channel** (`Public`, no hashtag): Uses fixed key `8b3387e9c5cdea6ac9e5edbaa115cd72` (default MeshCore channel)
+
 Used for:
 - Repeater echo detection (match `channelHash` in received packets)
 - Message decryption (AES-ECB via aes-js library)

.github/workflows/deploy.yml

@@ -49,7 +49,7 @@ jobs:
           cp -r main-content/* _site/ 2>/dev/null || true
 
           # MAIN: inject release version into root site
-          sed -i 's|<span id="appVersion"[^>]*>[^<]*</span>|<span id="appVersion" class="text-sm text-slate-400">'"${RELEASE_VERSION}"'</span>|' _site/index.html
+          sed -i 's|<span id="appVersion"[^>]*>[^<]*</span>|<span id="appVersion" class="text-xs bg-slate-800 border border-slate-700 px-3 py-1 rounded-full text-slate-400 flex-shrink-0">'"${RELEASE_VERSION}"'</span>|' _site/index.html
           sed -i 's|const APP_VERSION = "UNKNOWN";|const APP_VERSION = "'"${RELEASE_VERSION}"'";|' _site/content/wardrive.js
 
           # DEV: copy dev site under /dev
@@ -59,7 +59,7 @@ jobs:
 
           # DEV: inject DEV-EPOCH
           DEV_EPOCH=$(date -u +%s)
-          sed -i 's|<span id="appVersion"[^>]*>[^<]*</span>|<span id="appVersion" class="text-sm text-slate-400">DEV-'"${DEV_EPOCH}"'</span>|' _site/dev/index.html
+          sed -i 's|<span id="appVersion"[^>]*>[^<]*</span>|<span id="appVersion" class="text-xs bg-slate-800 border border-slate-700 px-3 py-1 rounded-full text-slate-400 flex-shrink-0">DEV-'"${DEV_EPOCH}"'</span>|' _site/dev/index.html
           sed -i 's|const APP_VERSION = "UNKNOWN";|const APP_VERSION = "DEV-'"${DEV_EPOCH}"'";|' _site/dev/content/wardrive.js
 
           find _site -name ".git" -exec rm -rf {} + 2>/dev/null || true

README.md

@@ -1,6 +1,6 @@
 # MeshCore GOME WarDriver
 
-[![Version](https://img.shields.io/badge/version-1.7.0-blue.svg)](https://github.com/MrAlders0n/MeshCore-GOME-WarDriver/releases/tag/v1.7.0)
+[![Version](https://img.shields.io/badge/version-1.8.0-blue.svg)](https://github.com/MrAlders0n/MeshCore-GOME-WarDriver/releases/tag/v1.8.0)
 [![License](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)
 [![Platform](https://img.shields.io/badge/platform-Android%20%7C%20iOS-orange.svg)](#platform-support)
 

content/device-models.json

@@ -0,0 +1,277 @@
+{
+  "version": "1.0.0",
+  "generated": "2026-01-04",
+  "source": "MeshCore firmware repository - github.com/meshcore-dev/MeshCore",
+  "devices": [
+    {
+      "manufacturer": "Ikoka Stick-E22-22dBm (Xiao_nrf52)",
+      "shortName": "Ikoka Stick",
+      "power": 0.3,
+      "platform": "nrf52",
+      "txPower": 22,
+      "notes": "EBYTE E22-900M22S, no PA amplifier"
+    },
+    {
+      "manufacturer": "Ikoka Stick-E22-30dBm (Xiao_nrf52)",
+      "shortName": "Ikoka Stick",
+      "power": 1.0,
+      "platform": "nrf52",
+      "txPower": 20,
+      "notes": "EBYTE E22-900M30S, 1W PA: 20dBm input → 30dBm output"
+    },
+    {
+      "manufacturer": "Ikoka Stick-E22-33dBm (Xiao_nrf52)",
+      "shortName": "Ikoka Stick",
+      "power": 2.0,
+      "platform": "nrf52",
+      "txPower": 9,
+      "notes": "EBYTE E22-900M33S, 2W PA: 9dBm input → 33dBm output (avoid hardware damage)"
+    },
+    {
+      "manufacturer": "Ikoka Nano-E22-22dBm (Xiao_nrf52)",
+      "shortName": "Ikoka Nano",
+      "power": 0.3,
+      "platform": "nrf52",
+      "txPower": 22,
+      "notes": "EBYTE E22-900M22S, no PA amplifier"
+    },
+    {
+      "manufacturer": "Ikoka Nano-E22-30dBm (Xiao_nrf52)",
+      "shortName": "Ikoka Nano",
+      "power": 1.0,
+      "platform": "nrf52",
+      "txPower": 20,
+      "notes": "EBYTE E22-900M30S, 1W PA: 20dBm input → 30dBm output"
+    },
+    {
+      "manufacturer": "Ikoka Nano-E22-33dBm (Xiao_nrf52)",
+      "shortName": "Ikoka Nano",
+      "power": 2.0,
+      "platform": "nrf52",
+      "txPower": 9,
+      "notes": "EBYTE E22-900M33S, 2W PA: 9dBm input → 33dBm output (avoid hardware damage)"
+    },
+    {
+      "manufacturer": "Ikoka Handheld E22 30dBm (Xiao_nrf52)",
+      "shortName": "Ikoka Handheld",
+      "power": 1.0,
+      "platform": "nrf52",
+      "txPower": 20,
+      "notes": "EBYTE E22-900M30S, 1W PA: 20dBm input → 30dBm output"
+    },
+    {
+      "manufacturer": "Elecrow ThinkNode-M1",
+      "shortName": "Elecrow ThinkNode M1",
+      "power": 0.3,
+      "platform": "nrf52",
+      "txPower": 22,
+      "notes": "Elecrow ThinkNode M1"
+    },
+    {
+      "manufacturer": "Heltec V2",
+      "shortName": "Heltec V2",
+      "power": 0.3,
+      "platform": "esp32",
+      "txPower": 20,
+      "notes": "Heltec WiFi LoRa 32 V2"
+    },
+    {
+      "manufacturer": "Heltec V3",
+      "shortName": "Heltec V3",
+      "power": 0.3,
+      "platform": "esp32-s3",
+      "txPower": 22,
+      "notes": "Heltec WiFi LoRa 32 V3"
+    },
+    {
+      "manufacturer": "Heltec V4",
+      "shortName": "Heltec V4",
+      "power": 0.6,
+      "platform": "esp32-s3",
+      "txPower": 10,
+      "notes": "Firmware power 10dBm, PA amplifier to 22dBm actual output"
+    },
+    {
+      "manufacturer": "Heltec E213",
+      "shortName": "Heltec E213",
+      "power": 0.3,
+      "platform": "esp32-s3",
+      "txPower": 22,
+      "notes": "Heltec E-Ink display variant"
+    },
+    {
+      "manufacturer": "Heltec E290",
+      "shortName": "Heltec E290",
+      "power": 0.3,
+      "platform": "esp32-s3",
+      "txPower": 22,
+      "notes": "Heltec E-Ink display variant"
+    },
+    {
+      "manufacturer": "Heltec T190",
+      "shortName": "Heltec T190",
+      "power": 0.3,
+      "platform": "esp32-s3",
+      "txPower": 22,
+      "notes": "Heltec T190 tracker variant"
+    },
+    {
+      "manufacturer": "Heltec T114",
+      "shortName": "Heltec T114",
+      "power": 0.3,
+      "platform": "nrf52",
+      "txPower": 22,
+      "notes": "Heltec T114 tracker variant"
+    },
+    {
+      "manufacturer": "Heltec Tracker V2",
+      "shortName": "Heltec Tracker V2",
+      "power": 0.3,
+      "platform": "esp32-s3",
+      "txPower": 10,
+      "notes": "Firmware power 10dBm, PA amplifier to 22dBm actual output"
+    },
+    {
+      "manufacturer": "Heltec Mesh Solar",
+      "shortName": "Heltec Mesh Solar",
+      "power": 0.3,
+      "platform": "nrf52",
+      "txPower": 22,
+      "notes": "Solar-powered variant"
+    },
+    {
+      "manufacturer": "Heltec MeshPocket",
+      "shortName": "Heltec MeshPocket",
+      "power": 0.3,
+      "platform": "nrf52",
+      "txPower": 22,
+      "notes": "Pocket-sized handheld"
+    },
+    {
+      "manufacturer": "Heltec CT62",
+      "shortName": "Heltec CT62",
+      "power": 0.3,
+      "platform": "esp32-c3",
+      "txPower": 22,
+      "notes": "ESP32-C3 based variant"
+    },
+    {
+      "manufacturer": "RAK 4631",
+      "shortName": "RAK 4631",
+      "power": 0.3,
+      "platform": "nrf52",
+      "txPower": 22,
+      "notes": "RAKwireless WisBlock Core"
+    },
+    {
+      "manufacturer": "RAK 3x72",
+      "shortName": "RAK 3x72",
+      "power": 0.3,
+      "platform": "stm32",
+      "txPower": 22,
+      "notes": "RAKwireless STM32WLE5 module"
+    },
+    {
+      "manufacturer": "LilyGo T-Echo",
+      "shortName": "LilyGo T-Echo",
+      "power": 0.3,
+      "platform": "nrf52",
+      "txPower": 22,
+      "notes": "E-Ink display variant (both T-Echo and T-Echo Lite)"
+    },
+    {
+      "manufacturer": "LilyGo T-Deck",
+      "shortName": "LilyGo T-Deck",
+      "power": 0.3,
+      "platform": "esp32-s3",
+      "txPower": 22,
+      "notes": "Full keyboard handheld"
+    },
+    {
+      "manufacturer": "LilyGo T-Beam",
+      "shortName": "LilyGo T-Beam",
+      "power": 0.3,
+      "platform": "esp32",
+      "txPower": 22,
+      "notes": "GPS tracker variant"
+    },
+    {
+      "manufacturer": "LILYGO T-LoRa V2.1-1.6",
+      "shortName": "LILYGO T-LoRa V2.1",
+      "power": 0.3,
+      "platform": "esp32",
+      "txPower": 20,
+      "notes": "OLED display variant"
+    },
+    {
+      "manufacturer": "Seeed Wio E5 Dev Board",
+      "shortName": "Wio E5 Dev Board",
+      "power": 0.3,
+      "platform": "stm32",
+      "txPower": 22,
+      "notes": "STM32WLE5 integrated LoRa"
+    },
+    {
+      "manufacturer": "Xiao C3",
+      "shortName": "Xiao C3",
+      "power": 0.3,
+      "platform": "esp32-c3",
+      "txPower": 22,
+      "notes": "Seeed Xiao ESP32-C3"
+    },
+    {
+      "manufacturer": "Xiao C6",
+      "shortName": "Xiao C6",
+      "power": 0.3,
+      "platform": "esp32-c6",
+      "txPower": 22,
+      "notes": "Seeed Xiao ESP32-C6"
+    },
+    {
+      "manufacturer": "Xiao S3 WIO",
+      "shortName": "Xiao S3 WIO",
+      "power": 0.3,
+      "platform": "esp32-s3",
+      "txPower": 22,
+      "notes": "Seeed Xiao ESP32-S3 with WIO expansion"
+    },
+    {
+      "manufacturer": "Tiny Relay",
+      "shortName": "Tiny Relay",
+      "power": 0.3,
+      "platform": "stm32",
+      "txPower": 22,
+      "notes": "STM32-based relay control board"
+    },
+    {
+      "manufacturer": "Minewsemi",
+      "shortName": "Minewsemi",
+      "power": 0.3,
+      "platform": "nrf52",
+      "txPower": 22,
+      "notes": "Minewsemi ME25LS01 tracker"
+    },
+    {
+      "manufacturer": "Station G2",
+      "shortName": "Station G2",
+      "power": 1.0,
+      "platform": "esp32-s3",
+      "txPower": 19,
+      "notes": "Custom power 19dBm (RX boosted gain disabled for RF performance)"
+    }
+  ],
+  "powerMapping": {
+    "0.3": "24 dBm and below - Standard devices without PA",
+    "0.6": "28 dBm - Heltek v4",
+    "1.0": "30 dBm - 1W PA modules (E22-900M30S): 20dBm input → 30dBm output",
+    "2.0": "33 dBm - 2W PA modules (E22-900M33S): 9dBm input → 33dBm output"
+  },
+  "notes": [
+    "Build suffix (e.g., 'nightly-e31c46f') is appended at compile time and should be stripped for matching",
+    "Power values are wardrive.js radio power settings (0.3, 0.6, 1.0, 2.0)",
+    "txPower values are firmware LORA_TX_POWER settings in dBm",
+    "PA (Power Amplifier) modules boost input power to higher output power",
+    "Some devices may report different strings based on firmware version",
+    "For unknown devices, default to power 0.3 (safest conservative setting)"
+  ]  
+}