From 8fd7e85c83a48c3f824a4fba6ec68428ccedb8db Mon Sep 17 00:00:00 2001
From: grigo <blacksmoke576@gmail.com>
Date: Thu, 11 Jun 2026 08:38:08 +0300
Subject: [PATCH] added local api

---
 .idea/gradle.xml                              |    1 +
 .idea/misc.xml                                |    1 -
 .../loratester/CommandPoller.java             |   45 +-
 .../loratester/TelemetryUploader.java         |   48 +
 .../loratester/location/GeoUtils.java         |   10 +
 .../loratester/model/RadioSnapshot.java       |  195 +++
 .../loratester/telnet/AtCommandFormatter.java |    8 +
 .../loratester/telnet/AtCommands.java         |   22 +-
 .../loratester/telnet/LoraStatsFormatter.java |  143 ++-
 .../loratester/telnet/RadioMacroBuilder.java  |   74 ++
 .../loratester/telnet/StatsExtractor.java     |   62 +-
 .../loratester/telnet/TelnetClient.java       |   12 +
 .../loratester/track/TrackRecorder.java       |   16 +
 .../loratester/ui/AtFragment.java             |  303 +++--
 .../loratester/ui/ChatAdapter.java            |   89 +-
 .../loratester/ui/ChatFragment.java           |    7 +
 .../loratester/ui/MapFragment.java            |  182 ++-
 .../loratester/ui/RadioComparePanel.java      |  187 +++
 .../loratester/ui/StatsFragment.java          |  232 +---
 app/src/main/res/layout/fragment_at.xml       |  255 ++--
 app/src/main/res/layout/fragment_map.xml      |   59 +
 app/src/main/res/layout/fragment_stats.xml    |   98 +-
 app/src/main/res/layout/item_chat.xml         |   45 +-
 .../main/res/layout/view_radio_compare.xml    |   55 +
 app/src/main/res/values/strings.xml           |   19 +
 server/.dockerignore                          |    8 +
 server/Dockerfile                             |   18 +
 server/README.md                              |   55 +-
 .../core/__pycache__/config.cpython-313.pyc   |  Bin 1082 -> 1630 bytes
 .../__pycache__/elevation.cpython-313.pyc     |  Bin 2068 -> 12629 bytes
 server/core/config.py                         |   10 +
 server/core/elevation.py                      |  307 ++++-
 server/docker-compose.yml                     |   20 +
 server/fastapi_app.py                         |   42 +-
 server/flask_app.py                           |   33 +-
 server/static/index.html                      | 1065 +++++++++++++++--
 server/static/radio-ui.js                     |  157 +++
 ...est_elevation.cpython-313-pytest-9.0.3.pyc |  Bin 0 -> 5771 bytes
 server/tests/test_elevation.py                |   64 +
 39 files changed, 3224 insertions(+), 723 deletions(-)
 create mode 100644 app/src/main/java/com/grigowashere/loratester/model/RadioSnapshot.java
 create mode 100644 app/src/main/java/com/grigowashere/loratester/telnet/RadioMacroBuilder.java
 create mode 100644 app/src/main/java/com/grigowashere/loratester/ui/RadioComparePanel.java
 create mode 100644 app/src/main/res/layout/view_radio_compare.xml
 create mode 100644 server/.dockerignore
 create mode 100644 server/Dockerfile
 create mode 100644 server/docker-compose.yml
 create mode 100644 server/static/radio-ui.js
 create mode 100644 server/tests/__pycache__/test_elevation.cpython-313-pytest-9.0.3.pyc
 create mode 100644 server/tests/test_elevation.py

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 97f0a8e..639c779 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 74dd639..b2c751a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
diff --git a/app/src/main/java/com/grigowashere/loratester/CommandPoller.java b/app/src/main/java/com/grigowashere/loratester/CommandPoller.java
index 3cb377d..c68f23c 100644
--- a/app/src/main/java/com/grigowashere/loratester/CommandPoller.java
+++ b/app/src/main/java/com/grigowashere/loratester/CommandPoller.java
@@ -4,6 +4,8 @@ import android.os.Handler;
 import android.os.Looper;
 import android.util.Log;
 
+import androidx.annotation.Nullable;
+
 import com.grigowashere.loratester.api.DeviceCommand;
 import com.grigowashere.loratester.api.PairedTrackSession;
 import com.grigowashere.loratester.api.ServerApi;
@@ -120,11 +122,17 @@ public class CommandPoller {
         }
         switch (cmd.kind) {
             case "at" -> {
-                String line = cmd.payload != null && cmd.payload.get("line") != null
-                        ? String.valueOf(cmd.payload.get("line")) : null;
-                if (line != null) {
-                    uploader.sendAtCommand(line, r ->
-                            Log.i(TAG, "remote AT " + line + " -> " + r));
+                List<String> lines = extractLines(cmd.payload);
+                if (lines != null && !lines.isEmpty()) {
+                    uploader.sendMacroSequence(lines, r ->
+                            Log.i(TAG, "remote macro " + lines + " -> " + r));
+                } else {
+                    String line = cmd.payload != null && cmd.payload.get("line") != null
+                            ? String.valueOf(cmd.payload.get("line")) : null;
+                    if (line != null) {
+                        uploader.sendAtCommand(line, r ->
+                                Log.i(TAG, "remote AT " + line + " -> " + r));
+                    }
                 }
             }
             case "mode" -> {
@@ -224,6 +232,33 @@ public class CommandPoller {
         return o instanceof Number ? ((Number) o).longValue() : null;
     }
 
+    @Nullable
+    private static List<String> extractLines(Map<String, Object> payload) {
+        if (payload == null) {
+            return null;
+        }
+        Object raw = payload.get("lines");
+        if (!(raw instanceof List<?> list) || list.isEmpty()) {
+            return null;
+        }
+        List<String> lines = new java.util.ArrayList<>();
+        for (Object item : list) {
+            if (item != null) {
+                String line = String.valueOf(item).trim();
+                if (!line.isEmpty()) {
+                    lines.add(line);
+                }
+            }
+        }
+        return lines.isEmpty() ? null : lines;
+    }
+
+    public void postMacroToPeer(String peerId, List<String> lines) {
+        Map<String, Object> payload = new HashMap<>();
+        payload.put("lines", lines);
+        postCommandToPeer(peerId, "at", payload);
+    }
+
     public void postCommandToPeer(String peerId, String kind, Map<String, Object> payload) {
         executor.execute(() -> {
             try {
diff --git a/app/src/main/java/com/grigowashere/loratester/TelemetryUploader.java b/app/src/main/java/com/grigowashere/loratester/TelemetryUploader.java
index 786665b..3d8dd2a 100644
--- a/app/src/main/java/com/grigowashere/loratester/TelemetryUploader.java
+++ b/app/src/main/java/com/grigowashere/loratester/TelemetryUploader.java
@@ -11,12 +11,14 @@ import com.grigowashere.loratester.api.UploadQueue;
 import com.grigowashere.loratester.net.NetworkMonitor;
 import com.grigowashere.loratester.location.GeoUtils;
 import com.grigowashere.loratester.telnet.AtCommandFormatter;
+import com.grigowashere.loratester.telnet.RadioMacroBuilder;
 import com.grigowashere.loratester.telnet.StatsExtractor;
 import com.grigowashere.loratester.telnet.TelnetClient;
 import com.grigowashere.loratester.telnet.TelnetFrameParser;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
+import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
@@ -168,6 +170,52 @@ public class TelemetryUploader implements TelnetClient.Listener {
         });
     }
 
+    public void sendMacroSequence(List<String> lines, AtSendCallback callback) {
+        telnetExecutor.execute(() -> {
+            TelnetClient.SendResult last = TelnetClient.SendResult.SENT;
+            if (lines != null) {
+                for (int i = 0; i < lines.size(); i++) {
+                    String line = lines.get(i);
+                    if (line == null || line.isEmpty()) {
+                        continue;
+                    }
+                    last = sendLineOnWorker(line);
+                    if (last != TelnetClient.SendResult.SENT) {
+                        break;
+                    }
+                    if (i < lines.size() - 1) {
+                        try {
+                            Thread.sleep(150);
+                        } catch (InterruptedException ignored) {
+                            Thread.currentThread().interrupt();
+                            break;
+                        }
+                    }
+                }
+            }
+            if (callback != null) {
+                TelnetClient.SendResult r = last;
+                mainHandler.post(() -> callback.onResult(r));
+            }
+        });
+    }
+
+    private TelnetClient.SendResult sendLineOnWorker(String line) {
+        if (RadioMacroBuilder.STOP.equals(line)) {
+            appendConsole(">> S\n");
+            if (telnetClient == null) {
+                appendConsole("!! telnet not started\n");
+                return TelnetClient.SendResult.NOT_CONNECTED;
+            }
+            TelnetClient.SendResult result = telnetClient.sendRawLine(line);
+            if (result != TelnetClient.SendResult.SENT) {
+                appendConsole("!! send failed: " + result + "\n");
+            }
+            return result;
+        }
+        return sendAtCommandOnWorker(line);
+    }
+
     private TelnetClient.SendResult sendAtCommandOnWorker(String command) {
         String normalized = AtCommandFormatter.normalize(command);
         appendConsole(">> " + normalized + "\n");
diff --git a/app/src/main/java/com/grigowashere/loratester/location/GeoUtils.java b/app/src/main/java/com/grigowashere/loratester/location/GeoUtils.java
index da8ee09..e24ef70 100644
--- a/app/src/main/java/com/grigowashere/loratester/location/GeoUtils.java
+++ b/app/src/main/java/com/grigowashere/loratester/location/GeoUtils.java
@@ -20,4 +20,14 @@ public final class GeoUtils {
     public static boolean isValidCoordinate(Double lat, Double lon) {
         return lat != null && lon != null && isValidCoordinate(lat.doubleValue(), lon.doubleValue());
     }
+
+    public static double haversineMeters(double lat1, double lon1, double lat2, double lon2) {
+        final double r = 6_371_000;
+        double dLat = Math.toRadians(lat2 - lat1);
+        double dLon = Math.toRadians(lon2 - lon1);
+        double a = Math.sin(dLat / 2) * Math.sin(dLat / 2)
+                + Math.cos(Math.toRadians(lat1)) * Math.cos(Math.toRadians(lat2))
+                * Math.sin(dLon / 2) * Math.sin(dLon / 2);
+        return r * 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+    }
 }
diff --git a/app/src/main/java/com/grigowashere/loratester/model/RadioSnapshot.java b/app/src/main/java/com/grigowashere/loratester/model/RadioSnapshot.java
new file mode 100644
index 0000000..5818a12
--- /dev/null
+++ b/app/src/main/java/com/grigowashere/loratester/model/RadioSnapshot.java
@@ -0,0 +1,195 @@
+package com.grigowashere.loratester.model;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.grigowashere.loratester.telnet.StatsExtractor;
+
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+
+/** Normalized radio stats from telemetry meta JSON (no duplicate fields). */
+public final class RadioSnapshot {
+
+    public final String role;
+    public final String frame;
+    public final Double frequencyMhz;
+    public final Integer sf;
+    public final Integer bwKhz;
+    public final Double powerDbm;
+    public final Double rssiDbm;
+    public final Double snrDb;
+    public final Integer packet;
+    public final String payload;
+    public final Double onAirMs;
+    public final Double txPktPerS;
+    public final Double rxPktPerS;
+    public final Double perPercent;
+    public final Map<String, String> extraFields;
+
+    public RadioSnapshot(
+            String role,
+            String frame,
+            Double frequencyMhz,
+            Integer sf,
+            Integer bwKhz,
+            Double powerDbm,
+            Double rssiDbm,
+            Double snrDb,
+            Integer packet,
+            String payload,
+            Double onAirMs,
+            Double txPktPerS,
+            Double rxPktPerS,
+            Double perPercent,
+            Map<String, String> extraFields
+    ) {
+        this.role = role;
+        this.frame = frame;
+        this.frequencyMhz = frequencyMhz;
+        this.sf = sf;
+        this.bwKhz = bwKhz;
+        this.powerDbm = powerDbm;
+        this.rssiDbm = rssiDbm;
+        this.snrDb = snrDb;
+        this.packet = packet;
+        this.payload = payload;
+        this.onAirMs = onAirMs;
+        this.txPktPerS = txPktPerS;
+        this.rxPktPerS = rxPktPerS;
+        this.perPercent = perPercent;
+        this.extraFields = extraFields != null ? extraFields : Map.of();
+    }
+
+    public static RadioSnapshot empty() {
+        return new RadioSnapshot(null, null, null, null, null, null, null, null,
+                null, null, null, null, null, null, Map.of());
+    }
+
+    public static RadioSnapshot fromMeta(String metaJson, String roleFallback, Double rssiFallback) {
+        if (metaJson == null || metaJson.isBlank()) {
+            RadioSnapshot snap = empty();
+            if (roleFallback != null || rssiFallback != null) {
+                return new RadioSnapshot(roleFallback, null, null, null, null, null,
+                        rssiFallback, null, null, null, null, null, null, null, Map.of());
+            }
+            return snap;
+        }
+        try {
+            JsonObject o = JsonParser.parseString(metaJson).getAsJsonObject();
+            String role = text(o, "role");
+            if (role == null) {
+                role = roleFallback;
+            }
+            Double rssi = dbl(o, "rssi_dbm");
+            if (rssi == null) {
+                rssi = rssiFallback;
+            }
+            Map<String, String> extra = new LinkedHashMap<>();
+            JsonElement fieldsEl = o.get("fields");
+            if (fieldsEl != null && fieldsEl.isJsonObject()) {
+                for (Map.Entry<String, JsonElement> e : fieldsEl.getAsJsonObject().entrySet()) {
+                    String label = e.getKey();
+                    if (isKnownFieldLabel(label)) {
+                        continue;
+                    }
+                    extra.put(label, e.getValue().getAsString());
+                }
+            }
+            return new RadioSnapshot(
+                    role,
+                    text(o, "frame"),
+                    hzToMhz(lng(o, "frequency_hz")),
+                    integer(o, "spreading_factor"),
+                    integer(o, "bandwidth_khz"),
+                    dbl(o, "power_dbm"),
+                    rssi,
+                    dbl(o, "snr_db"),
+                    integer(o, "packet"),
+                    text(o, "payload"),
+                    dbl(o, "on_air_ms"),
+                    dbl(o, "tx_pkt_per_s"),
+                    dbl(o, "rx_pkt_per_s"),
+                    dbl(o, "per_percent"),
+                    extra
+            );
+        } catch (Exception ignored) {
+            return new RadioSnapshot(roleFallback, null, null, null, null, null,
+                    rssiFallback, null, null, null, null, null, null, null, Map.of());
+        }
+    }
+
+    public static RadioSnapshot fromExtracted(StatsExtractor.ExtractedStats stats) {
+        if (stats == null) {
+            return empty();
+        }
+        return fromMeta(stats.metaJson, stats.role, stats.rssiDbm != null ? stats.rssiDbm : stats.rssi);
+    }
+
+    public Set<String> diff(RadioSnapshot prev) {
+        Set<String> changed = new HashSet<>();
+        if (prev == null) {
+            return changed;
+        }
+        cmp(changed, "role", role, prev.role);
+        cmp(changed, "rssi", rssiDbm, prev.rssiDbm);
+        cmp(changed, "snr", snrDb, prev.snrDb);
+        cmp(changed, "packet", packet, prev.packet);
+        cmp(changed, "payload", payload, prev.payload);
+        cmp(changed, "per", perPercent, prev.perPercent);
+        cmp(changed, "txSpeed", txPktPerS, prev.txPktPerS);
+        cmp(changed, "rxSpeed", rxPktPerS, prev.rxPktPerS);
+        cmp(changed, "frequency", frequencyMhz, prev.frequencyMhz);
+        cmp(changed, "sf", sf, prev.sf);
+        cmp(changed, "bw", bwKhz, prev.bwKhz);
+        cmp(changed, "power", powerDbm, prev.powerDbm);
+        return changed;
+    }
+
+    private static void cmp(Set<String> changed, String key, Object a, Object b) {
+        if (!Objects.equals(a, b)) {
+            changed.add(key);
+        }
+    }
+
+    private static boolean isKnownFieldLabel(String label) {
+        String n = label.toLowerCase(Locale.ROOT).trim();
+        return n.equals("send") || n.equals("receive")
+                || n.contains("frequency") || n.equals("power") || n.equals("rssi")
+                || n.equals("snr") || n.contains("spreading") || n.contains("bandwidth")
+                || n.equals("packet") || n.contains("packet number") || n.equals("payload")
+                || n.contains("on air") || n.contains("tx speed") || n.contains("rx speed")
+                || n.equals("per");
+    }
+
+    private static String text(JsonObject o, String key) {
+        JsonElement e = o.get(key);
+        return e != null && !e.isJsonNull() ? e.getAsString() : null;
+    }
+
+    private static Integer integer(JsonObject o, String key) {
+        JsonElement e = o.get(key);
+        return e != null && e.isJsonPrimitive() ? e.getAsInt() : null;
+    }
+
+    private static Double dbl(JsonObject o, String key) {
+        JsonElement e = o.get(key);
+        return e != null && e.isJsonPrimitive() ? e.getAsDouble() : null;
+    }
+
+    private static Long lng(JsonObject o, String key) {
+        JsonElement e = o.get(key);
+        return e != null && e.isJsonPrimitive() ? e.getAsLong() : null;
+    }
+
+    private static Double hzToMhz(Long hz) {
+        if (hz == null) {
+            return null;
+        }
+        return hz / 1_000_000.0;
+    }
+}
diff --git a/app/src/main/java/com/grigowashere/loratester/telnet/AtCommandFormatter.java b/app/src/main/java/com/grigowashere/loratester/telnet/AtCommandFormatter.java
index 0ba6c44..843c258 100644
--- a/app/src/main/java/com/grigowashere/loratester/telnet/AtCommandFormatter.java
+++ b/app/src/main/java/com/grigowashere/loratester/telnet/AtCommandFormatter.java
@@ -30,4 +30,12 @@ public final class AtCommandFormatter {
         String wire = line + "\r\n";
         return wire.getBytes(StandardCharsets.UTF_8);
     }
+
+    /** Literal line (e.g. screen reset "S") without AT prefix. */
+    public static byte[] toWireBytesLiteral(String line) {
+        if (line == null || line.isEmpty()) {
+            return new byte[0];
+        }
+        return (line + "\r\n").getBytes(StandardCharsets.UTF_8);
+    }
 }
diff --git a/app/src/main/java/com/grigowashere/loratester/telnet/AtCommands.java b/app/src/main/java/com/grigowashere/loratester/telnet/AtCommands.java
index 6916ad8..6e280a2 100644
--- a/app/src/main/java/com/grigowashere/loratester/telnet/AtCommands.java
+++ b/app/src/main/java/com/grigowashere/loratester/telnet/AtCommands.java
@@ -1,15 +1,33 @@
 package com.grigowashere.loratester.telnet;
 
-/** Common AT commands for LoRa modules (via telnet bridge). */
+/** LoRa module AT commands (telnet bridge). */
 public final class AtCommands {
 
-    public static final String HELP = "AT+H";
     public static final String TRANSMIT = "AT+TX";
     public static final String RECEIVE = "AT+RX";
+    /** Stop TX or RX test. */
+    public static final String STOP = "S";
+    public static final String TIMEOUT_MS = "AT+TM=";
+    public static final String FREQUENCY_HZ = "AT+FQ=";
+    public static final String POWER_DBM = "AT+PW=";
+    public static final String SPREADING_FACTOR = "AT+SF=";
+    public static final String BANDWIDTH = "AT+BW=";
+    public static final String CODE_RATE = "AT+CR=";
+    public static final String PREAMBLE = "AT+PL=";
+
+    /** Legacy / bridge helpers (if supported by firmware). */
+    public static final String HELP = "AT+H";
     public static final String STATUS = "AT+STATUS";
     public static final String RESET = "AT+RESET";
     public static final String BASIC = "AT";
 
+    public static final String[] BW_KHZ = {
+            "7.81", "10.42", "15.63", "20.83", "31.25",
+            "41.67", "62.5", "125", "250", "500"
+    };
+
+    public static final String[] CODE_RATES = {"4/5", "4/6", "4/7", "4/8"};
+
     private AtCommands() {
     }
 }
diff --git a/app/src/main/java/com/grigowashere/loratester/telnet/LoraStatsFormatter.java b/app/src/main/java/com/grigowashere/loratester/telnet/LoraStatsFormatter.java
index cf7f05c..e9938a8 100644
--- a/app/src/main/java/com/grigowashere/loratester/telnet/LoraStatsFormatter.java
+++ b/app/src/main/java/com/grigowashere/loratester/telnet/LoraStatsFormatter.java
@@ -1,10 +1,7 @@
 package com.grigowashere.loratester.telnet;
 
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
+import com.grigowashere.loratester.model.RadioSnapshot;
 
-import java.util.HashSet;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
@@ -14,67 +11,56 @@ public final class LoraStatsFormatter {
     private LoraStatsFormatter() {
     }
 
-    /** Human-readable lines from telemetry meta JSON (fields first). */
+    @Deprecated
     public static String formatMeta(String metaJson) {
-        if (metaJson == null || metaJson.isEmpty()) {
+        RadioSnapshot snap = RadioSnapshot.fromMeta(metaJson, null, null);
+        StringBuilder sb = new StringBuilder();
+        String dynamic = formatDynamic(snap, Set.of());
+        if (!dynamic.isEmpty()) {
+            sb.append(dynamic);
+        }
+        String stat = formatStatic(snap, Set.of());
+        if (!stat.isEmpty()) {
+            if (sb.length() > 0) {
+                sb.append("\n");
+            }
+            sb.append(stat);
+        }
+        return sb.toString().trim();
+    }
+
+    public static String formatDynamic(RadioSnapshot s, Set<String> changed) {
+        if (s == null) {
             return "";
         }
-        try {
-            JsonObject o = JsonParser.parseString(metaJson).getAsJsonObject();
-            StringBuilder sb = new StringBuilder();
-            Set<String> shown = new HashSet<>();
-
-            appendFieldsBlock(sb, o.get("fields"), shown);
-
-            String role = text(o, "role");
-            if (role != null) {
-                append(sb, "Роль", roleLabel(role));
-            }
-            append(sb, "Кадр", text(o, "frame"));
-            append(sb, "Мощность TX", dbl(o, "power_dbm"), " dBm");
-            append(sb, "RSSI", dbl(o, "rssi_dbm"), " dBm");
-            append(sb, "SNR", dbl(o, "snr_db"), " dB");
-            append(sb, "Частота", freqMhz(o), " MHz");
-            append(sb, "SF", integer(o, "spreading_factor"));
-            append(sb, "BW", integer(o, "bandwidth_khz"), " kHz");
-            append(sb, "Пакет", integer(o, "packet"));
-            append(sb, "Payload", text(o, "payload"));
-            append(sb, "On Air", dbl(o, "on_air_ms"), " ms");
-            append(sb, "TX Speed", dbl(o, "tx_pkt_per_s"), " pkt/s");
-            append(sb, "RX Speed", dbl(o, "rx_pkt_per_s"), " pkt/s");
-            append(sb, "PER", dbl(o, "per_percent"), " %");
-            return sb.toString().trim();
-        } catch (Exception ignored) {
-            return metaJson;
+        StringBuilder sb = new StringBuilder();
+        appendLine(sb, "RSSI", fmtDbm(s.rssiDbm), "rssi", changed);
+        appendLine(sb, "SNR", fmtSuffix(s.snrDb, " dB"), "snr", changed);
+        appendLine(sb, "Пакет", fmtInt(s.packet), "packet", changed);
+        appendLine(sb, "Payload", s.payload, "payload", changed);
+        appendLine(sb, "PER", fmtSuffix(s.perPercent, " %"), "per", changed);
+        appendLine(sb, "TX Speed", fmtSuffix(s.txPktPerS, " pkt/s"), "txSpeed", changed);
+        appendLine(sb, "RX Speed", fmtSuffix(s.rxPktPerS, " pkt/s"), "rxSpeed", changed);
+        for (Map.Entry<String, String> e : s.extraFields.entrySet()) {
+            append(sb, e.getKey(), e.getValue());
         }
+        return sb.toString().trim();
     }
 
-    private static void appendFieldsBlock(StringBuilder sb, JsonElement fieldsEl, Set<String> shown) {
-        if (fieldsEl == null || !fieldsEl.isJsonObject()) {
-            return;
+    public static String formatStatic(RadioSnapshot s, Set<String> changed) {
+        if (s == null) {
+            return "";
         }
-        JsonObject fields = fieldsEl.getAsJsonObject();
-        for (Map.Entry<String, JsonElement> e : fields.entrySet()) {
-            String label = e.getKey();
-            if (isSkippedFieldLabel(label)) {
-                continue;
-            }
-            String norm = normalizeLabel(label);
-            if (shown.contains(norm)) {
-                continue;
-            }
-            shown.add(norm);
-            append(sb, label, e.getValue().getAsString());
+        StringBuilder sb = new StringBuilder();
+        if (s.role != null) {
+            appendLine(sb, "Роль", roleLabel(s.role), "role", changed);
         }
-    }
-
-    private static String normalizeLabel(String label) {
-        return label.toLowerCase(Locale.ROOT).replaceAll("\\s+", " ").trim();
-    }
-
-    private static boolean isSkippedFieldLabel(String label) {
-        String l = normalizeLabel(label);
-        return l.equals("send") || l.equals("receive");
+        appendLine(sb, "Частота", fmtSuffix(s.frequencyMhz, " MHz"), "frequency", changed);
+        appendLine(sb, "SF", fmtInt(s.sf), "sf", changed);
+        appendLine(sb, "BW", fmtSuffix(s.bwKhz, " kHz"), "bw", changed);
+        appendLine(sb, "Мощность TX", fmtDbm(s.powerDbm), "power", changed);
+        appendLine(sb, "On Air", fmtSuffix(s.onAirMs, " ms"), "onAir", changed);
+        return sb.toString().trim();
     }
 
     public static String roleLabel(String role) {
@@ -87,12 +73,23 @@ public final class LoraStatsFormatter {
         return role;
     }
 
-    private static String freqMhz(JsonObject o) {
-        if (!o.has("frequency_hz")) {
-            return null;
+    private static void appendLine(
+            StringBuilder sb,
+            String label,
+            String value,
+            String changeKey,
+            Set<String> changed
+    ) {
+        if (value == null || value.isEmpty()) {
+            return;
         }
-        long hz = o.get("frequency_hz").getAsLong();
-        return String.format(Locale.US, "%.3f", hz / 1_000_000.0);
+        if (sb.length() > 0) {
+            sb.append("\n");
+        }
+        if (changed != null && changed.contains(changeKey)) {
+            sb.append("▸ ");
+        }
+        sb.append(label).append(": ").append(value);
     }
 
     private static void append(StringBuilder sb, String label, String value) {
@@ -105,25 +102,19 @@ public final class LoraStatsFormatter {
         sb.append(label).append(": ").append(value);
     }
 
-    private static void append(StringBuilder sb, String label, String value, String suffix) {
-        if (value == null) {
-            return;
-        }
-        append(sb, label, value + suffix);
+    private static String fmtDbm(Double v) {
+        return v != null ? String.format(Locale.US, "%.0f dBm", v) : null;
     }
 
-    private static String text(JsonObject o, String key) {
-        JsonElement e = o.get(key);
-        return e != null && !e.isJsonNull() ? e.getAsString() : null;
+    private static String fmtInt(Integer v) {
+        return v != null ? String.valueOf(v) : null;
     }
 
-    private static String integer(JsonObject o, String key) {
-        JsonElement e = o.get(key);
-        return e != null && e.isJsonPrimitive() ? String.valueOf(e.getAsInt()) : null;
+    private static String fmtSuffix(Double v, String suffix) {
+        return v != null ? String.format(Locale.US, "%s%s", v, suffix) : null;
     }
 
-    private static String dbl(JsonObject o, String key) {
-        JsonElement e = o.get(key);
-        return e != null && e.isJsonPrimitive() ? String.valueOf(e.getAsDouble()) : null;
+    private static String fmtSuffix(Integer v, String suffix) {
+        return v != null ? v + suffix : null;
     }
 }
diff --git a/app/src/main/java/com/grigowashere/loratester/telnet/RadioMacroBuilder.java b/app/src/main/java/com/grigowashere/loratester/telnet/RadioMacroBuilder.java
new file mode 100644
index 0000000..22c447b
--- /dev/null
+++ b/app/src/main/java/com/grigowashere/loratester/telnet/RadioMacroBuilder.java
@@ -0,0 +1,74 @@
+package com.grigowashere.loratester.telnet;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/** Builds macro: S (stop) then configuration AT commands, then TX/RX if requested. */
+public final class RadioMacroBuilder {
+
+    /** Stop TX or RX before applying new settings. */
+    public static final String STOP = AtCommands.STOP;
+
+    /** @deprecated use {@link #STOP} */
+    @Deprecated
+    public static final String SCREEN_RESET = STOP;
+
+    public static final class Params {
+        public Long frequencyHz;
+        public Integer powerDbm;
+        public Integer sf;
+        public String bwKhz;
+        public String codeRate;
+        public Integer preamble;
+        public Integer sendTimeoutMs;
+        public String role;
+    }
+
+    private RadioMacroBuilder() {
+    }
+
+    public static List<String> apply(Integer sf, Integer bwKhz, String role) {
+        Params p = new Params();
+        p.sf = sf;
+        if (bwKhz != null) {
+            p.bwKhz = String.valueOf(bwKhz);
+        }
+        p.role = role;
+        return apply(p);
+    }
+
+    public static List<String> apply(Params p) {
+        List<String> lines = new ArrayList<>();
+        lines.add(STOP);
+        if (p == null) {
+            return lines;
+        }
+        if (p.frequencyHz != null && p.frequencyHz >= 430_000_000L && p.frequencyHz <= 470_000_000L) {
+            lines.add(AtCommands.FREQUENCY_HZ + p.frequencyHz);
+        }
+        if (p.powerDbm != null && p.powerDbm >= -9 && p.powerDbm <= 22) {
+            lines.add(AtCommands.POWER_DBM + p.powerDbm);
+        }
+        if (p.sf != null && p.sf >= 5 && p.sf <= 12) {
+            lines.add(AtCommands.SPREADING_FACTOR + p.sf);
+        }
+        if (p.bwKhz != null && !p.bwKhz.isBlank()) {
+            lines.add(AtCommands.BANDWIDTH + p.bwKhz.trim());
+        }
+        if (p.codeRate != null && !p.codeRate.isBlank()) {
+            lines.add(AtCommands.CODE_RATE + p.codeRate.trim());
+        }
+        if (p.preamble != null && p.preamble >= 1 && p.preamble <= 64) {
+            lines.add(AtCommands.PREAMBLE + p.preamble);
+        }
+        if (p.sendTimeoutMs != null && p.sendTimeoutMs >= 0 && p.sendTimeoutMs <= 60_000) {
+            lines.add(AtCommands.TIMEOUT_MS + p.sendTimeoutMs);
+        }
+        if (StatsExtractor.ROLE_TX.equals(p.role)) {
+            lines.add(AtCommands.TRANSMIT);
+        } else if (StatsExtractor.ROLE_RX.equals(p.role)) {
+            lines.add(AtCommands.RECEIVE);
+        }
+        return lines;
+    }
+}
diff --git a/app/src/main/java/com/grigowashere/loratester/telnet/StatsExtractor.java b/app/src/main/java/com/grigowashere/loratester/telnet/StatsExtractor.java
index 6cd1c35..737b7b6 100644
--- a/app/src/main/java/com/grigowashere/loratester/telnet/StatsExtractor.java
+++ b/app/src/main/java/com/grigowashere/loratester/telnet/StatsExtractor.java
@@ -68,10 +68,6 @@ public class StatsExtractor {
         if (role != null) {
             meta.put("role", role);
         }
-        if (!fields.isEmpty()) {
-            meta.put("fields", fields);
-        }
-
         Double rssiDbm = firstDouble(RSSI, normalized);
         if (rssiDbm == null) {
             rssiDbm = matchDouble(rssiPattern, normalized);
@@ -103,7 +99,9 @@ public class StatsExtractor {
         putDouble(meta, "rx_pkt_per_s", matchDouble(RX_SPEED, normalized));
         putDouble(meta, "per_percent", matchDouble(PER, normalized));
 
-        enrichFieldsFromStructured(meta, fields);
+        if (!fields.isEmpty()) {
+            meta.put("fields", fields);
+        }
 
         Double rangeM = matchDouble(rangePattern, normalized);
         Double displayDbm = rssiDbm != null ? rssiDbm : txPower;
@@ -128,57 +126,21 @@ public class StatsExtractor {
             String value = trimmed.substring(colon + 1).trim();
             if (label.isEmpty()
                     || label.equalsIgnoreCase("SEND")
-                    || label.equalsIgnoreCase("RECEIVE")) {
+                    || label.equalsIgnoreCase("RECEIVE")
+                    || isStructuredLabel(label)) {
                 continue;
             }
             fields.put(label, value);
         }
     }
 
-    /** Ensure meta.fields has display lines even when line split missed some rows. */
-    private static void enrichFieldsFromStructured(
-            Map<String, Object> meta,
-            Map<String, String> fields
-    ) {
-        putFieldIfAbsent(fields, "Frequency", meta.get("frequency_hz"),
-                v -> v + " Hz");
-        putFieldIfAbsent(fields, "Power", meta.get("power_dbm"),
-                v -> v + " dBm");
-        putFieldIfAbsent(fields, "RSSI", meta.get("rssi_dbm"),
-                v -> String.valueOf(v));
-        putFieldIfAbsent(fields, "SNR", meta.get("snr_db"),
-                v -> String.valueOf(v));
-        putFieldIfAbsent(fields, "Spreading Factor", meta.get("spreading_factor"),
-                String::valueOf);
-        putFieldIfAbsent(fields, "Bandwidth", meta.get("bandwidth_khz"),
-                v -> v + " kHz");
-        Object packet = meta.get("packet");
-        if (packet != null) {
-            putFieldIfAbsent(fields, "Packet", packet, String::valueOf);
-            putFieldIfAbsent(fields, "Packet Number", packet, String::valueOf);
-        }
-        putFieldIfAbsent(fields, "Payload", meta.get("payload"),
-                v -> (String) v);
-        putFieldIfAbsent(fields, "On Air", meta.get("on_air_ms"),
-                v -> v + " ms");
-        putFieldIfAbsent(fields, "TX Speed", meta.get("tx_pkt_per_s"),
-                v -> v + " pkt/s");
-        putFieldIfAbsent(fields, "RX Speed", meta.get("rx_pkt_per_s"),
-                v -> v + " pkt/s");
-        putFieldIfAbsent(fields, "PER", meta.get("per_percent"),
-                v -> v + " %");
-    }
-
-    private static void putFieldIfAbsent(
-            Map<String, String> fields,
-            String label,
-            Object value,
-            java.util.function.Function<Object, String> format
-    ) {
-        if (value == null || fields.containsKey(label)) {
-            return;
-        }
-        fields.put(label, format.apply(value));
+    private static boolean isStructuredLabel(String label) {
+        String n = label.toLowerCase(Locale.ROOT).trim();
+        return n.equals("frequency") || n.equals("power") || n.equals("rssi")
+                || n.equals("snr") || n.contains("spreading factor") || n.equals("bandwidth")
+                || n.equals("packet") || n.contains("packet number") || n.equals("payload")
+                || n.contains("on air") || n.contains("tx speed") || n.contains("rx speed")
+                || n.equals("per");
     }
 
     private static ExtractedStats empty(String frame) {
diff --git a/app/src/main/java/com/grigowashere/loratester/telnet/TelnetClient.java b/app/src/main/java/com/grigowashere/loratester/telnet/TelnetClient.java
index 5ca5442..006e00f 100644
--- a/app/src/main/java/com/grigowashere/loratester/telnet/TelnetClient.java
+++ b/app/src/main/java/com/grigowashere/loratester/telnet/TelnetClient.java
@@ -74,11 +74,23 @@ public class TelnetClient {
     /**
      * Sends an AT command. Adds AT prefix and CR+LF if missing.
      */
+    public SendResult sendRawLine(String line) {
+        byte[] wire = AtCommandFormatter.toWireBytesLiteral(line);
+        if (wire.length == 0) {
+            return SendResult.EMPTY;
+        }
+        return writeWire(wire);
+    }
+
     public SendResult sendAtCommand(String command) {
         byte[] wire = AtCommandFormatter.toWireBytes(command);
         if (wire.length == 0) {
             return SendResult.EMPTY;
         }
+        return writeWire(wire);
+    }
+
+    private SendResult writeWire(byte[] wire) {
         Socket socket = activeSocket.get();
         if (socket == null || socket.isClosed()) {
             return SendResult.NOT_CONNECTED;
diff --git a/app/src/main/java/com/grigowashere/loratester/track/TrackRecorder.java b/app/src/main/java/com/grigowashere/loratester/track/TrackRecorder.java
index e9c44f0..218fe84 100644
--- a/app/src/main/java/com/grigowashere/loratester/track/TrackRecorder.java
+++ b/app/src/main/java/com/grigowashere/loratester/track/TrackRecorder.java
@@ -29,7 +29,11 @@ public class TrackRecorder {
 
     public interface Listener {
         void onStateChanged(boolean recording, int pointCount, long trackId);
+
         void onError(String message);
+
+        default void onPointRecorded(double lat, double lon) {
+        }
     }
 
     private final ServerApi serverApi;
@@ -209,6 +213,18 @@ public class TrackRecorder {
         }
         totalPoints++;
         notifyState();
+        notifyPoint(lat, lon);
+    }
+
+    private void notifyPoint(double lat, double lon) {
+        mainHandler.post(() -> {
+            if (listener != null) {
+                listener.onPointRecorded(lat, lon);
+            }
+            if (pairedListener != null) {
+                pairedListener.onPointRecorded(lat, lon);
+            }
+        });
     }
 
     private void flushBuffer() {
diff --git a/app/src/main/java/com/grigowashere/loratester/ui/AtFragment.java b/app/src/main/java/com/grigowashere/loratester/ui/AtFragment.java
index 6227f8d..c7c240e 100644
--- a/app/src/main/java/com/grigowashere/loratester/ui/AtFragment.java
+++ b/app/src/main/java/com/grigowashere/loratester/ui/AtFragment.java
@@ -5,8 +5,10 @@ import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.ScrollView;
+import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -14,9 +16,8 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
+import com.google.android.material.button.MaterialButton;
 import com.google.android.material.button.MaterialButtonToggleGroup;
-import com.google.android.material.chip.Chip;
-import com.google.android.material.chip.ChipGroup;
 import com.google.android.material.textfield.TextInputEditText;
 import com.grigowashere.loratester.CommandPoller;
 import com.grigowashere.loratester.LoraApp;
@@ -24,12 +25,15 @@ import com.grigowashere.loratester.PeerDevices;
 import com.grigowashere.loratester.R;
 import com.grigowashere.loratester.TelemetryUploader;
 import com.grigowashere.loratester.api.DeviceInfo;
+import com.grigowashere.loratester.model.RadioSnapshot;
 import com.grigowashere.loratester.telnet.AtCommands;
+import com.grigowashere.loratester.telnet.LoraStatsFormatter;
+import com.grigowashere.loratester.telnet.RadioMacroBuilder;
+import com.grigowashere.loratester.telnet.StatsExtractor;
 import com.grigowashere.loratester.telnet.TelnetClient;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
+import java.util.Locale;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
@@ -40,11 +44,21 @@ public class AtFragment extends Fragment {
     private TelemetryUploader uploader;
     private CommandPoller commandPoller;
     private TextView atStatus;
-    private TextView atConsole;
-    private ScrollView atConsoleScroll;
-    private TextInputEditText atCommandInput;
+    private TextView atCurrentSnapshot;
+    private TextInputEditText atInputFq;
+    private TextInputEditText atInputPw;
+    private TextInputEditText atInputSf;
+    private TextInputEditText atInputPl;
+    private TextInputEditText atInputTm;
+    private Spinner atBwSpinner;
+    private Spinner atCrSpinner;
+    private Spinner atRoleSpinner;
     private MaterialButtonToggleGroup atTargetGroup;
+    private ScrollView atConsoleScroll;
+    private TextView atConsole;
     private String lastConsole = "";
+    private boolean consoleVisible;
+    private boolean formInitialized;
 
     @Override
     public void onAttach(@NonNull Context context) {
@@ -67,109 +81,99 @@ public class AtFragment extends Fragment {
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         atStatus = view.findViewById(R.id.atStatus);
-        atConsole = view.findViewById(R.id.atConsole);
-        atConsoleScroll = view.findViewById(R.id.atConsoleScroll);
-        atCommandInput = view.findViewById(R.id.atCommandInput);
+        atCurrentSnapshot = view.findViewById(R.id.atCurrentSnapshot);
+        atInputFq = view.findViewById(R.id.atInputFq);
+        atInputPw = view.findViewById(R.id.atInputPw);
+        atInputSf = view.findViewById(R.id.atInputSf);
+        atInputPl = view.findViewById(R.id.atInputPl);
+        atInputTm = view.findViewById(R.id.atInputTm);
+        atBwSpinner = view.findViewById(R.id.atBwSpinner);
+        atCrSpinner = view.findViewById(R.id.atCrSpinner);
+        atRoleSpinner = view.findViewById(R.id.atRoleSpinner);
         atTargetGroup = view.findViewById(R.id.atTargetGroup);
-        ChipGroup chips = view.findViewById(R.id.atQuickChips);
-        Button sendBtn = view.findViewById(R.id.atSendBtn);
-        Button clearLog = view.findViewById(R.id.atClearLog);
-        pollHelper = new FragmentPollHelper(this, this::refreshConsole);
+        atConsoleScroll = view.findViewById(R.id.atConsoleScroll);
+        atConsole = view.findViewById(R.id.atConsole);
+        Button applyBtn = view.findViewById(R.id.atApplyBtn);
+        Button stopBtn = view.findViewById(R.id.atStopBtn);
+        MaterialButton consoleToggle = view.findViewById(R.id.atConsoleToggle);
+        pollHelper = new FragmentPollHelper(this, this::refresh);
 
-        if (atTargetGroup != null) {
-            atTargetGroup.check(R.id.atTargetLocal);
-        }
+        atTargetGroup.check(R.id.atTargetLocal);
+        atBwSpinner.setAdapter(new ArrayAdapter<>(
+                requireContext(),
+                android.R.layout.simple_spinner_dropdown_item,
+                AtCommands.BW_KHZ
+        ));
+        atCrSpinner.setAdapter(new ArrayAdapter<>(
+                requireContext(),
+                android.R.layout.simple_spinner_dropdown_item,
+                AtCommands.CODE_RATES
+        ));
+        atRoleSpinner.setAdapter(new ArrayAdapter<>(
+                requireContext(),
+                android.R.layout.simple_spinner_dropdown_item,
+                new String[]{"—", "TX", "RX"}
+        ));
 
-        addQuickChip(chips, "AT+H", AtCommands.HELP);
-        addQuickChip(chips, "AT+TX", AtCommands.TRANSMIT);
-        addQuickChip(chips, "AT+RX", AtCommands.RECEIVE);
-        addQuickChip(chips, "AT+STATUS", AtCommands.STATUS);
-        addQuickChip(chips, "AT", AtCommands.BASIC);
-
-        sendBtn.setOnClickListener(v -> sendFromInput());
-        clearLog.setOnClickListener(v -> {
-            if (uploader != null) {
-                uploader.clearConsoleLog();
-            }
-            lastConsole = "";
-            if (atConsole != null) {
-                atConsole.setText("");
-            }
+        applyBtn.setOnClickListener(v -> applyMacro());
+        stopBtn.setOnClickListener(v -> sendLines(List.of(AtCommands.STOP)));
+        consoleToggle.setOnClickListener(v -> {
+            consoleVisible = !consoleVisible;
+            atConsoleScroll.setVisibility(consoleVisible ? View.VISIBLE : View.GONE);
+            consoleToggle.setText(consoleVisible
+                    ? getString(R.string.at_console_hide)
+                    : getString(R.string.at_console_toggle));
         });
-
-        if (atCommandInput != null) {
-            atCommandInput.setOnEditorActionListener((textView, actionId, event) -> {
-                sendFromInput();
-                return true;
-            });
-        }
     }
 
-    private boolean isPeerTarget() {
-        return atTargetGroup != null && atTargetGroup.getCheckedButtonId() == R.id.atTargetPeer;
+    private RadioMacroBuilder.Params buildParams() {
+        RadioMacroBuilder.Params p = new RadioMacroBuilder.Params();
+        Double fqMhz = parseDouble(atInputFq);
+        if (fqMhz != null) {
+            p.frequencyHz = Math.round(fqMhz * 1_000_000L);
+        }
+        p.powerDbm = parseInt(atInputPw);
+        p.sf = parseInt(atInputSf);
+        int bwPos = atBwSpinner != null ? atBwSpinner.getSelectedItemPosition() : -1;
+        if (bwPos >= 0 && bwPos < AtCommands.BW_KHZ.length) {
+            p.bwKhz = AtCommands.BW_KHZ[bwPos];
+        }
+        if (atCrSpinner != null && atCrSpinner.getSelectedItem() != null) {
+            p.codeRate = atCrSpinner.getSelectedItem().toString();
+        }
+        p.preamble = parseInt(atInputPl);
+        p.sendTimeoutMs = parseInt(atInputTm);
+        if (atRoleSpinner != null && atRoleSpinner.getSelectedItem() != null) {
+            String role = atRoleSpinner.getSelectedItem().toString();
+            if (!"—".equals(role)) {
+                p.role = role;
+            }
+        }
+        return p;
     }
 
-    private void addQuickChip(ChipGroup group, String label, String command) {
-        Chip chip = new Chip(requireContext());
-        chip.setText(label);
-        chip.setCheckable(false);
-        chip.setOnClickListener(v -> sendCommand(command));
-        group.addView(chip);
+    private void applyMacro() {
+        sendLines(RadioMacroBuilder.apply(buildParams()));
     }
 
-    private void sendFromInput() {
-        if (atCommandInput == null || atCommandInput.getText() == null) {
-            return;
-        }
-        String cmd = atCommandInput.getText().toString().trim();
-        if (cmd.isEmpty()) {
-            return;
-        }
-        sendCommand(cmd);
-        atCommandInput.setText("");
-    }
-
-    private void sendCommand(String command) {
-        if (uploader == null || !isAdded()) {
-            return;
-        }
+    private void sendLines(List<String> lines) {
         if (isPeerTarget()) {
-            sendToPeer(command);
-            return;
+            sendMacroToPeer(lines);
+        } else {
+            uploader.sendMacroSequence(lines, this::onSendResult);
         }
-        uploader.sendAtCommand(command, result -> {
-            if (!isAdded()) {
-                return;
-            }
-            Context ctx = getContext();
-            if (ctx == null) {
-                return;
-            }
-            if (result == TelnetClient.SendResult.NOT_CONNECTED) {
-                Toast.makeText(ctx, R.string.at_not_connected, Toast.LENGTH_SHORT).show();
-            } else if (result == TelnetClient.SendResult.IO_ERROR) {
-                Toast.makeText(ctx, R.string.at_send_error, Toast.LENGTH_SHORT).show();
-            }
-            updateConsoleView();
-        });
     }
 
-    private void sendToPeer(String command) {
-        if (commandPoller == null) {
-            return;
-        }
+    private void sendMacroToPeer(List<String> lines) {
         executor.execute(() -> {
             try {
                 List<DeviceInfo> devices = uploader.getServerApi().getDevices();
-                PeerDevices.Result peer = PeerDevices.resolve(
-                        devices, uploader.getDeviceId());
+                PeerDevices.Result peer = PeerDevices.resolve(devices, uploader.getDeviceId());
                 if (!peer.ok()) {
                     showToast(R.string.at_peer_unavailable);
                     return;
                 }
-                Map<String, Object> payload = new HashMap<>();
-                payload.put("line", command);
-                commandPoller.postCommandToPeer(peer.peerId, "at", payload);
+                commandPoller.postMacroToPeer(peer.peerId, lines);
                 showToast(getString(R.string.at_sent_to_peer, peer.peerId));
             } catch (Exception e) {
                 showToast(R.string.stats_push_failed);
@@ -177,78 +181,127 @@ public class AtFragment extends Fragment {
         });
     }
 
-    private void showToast(int resId) {
-        if (isAdded()) {
-            requireActivity().runOnUiThread(() ->
-                    Toast.makeText(requireContext(), resId, Toast.LENGTH_SHORT).show());
+    private void onSendResult(TelnetClient.SendResult result) {
+        if (!isAdded()) return;
+        if (result == TelnetClient.SendResult.NOT_CONNECTED) {
+            showToast(R.string.at_not_connected);
+        } else if (result == TelnetClient.SendResult.IO_ERROR) {
+            showToast(R.string.at_send_error);
+        }
+        updateConsoleView();
+    }
+
+    private Integer parseInt(TextInputEditText field) {
+        if (field == null || field.getText() == null) return null;
+        String s = field.getText().toString().trim();
+        if (s.isEmpty()) return null;
+        try {
+            return Integer.parseInt(s);
+        } catch (NumberFormatException e) {
+            return null;
         }
     }
 
-    private void showToast(String msg) {
-        if (isAdded()) {
-            requireActivity().runOnUiThread(() ->
-                    Toast.makeText(requireContext(), msg, Toast.LENGTH_SHORT).show());
+    private Double parseDouble(TextInputEditText field) {
+        if (field == null || field.getText() == null) return null;
+        String s = field.getText().toString().trim();
+        if (s.isEmpty()) return null;
+        try {
+            return Double.parseDouble(s);
+        } catch (NumberFormatException e) {
+            return null;
         }
     }
 
-    private void refreshConsole() {
-        if (!isAdded() || uploader == null || atStatus == null) {
-            return;
-        }
-        boolean telnetOn = uploader.isTelnetConnected();
+    private boolean isPeerTarget() {
+        return atTargetGroup != null && atTargetGroup.getCheckedButtonId() == R.id.atTargetPeer;
+    }
+
+    private void refresh() {
+        if (!isAdded() || uploader == null || atStatus == null) return;
         atStatus.setText(getString(
                 R.string.at_status,
-                telnetOn ? getString(R.string.connected) : getString(R.string.disconnected)
+                uploader.isTelnetConnected()
+                        ? getString(R.string.connected) : getString(R.string.disconnected)
         ));
+        RadioSnapshot snap = RadioSnapshot.fromExtracted(uploader.getLastStats());
+        atCurrentSnapshot.setText(LoraStatsFormatter.formatStatic(snap, java.util.Set.of())
+                + "\n" + LoraStatsFormatter.formatDynamic(snap, java.util.Set.of()));
+        if (!formInitialized) {
+            if (snap.frequencyMhz != null && isEmpty(atInputFq)) {
+                atInputFq.setText(String.format(Locale.US, "%.3f", snap.frequencyMhz));
+            }
+            if (snap.powerDbm != null && isEmpty(atInputPw)) {
+                atInputPw.setText(String.valueOf(snap.powerDbm.intValue()));
+            }
+            if (snap.sf != null && isEmpty(atInputSf)) {
+                atInputSf.setText(String.valueOf(snap.sf));
+            }
+            if (snap.bwKhz != null) {
+                selectBw(String.valueOf(snap.bwKhz));
+            }
+            if (snap.role != null && atRoleSpinner != null) {
+                atRoleSpinner.setSelection(StatsExtractor.ROLE_RX.equals(snap.role) ? 2 : 1);
+            }
+            formInitialized = true;
+        }
         updateConsoleView();
         if (pollHelper != null) {
             pollHelper.scheduleNext(400);
         }
     }
 
-    private void updateConsoleView() {
-        if (uploader == null || atConsole == null || atConsoleScroll == null) {
-            return;
+    private static boolean isEmpty(TextInputEditText field) {
+        return field == null || field.getText() == null || field.getText().length() == 0;
+    }
+
+    private void selectBw(String bw) {
+        if (atBwSpinner == null || bw == null) return;
+        for (int i = 0; i < AtCommands.BW_KHZ.length; i++) {
+            if (AtCommands.BW_KHZ[i].equals(bw) || AtCommands.BW_KHZ[i].equals(bw.replace(".0", ""))) {
+                atBwSpinner.setSelection(i);
+                return;
+            }
         }
+    }
+
+    private void updateConsoleView() {
+        if (uploader == null || atConsole == null || atConsoleScroll == null) return;
         String log = uploader.getConsoleLog();
         if (!log.equals(lastConsole)) {
             lastConsole = log;
             atConsole.setText(log);
-            atConsoleScroll.post(() -> {
-                if (atConsoleScroll != null) {
-                    atConsoleScroll.fullScroll(View.FOCUS_DOWN);
-                }
-            });
+            if (consoleVisible) {
+                atConsoleScroll.post(() -> atConsoleScroll.fullScroll(View.FOCUS_DOWN));
+            }
         }
     }
 
+    private void showToast(int resId) {
+        if (isAdded()) Toast.makeText(requireContext(), resId, Toast.LENGTH_SHORT).show();
+    }
+
+    private void showToast(String msg) {
+        if (isAdded()) Toast.makeText(requireContext(), msg, Toast.LENGTH_SHORT).show();
+    }
+
     @Override
     public void onResume() {
         super.onResume();
-        if (pollHelper != null) {
-            pollHelper.start(0);
-        }
+        if (pollHelper != null) pollHelper.start(0);
     }
 
     @Override
     public void onPause() {
-        if (pollHelper != null) {
-            pollHelper.stop();
-        }
+        if (pollHelper != null) pollHelper.stop();
         super.onPause();
     }
 
     @Override
     public void onDestroyView() {
-        if (pollHelper != null) {
-            pollHelper.stop();
-        }
-        atStatus = null;
-        atConsole = null;
-        atConsoleScroll = null;
-        atCommandInput = null;
-        atTargetGroup = null;
+        if (pollHelper != null) pollHelper.stop();
         pollHelper = null;
+        formInitialized = false;
         super.onDestroyView();
     }
 
diff --git a/app/src/main/java/com/grigowashere/loratester/ui/ChatAdapter.java b/app/src/main/java/com/grigowashere/loratester/ui/ChatAdapter.java
index d6bc585..a6fafd6 100644
--- a/app/src/main/java/com/grigowashere/loratester/ui/ChatAdapter.java
+++ b/app/src/main/java/com/grigowashere/loratester/ui/ChatAdapter.java
@@ -1,8 +1,14 @@
 package com.grigowashere.loratester.ui;
 
+import android.graphics.Color;
+import android.os.Handler;
+import android.os.Looper;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -14,17 +20,37 @@ import com.grigowashere.loratester.api.ChatMessage;
 import java.text.DateFormat;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
+import java.util.Set;
 
 public class ChatAdapter extends RecyclerView.Adapter<ChatAdapter.Holder> {
 
+    private static final int COLOR_SELF_BG = 0xFF16213E;
+    private static final int COLOR_OTHER_BG = 0xFF1A4A6E;
+    private static final int COLOR_NEW_HIGHLIGHT = 0x33E94560;
+
     private final List<ChatMessage> messages = new ArrayList<>();
     private final DateFormat timeFormat =
             DateFormat.getTimeInstance(DateFormat.SHORT, Locale.getDefault());
+    private final Handler handler = new Handler(Looper.getMainLooper());
+    private final Set<Integer> highlightedPositions = new HashSet<>();
+
+    private String selfDeviceId;
+    private double lastSeenTs;
+
+    public void setSelfDeviceId(String selfDeviceId) {
+        this.selfDeviceId = selfDeviceId;
+    }
+
+    public void setLastSeenTs(double lastSeenTs) {
+        this.lastSeenTs = lastSeenTs;
+    }
 
     public void setMessages(List<ChatMessage> newMessages) {
         messages.clear();
+        highlightedPositions.clear();
         messages.addAll(newMessages);
         notifyDataSetChanged();
     }
@@ -35,7 +61,26 @@ public class ChatAdapter extends RecyclerView.Adapter<ChatAdapter.Holder> {
         }
         int start = messages.size();
         messages.addAll(more);
+        for (int i = 0; i < more.size(); i++) {
+            if (more.get(i).ts > lastSeenTs) {
+                highlightedPositions.add(start + i);
+            }
+        }
         notifyItemRangeInserted(start, more.size());
+        for (int i = 0; i < more.size(); i++) {
+            int pos = start + i;
+            if (highlightedPositions.contains(pos)) {
+                scheduleClearHighlight(pos);
+            }
+        }
+    }
+
+    private void scheduleClearHighlight(int position) {
+        handler.postDelayed(() -> {
+            if (highlightedPositions.remove(position)) {
+                notifyItemChanged(position);
+            }
+        }, 3000);
     }
 
     public double lastTs() {
@@ -56,8 +101,42 @@ public class ChatAdapter extends RecyclerView.Adapter<ChatAdapter.Holder> {
     @Override
     public void onBindViewHolder(@NonNull Holder holder, int position) {
         ChatMessage m = messages.get(position);
+        boolean self = selfDeviceId != null && selfDeviceId.equals(m.device_id);
         String time = timeFormat.format(new Date((long) (m.ts * 1000)));
-        holder.text.setText(time + "  " + m.device_id + ": " + m.text);
+
+        FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) holder.bubble.getLayoutParams();
+        lp.gravity = self ? Gravity.END : Gravity.START;
+        holder.bubble.setLayoutParams(lp);
+        holder.bubble.setBackgroundColor(self ? COLOR_SELF_BG : COLOR_OTHER_BG);
+
+        holder.author.setText(self
+                ? holder.itemView.getContext().getString(R.string.chat_self_label)
+                : m.device_id);
+        holder.text.setText(m.text);
+        holder.time.setText(time);
+
+        int bg = self ? COLOR_SELF_BG : COLOR_OTHER_BG;
+        if (highlightedPositions.contains(position)) {
+            holder.bubble.setBackgroundColor(blend(bg, COLOR_NEW_HIGHLIGHT));
+        } else {
+            holder.bubble.setBackgroundColor(bg);
+        }
+    }
+
+    private static int blend(int base, int overlay) {
+        int ba = Color.alpha(base);
+        int br = Color.red(base);
+        int bg = Color.green(base);
+        int bb = Color.blue(base);
+        int oa = Color.alpha(overlay);
+        int or = Color.red(overlay);
+        int og = Color.green(overlay);
+        int ob = Color.blue(overlay);
+        float ratio = oa / 255f;
+        int r = (int) (br * (1 - ratio) + or * ratio);
+        int g = (int) (bg * (1 - ratio) + og * ratio);
+        int b = (int) (bb * (1 - ratio) + ob * ratio);
+        return Color.argb(ba, r, g, b);
     }
 
     @Override
@@ -66,11 +145,17 @@ public class ChatAdapter extends RecyclerView.Adapter<ChatAdapter.Holder> {
     }
 
     static class Holder extends RecyclerView.ViewHolder {
+        final LinearLayout bubble;
+        final TextView author;
         final TextView text;
+        final TextView time;
 
         Holder(@NonNull View itemView) {
             super(itemView);
-            text = itemView.findViewById(R.id.chatItemText);
+            bubble = itemView.findViewById(R.id.chatBubble);
+            author = itemView.findViewById(R.id.chatAuthor);
+            text = itemView.findViewById(R.id.chatText);
+            time = itemView.findViewById(R.id.chatTime);
         }
     }
 }
diff --git a/app/src/main/java/com/grigowashere/loratester/ui/ChatFragment.java b/app/src/main/java/com/grigowashere/loratester/ui/ChatFragment.java
index 4564dbb..736e593 100644
--- a/app/src/main/java/com/grigowashere/loratester/ui/ChatFragment.java
+++ b/app/src/main/java/com/grigowashere/loratester/ui/ChatFragment.java
@@ -66,6 +66,9 @@ public class ChatFragment extends Fragment {
         View inputBar = view.findViewById(R.id.chatInputBar);
 
         adapter = new ChatAdapter();
+        if (uploader != null) {
+            adapter.setSelfDeviceId(uploader.getDeviceId());
+        }
         LinearLayoutManager layoutManager = new LinearLayoutManager(requireContext());
         recycler.setLayoutManager(layoutManager);
         recycler.setAdapter(adapter);
@@ -161,6 +164,10 @@ public class ChatFragment extends Fragment {
     @Override
     public void onResume() {
         super.onResume();
+        if (adapter != null && uploader != null) {
+            adapter.setSelfDeviceId(uploader.getDeviceId());
+            adapter.setLastSeenTs(chatSince);
+        }
         if (pollHelper != null) {
             pollHelper.start(0);
         }
diff --git a/app/src/main/java/com/grigowashere/loratester/ui/MapFragment.java b/app/src/main/java/com/grigowashere/loratester/ui/MapFragment.java
index 069e63d..e882c81 100644
--- a/app/src/main/java/com/grigowashere/loratester/ui/MapFragment.java
+++ b/app/src/main/java/com/grigowashere/loratester/ui/MapFragment.java
@@ -61,6 +61,10 @@ import java.util.concurrent.Executors;
 
 public class MapFragment extends Fragment {
 
+    private static final class MapSessionState {
+        static boolean initialFitDone;
+    }
+
     private static final int TILE_SIZE_PX = 256;
     private static final long DEVICE_POLL_MS = 5000;
     /** Ignore GPS jitter smaller than ~11 m. */
@@ -76,6 +80,7 @@ public class MapFragment extends Fragment {
             DateFormat.getTimeInstance(DateFormat.SHORT, Locale.getDefault());
     private final Map<String, Marker> deviceMarkers = new HashMap<>();
     private final List<Layer> trackLayers = new ArrayList<>();
+    private final List<LatLong> liveTrackPoints = new ArrayList<>();
 
     private FragmentPollHelper pollHelper;
     private TelemetryUploader uploader;
@@ -85,9 +90,14 @@ public class MapFragment extends Fragment {
     private TileDownloadLayer downloadLayer;
     private TileCache tileCache;
     private TextView mapStatus;
+    private TextView mapDistance;
     private TextView trackStatus;
     private Button btnTrack;
     private Button btnPairedTrack;
+    private Button btnCenterMe;
+    private Button btnCenterTx;
+    private Button btnCenterRx;
+    private Button btnCenterBoth;
     private Spinner trackSpinner;
     private List<TrackInfo> savedTracks = new ArrayList<>();
     private boolean mapResumed;
@@ -95,8 +105,10 @@ public class MapFragment extends Fragment {
     private NetworkMonitor networkMonitor;
     private NetworkMonitor.Listener networkListener;
     private boolean networkOnline = true;
-    private boolean initialFitDone;
     private boolean userMovedMap;
+    private List<DeviceInfo> lastDevices = new ArrayList<>();
+    private Polyline liveTrackPolyline;
+    private Marker liveTrackMarker;
     private boolean suppressTrackSpinner;
     private Bitmap bitmapTx;
     private Bitmap bitmapRx;
@@ -128,12 +140,30 @@ public class MapFragment extends Fragment {
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         mapView = view.findViewById(R.id.mapView);
         mapStatus = view.findViewById(R.id.mapStatus);
+        mapDistance = view.findViewById(R.id.mapDistance);
         trackStatus = view.findViewById(R.id.trackStatus);
         btnTrack = view.findViewById(R.id.btnTrack);
         btnPairedTrack = view.findViewById(R.id.btnPairedTrack);
+        btnCenterMe = view.findViewById(R.id.btnCenterMe);
+        btnCenterTx = view.findViewById(R.id.btnCenterTx);
+        btnCenterRx = view.findViewById(R.id.btnCenterRx);
+        btnCenterBoth = view.findViewById(R.id.btnCenterBoth);
         trackSpinner = view.findViewById(R.id.trackSpinner);
         pollHelper = new FragmentPollHelper(this, this::refreshDevices);
 
+        if (btnCenterMe != null) {
+            btnCenterMe.setOnClickListener(v -> centerOnSelf());
+        }
+        if (btnCenterTx != null) {
+            btnCenterTx.setOnClickListener(v -> centerOnRole(StatsExtractor.ROLE_TX));
+        }
+        if (btnCenterRx != null) {
+            btnCenterRx.setOnClickListener(v -> centerOnRole(StatsExtractor.ROLE_RX));
+        }
+        if (btnCenterBoth != null) {
+            btnCenterBoth.setOnClickListener(v -> centerOnBoth());
+        }
+
         networkOnline = networkMonitor != null && networkMonitor.isOnline();
         networkListener = online -> {
             networkOnline = online;
@@ -263,7 +293,6 @@ public class MapFragment extends Fragment {
     public void onDestroyView() {
         mapResumed = false;
         mapInitialized = false;
-        initialFitDone = false;
         if (pollHelper != null) {
             pollHelper.stop();
         }
@@ -276,6 +305,7 @@ public class MapFragment extends Fragment {
         }
         removeAllDeviceMarkers();
         clearTrackLayers();
+        clearLiveTrackLayers();
         deviceMarkers.clear();
         if (downloadLayer != null) {
             downloadLayer.onDestroy();
@@ -290,7 +320,12 @@ public class MapFragment extends Fragment {
         bitmapRx = null;
         bitmapTrackPoint = null;
         mapStatus = null;
+        mapDistance = null;
         trackStatus = null;
+        btnCenterMe = null;
+        btnCenterTx = null;
+        btnCenterRx = null;
+        btnCenterBoth = null;
         btnTrack = null;
         trackSpinner = null;
         pollHelper = null;
@@ -332,8 +367,14 @@ public class MapFragment extends Fragment {
                 if (trackStatus != null) {
                     trackStatus.setText(getString(R.string.track_status, pointCount));
                 }
-                if (!recording && trackId > 0) {
-                    loadTrackList();
+                if (recording && pointCount <= 1) {
+                    clearLiveTrackLayers();
+                }
+                if (!recording) {
+                    clearLiveTrackLayers();
+                    if (trackId > 0) {
+                        loadTrackList();
+                    }
                 }
             }
 
@@ -343,9 +384,62 @@ public class MapFragment extends Fragment {
                     trackStatus.setText(getString(R.string.track_error, message));
                 }
             }
+
+            @Override
+            public void onPointRecorded(double lat, double lon) {
+                if (!isAdded() || !mapResumed) {
+                    return;
+                }
+                requireActivity().runOnUiThread(() ->
+                        runWhenMapReady(() -> appendLiveTrackPoint(lat, lon)));
+            }
         });
     }
 
+    private void appendLiveTrackPoint(double lat, double lon) {
+        if (!isMapReady() || !GeoUtils.isValidCoordinate(lat, lon)) {
+            return;
+        }
+        LatLong pos = new LatLong(lat, lon);
+        if (!liveTrackPoints.isEmpty()) {
+            LatLong last = liveTrackPoints.get(liveTrackPoints.size() - 1);
+            if (samePosition(last, pos)) {
+                return;
+            }
+        }
+        liveTrackPoints.add(pos);
+        if (liveTrackPolyline == null) {
+            liveTrackPolyline = new Polyline(
+                    MapsforgeBitmaps.linePaint(Color.GREEN, 4f),
+                    AndroidGraphicFactory.INSTANCE
+            );
+            mapView.getLayerManager().getLayers().add(liveTrackPolyline);
+        }
+        liveTrackPolyline.getLatLongs().clear();
+        liveTrackPolyline.getLatLongs().addAll(liveTrackPoints);
+        if (liveTrackMarker == null) {
+            liveTrackMarker = new Marker(pos, bitmapTrackPoint, 0, 0);
+            mapView.getLayerManager().getLayers().add(liveTrackMarker);
+        } else {
+            liveTrackMarker.setLatLong(pos);
+        }
+        mapView.invalidate();
+    }
+
+    private void clearLiveTrackLayers() {
+        liveTrackPoints.clear();
+        if (mapView != null) {
+            if (liveTrackPolyline != null) {
+                mapView.getLayerManager().getLayers().remove(liveTrackPolyline);
+            }
+            if (liveTrackMarker != null) {
+                mapView.getLayerManager().getLayers().remove(liveTrackMarker);
+            }
+        }
+        liveTrackPolyline = null;
+        liveTrackMarker = null;
+    }
+
     private void toggleTracking() {
         if (trackRecorder.isRecording()) {
             trackRecorder.stop();
@@ -562,6 +656,7 @@ public class MapFragment extends Fragment {
         if (!isMapReady()) {
             return;
         }
+        lastDevices = devices != null ? devices : new ArrayList<>();
 
         int txCount = 0;
         int rxCount = 0;
@@ -611,13 +706,84 @@ public class MapFragment extends Fragment {
                     networkStatusSuffix()
             ));
         }
+        updateGpsDistance();
 
-        if (!boundsPoints.isEmpty() && !userMovedMap && !initialFitDone) {
+        if (!boundsPoints.isEmpty() && !userMovedMap && !MapSessionState.initialFitDone) {
             fitBoundsOnce(boundsPoints, onMap == 1, false);
-            initialFitDone = true;
+            MapSessionState.initialFitDone = true;
         }
     }
 
+    private void updateGpsDistance() {
+        if (mapDistance == null) {
+            return;
+        }
+        DeviceInfo tx = null;
+        DeviceInfo rx = null;
+        for (DeviceInfo d : lastDevices) {
+            if (!GeoUtils.isValidCoordinate(d.lat, d.lon)) {
+                continue;
+            }
+            if (StatsExtractor.ROLE_TX.equals(d.role)) {
+                tx = d;
+            } else if (StatsExtractor.ROLE_RX.equals(d.role)) {
+                rx = d;
+            }
+        }
+        if (tx != null && rx != null) {
+            double dist = GeoUtils.haversineMeters(tx.lat, tx.lon, rx.lat, rx.lon);
+            mapDistance.setVisibility(View.VISIBLE);
+            mapDistance.setText(getString(R.string.map_gps_distance, String.format(Locale.US, "%.0f", dist)));
+        } else {
+            mapDistance.setVisibility(View.GONE);
+        }
+    }
+
+    private void centerOnSelf() {
+        if (uploader == null) {
+            return;
+        }
+        String myId = uploader.getDeviceId();
+        for (DeviceInfo d : lastDevices) {
+            if (myId.equals(d.device_id) && GeoUtils.isValidCoordinate(d.lat, d.lon)) {
+                centerOnPoint(new LatLong(d.lat, d.lon), (byte) 14);
+                return;
+            }
+        }
+    }
+
+    private void centerOnRole(String role) {
+        for (DeviceInfo d : lastDevices) {
+            if (role.equals(d.role) && GeoUtils.isValidCoordinate(d.lat, d.lon)) {
+                centerOnPoint(new LatLong(d.lat, d.lon), (byte) 14);
+                return;
+            }
+        }
+    }
+
+    private void centerOnBoth() {
+        List<LatLong> points = new ArrayList<>();
+        for (DeviceInfo d : lastDevices) {
+            if (GeoUtils.isValidCoordinate(d.lat, d.lon)) {
+                points.add(new LatLong(d.lat, d.lon));
+            }
+        }
+        if (!points.isEmpty()) {
+            userMovedMap = false;
+            fitBoundsOnce(points, points.size() == 1, true);
+        }
+    }
+
+    private void centerOnPoint(LatLong point, byte zoom) {
+        if (!isMapReady()) {
+            return;
+        }
+        MapViewPosition position = (MapViewPosition) mapView.getModel().mapViewPosition;
+        position.setCenter(point);
+        position.setZoomLevel(zoom);
+        mapView.invalidate();
+    }
+
     /** Adjust camera only on first device load or when user picks a saved track. */
     private void fitBoundsOnce(List<LatLong> points, boolean singlePoint, boolean force) {
         if (!isMapReady() || points.isEmpty() || (!force && userMovedMap)) {
@@ -630,7 +796,7 @@ public class MapFragment extends Fragment {
             }
             if (singlePoint) {
                 position.setCenter(points.get(0));
-                position.setZoomLevel((byte) 13);
+                position.setZoomLevel((byte) 14);
                 return;
             }
             double minLat = Double.MAX_VALUE;
@@ -654,7 +820,7 @@ public class MapFragment extends Fragment {
             double lonSpan = Math.max(box.maxLongitude - box.minLongitude, 0.001);
             double latZoom = Math.log(h / (double) TILE_SIZE_PX / latSpan) / Math.log(2);
             double lonZoom = Math.log(w / (double) TILE_SIZE_PX / lonSpan) / Math.log(2);
-            byte zoom = (byte) Math.max(8, Math.min(15, Math.floor(Math.min(latZoom, lonZoom))));
+            byte zoom = (byte) Math.max(12, Math.min(16, Math.floor(Math.min(latZoom, lonZoom))));
             position.setZoomLevel(zoom);
         };
         if (mapView.getWidth() > 0 && mapView.getHeight() > 0) {
diff --git a/app/src/main/java/com/grigowashere/loratester/ui/RadioComparePanel.java b/app/src/main/java/com/grigowashere/loratester/ui/RadioComparePanel.java
new file mode 100644
index 0000000..a4a9924
--- /dev/null
+++ b/app/src/main/java/com/grigowashere/loratester/ui/RadioComparePanel.java
@@ -0,0 +1,187 @@
+package com.grigowashere.loratester.ui;
+
+import android.content.Context;
+import android.graphics.Color;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.TableLayout;
+import android.widget.TableRow;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+
+import com.google.android.material.button.MaterialButton;
+import com.grigowashere.loratester.R;
+import com.grigowashere.loratester.model.RadioSnapshot;
+import com.grigowashere.loratester.telnet.LoraStatsFormatter;
+import com.grigowashere.loratester.telnet.StatsExtractor;
+
+import java.util.Locale;
+import java.util.Set;
+
+public class RadioComparePanel extends LinearLayout {
+
+    private static final int COLOR_TX = 0xFFE94560;
+    private static final int COLOR_RX = 0xFF4FC3F7;
+    private static final int COLOR_CHANGED = 0x33E94560;
+
+    private TextView txHeader;
+    private TextView rxHeader;
+    private TableLayout dynamicTable;
+    private TableLayout staticTable;
+    private MaterialButton staticToggle;
+    private boolean staticExpanded;
+
+    public RadioComparePanel(Context context) {
+        super(context);
+        init(context);
+    }
+
+    public RadioComparePanel(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init(context);
+    }
+
+    private void init(Context context) {
+        setOrientation(VERTICAL);
+        LayoutInflater.from(context).inflate(R.layout.view_radio_compare, this, true);
+        txHeader = findViewById(R.id.compareTxHeader);
+        rxHeader = findViewById(R.id.compareRxHeader);
+        dynamicTable = findViewById(R.id.compareDynamicTable);
+        staticTable = findViewById(R.id.compareStaticTable);
+        staticToggle = findViewById(R.id.compareStaticToggle);
+        staticToggle.setOnClickListener(v -> {
+            staticExpanded = !staticExpanded;
+            staticTable.setVisibility(staticExpanded ? VISIBLE : GONE);
+            staticToggle.setText(staticExpanded
+                    ? getContext().getString(R.string.stats_static_hide)
+                    : getContext().getString(R.string.stats_static_toggle));
+        });
+    }
+
+    public void bind(
+            RadioSnapshot txSnap,
+            RadioSnapshot rxSnap,
+            String txDeviceId,
+            String rxDeviceId,
+            Set<String> changedTx,
+            Set<String> changedRx
+    ) {
+        txHeader.setText("TX · " + (txDeviceId != null ? txDeviceId : "—"));
+        rxHeader.setText("RX · " + (rxDeviceId != null ? rxDeviceId : "—"));
+        fillTable(dynamicTable, true, txSnap, rxSnap, changedTx, changedRx);
+        fillTable(staticTable, false, txSnap, rxSnap, changedTx, changedRx);
+    }
+
+    private void fillTable(
+            TableLayout table,
+            boolean dynamic,
+            RadioSnapshot tx,
+            RadioSnapshot rx,
+            Set<String> changedTx,
+            Set<String> changedRx
+    ) {
+        table.removeAllViews();
+        if (dynamic) {
+            addRow(table, "RSSI", fmtDbm(tx.rssiDbm), fmtDbm(rx.rssiDbm), "rssi", changedTx, changedRx);
+            addRow(table, "SNR", fmtSuffix(tx.snrDb, " dB"), fmtSuffix(rx.snrDb, " dB"), "snr", changedTx, changedRx);
+            addRow(table, "Пакет", fmtInt(tx.packet), fmtInt(rx.packet), "packet", changedTx, changedRx);
+            addRow(table, "Payload", str(tx.payload), str(rx.payload), "payload", changedTx, changedRx);
+            addRow(table, "PER", fmtSuffix(tx.perPercent, " %"), fmtSuffix(rx.perPercent, " %"), "per", changedTx, changedRx);
+            addRow(table, "TX spd", fmtSuffix(tx.txPktPerS, " p/s"), fmtSuffix(rx.txPktPerS, " p/s"), "txSpeed", changedTx, changedRx);
+            addRow(table, "RX spd", fmtSuffix(tx.rxPktPerS, " p/s"), fmtSuffix(rx.rxPktPerS, " p/s"), "rxSpeed", changedTx, changedRx);
+        } else {
+            addRow(table, "Роль", LoraStatsFormatter.roleLabel(tx.role), LoraStatsFormatter.roleLabel(rx.role), "role", changedTx, changedRx);
+            addRow(table, "Частота", fmtMhz(tx.frequencyMhz), fmtMhz(rx.frequencyMhz), "frequency", changedTx, changedRx);
+            addRow(table, "SF", fmtInt(tx.sf), fmtInt(rx.sf), "sf", changedTx, changedRx);
+            addRow(table, "BW", fmtSuffixInt(tx.bwKhz, " kHz"), fmtSuffixInt(rx.bwKhz, " kHz"), "bw", changedTx, changedRx);
+            addRow(table, "Мощн.", fmtDbm(tx.powerDbm), fmtDbm(rx.powerDbm), "power", changedTx, changedRx);
+        }
+    }
+
+    private void addRow(
+            TableLayout table,
+            String label,
+            String txVal,
+            String rxVal,
+            String changeKey,
+            Set<String> changedTx,
+            Set<String> changedRx
+    ) {
+        TableRow row = new TableRow(getContext());
+        TextView lbl = cell(label, 0xFFAAAAAA, false);
+        TextView tx = cell(txVal, COLOR_TX, changedTx != null && changedTx.contains(changeKey));
+        TextView rx = cell(rxVal, COLOR_RX, changedRx != null && changedRx.contains(changeKey));
+        row.addView(lbl);
+        row.addView(tx);
+        row.addView(rx);
+        table.addView(row);
+    }
+
+    private TextView cell(String text, int color, boolean changed) {
+        TextView tv = new TextView(getContext());
+        tv.setText(text != null ? text : "—");
+        tv.setTextColor(color);
+        tv.setTextSize(11f);
+        tv.setPadding(4, 2, 4, 2);
+        if (changed) {
+            tv.setBackgroundColor(COLOR_CHANGED);
+        }
+        return tv;
+    }
+
+    /** Assign TX/RX snapshots by device role. */
+    public static void bindByRole(
+            RadioComparePanel panel,
+            RadioSnapshot local,
+            RadioSnapshot peer,
+            String localId,
+            String peerId,
+            Set<String> changedLocal,
+            Set<String> changedPeer
+    ) {
+        RadioSnapshot tx = local;
+        RadioSnapshot rx = peer;
+        String txId = localId;
+        String rxId = peerId;
+        Set<String> chTx = changedLocal;
+        Set<String> chRx = changedPeer;
+        if (StatsExtractor.ROLE_RX.equals(local != null ? local.role : null)) {
+            tx = peer;
+            rx = local;
+            txId = peerId;
+            rxId = localId;
+            chTx = changedPeer;
+            chRx = changedLocal;
+        }
+        if (tx == null) tx = RadioSnapshot.empty();
+        if (rx == null) rx = RadioSnapshot.empty();
+        panel.bind(tx, rx, txId, rxId, chTx, chRx);
+    }
+
+    private static String str(String v) {
+        return v != null && !v.isEmpty() ? v : "—";
+    }
+
+    private static String fmtInt(Integer v) {
+        return v != null ? String.valueOf(v) : "—";
+    }
+
+    private static String fmtDbm(Double v) {
+        return v != null ? String.format(Locale.US, "%.0f dBm", v) : "—";
+    }
+
+    private static String fmtMhz(Double v) {
+        return v != null ? String.format(Locale.US, "%.3f MHz", v) : "—";
+    }
+
+    private static String fmtSuffix(Double v, String suffix) {
+        return v != null ? v + suffix : "—";
+    }
+
+    private static String fmtSuffixInt(Integer v, String suffix) {
+        return v != null ? v + suffix : "—";
+    }
+}
diff --git a/app/src/main/java/com/grigowashere/loratester/ui/StatsFragment.java b/app/src/main/java/com/grigowashere/loratester/ui/StatsFragment.java
index 85c340c..e1827ec 100644
--- a/app/src/main/java/com/grigowashere/loratester/ui/StatsFragment.java
+++ b/app/src/main/java/com/grigowashere/loratester/ui/StatsFragment.java
@@ -23,15 +23,11 @@ import com.grigowashere.loratester.R;
 import com.grigowashere.loratester.TelemetryUploader;
 import com.grigowashere.loratester.api.DeviceInfo;
 import com.grigowashere.loratester.api.TelemetryHistoryItem;
-import com.grigowashere.loratester.location.GeoUtils;
-import com.grigowashere.loratester.telnet.LoraStatsFormatter;
+import com.grigowashere.loratester.model.RadioSnapshot;
 import com.grigowashere.loratester.telnet.StatsExtractor;
 
-import java.text.DateFormat;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -41,32 +37,25 @@ public class StatsFragment extends Fragment {
     private static final long SERVER_POLL_MS = 1000;
 
     private final ExecutorService executor = Executors.newSingleThreadExecutor();
-    private final DateFormat timeFormat =
-            DateFormat.getTimeInstance(DateFormat.MEDIUM, Locale.getDefault());
     private FragmentPollHelper pollHelper;
     private TelemetryUploader uploader;
     private CommandPoller commandPoller;
     private PeerStatsCache peerStatsCache;
     private TextView statsStatus;
     private TextView statsPeerWarning;
-    private TextView statsLocalDetails;
-    private TextView statsPeerDetails;
+    private RadioComparePanel radioComparePanel;
     private RecyclerView statsHistoryList;
     private final HistoryAdapter historyAdapter = new HistoryAdapter();
 
-    private StatsExtractor.ExtractedStats cachedLocal;
-    private DeviceInfo cachedServer;
-    private DeviceInfo cachedPeer;
-    private int cachedDeviceCount;
+    private RadioSnapshot prevLocal = RadioSnapshot.empty();
+    private RadioSnapshot prevPeer = RadioSnapshot.empty();
+    private RadioSnapshot snapLocal = RadioSnapshot.empty();
+    private RadioSnapshot snapPeer = RadioSnapshot.empty();
     private String cachedPeerId;
     private String cachedPeerError;
-    private String cachedError;
+    private int cachedDeviceCount;
 
-    private final TelemetryUploader.StatsListener statsListener = stats -> {
-        cachedLocal = stats;
-        cachedError = null;
-        postRender();
-    };
+    private final TelemetryUploader.StatsListener statsListener = stats -> postRender();
 
     @Override
     public void onAttach(@NonNull Context context) {
@@ -91,15 +80,12 @@ public class StatsFragment extends Fragment {
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         statsStatus = view.findViewById(R.id.statsStatus);
         statsPeerWarning = view.findViewById(R.id.statsPeerWarning);
-        statsLocalDetails = view.findViewById(R.id.statsLocalDetails);
-        statsPeerDetails = view.findViewById(R.id.statsPeerDetails);
+        radioComparePanel = view.findViewById(R.id.radioComparePanel);
         statsHistoryList = view.findViewById(R.id.statsHistoryList);
         statsHistoryList.setLayoutManager(new LinearLayoutManager(requireContext()));
         statsHistoryList.setAdapter(historyAdapter);
         Button btnSimulate = view.findViewById(R.id.btnSimulate);
         Button btnPushStats = view.findViewById(R.id.btnPushStats);
-        Button btnModeTx = view.findViewById(R.id.btnModeTxPeer);
-        Button btnModeRx = view.findViewById(R.id.btnModeRxPeer);
         pollHelper = new FragmentPollHelper(this, this::refresh);
 
         btnSimulate.setOnClickListener(v -> {
@@ -107,18 +93,14 @@ public class StatsFragment extends Fragment {
                     SEND
                     Frequency:         433000000 Hz
                     Power:             22 dBm
+                    Spreading Factor:  7
+                    Bandwidth:         125 kHz
                     Packet:            1
                     Payload:           Sim TX
                     \u001b[2J""";
             uploader.simulateChunk(chunk);
-            if (pollHelper.canRun()) {
-                statsStatus.setText(R.string.simulate_sent);
-            }
         });
-
         btnPushStats.setOnClickListener(v -> pushStatsToPeer());
-        btnModeTx.setOnClickListener(v -> sendModeToPeer("TX"));
-        btnModeRx.setOnClickListener(v -> sendModeToPeer("RX"));
     }
 
     private void pushStatsToPeer() {
@@ -127,34 +109,18 @@ public class StatsFragment extends Fragment {
             return;
         }
         Map<String, Object> payload = new HashMap<>();
-        String meta = pickMetaJson(true);
-        if (meta != null) {
-            payload.put("meta", meta);
-        }
-        Double rssi = pickRssi(true);
-        if (rssi != null) {
-            payload.put("rssi", rssi);
-        }
-        if (cachedLocal != null && cachedLocal.role != null) {
-            payload.put("role", cachedLocal.role);
-        } else if (cachedServer != null && cachedServer.role != null) {
-            payload.put("role", cachedServer.role);
+        StatsExtractor.ExtractedStats localStats = uploader.getLastStats();
+        if (localStats != null && localStats.metaJson != null) {
+            payload.put("meta", localStats.metaJson);
         }
+        if (snapLocal.role != null) payload.put("role", snapLocal.role);
+        if (snapLocal.rssiDbm != null) payload.put("rssi", snapLocal.rssiDbm);
+        if (snapLocal.sf != null) payload.put("sf", snapLocal.sf);
+        if (snapLocal.bwKhz != null) payload.put("bw", snapLocal.bwKhz);
         commandPoller.postCommandToPeer(cachedPeerId, "stats_push", payload);
         toast(R.string.stats_pushed);
     }
 
-    private void sendModeToPeer(String role) {
-        if (commandPoller == null || cachedPeerId == null) {
-            toast(R.string.at_peer_unavailable);
-            return;
-        }
-        Map<String, Object> payload = new HashMap<>();
-        payload.put("role", role);
-        commandPoller.postCommandToPeer(cachedPeerId, "mode", payload);
-        toast(R.string.stats_pushed);
-    }
-
     private void toast(int resId) {
         if (isAdded()) {
             Toast.makeText(requireContext(), resId, Toast.LENGTH_SHORT).show();
@@ -166,7 +132,6 @@ public class StatsFragment extends Fragment {
         super.onResume();
         if (uploader != null) {
             uploader.setStatsListener(statsListener);
-            cachedLocal = uploader.getLastStats();
             postRender();
         }
         if (pollHelper != null) {
@@ -192,8 +157,7 @@ public class StatsFragment extends Fragment {
         }
         statsStatus = null;
         statsPeerWarning = null;
-        statsLocalDetails = null;
-        statsPeerDetails = null;
+        radioComparePanel = null;
         statsHistoryList = null;
         pollHelper = null;
         super.onDestroyView();
@@ -206,10 +170,10 @@ public class StatsFragment extends Fragment {
     }
 
     private void postRender() {
-        if (!isAdded() || statsLocalDetails == null) {
+        if (!isAdded() || radioComparePanel == null) {
             return;
         }
-        requireActivity().runOnUiThread(this::renderDetails);
+        requireActivity().runOnUiThread(this::render);
     }
 
     private void refresh() {
@@ -217,11 +181,11 @@ public class StatsFragment extends Fragment {
             return;
         }
         String deviceId = uploader.getDeviceId();
-        boolean telnet = uploader.isTelnetConnected();
         statsStatus.setText(getString(
                 R.string.stats_status,
                 deviceId,
-                telnet ? getString(R.string.connected) : getString(R.string.disconnected)
+                uploader.isTelnetConnected()
+                        ? getString(R.string.connected) : getString(R.string.disconnected)
         ));
 
         executor.execute(() -> {
@@ -232,19 +196,37 @@ public class StatsFragment extends Fragment {
                 PeerDevices.Result peer = PeerDevices.resolve(devices, deviceId);
                 cachedPeerId = peer.peerId;
                 cachedPeerError = peer.error;
-                cachedPeer = null;
-                cachedServer = null;
+
+                DeviceInfo self = null;
+                DeviceInfo peerDev = null;
                 for (DeviceInfo d : devices) {
                     if (deviceId.equals(d.device_id)) {
-                        cachedServer = d;
+                        self = d;
                     } else if (peer.peerId != null && peer.peerId.equals(d.device_id)) {
-                        cachedPeer = d;
+                        peerDev = d;
                     }
                 }
-                cachedError = null;
+
+                StatsExtractor.ExtractedStats localStats = uploader.getLastStats();
+                snapLocal = localStats != null
+                        ? RadioSnapshot.fromExtracted(localStats)
+                        : RadioSnapshot.fromMeta(
+                                self != null ? self.meta : null,
+                                self != null ? self.role : null,
+                                self != null ? self.rssi : null);
+
+                PeerStatsCache.Snapshot push = peerStatsCache != null ? peerStatsCache.get() : null;
+                if (push != null && push.meta != null) {
+                    snapPeer = RadioSnapshot.fromMeta(push.meta, push.role, push.rssi);
+                } else {
+                    snapPeer = RadioSnapshot.fromMeta(
+                            peerDev != null ? peerDev.meta : null,
+                            peerDev != null ? peerDev.role : null,
+                            peerDev != null ? peerDev.rssi : null);
+                }
+
                 history = uploader.getServerApi().getTelemetryHistory(deviceId, 30);
-            } catch (Exception e) {
-                cachedError = e.getMessage() != null ? e.getMessage() : "error";
+            } catch (Exception ignored) {
             }
             List<TelemetryHistoryItem> finalHistory = history;
             if (isAdded()) {
@@ -261,11 +243,10 @@ public class StatsFragment extends Fragment {
         });
     }
 
-    private void renderDetails() {
-        if (!isAdded() || statsLocalDetails == null || uploader == null) {
+    private void render() {
+        if (!isAdded() || radioComparePanel == null || uploader == null) {
             return;
         }
-
         if (statsPeerWarning != null) {
             if (cachedPeerError != null) {
                 statsPeerWarning.setVisibility(View.VISIBLE);
@@ -275,105 +256,18 @@ public class StatsFragment extends Fragment {
                 statsPeerWarning.setVisibility(View.GONE);
             }
         }
-
-        statsLocalDetails.setText(formatDeviceBlock(true));
-        statsPeerDetails.setText(formatDeviceBlock(false));
-    }
-
-    private CharSequence formatDeviceBlock(boolean local) {
-        StringBuilder sb = new StringBuilder();
-        if (local) {
-            sb.append(uploader.isTelnetConnected()
-                    ? getString(R.string.telnet_connected)
-                    : getString(R.string.telnet_disconnected));
-            long at = uploader.getLastStatsAtMs();
-            if (at > 0) {
-                sb.append(" · ").append(timeFormat.format(new Date(at)));
-            }
-            sb.append("\n\n");
-            appendStatsBody(sb, pickMetaJson(true), pickRssi(true), cachedServer, true);
-        } else {
-            if (cachedPeerId == null) {
-                sb.append(getString(R.string.stats_peer_absent));
-                return sb;
-            }
-            sb.append(cachedPeerId);
-            if (cachedPeer != null && cachedPeer.role != null) {
-                sb.append(" · ").append(cachedPeer.role);
-            }
-            sb.append("\n\n");
-            PeerStatsCache.Snapshot push = peerStatsCache != null ? peerStatsCache.get() : null;
-            if (push != null && push.meta != null) {
-                appendStatsBody(sb, push.meta, push.rssi, cachedPeer, false);
-            } else if (cachedPeer != null) {
-                appendStatsBody(sb, cachedPeer.meta, cachedPeer.rssi, cachedPeer, false);
-            } else {
-                sb.append(getString(R.string.no_telemetry_yet));
-            }
-        }
-        return sb;
-    }
-
-    private void appendStatsBody(
-            StringBuilder sb,
-            String meta,
-            Double rssi,
-            DeviceInfo gpsSource,
-            boolean local
-    ) {
-        if (meta != null && !meta.isEmpty()) {
-            String fields = LoraStatsFormatter.formatMeta(meta);
-            if (!fields.isEmpty()) {
-                sb.append(fields).append("\n");
-            }
-        } else if (local && cachedError != null) {
-            sb.append(getString(R.string.stats_error, cachedError)).append("\n");
-        } else if (local) {
-            sb.append(getString(R.string.no_telemetry_yet)).append("\n");
-        }
-        sb.append("\nСигнал (dBm): ").append(rssi != null ? rssi : "—").append("\n");
-        Double lat = null;
-        Double lon = null;
-        if (gpsSource != null) {
-            lat = gpsSource.lat;
-            lon = gpsSource.lon;
-        }
-        if (GeoUtils.isValidCoordinate(lat, lon)) {
-            sb.append("GPS: ").append(lat).append(", ").append(lon).append("\n");
-        } else {
-            sb.append(getString(R.string.gps_waiting)).append("\n");
-        }
-    }
-
-    private String pickMetaJson(boolean local) {
-        if (local) {
-            boolean telnet = uploader.isTelnetConnected();
-            if (telnet && cachedLocal != null && cachedLocal.metaJson != null) {
-                return cachedLocal.metaJson;
-            }
-            if (cachedServer != null && cachedServer.meta != null && !cachedServer.meta.isEmpty()) {
-                return cachedServer.meta;
-            }
-            if (cachedLocal != null && cachedLocal.metaJson != null) {
-                return cachedLocal.metaJson;
-            }
-        }
-        return null;
-    }
-
-    private Double pickRssi(boolean local) {
-        if (local) {
-            boolean telnet = uploader.isTelnetConnected();
-            if (telnet && cachedLocal != null && cachedLocal.rssi != null) {
-                return cachedLocal.rssi;
-            }
-            if (cachedServer != null && cachedServer.rssi != null) {
-                return cachedServer.rssi;
-            }
-            if (cachedLocal != null) {
-                return cachedLocal.rssi;
-            }
-        }
-        return null;
+        var chLocal = snapLocal.diff(prevLocal);
+        var chPeer = snapPeer.diff(prevPeer);
+        RadioComparePanel.bindByRole(
+                radioComparePanel,
+                snapLocal,
+                snapPeer,
+                uploader.getDeviceId(),
+                cachedPeerId,
+                chLocal,
+                chPeer
+        );
+        prevLocal = snapLocal;
+        prevPeer = snapPeer;
     }
 }
diff --git a/app/src/main/res/layout/fragment_at.xml b/app/src/main/res/layout/fragment_at.xml
index c3f75cc..39712fb 100644
--- a/app/src/main/res/layout/fragment_at.xml
+++ b/app/src/main/res/layout/fragment_at.xml
@@ -12,90 +12,209 @@
         android:layout_height="wrap_content"
         android:textSize="14sp" />
 
-    <com.google.android.material.button.MaterialButtonToggleGroup
-        android:id="@+id/atTargetGroup"
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="6dp"
-        app:singleSelection="true"
-        app:selectionRequired="true">
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:fillViewport="true">
 
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/atTargetLocal"
-            style="@style/Widget.Material3.Button.OutlinedButton"
-            android:layout_width="0dp"
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/at_target_local"
-            android:checked="true" />
+            android:orientation="vertical">
 
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/atTargetPeer"
-            style="@style/Widget.Material3.Button.OutlinedButton"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/at_target_peer" />
-    </com.google.android.material.button.MaterialButtonToggleGroup>
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:text="@string/at_current_values"
+                android:textStyle="bold" />
 
-    <com.google.android.material.chip.ChipGroup
-        android:id="@+id/atQuickChips"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:orientation="horizontal">
-
-        <com.google.android.material.textfield.TextInputLayout
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:hint="@string/at_command_hint">
-
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/atCommandInput"
+            <TextView
+                android:id="@+id/atCurrentSnapshot"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:fontFamily="monospace"
-                android:inputType="text"
-                android:singleLine="true" />
-        </com.google.android.material.textfield.TextInputLayout>
+                android:textSize="11sp" />
 
-        <Button
-            android:id="@+id/atSendBtn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginStart="8dp"
-            android:text="@string/send" />
-    </LinearLayout>
+            <com.google.android.material.textfield.TextInputLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:hint="@string/at_hint_fq_mhz">
 
-    <LinearLayout
-        android:layout_width="match_parent"
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/atInputFq"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="numberDecimal" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:hint="@string/at_hint_power">
+
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/atInputPw"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:inputType="numberSigned" />
+                </com.google.android.material.textfield.TextInputLayout>
+
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="8dp"
+                    android:layout_weight="1"
+                    android:hint="SF">
+
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/atInputSf"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:inputType="number" />
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:text="@string/at_hint_bw"
+                android:textSize="12sp" />
+
+            <Spinner
+                android:id="@+id/atBwSpinner"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:text="@string/at_hint_cr"
+                android:textSize="12sp" />
+
+            <Spinner
+                android:id="@+id/atCrSpinner"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:hint="@string/at_hint_pl">
+
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/atInputPl"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:inputType="number" />
+                </com.google.android.material.textfield.TextInputLayout>
+
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="8dp"
+                    android:layout_weight="1"
+                    android:hint="@string/at_hint_tm">
+
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/atInputTm"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:inputType="number" />
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:text="@string/at_hint_role"
+                android:textSize="12sp" />
+
+            <Spinner
+                android:id="@+id/atRoleSpinner"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+
+            <com.google.android.material.button.MaterialButtonToggleGroup
+                android:id="@+id/atTargetGroup"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="6dp"
+                app:selectionRequired="true"
+                app:singleSelection="true">
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/atTargetLocal"
+                    style="@style/Widget.Material3.Button.OutlinedButton"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/at_target_local" />
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/atTargetPeer"
+                    style="@style/Widget.Material3.Button.OutlinedButton"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/at_target_peer" />
+            </com.google.android.material.button.MaterialButtonToggleGroup>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="6dp"
+                android:orientation="horizontal">
+
+                <Button
+                    android:id="@+id/atApplyBtn"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/at_apply" />
+
+                <Button
+                    android:id="@+id/atStopBtn"
+                    style="@style/Widget.Material3.Button.OutlinedButton"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="6dp"
+                    android:text="S" />
+            </LinearLayout>
+        </LinearLayout>
+    </ScrollView>
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/atConsoleToggle"
+        style="@style/Widget.Material3.Button.TextButton"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
-        android:orientation="horizontal">
-
-        <Button
-            android:id="@+id/atClearLog"
-            style="@style/Widget.Material3.Button.TextButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/at_clear_log" />
-    </LinearLayout>
+        android:text="@string/at_console_toggle" />
 
     <ScrollView
         android:id="@+id/atConsoleScroll"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_marginTop="8dp"
-        android:layout_weight="1"
+        android:layout_height="120dp"
         android:background="#0D1117"
-        android:padding="8dp">
+        android:padding="8dp"
+        android:visibility="gone">
 
         <TextView
             android:id="@+id/atConsole"
diff --git a/app/src/main/res/layout/fragment_map.xml b/app/src/main/res/layout/fragment_map.xml
index dff458f..2740960 100644
--- a/app/src/main/res/layout/fragment_map.xml
+++ b/app/src/main/res/layout/fragment_map.xml
@@ -32,6 +32,65 @@
                 android:textColor="#FFFFFF"
                 android:textSize="10sp" />
 
+            <TextView
+                android:id="@+id/mapDistance"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                android:textColor="#00FF88"
+                android:textSize="9sp"
+                android:visibility="gone" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:orientation="horizontal">
+
+                <Button
+                    android:id="@+id/btnCenterMe"
+                    style="@style/Widget.Material3.Button.OutlinedButton"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:minHeight="32dp"
+                    android:text="@string/map_center_me"
+                    android:textSize="10sp" />
+
+                <Button
+                    android:id="@+id/btnCenterTx"
+                    style="@style/Widget.Material3.Button.OutlinedButton"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="2dp"
+                    android:layout_weight="1"
+                    android:minHeight="32dp"
+                    android:text="@string/map_center_tx"
+                    android:textSize="10sp" />
+
+                <Button
+                    android:id="@+id/btnCenterRx"
+                    style="@style/Widget.Material3.Button.OutlinedButton"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="2dp"
+                    android:layout_weight="1"
+                    android:minHeight="32dp"
+                    android:text="@string/map_center_rx"
+                    android:textSize="10sp" />
+
+                <Button
+                    android:id="@+id/btnCenterBoth"
+                    style="@style/Widget.Material3.Button.OutlinedButton"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="2dp"
+                    android:layout_weight="1"
+                    android:minHeight="32dp"
+                    android:text="@string/map_center_both"
+                    android:textSize="10sp" />
+            </LinearLayout>
+
             <TextView
                 android:id="@+id/mapLegend"
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_stats.xml b/app/src/main/res/layout/fragment_stats.xml
index d653056..0514c1a 100644
--- a/app/src/main/res/layout/fragment_stats.xml
+++ b/app/src/main/res/layout/fragment_stats.xml
@@ -24,6 +24,20 @@
             android:textSize="12sp"
             android:visibility="gone" />
 
+        <com.grigowashere.loratester.ui.RadioComparePanel
+            android:id="@+id/radioComparePanel"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp" />
+
+        <Button
+            android:id="@+id/btnPushStats"
+            style="@style/Widget.Material3.Button.TonalButton"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:text="@string/stats_push_peer" />
+
         <Button
             android:id="@+id/btnSimulate"
             android:layout_width="match_parent"
@@ -31,90 +45,6 @@
             android:layout_marginTop="8dp"
             android:text="@string/simulate_telnet" />
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:orientation="horizontal">
-
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:orientation="vertical"
-                android:paddingEnd="6dp">
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/stats_local_title"
-                    android:textSize="13sp"
-                    android:textStyle="bold" />
-
-                <TextView
-                    android:id="@+id/statsLocalDetails"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="4dp"
-                    android:fontFamily="monospace"
-                    android:textSize="11sp" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:orientation="vertical"
-                android:paddingStart="6dp">
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/stats_peer_title"
-                    android:textSize="13sp"
-                    android:textStyle="bold" />
-
-                <TextView
-                    android:id="@+id/statsPeerDetails"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="4dp"
-                    android:fontFamily="monospace"
-                    android:textSize="11sp" />
-            </LinearLayout>
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:orientation="horizontal">
-
-            <Button
-                android:id="@+id/btnPushStats"
-                style="@style/Widget.Material3.Button.TonalButton"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="4dp"
-                android:layout_weight="1"
-                android:text="@string/stats_push_peer" />
-
-            <Button
-                android:id="@+id/btnModeTxPeer"
-                style="@style/Widget.Material3.Button.OutlinedButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="TX→" />
-
-            <Button
-                android:id="@+id/btnModeRxPeer"
-                style="@style/Widget.Material3.Button.OutlinedButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="4dp"
-                android:text="RX→" />
-        </LinearLayout>
-
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_chat.xml b/app/src/main/res/layout/item_chat.xml
index a66dd17..afa34d9 100644
--- a/app/src/main/res/layout/item_chat.xml
+++ b/app/src/main/res/layout/item_chat.xml
@@ -1,7 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/chatItemText"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="6dp"
-    android:textSize="13sp" />
+    android:paddingStart="8dp"
+    android:paddingEnd="8dp"
+    android:paddingTop="4dp"
+    android:paddingBottom="4dp">
+
+    <LinearLayout
+        android:id="@+id/chatBubble"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="start"
+        android:background="#1A4A6E"
+        android:maxWidth="280dp"
+        android:orientation="vertical"
+        android:padding="8dp">
+
+        <TextView
+            android:id="@+id/chatAuthor"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="#AAAAAA"
+            android:textSize="10sp"
+            android:textStyle="bold" />
+
+        <TextView
+            android:id="@+id/chatText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dp"
+            android:textColor="#EEEEEE"
+            android:textSize="13sp" />
+
+        <TextView
+            android:id="@+id/chatTime"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dp"
+            android:textColor="#888888"
+            android:textSize="9sp" />
+    </LinearLayout>
+</FrameLayout>
diff --git a/app/src/main/res/layout/view_radio_compare.xml b/app/src/main/res/layout/view_radio_compare.xml
new file mode 100644
index 0000000..9af135e
--- /dev/null
+++ b/app/src/main/res/layout/view_radio_compare.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingBottom="4dp">
+
+        <TextView
+            android:id="@+id/compareTxHeader"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:textColor="#E94560"
+            android:textSize="12sp"
+            android:textStyle="bold" />
+
+        <TextView
+            android:id="@+id/compareRxHeader"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:textColor="#4FC3F7"
+            android:textSize="12sp"
+            android:textStyle="bold" />
+    </LinearLayout>
+
+    <TableLayout
+        android:id="@+id/compareDynamicTable"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:stretchColumns="1,2" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/compareStaticToggle"
+        style="@style/Widget.Material3.Button.TextButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:minHeight="0dp"
+        android:padding="0dp"
+        android:text="@string/stats_static_toggle"
+        android:textSize="12sp" />
+
+    <TableLayout
+        android:id="@+id/compareStaticTable"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:stretchColumns="1,2"
+        android:visibility="gone" />
+
+</LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 17cde71..e41f4d5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -63,4 +63,23 @@
     <string name="track_paired_start">Старт трека (оба)</string>
     <string name="track_paired_started">Синхронный старт запланирован</string>
     <string name="track_paired_need_two">Нужны 2 устройства online</string>
+    <string name="stats_static_toggle">▼ Статика</string>
+    <string name="stats_static_hide">▲ Статика</string>
+    <string name="at_current_values">Текущие значения</string>
+    <string name="at_apply">Применить</string>
+    <string name="at_hint_fq_mhz">Частота MHz (430–470)</string>
+    <string name="at_hint_power">Мощность dBm (-9…22)</string>
+    <string name="at_hint_bw">Bandwidth kHz</string>
+    <string name="at_hint_cr">Code rate</string>
+    <string name="at_hint_pl">Preamble (1–64)</string>
+    <string name="at_hint_tm">Timeout ms (0–60000)</string>
+    <string name="at_hint_role">Роль после настройки</string>
+    <string name="at_console_toggle">▼ Консоль</string>
+    <string name="at_console_hide">▲ Консоль</string>
+    <string name="map_center_me">Я</string>
+    <string name="map_center_tx">TX</string>
+    <string name="map_center_rx">RX</string>
+    <string name="map_center_both">Оба</string>
+    <string name="map_gps_distance">GPS между устройствами: %1$s m</string>
+    <string name="chat_self_label">Вы</string>
 </resources>
diff --git a/server/.dockerignore b/server/.dockerignore
new file mode 100644
index 0000000..dfb4d66
--- /dev/null
+++ b/server/.dockerignore
@@ -0,0 +1,8 @@
+.venv
+__pycache__
+*.pyc
+*.pyo
+*.db
+.pytest_cache
+.git
+*.md
diff --git a/server/Dockerfile b/server/Dockerfile
new file mode 100644
index 0000000..3005fdd
--- /dev/null
+++ b/server/Dockerfile
@@ -0,0 +1,18 @@
+FROM python:3.12-slim
+
+WORKDIR /app
+
+ENV PYTHONDONTWRITEBYTECODE=1 \
+    PYTHONUNBUFFERED=1 \
+    LORATESTER_HOST=0.0.0.0 \
+    LORATESTER_PORT=7634 \
+    LORATESTER_DB=/data/loratester.db
+
+COPY requirements.txt .
+RUN pip install --no-cache-dir -r requirements.txt
+
+COPY . .
+
+EXPOSE 7634
+
+CMD ["uvicorn", "fastapi_app:app", "--host", "0.0.0.0", "--port", "7634"]
diff --git a/server/README.md b/server/README.md
index 36a8245..7e5431b 100644
--- a/server/README.md
+++ b/server/README.md
@@ -23,14 +23,47 @@ python flask_app.py
 | `LORATESTER_DB` | `./loratester.db` |
 | `LORATESTER_TELEMETRY_LIMIT` | `5000` (записей истории на устройство) |
 | `LORATESTER_TRACK_POINTS_LIMIT` | `10000` (точек на один трек) |
+| `LORATESTER_ELEVATION_URL` | `http://192.168.1.109:8085/v1/elevation` |
+| `LORATESTER_ELEVATION_PROBE_TTL` | `60` (сек, кэш проверки доступности) |
+| `LORATESTER_ELEVATION_TIMEOUT` | `8` (сек, таймаут HTTP к сервису высот) |
+
+## Docker Compose
+
+```bash
+cd server
+docker compose up -d --build
+```
+
+Проверка:
+
+```bash
+curl http://127.0.0.1:7634/api/health | jq
+```
+
+Ожидается `"elevation_ok": true` если локальный Open-Meteo доступен с хоста/контейнера.
+
+Переопределить URL высот (`.env` рядом с `docker-compose.yml`):
+
+```env
+LORATESTER_ELEVATION_URL=http://192.168.1.109:8085/v1/elevation
+```
+
+БД хранится в volume `loratester-data` (`/data/loratester.db` внутри контейнера).
 
 ## Деплой (grigowashere.ru:7634)
 
 ```bash
-cd /srv/storage/disk2/services/LoraTester
+cd /srv/storage/disk2/services/LoraTester/server
+docker compose up -d --build
+```
+
+Или без Docker:
+
+```bash
+cd /srv/storage/disk2/services/LoraTester/server
 pip install -r requirements.txt
-# один путь БД для всех воркеров:
 export LORATESTER_DB=/srv/storage/disk2/services/LoraTester/loratester.db
+export LORATESTER_ELEVATION_URL=http://192.168.1.109:8085/v1/elevation
 uvicorn fastapi_app:app --host 0.0.0.0 --port 7634
 ```
 
@@ -42,7 +75,7 @@ uvicorn fastapi_app:app --host 0.0.0.0 --port 7634
 curl http://127.0.0.1:7634/api/health
 ```
 
-Ожидается `"db_ok": true`, `"schema_version": 4`.
+Ожидается `"db_ok": true`, `"schema_version": 4`, `"elevation_ok": true`.
 
 Если БД создана вручную и схема битая (`no such table: devices` / `no such column: t.meta`):
 
@@ -66,13 +99,19 @@ curl http://127.0.0.1:7634/api/health
 - `POST /api/tracks/{id}/points` — `{points: [{ts, lat, lon, altitude_gps?, rssi?, role?, meta?}]}`
 - `POST /api/tracks/{id}/finish`
 - `GET /api/tracks?device_id=`
-- `GET /api/tracks/{id}` — метаданные + точки (высота terrain через Open-Meteo)
+- `GET /api/tracks/{id}` — метаданные + точки (высота terrain через локальный Open-Meteo)
 
 ### Команды (очередь на устройство)
 
 - `POST /api/commands` — `{from_device_id, to_device_id, kind, payload?}`  
-  `kind`: `at` (`payload.line`), `mode` (`payload.role`: TX/RX), `stats_push` (снимок meta/rssi/role)  
-  `from_device_id`: `web` или `android-xxxxxxxx`
+  `kind`: `at` (`payload.line` — одна строка, или `payload.lines` — массив макроса), `mode` (`payload.role`: TX/RX), `stats_push` (снимок meta/rssi/role/sf/bw)  
+  `from_device_id`: `web` или `android-xxxxxxxx`  
+  Макрос обычно: `S` (стоп TX/RX), затем `AT+FQ=`, `AT+PW=`, `AT+SF=`, `AT+BW=`, `AT+CR=`, `AT+PL=`, `AT+TM=`, при необходимости `AT+TX` / `AT+RX`.
+
+### Профиль высот (веб, треки)
+
+- `POST /api/elevation/profile` — `{points: [{lat, lon}], step_m?: 10}` → срез рельефа (локальный Open-Meteo)
+- `GET /api/tracks/{id}/elevation-profile?step_m=10` — то же по сохранённому треку
 - `GET /api/commands/pending?device_id=` — Android, доставка + `delivered_at`
 - `GET /api/commands?to_device_id=&limit=` — история (веб)
 
@@ -87,7 +126,7 @@ curl http://127.0.0.1:7634/api/health
 
 - `POST /api/chat` — `{device_id, text}`
 - `GET /api/chat?since=0`
-- `GET /api/health` — `{ok, db_ok, schema_version, database_path}`
+- `GET /api/health` — `{ok, db_ok, schema_version, database_path, elevation_ok, elevation_url, elevation_error}`
 
 ## FastAPI (прод)
 
@@ -107,6 +146,6 @@ python -m pytest tests/ -v
 
 ## Android
 
-URL: `http://grigowashere.ru:7634`. На карте: **Начать/Остановить трекинг пути** — точки с GPS, статистикой приёма и высотой (Open-Meteo на сервере). Вкладка **Статистика** — история с сервера.
+URL: `http://grigowashere.ru:7634`. На карте: **Начать/Остановить трекинг пути** — точки с GPS, статистикой приёма и высотой (локальный Open-Meteo на сервере). Вкладка **Статистика** — история с сервера.
 
 Telnet: `127.0.0.1:2727` — мост COM→telnet на устройстве.
diff --git a/server/core/__pycache__/config.cpython-313.pyc b/server/core/__pycache__/config.cpython-313.pyc
index 602ab85dd337f3bf5b7a658890e063e13d15fcd3..707a869a58fd20654f2aceddc37fba7d5737e738 100644
GIT binary patch
delta 503
zcmdnRagT@ZGcPX}0}%Z5(8~JAG?7n&X$I3qja`fr?`iAu2J@LRfg~9if)pV%G8xQo
z$_U{X3C0LbUcjg;E)XmT(*c(ghR8_@1q)-yiKH`XicEgSxU~M3gpYraV~A^Th-*;1
ztB-4#V~D4}UwmkgPnB9mNlAf~zP_QQk)ENMg`T0Fp@F59g@J{sewm?uYEEidVo7Fx
z-YrJ`TXI+p2?+9ca*YoO@wvrhW^hXen;PEu5KmuM|Im<Ij24=rlY5!^LvOJa6_*rc
z7Tgj<IL9%-6Xc{@tZ6y<i6yth5i)Q);)7kCZ%HB~oc;a$T%ALp=1-Ppj^)+_h8ig3
zip3ZwH#4u#yTBlHLqu%4*F>-BeiQv}u*ltD(fQ2EEXwqqje(i7QLRI`S^EP!1EbJK
z4hCt38!T+?UX5PuevN(?gpD_ZTxPNQ%*-Usbb&$qBO8OP5{kUx2II>t=0JH_ri%=c
IMe0CX0l7PdEC2ui

delta 74
zcmcb|vx|f8GcPX}0}wcwC}wSAoX97^w2N`0#x6#dbVg0y$w!!$GHD7-{>t1x`4&qI
aw;WI*BM=vFV3_R4x}M`AgHVwSkPiUdK@y?>

diff --git a/server/core/__pycache__/elevation.cpython-313.pyc b/server/core/__pycache__/elevation.cpython-313.pyc
index e0c6493f2baa3078f365593303d45e1f4e20cb7f..3b42a3dc3c27037e819baf5fa80bfc56eb3620e8 100644
GIT binary patch
literal 12629
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

literal 2068
zcmZuyU2Gdg5Z=49&*y*Vr*V>&^b!(UH^GL|v`HW>!306lq$L+imF((tve&MIedq3-
zLmNN}f`=54nhL760*O5E0B=0<h?*B3lLi!P6;P!Lq`pN;Q6>7q>^T>wRZsHF?99&W
z&g?hionX+1;2S^DJ!iQPdcYRWC)5RQ=VK6VqCTV`f)q~SC%Flp@G_HyNr4E!U6ZZ}
zH*xRkL?UK{nUE8x!Fy0f8szG0;(Y}XpW@E=74ZnD6b}g~K1J$8b1o88{EF9>LIoif
zSQwtgglI)w#w9$jSw%ya=Zl(ru7dTKr?7<$`Dj+lUcx!Kf{C0p43aDAnuTNWhwQW%
zNBx?v8<y>APQzL{S7Bka(!#M^F>9r*YNdqJ`I4bo1G3F74nX|+p1S_xMJlSvvE;ks
zg?b9on_0dt+0+dbipK362jM14?<R^+3Q9G&yK|qGYiLjKy(q>{KZG}6mvs}Ps^?-n
z6-t@~#L!LVF3WT>Ig&}4n3x&Ej8}+JAek{eM~q@lv8uVEah@1+IBS`ivj)*-v1wtF
zf$j6avIfDKz52x~SE*06i>7{nuaW@7kHF9D0J4a-0!_;=E?@p~>bt>}mKE*W(KUZ;
z%@x}LBYG-n4=C)U5!`Tp(iiqp*7+2l-YeAW;GlUCYG_hCt6VSYLTQ%2{mqDu)ZjfR
zEjcTN8|HYV3n^j7@8}v_;V%F-<GkV;=5<%fH4|*u9BFV@kP+C!j<&%ayY5c8pL>Se
zLGmbfbk{8hS;{DZbTK75I;{tCZF1tKL`7uTI=;Fm<=I~e)(I(($t%!p3UWXr+tqni
zr#w|d=2<}9XaG4U=Kz3t=+nb+CmBt*j|zuTp6f>GX6H5@q;(^tOX*feGZS^B23I^6
zxRf-w`!+0|0zPBX^jMwexjd@Jj!CSwJXW!cjjFY9<dS7o%#lPws}$n~>(w&r)p*t@
zC+1&G>|qgrE&<SsfM86$fcAndLMXAK5v^=e@7`X*fV2>6MB6tK@>;P3BOq@Oxz8Nv
zGe>~M0yeY>D>`+v3tgdNvQ)&nMJ09iy{YkYsaYx%utg&<VN9%oyK2IusG8I@XBs+n
z+v9+G$FF3uJrJl^G71GusOLkC=taE{^AbQbj5BtK0PRG@Z2bt1P*+Z~H0s;Sz@);w
zR-zm>nUCyzgyEPr<*}8$r0#82%cKwV?0w9CfIw&ZT9=g#U)N%?=J9=%|Ll{k@PXy*
zwU5@M&TT&AexKV4Heb(tk@?~1y<q>3^R-CZE#D1aEizo|J+dAh*><C*gWE`G3N4Lo
zODGuH40Nprx_%GHwU*XfCvTkmdT8nGTE`3Dx8G@B>EGyxZ+4vcxo2tOuW-j!+rirt
zE0^y~ZL}R*7HVDH--yfR4Sy}#`8bL~1M9*5?Ffo=K5l}=_94^~{rsJ!*FK%B`NNM7
zgX)i9|C2}UC~#m0aqOB>=z8c{Xf68IugTxEP3io)bpFY<z)b&{Y)GuMC!5hPV*^P}
zxZCRm`EEi2y2|;IVb7{xU~<@|&A#NQuzDz(91>QC+#tuq`g?Rj82eEOlc-3rRVDgD
z%X5bP^IgbG;I|Nd=6@g-rXE$z8Cg|@8LH;15EZK`fjNk%hhYOSK}G9o1vp`SL)ZgS
zFQDvf9XXP!>ROpO9b#r1oncko_a_CWHfCaj*~Y+6h_EqM$BFbt*~nE(_%um?4jLVq
zr-4BIIF6z-f1{oUDD)>f_y7g&dn23P&U@a@+d~`P-bL~L;HgD%O*+1TPSyOOMd^{q
NamW6ZTDgcF|9{mM*S!D$

diff --git a/server/core/config.py b/server/core/config.py
index 69c3b16..ed1142b 100644
--- a/server/core/config.py
+++ b/server/core/config.py
@@ -9,3 +9,13 @@ HOST = os.environ.get("LORATESTER_HOST", "0.0.0.0")
 PORT = int(os.environ.get("LORATESTER_PORT", "7634"))
 TELEMETRY_LIMIT = int(os.environ.get("LORATESTER_TELEMETRY_LIMIT", "5000"))
 TRACK_POINTS_LIMIT = int(os.environ.get("LORATESTER_TRACK_POINTS_LIMIT", "10000"))
+ELEVATION_API_URL = os.environ.get(
+    "LORATESTER_ELEVATION_URL",
+    "http://192.168.1.109:8085/v1/elevation",
+).rstrip("/")
+ELEVATION_PROBE_TTL_SEC = float(
+    os.environ.get("LORATESTER_ELEVATION_PROBE_TTL", "60")
+)
+ELEVATION_CONNECT_TIMEOUT = float(
+    os.environ.get("LORATESTER_ELEVATION_TIMEOUT", "8")
+)
diff --git a/server/core/elevation.py b/server/core/elevation.py
index fe1326c..4404115 100644
--- a/server/core/elevation.py
+++ b/server/core/elevation.py
@@ -1,40 +1,309 @@
-"""Terrain elevation via Open-Meteo (cached per coordinate)."""
+"""Terrain elevation via self-hosted Open-Meteo-compatible API."""
 
 from __future__ import annotations
 
 import logging
-from typing import Optional
+import math
+import time
+from typing import Any, Optional
 
 import httpx
 
+from .config import (
+    ELEVATION_API_URL,
+    ELEVATION_CONNECT_TIMEOUT,
+    ELEVATION_PROBE_TTL_SEC,
+)
+
 logger = logging.getLogger(__name__)
 
+_BATCH_SIZE = 100
 _CACHE: dict[tuple[float, float], Optional[float]] = {}
-_TIMEOUT = 3.0
+_probe_checked_at = 0.0
+_probe_ok = False
+_probe_error: Optional[str] = None
 
 
 def _cache_key(lat: float, lon: float) -> tuple[float, float]:
-    return (round(lat, 4), round(lon, 4))
+    return (round(lat, 6), round(lon, 6))
 
 
-def fetch_elevation_m(lat: float, lon: float) -> Optional[float]:
-    key = _cache_key(lat, lon)
-    if key in _CACHE:
-        return _CACHE[key]
+def haversine_m(lat1: float, lon1: float, lat2: float, lon2: float) -> float:
+    r = 6_371_000.0
+    d_lat = math.radians(lat2 - lat1)
+    d_lon = math.radians(lon2 - lon1)
+    a = (
+        math.sin(d_lat / 2) ** 2
+        + math.cos(math.radians(lat1))
+        * math.cos(math.radians(lat2))
+        * math.sin(d_lon / 2) ** 2
+    )
+    return r * 2 * math.atan2(math.sqrt(a), math.sqrt(1 - a))
+
+
+def probe_elevation_api(force: bool = False) -> dict[str, Any]:
+    """Ping elevation service before batch requests (cached for TTL)."""
+    global _probe_checked_at, _probe_ok, _probe_error
+
+    now = time.monotonic()
+    if (
+        not force
+        and _probe_checked_at > 0
+        and now - _probe_checked_at < ELEVATION_PROBE_TTL_SEC
+    ):
+        return {
+            "ok": _probe_ok,
+            "url": ELEVATION_API_URL,
+            "error": _probe_error,
+        }
+
     try:
-        with httpx.Client(timeout=_TIMEOUT) as client:
+        with httpx.Client(timeout=ELEVATION_CONNECT_TIMEOUT) as client:
             r = client.get(
-                "https://api.open-meteo.com/v1/elevation",
-                params={"latitude": lat, "longitude": lon},
+                ELEVATION_API_URL,
+                params={"latitude": "0.000000", "longitude": "0.000000"},
             )
             r.raise_for_status()
             data = r.json()
-            elevations = data.get("elevation") or []
-            if elevations:
-                val = float(elevations[0])
-                _CACHE[key] = val
-                return val
+            if "elevation" not in data:
+                raise ValueError("response has no elevation field")
+        _probe_checked_at = now
+        _probe_ok = True
+        _probe_error = None
+        logger.info("elevation API ok: %s", ELEVATION_API_URL)
     except Exception as e:
-        logger.warning("open-meteo elevation failed for %s,%s: %s", lat, lon, e)
-    _CACHE[key] = None
-    return None
+        _probe_checked_at = now
+        _probe_ok = False
+        _probe_error = str(e)
+        logger.warning("elevation API unreachable %s: %s", ELEVATION_API_URL, e)
+
+    return {
+        "ok": _probe_ok,
+        "url": ELEVATION_API_URL,
+        "error": _probe_error,
+    }
+
+
+def elevation_status(force: bool = False) -> dict[str, Any]:
+    probe = probe_elevation_api(force=force)
+    return {
+        "elevation_ok": probe["ok"],
+        "elevation_url": probe["url"],
+        "elevation_error": probe["error"],
+    }
+
+
+def _fetch_elevation_batch(
+    batch_lat: list[float], batch_lon: list[float]
+) -> list[Optional[float]]:
+    if not batch_lat:
+        return []
+    params = {
+        "latitude": ",".join(f"{lat:.6f}" for lat in batch_lat),
+        "longitude": ",".join(f"{lon:.6f}" for lon in batch_lon),
+    }
+    with httpx.Client(timeout=ELEVATION_CONNECT_TIMEOUT) as client:
+        r = client.get(ELEVATION_API_URL, params=params)
+        r.raise_for_status()
+        data = r.json()
+    elevations = data.get("elevation") or []
+    out: list[Optional[float]] = []
+    for j, elev in enumerate(elevations):
+        if j >= len(batch_lat):
+            break
+        if elev is None:
+            out.append(None)
+        else:
+            out.append(float(elev))
+    while len(out) < len(batch_lat):
+        out.append(None)
+    return out
+
+
+def fetch_elevation_m(lat: float, lon: float) -> Optional[float]:
+    vals = fetch_elevations_batch([lat], [lon])
+    return vals[0] if vals else None
+
+
+def fetch_elevations_batch(
+    lats: list[float], lons: list[float]
+) -> list[Optional[float]]:
+    if not lats or len(lats) != len(lons):
+        return []
+
+    probe = probe_elevation_api()
+    if not probe["ok"]:
+        logger.warning(
+            "skip elevation fetch: API unreachable (%s)",
+            probe.get("error"),
+        )
+        return [None] * len(lats)
+
+    out: list[Optional[float]] = [None] * len(lats)
+    pending_idx: list[int] = []
+    pending_lat: list[float] = []
+    pending_lon: list[float] = []
+
+    for i, (lat, lon) in enumerate(zip(lats, lons)):
+        key = _cache_key(lat, lon)
+        if key in _CACHE:
+            out[i] = _CACHE[key]
+        else:
+            pending_idx.append(i)
+            pending_lat.append(float(lat))
+            pending_lon.append(float(lon))
+
+    for start in range(0, len(pending_lat), _BATCH_SIZE):
+        batch_i = pending_idx[start : start + _BATCH_SIZE]
+        batch_lat = pending_lat[start : start + _BATCH_SIZE]
+        batch_lon = pending_lon[start : start + _BATCH_SIZE]
+        try:
+            batch_vals = _fetch_elevation_batch(batch_lat, batch_lon)
+            for j, val in enumerate(batch_vals):
+                lat = batch_lat[j]
+                lon = batch_lon[j]
+                _CACHE[_cache_key(lat, lon)] = val
+                out[batch_i[j]] = val
+            logger.info(
+                "elevation ok: %s points, sample=%s",
+                len(batch_lat),
+                batch_vals[0] if batch_vals else None,
+            )
+        except Exception as e:
+            logger.warning(
+                "elevation batch failed (%s points): %s",
+                len(batch_lat),
+                e,
+            )
+            for j in range(len(batch_lat)):
+                try:
+                    single = _fetch_elevation_batch(
+                        [batch_lat[j]], [batch_lon[j]]
+                    )
+                    val = single[0] if single else None
+                except Exception as e2:
+                    logger.warning(
+                        "elevation single failed %.6f,%.6f: %s",
+                        batch_lat[j],
+                        batch_lon[j],
+                        e2,
+                    )
+                    val = None
+                _CACHE[_cache_key(batch_lat[j], batch_lon[j])] = val
+                out[batch_i[j]] = val
+    return out
+
+
+def _interp_at_dist(
+    cleaned: list[tuple[float, float]], cum: list[float], dist_m: float
+) -> tuple[float, float]:
+    if dist_m <= 0:
+        return cleaned[0]
+    if dist_m >= cum[-1]:
+        return cleaned[-1]
+    for i in range(1, len(cum)):
+        if dist_m <= cum[i]:
+            seg = cum[i] - cum[i - 1]
+            t = 0.0 if seg <= 0 else (dist_m - cum[i - 1]) / seg
+            lat1, lon1 = cleaned[i - 1]
+            lat2, lon2 = cleaned[i]
+            return lat1 + (lat2 - lat1) * t, lon1 + (lon2 - lon1) * t
+    return cleaned[-1]
+
+
+def resample_track_path(
+    points: list[dict[str, Any]], step_m: float = 10.0
+) -> list[dict[str, float]]:
+    """Sample (lat, lon, dist_m) along polyline every ~step_m meters."""
+    if not points or step_m <= 0:
+        return []
+    cleaned: list[tuple[float, float]] = []
+    for p in points:
+        lat = p.get("lat")
+        lon = p.get("lon")
+        if lat is None or lon is None:
+            continue
+        lat_f, lon_f = float(lat), float(lon)
+        if not cleaned or haversine_m(cleaned[-1][0], cleaned[-1][1], lat_f, lon_f) > 0.5:
+            cleaned.append((lat_f, lon_f))
+    if not cleaned:
+        return []
+    if len(cleaned) == 1:
+        return [{"lat": cleaned[0][0], "lon": cleaned[0][1], "dist_m": 0.0}]
+
+    cum = [0.0]
+    for i in range(1, len(cleaned)):
+        cum.append(
+            cum[-1]
+            + haversine_m(
+                cleaned[i - 1][0], cleaned[i - 1][1], cleaned[i][0], cleaned[i][1]
+            )
+        )
+    total = cum[-1]
+    samples: list[dict[str, float]] = []
+    dist = 0.0
+    while dist <= total + 1e-6:
+        lat, lon = _interp_at_dist(cleaned, cum, dist)
+        samples.append({"lat": lat, "lon": lon, "dist_m": round(dist, 1)})
+        if dist >= total:
+            break
+        dist += step_m
+    return samples
+
+
+def build_elevation_profile(
+    points: list[dict[str, Any]], step_m: float = 10.0
+) -> dict[str, Any]:
+    """Resample track and fetch terrain elevations."""
+    step_m = max(5.0, min(10.0, float(step_m)))
+    samples = resample_track_path(points, step_m)
+    if not samples:
+        return {
+            "step_m": step_m,
+            "points": [],
+            "total_m": 0.0,
+            "api_source": "elevation",
+            "api_error": "no samples",
+        }
+
+    probe = probe_elevation_api()
+    if not probe["ok"]:
+        return {
+            "step_m": step_m,
+            "points": [],
+            "total_m": 0.0,
+            "api_source": "elevation",
+            "api_error": f"elevation API unreachable: {probe['error']}",
+            "elevation_url": ELEVATION_API_URL,
+        }
+
+    lats = [s["lat"] for s in samples]
+    lons = [s["lon"] for s in samples]
+    elevations = fetch_elevations_batch(lats, lons)
+
+    profile: list[dict[str, Any]] = []
+    elev_vals: list[float] = []
+    for s, elev in zip(samples, elevations):
+        item = {
+            "dist_m": round(s["dist_m"], 1),
+            "lat": round(s["lat"], 6),
+            "lon": round(s["lon"], 6),
+            "elevation_m": elev,
+        }
+        profile.append(item)
+        if elev is not None:
+            elev_vals.append(elev)
+
+    total_m = profile[-1]["dist_m"] if profile else 0.0
+    result: dict[str, Any] = {
+        "step_m": step_m,
+        "total_m": total_m,
+        "min_elevation_m": min(elev_vals) if elev_vals else None,
+        "max_elevation_m": max(elev_vals) if elev_vals else None,
+        "points": profile,
+        "api_source": "elevation",
+        "elevation_url": ELEVATION_API_URL,
+    }
+    if not elev_vals:
+        result["api_error"] = "elevation API returned no values"
+    return result
diff --git a/server/docker-compose.yml b/server/docker-compose.yml
new file mode 100644
index 0000000..be5dafe
--- /dev/null
+++ b/server/docker-compose.yml
@@ -0,0 +1,20 @@
+services:
+  loratester:
+    build: .
+    container_name: loratester
+    restart: unless-stopped
+    ports:
+      - "${LORATESTER_PORT:-7634}:7634"
+    volumes:
+      - loratester-data:/data
+    environment:
+      LORATESTER_DB: /data/loratester.db
+      LORATESTER_PORT: "7634"
+      LORATESTER_ELEVATION_URL: ${LORATESTER_ELEVATION_URL:-http://192.168.1.109:8085/v1/elevation}
+      LORATESTER_ELEVATION_PROBE_TTL: ${LORATESTER_ELEVATION_PROBE_TTL:-60}
+      LORATESTER_ELEVATION_TIMEOUT: ${LORATESTER_ELEVATION_TIMEOUT:-8}
+      LORATESTER_TELEMETRY_LIMIT: ${LORATESTER_TELEMETRY_LIMIT:-5000}
+      LORATESTER_TRACK_POINTS_LIMIT: ${LORATESTER_TRACK_POINTS_LIMIT:-10000}
+
+volumes:
+  loratester-data:
diff --git a/server/fastapi_app.py b/server/fastapi_app.py
index f18c358..9ad2419 100644
--- a/server/fastapi_app.py
+++ b/server/fastapi_app.py
@@ -298,10 +298,50 @@ def paired_tracks_cancel(body: PairedTrackCancelBody):
         raise HTTPException(400, detail=str(e)) from e
 
 
+class ElevationPoint(BaseModel):
+    lat: float
+    lon: float
+    ts: Optional[float] = None
+
+
+class ElevationProfileBody(BaseModel):
+    points: list[ElevationPoint] = Field(default_factory=list)
+    step_m: float = 10.0
+
+
+@app.post("/api/elevation/profile")
+def elevation_profile(body: ElevationProfileBody):
+    from core.elevation import build_elevation_profile
+
+    pts = [p.model_dump(exclude_none=True) for p in body.points]
+    return build_elevation_profile(pts, body.step_m)
+
+
+@app.get("/api/tracks/{track_id}/elevation-profile")
+def track_elevation_profile(
+    track_id: int,
+    step_m: float = Query(10.0, ge=5.0, le=10.0),
+):
+    from core.elevation import build_elevation_profile
+
+    try:
+        track = storage.get_track(track_id)
+    except ValueError as e:
+        raise HTTPException(404, detail=str(e)) from e
+    return build_elevation_profile(track.get("points") or [], step_m)
+
+
 @app.get("/api/health")
 def health():
+    from core.elevation import elevation_status
+
     status = storage.db_status()
-    return {"ok": status["db_ok"], "ts": time.time(), **status}
+    return {
+        "ok": status["db_ok"],
+        "ts": time.time(),
+        **status,
+        **elevation_status(),
+    }
 
 
 if __name__ == "__main__":
diff --git a/server/flask_app.py b/server/flask_app.py
index 3ba86ef..f9e06c0 100644
--- a/server/flask_app.py
+++ b/server/flask_app.py
@@ -237,10 +237,41 @@ def paired_tracks_cancel():
         return jsonify({"error": str(e)}), 400
 
 
+@app.post("/api/elevation/profile")
+def elevation_profile():
+    from core.elevation import build_elevation_profile
+
+    body = request.get_json(force=True, silent=True) or {}
+    points = body.get("points") or []
+    step_m = body.get("step_m", 10)
+    try:
+        step = float(step_m)
+    except (TypeError, ValueError):
+        step = 10.0
+    return jsonify(build_elevation_profile(points, step))
+
+
+@app.get("/api/tracks/<int:track_id>/elevation-profile")
+def track_elevation_profile(track_id: int):
+    from core.elevation import build_elevation_profile
+
+    step_m = request.args.get("step_m", 10, type=float)
+    try:
+        track = storage.get_track(track_id)
+    except ValueError as e:
+        return jsonify({"error": str(e)}), 404
+    points = track.get("points") or []
+    return jsonify(build_elevation_profile(points, step_m or 10.0))
+
+
 @app.get("/api/health")
 def health():
+    from core.elevation import elevation_status
+
     status = storage.db_status()
-    return jsonify({"ok": status["db_ok"], "ts": time.time(), **status})
+    return jsonify(
+        {"ok": status["db_ok"], "ts": time.time(), **status, **elevation_status()}
+    )
 
 
 def _float_or_none(value):
diff --git a/server/static/index.html b/server/static/index.html
index 513df39..1d8b951 100644
--- a/server/static/index.html
+++ b/server/static/index.html
@@ -12,7 +12,14 @@
     header h1 { margin: 0; font-size: 1.2rem; flex: 1; }
     main { display: grid; grid-template-columns: 1fr 340px; grid-template-rows: 1fr auto; height: calc(100vh - 52px); }
     @media (max-width: 900px) {
-      main { grid-template-columns: 1fr; grid-template-rows: 45vh minmax(180px, 1fr) auto; }
+      main {
+        grid-template-columns: 1fr;
+        grid-template-rows: minmax(200px, 38vh) auto minmax(160px, 1fr);
+        overflow-y: auto;
+      }
+      #mapWrap { grid-row: 1; }
+      #trackTimeline { grid-row: 2; }
+      aside { grid-row: 3; }
     }
     #mapWrap { grid-column: 1; grid-row: 1; position: relative; min-height: 0; }
     #map { width: 100%; height: 100%; }
@@ -20,27 +27,41 @@
       display: none; grid-column: 1 / -1; grid-row: 2;
       background: #16213e; padding: 8px 16px; border-top: 1px solid #333;
     }
-    #trackTimeline.visible { display: block; }
+    #trackTimeline.visible { display: block; min-height: 200px; flex-shrink: 0; }
     .timeline-bar { display: flex; flex-direction: column; gap: 6px; }
     .timeline-bar-header { display: flex; justify-content: space-between; align-items: center; gap: 8px; }
     .timeline-bar-title { font-size: 0.85rem; font-weight: 600; }
     .timeline-bar .timeline-labels { width: 100%; margin: 0; }
     .timeline-bar #timeSlider { width: 100%; margin: 0; }
+    #elevationPanel {
+      margin-top: 8px; padding: 8px 10px;
+      background: #0f3460; border: 1px solid #00ff8844; border-radius: 6px;
+    }
+    #elevationPanelTitle {
+      font-size: 0.8rem; color: #00ff88; margin-bottom: 6px;
+      display: flex; justify-content: space-between; align-items: center; font-weight: 600;
+    }
+    #elevationStatus { font-size: 0.7rem; color: #aaa; font-weight: 400; }
+    #elevationCanvas { width: 100%; height: 130px; display: block; background: #0a0a14; border-radius: 4px; }
+    .elev-legend { font-size: 0.7rem; }
     #timelineStatsPanel {
       display: none; margin-top: 10px; padding-top: 10px; border-top: 1px solid #333;
     }
     #timelineStatsPanel.visible { display: block; }
-    #timelineStatsPanel.timeline-single #timelineStats { grid-template-columns: 1fr; }
-    #timelineStatsPanel.timeline-single .timeline-col.rx { display: none; }
     #timelineStatsPanel.timeline-single #distanceNow { display: none; }
     #timelineNote { font-size: 0.75rem; color: #aaa; margin: 4px 0 8px; }
     #timeSlider { width: 100%; margin: 6px 0; }
     .timeline-labels { display: flex; justify-content: space-between; font-size: 0.75rem; color: #aaa; }
-    #timelineStats { display: grid; grid-template-columns: 1fr 1fr; gap: 8px; margin-top: 8px; font-size: 0.8rem; }
-    .timeline-col { background: #0a0a14; padding: 8px; border-radius: 4px; }
-    .timeline-col h3 { margin: 0 0 6px; font-size: 0.85rem; }
-    .timeline-col.tx h3 { color: #e94560; }
-    .timeline-col.rx h3 { color: #4fc3f7; }
+    #timelineStats { margin-top: 8px; font-size: 0.8rem; }
+    .radio-compare-grid { background: #0a0a14; padding: 8px; border-radius: 4px; }
+    .radio-compare-head { display: grid; grid-template-columns: 1fr 1fr; gap: 8px; margin-bottom: 6px; font-weight: 600; }
+    .radio-row { display: grid; grid-template-columns: 72px 1fr 1fr; gap: 6px; padding: 2px 0; }
+    .radio-label { color: #aaa; }
+    .radio-tx { color: #e94560; }
+    .radio-rx { color: #4fc3f7; }
+    .radio-row .changed, .changed { background: #e9456033; border-radius: 3px; padding: 0 2px; }
+    .radio-static summary { cursor: pointer; color: #aaa; margin: 4px 0; }
+    #stats .changed { background: #e9456033; border-radius: 3px; }
     #distanceNow { font-size: 0.9rem; margin-top: 4px; color: #00ff88; }
     aside {
       grid-column: 2; grid-row: 1;
@@ -57,7 +78,12 @@
     #deviceList li:hover, #deviceList li.active { background: #e94560; }
     #stats { font-size: 0.85rem; line-height: 1.5; }
     #history { font-size: 0.75rem; max-height: 100px; overflow: auto; }
-    #chatLog { height: 140px; overflow: auto; font-size: 0.8rem; background: #0a0a14; padding: 8px; border-radius: 4px; }
+    #chatLog { height: 140px; overflow: auto; font-size: 0.8rem; background: #0a0a14; padding: 8px; border-radius: 4px; display: flex; flex-direction: column; gap: 4px; }
+    .chat-msg { max-width: 85%; padding: 6px 8px; border-radius: 8px; line-height: 1.35; }
+    .chat-self { align-self: flex-end; background: #16213e; text-align: right; }
+    .chat-other { align-self: flex-start; background: #1a4a6e; }
+    .chat-new { box-shadow: inset 0 0 0 1px #e94560; }
+    .chat-meta { font-size: 0.7rem; color: #aaa; margin-bottom: 2px; }
     #chatForm { display: flex; gap: 6px; margin-top: 6px; }
     #chatForm input { flex: 1; padding: 6px; border: none; border-radius: 4px; }
     #chatForm button { padding: 6px 12px; background: #e94560; color: #fff; border: none; border-radius: 4px; cursor: pointer; }
@@ -95,6 +121,43 @@
     #mapModalHeader span { font-size: 0.85rem; font-weight: 600; }
     #mapModalClose { background: none; border: none; color: #eee; font-size: 1.2rem; cursor: pointer; padding: 0 4px; }
     #mapModalBody { padding: 10px; font-size: 0.85rem; line-height: 1.45; }
+    #mapCenterBar {
+      position: absolute; top: 10px; right: 10px; left: auto; z-index: 1000;
+      display: flex; gap: 4px; flex-wrap: wrap;
+      pointer-events: auto;
+    }
+    #mapCenterBar button {
+      padding: 5px 10px; font-size: 0.75rem; border: 1px solid #444; border-radius: 4px;
+      background: #16213ee6; color: #eee; cursor: pointer;
+      box-shadow: 0 1px 4px rgba(0,0,0,0.35);
+    }
+    #mapCenterBar button:hover { background: #1f3460; }
+    #mapCenterBar button.active { background: #00ff88; color: #111; border-color: #00ff88; }
+    .leaflet-top.leaflet-left { margin-top: 0; margin-left: 0; }
+    #gpsDistance { color: #00ff88; font-size: 0.8rem; }
+    #mapRulerPanel {
+      display: none; position: absolute; left: 8px; right: 8px; bottom: 8px; z-index: 1000;
+      background: #16213ef0; border: 1px solid #00ff8866; border-radius: 8px;
+      padding: 8px 10px; pointer-events: auto;
+    }
+    #mapRulerPanel.open { display: block; }
+    #mapRulerHead {
+      display: flex; justify-content: space-between; align-items: center;
+      font-size: 0.8rem; color: #00ff88; font-weight: 600; margin-bottom: 6px;
+    }
+    #mapRulerStatus { font-size: 0.7rem; color: #aaa; font-weight: 400; }
+    #btnMapRulerClose {
+      background: none; border: none; color: #eee; font-size: 1.1rem;
+      cursor: pointer; padding: 0 4px; line-height: 1;
+    }
+    #mapRulerCanvas { width: 100%; height: 120px; display: block; background: #0a0a14; border-radius: 4px; }
+    #mapRulerTools { display: flex; gap: 4px; margin-bottom: 6px; flex-wrap: wrap; }
+    #mapRulerTools button {
+      padding: 3px 8px; font-size: 0.7rem; border: 1px solid #444; border-radius: 4px;
+      background: #0a0a14; color: #ccc; cursor: pointer;
+    }
+    #mapRulerTools button.active { background: #00ff88; color: #111; border-color: #00ff88; }
+    #mapRulerHint { font-size: 0.7rem; color: #aaa; margin-bottom: 4px; min-height: 1em; }
   </style>
 </head>
 <body>
@@ -103,10 +166,30 @@
     <span class="muted" id="status">загрузка…</span>
     <span class="muted" id="pollStatus" title="Автообновление">⟳ 1 с</span>
     <span class="legend"><span class="legend-tx">● TX</span> &nbsp; <span class="legend-rx">● RX</span></span>
+    <span id="gpsDistance" class="muted">GPS: —</span>
     <input type="text" id="webDeviceId" placeholder="ник в чате" style="padding:6px;border-radius:4px;border:none;max-width:160px" />
   </header>
   <main>
     <div id="mapWrap">
+      <div id="mapCenterBar">
+        <button type="button" id="btnMapTx">TX</button>
+        <button type="button" id="btnMapRx">RX</button>
+        <button type="button" id="btnMapBoth">Оба</button>
+        <button type="button" id="btnMapRuler">Линейка</button>
+      </div>
+      <div id="mapRulerPanel">
+        <div id="mapRulerHead">
+          <span>Линейка высот <span id="mapRulerStatus"></span></span>
+          <button type="button" id="btnMapRulerClose" aria-label="Закрыть">×</button>
+        </div>
+        <div id="mapRulerTools">
+          <button type="button" id="btnRulerPick" class="active">Точки</button>
+          <button type="button" id="btnRulerAutoTxRx">TX→RX</button>
+          <button type="button" id="btnRulerClear">Сброс</button>
+        </div>
+        <div id="mapRulerHint">Клик на карте — точка A, затем точка B</div>
+        <canvas id="mapRulerCanvas" width="800" height="120"></canvas>
+      </div>
       <div id="map"></div>
     </div>
     <aside>
@@ -123,12 +206,31 @@
         <h2>Управление</h2>
         <label class="muted">Целевое устройство</label>
         <select id="cmdTargetSelect"><option value="">—</option></select>
-        <input type="text" id="cmdAtInput" placeholder="AT+SF=7 …" />
-        <div class="cmd-row">
-          <button type="button" id="btnCmdAt">AT</button>
-          <button type="button" id="btnCmdTx">AT+TX</button>
-          <button type="button" id="btnCmdRx">AT+RX</button>
+        <div id="cmdCurrentValues" class="muted" style="margin-top:4px;font-size:0.75rem">—</div>
+        <div class="cmd-row" style="margin-top:6px">
+          <label class="muted" style="flex:1">FQ MHz<input type="number" id="cmdFq" step="0.001" placeholder="433" /></label>
+          <label class="muted" style="flex:1">PW dBm<input type="number" id="cmdPw" min="-9" max="22" placeholder="22" /></label>
         </div>
+        <div class="cmd-row">
+          <label class="muted" style="flex:1">SF<input type="number" id="cmdSf" min="5" max="12" placeholder="7" /></label>
+          <label class="muted" style="flex:1">PL<input type="number" id="cmdPl" min="1" max="64" placeholder="8" /></label>
+        </div>
+        <label class="muted">BW kHz</label>
+        <select id="cmdBw">
+          <option value="">—</option>
+          <option>7.81</option><option>10.42</option><option>15.63</option><option>20.83</option>
+          <option>31.25</option><option>41.67</option><option>62.5</option>
+          <option selected>125</option><option>250</option><option>500</option>
+        </select>
+        <label class="muted">CR</label>
+        <select id="cmdCr">
+          <option value="">—</option><option>4/5</option><option>4/6</option><option>4/7</option><option>4/8</option>
+        </select>
+        <label class="muted">TM ms</label>
+        <input type="number" id="cmdTm" min="0" max="60000" placeholder="0" />
+        <label class="muted">Роль</label>
+        <select id="cmdRole"><option value="">—</option><option value="TX">TX</option><option value="RX">RX</option></select>
+        <button type="button" id="btnCmdApply" style="width:100%;margin-top:6px;padding:6px;background:#e94560;color:#fff;border:none;border-radius:4px;font-weight:600;cursor:pointer">Применить</button>
         <button type="button" id="btnPairedStart" style="width:100%;margin-top:8px;padding:6px;background:#00ff88;color:#111;border:none;border-radius:4px;font-weight:600;cursor:pointer">Старт трека (оба)</button>
         <div id="pairedStatus">—</div>
       </div>
@@ -163,10 +265,7 @@
           <h3 style="margin:0 0 6px;font-size:0.9rem">Статистика по времени</h3>
           <div id="timelineNote"></div>
           <div id="distanceNow">Расстояние GPS: —</div>
-          <div id="timelineStats">
-            <div class="timeline-col tx"><h3 id="timelineCol1Label">TX</h3><div id="statsTx">—</div></div>
-            <div class="timeline-col rx"><h3>RX</h3><div id="statsRx">—</div></div>
-          </div>
+          <div id="timelineStats">—</div>
         </div>
       </div>
       <div class="panel" style="flex:1;display:flex;flex-direction:column">
@@ -190,6 +289,13 @@
           <span id="timeEnd">—</span>
         </div>
         <input type="range" id="timeSlider" min="0" max="100" value="0" step="1" />
+        <div id="elevationPanel">
+          <div id="elevationPanelTitle">
+            <span>Линейка высот <span id="elevationStatus" class="muted">—</span></span>
+            <span class="elev-legend"><span class="legend-tx">TX</span> <span class="legend-rx">RX</span></span>
+          </div>
+          <canvas id="elevationCanvas" width="800" height="130"></canvas>
+        </div>
       </div>
     </div>
   </main>
@@ -201,6 +307,7 @@
     <div id="mapModalBody"></div>
   </div>
   <script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js"></script>
+  <script src="/static/radio-ui.js"></script>
   <script>
     const map = L.map('map').setView([55.75, 37.62], 10);
     L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
@@ -210,6 +317,10 @@
     const markers = {};
     let selectedId = null;
     let chatSince = 0;
+    let chatLastReadTs = 0;
+    let prevDeviceSnap = null;
+    let prevTimelineTxSnap = null;
+    let prevTimelineRxSnap = null;
     let mapInitialFitDone = false;
     let userMovedMap = false;
     let programmaticMove = false;
@@ -237,6 +348,19 @@
     let dualTracksActive = false;
     let singleTrackActive = false;
     let lastDevices = [];
+    let elevProfileTx = null;
+    let elevProfileRx = null;
+    let elevProfileSingle = null;
+    let elevProfileMapLine = null;
+    let elevationLoadState = 'idle';
+    let mapRulerOpen = false;
+    let mapRulerMode = 'pick';
+    let mapRulerPtA = null;
+    let mapRulerPtB = null;
+    let mapRulerLoadState = 'idle';
+    let mapRulerLineLayer = null;
+    let mapRulerMarkerA = null;
+    let mapRulerMarkerB = null;
 
     const DEVICE_POLL_MS = 1000;
     const CHAT_POLL_MS = 2500;
@@ -249,6 +373,7 @@
     map.on('zoomend moveend', () => {
       if (!programmaticMove) userMovedMap = true;
     });
+    map.on('click', onMapRulerClick);
 
     function isNullIsland(lat, lon) {
       return Math.abs(lat) < 1e-5 && Math.abs(lon) < 1e-5;
@@ -294,7 +419,7 @@
     function setMapViewProgrammatically(fn) {
       programmaticMove = true;
       fn();
-      setTimeout(() => { programmaticMove = false; }, 0);
+      map.once('moveend', () => { programmaticMove = false; });
     }
 
     function fitAllMarkers(bounds) {
@@ -302,7 +427,7 @@
       if (bounds.length === 1) {
         setMapViewProgrammatically(() => map.setView(bounds[0], 13));
       } else {
-        setMapViewProgrammatically(() => map.fitBounds(bounds, { padding: [40, 40], maxZoom: 14 }));
+        setMapViewProgrammatically(() => map.fitBounds(bounds, { padding: [40, 40], maxZoom: 16 }));
       }
       mapInitialFitDone = true;
     }
@@ -312,54 +437,737 @@
       return String(s).replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;');
     }
 
-    function formatMeta(meta) {
-      if (!meta) return '';
-      try {
-        const m = typeof meta === 'string' ? JSON.parse(meta) : meta;
-        const lines = [];
-        const skip = new Set(['send', 'receive']);
-        const shown = new Set();
-        const addLine = (label, value) => {
-          if (value == null || value === '') return;
-          const key = label.toLowerCase();
-          if (shown.has(key)) return;
-          shown.add(key);
-          lines.push(`${escapeHtml(label)}: ${escapeHtml(String(value))}`);
-        };
-        if (m.fields && typeof m.fields === 'object') {
-          for (const [k, v] of Object.entries(m.fields)) {
-            if (skip.has(k.toLowerCase())) continue;
-            addLine(k, v);
-          }
-        }
-        addLine('Роль', m.role ? roleLabel(m.role) : null);
-        addLine('Кадр', m.frame);
-        addLine('Мощность TX', m.power_dbm != null ? `${m.power_dbm} dBm` : null);
-        addLine('RSSI', m.rssi_dbm != null ? `${m.rssi_dbm} dBm` : null);
-        addLine('SNR', m.snr_db != null ? `${m.snr_db} dB` : null);
-        addLine('Частота', m.frequency_hz ? `${(m.frequency_hz/1e6).toFixed(3)} MHz` : null);
-        addLine('SF', m.spreading_factor);
-        addLine('BW', m.bandwidth_khz != null ? `${m.bandwidth_khz} kHz` : null);
-        addLine('Пакет', m.packet);
-        addLine('Payload', m.payload);
-        addLine('On Air', m.on_air_ms != null ? `${m.on_air_ms} ms` : null);
-        addLine('TX Speed', m.tx_pkt_per_s != null ? `${m.tx_pkt_per_s} pkt/s` : null);
-        addLine('RX Speed', m.rx_pkt_per_s != null ? `${m.rx_pkt_per_s} pkt/s` : null);
-        addLine('PER', m.per_percent != null ? `${m.per_percent} %` : null);
-        return lines.length ? lines.join('<br>') : '';
-      } catch (e) {
-        return '';
+    function telemetryToSnap(r) {
+      return RadioUI.parseRadioSnapshot(r.meta, r.role, r.rssi);
+    }
+
+    function formatTelemetryRow(r, changed) {
+      const snap = telemetryToSnap(r);
+      let html = RadioUI.formatRadioPanel(snap, changed || new Set());
+      if (r.range_m != null) html += `<div><b>Range:</b> ${r.range_m} m</div>`;
+      if (r.lat != null && r.lon != null && !isNullIsland(r.lat, r.lon)) {
+        html += `<div><b>GPS:</b> ${r.lat.toFixed(5)}, ${r.lon.toFixed(5)}</div>`;
+      }
+      return html;
+    }
+
+    function renderTimelineCompare(txTel, rxTel, txId, rxId) {
+      const txSnap = txTel ? telemetryToSnap(txTel) : RadioUI.parseRadioSnapshot(null);
+      const rxSnap = rxTel ? telemetryToSnap(rxTel) : RadioUI.parseRadioSnapshot(null);
+      const chTx = RadioUI.diffSnapshots(prevTimelineTxSnap, txSnap);
+      const chRx = RadioUI.diffSnapshots(prevTimelineRxSnap, rxSnap);
+      prevTimelineTxSnap = txSnap;
+      prevTimelineRxSnap = rxSnap;
+      return RadioUI.renderCompareGrid(txSnap, rxSnap, txId, rxId, chTx, chRx);
+    }
+
+    function fillCmdFormFromDevice(d) {
+      if (!d) return;
+      const snap = RadioUI.parseRadioSnapshot(d.meta, d.role, d.rssi);
+      document.getElementById('cmdCurrentValues').innerHTML =
+        RadioUI.formatRadioPanel(snap, new Set());
+      if (snap.frequencyMhz != null) {
+        document.getElementById('cmdFq').value = snap.frequencyMhz.toFixed(3);
+      }
+      if (snap.powerDbm != null) document.getElementById('cmdPw').value = snap.powerDbm;
+      if (snap.sf != null) document.getElementById('cmdSf').value = snap.sf;
+      if (snap.bwKhz != null) document.getElementById('cmdBw').value = String(snap.bwKhz);
+      if (snap.role) document.getElementById('cmdRole').value = snap.role;
+    }
+
+    function buildMacroLines() {
+      const lines = ['S'];
+      const fq = document.getElementById('cmdFq').value.trim();
+      const pw = document.getElementById('cmdPw').value.trim();
+      const sf = document.getElementById('cmdSf').value.trim();
+      const bw = document.getElementById('cmdBw').value.trim();
+      const cr = document.getElementById('cmdCr').value.trim();
+      const pl = document.getElementById('cmdPl').value.trim();
+      const tm = document.getElementById('cmdTm').value.trim();
+      const role = document.getElementById('cmdRole').value;
+      if (fq) {
+        const hz = Math.round(parseFloat(fq) * 1e6);
+        if (hz >= 430000000 && hz <= 470000000) lines.push(`AT+FQ=${hz}`);
+      }
+      if (pw) lines.push(`AT+PW=${pw}`);
+      if (sf) lines.push(`AT+SF=${sf}`);
+      if (bw) lines.push(`AT+BW=${bw}`);
+      if (cr) lines.push(`AT+CR=${cr}`);
+      if (pl) lines.push(`AT+PL=${pl}`);
+      if (tm) lines.push(`AT+TM=${tm}`);
+      if (role === 'TX') lines.push('AT+TX');
+      if (role === 'RX') lines.push('AT+RX');
+      return lines;
+    }
+
+    function setElevationStatus(text) {
+      const el = document.getElementById('elevationStatus');
+      if (el) el.textContent = text ? `· ${text}` : '';
+    }
+
+    function setMapRulerStatus(text) {
+      const el = document.getElementById('mapRulerStatus');
+      if (el) el.textContent = text ? `· ${text}` : '';
+    }
+
+    function getTxRxDevices(devices) {
+      let tx = null;
+      let rx = null;
+      (devices || lastDevices).forEach(d => {
+        if (d.lat == null || d.lon == null || isNullIsland(d.lat, d.lon)) return;
+        if (d.role === 'TX') tx = d;
+        if (d.role === 'RX') rx = d;
+      });
+      return { tx, rx };
+    }
+
+    function buildDirectLinePoints(tx, rx, stepM = 10) {
+      const total = haversineM(tx.lat, tx.lon, rx.lat, rx.lon);
+      if (total < 1) {
+        return [{ lat: tx.lat, lon: tx.lon }];
+      }
+      const pts = [];
+      for (let d = 0; d <= total + 1e-6; d += stepM) {
+        const f = Math.min(1, d / total);
+        pts.push({
+          lat: tx.lat + (rx.lat - tx.lat) * f,
+          lon: tx.lon + (rx.lon - tx.lon) * f
+        });
+        if (d >= total) break;
+      }
+      const last = pts[pts.length - 1];
+      if (haversineM(last.lat, last.lon, rx.lat, rx.lon) > 1) {
+        pts.push({ lat: rx.lat, lon: rx.lon });
+      }
+      return pts;
+    }
+
+    function makeRulerPointIcon(label, color) {
+      return L.divIcon({
+        className: '',
+        html: `<div style="width:22px;height:22px;border-radius:50%;background:${color};border:2px solid #fff;color:#fff;font-size:11px;font-weight:700;display:flex;align-items:center;justify-content:center;box-shadow:0 0 4px #000">${label}</div>`,
+        iconSize: [22, 22],
+        iconAnchor: [11, 11]
+      });
+    }
+
+    function setMapRulerHint(text) {
+      const el = document.getElementById('mapRulerHint');
+      if (el) el.textContent = text || '';
+    }
+
+    function updateMapRulerLineLayer(a, b) {
+      if (mapRulerLineLayer) {
+        map.removeLayer(mapRulerLineLayer);
+        mapRulerLineLayer = null;
+      }
+      if (!mapRulerOpen || !a || !b) return;
+      mapRulerLineLayer = L.polyline(
+        [[a.lat, a.lon], [b.lat, b.lon]],
+        { color: '#00ff88', weight: 3, dashArray: '8,6', opacity: 0.85 }
+      ).addTo(map);
+    }
+
+    function clearMapRulerLineLayer() {
+      if (mapRulerLineLayer) {
+        map.removeLayer(mapRulerLineLayer);
+        mapRulerLineLayer = null;
       }
     }
 
-    function formatTelemetryRow(r) {
-      let html = formatMeta(r.meta);
-      html += `RSSI: ${r.rssi ?? '—'} dBm<br>`;
-      html += `Range: ${r.range_m ?? '—'} m<br>`;
-      if (r.lat != null && r.lon != null && !isNullIsland(r.lat, r.lon)) {
-        html += `GPS: ${r.lat.toFixed(5)}, ${r.lon.toFixed(5)}`;
+    function clearMapRulerPickPoints() {
+      mapRulerPtA = null;
+      mapRulerPtB = null;
+      if (mapRulerMarkerA) {
+        map.removeLayer(mapRulerMarkerA);
+        mapRulerMarkerA = null;
       }
-      return html;
+      if (mapRulerMarkerB) {
+        map.removeLayer(mapRulerMarkerB);
+        mapRulerMarkerB = null;
+      }
+      clearMapRulerLineLayer();
+      elevProfileMapLine = null;
+    }
+
+    function setMapRulerMode(mode) {
+      mapRulerMode = mode;
+      document.getElementById('btnRulerPick').classList.toggle('active', mode === 'pick');
+      document.getElementById('btnRulerAutoTxRx').classList.toggle('active', mode === 'auto');
+      if (mode === 'pick') {
+        setMapRulerHint(mapRulerPtB
+          ? 'A и B заданы — клик сбрасывает и задаёт новую A'
+          : mapRulerPtA
+            ? 'Клик на карте — точка B'
+            : 'Клик на карте — точка A, затем точка B');
+      } else {
+        setMapRulerHint('Линия между устройствами TX и RX (обновляется при poll)');
+      }
+    }
+
+    function placeMapRulerMarker(which, pt, color) {
+      const marker = L.marker([pt.lat, pt.lon], {
+        icon: makeRulerPointIcon(which, color),
+        draggable: true,
+        zIndexOffset: 900
+      }).addTo(map);
+      marker.on('dragend', () => {
+        const ll = marker.getLatLng();
+        const updated = { lat: ll.lat, lon: ll.lng };
+        if (which === 'A') mapRulerPtA = updated;
+        else mapRulerPtB = updated;
+        if (mapRulerPtA && mapRulerPtB) {
+          loadMapRulerProfileFromPoints(mapRulerPtA, mapRulerPtB);
+        }
+      });
+      if (which === 'A') {
+        if (mapRulerMarkerA) map.removeLayer(mapRulerMarkerA);
+        mapRulerMarkerA = marker;
+      } else {
+        if (mapRulerMarkerB) map.removeLayer(mapRulerMarkerB);
+        mapRulerMarkerB = marker;
+      }
+    }
+
+    async function loadMapRulerProfileFromPoints(a, b) {
+      if (!a || !b) return;
+      mapRulerLoadState = 'loading';
+      setMapRulerStatus('загрузка…');
+      updateMapRulerLineLayer(a, b);
+      drawMapRulerChart();
+      const linePts = buildDirectLinePoints(a, b, 10);
+      elevProfileMapLine = await fetchElevationProfile(linePts);
+      mapRulerLoadState = 'done';
+      const dist = haversineM(a.lat, a.lon, b.lat, b.lon);
+      const n = elevationPointCount(elevProfileMapLine);
+      if (n > 0) {
+        const src = elevProfileMapLine.source === 'elevation' ? 'высоты'
+          : elevProfileMapLine.source === 'server' ? 'сервер'
+          : elevProfileMapLine.source || 'данные';
+        setMapRulerStatus(`${dist.toFixed(0)} m · ${src} · ${n} точек`);
+      } else {
+        setMapRulerStatus(`${dist.toFixed(0)} m · ${elevProfileMapLine?.api_error || 'нет данных'}`);
+      }
+      drawMapRulerChart();
+    }
+
+    function onMapRulerClick(e) {
+      if (!mapRulerOpen || mapRulerMode !== 'pick') return;
+      const pt = { lat: e.latlng.lat, lon: e.latlng.lng };
+      if (!mapRulerPtA) {
+        mapRulerPtA = pt;
+        placeMapRulerMarker('A', pt, TX_COLOR);
+        setMapRulerHint('Клик на карте — точка B');
+        setMapRulerStatus('точка A');
+        drawMapRulerChart();
+        return;
+      }
+      if (!mapRulerPtB) {
+        mapRulerPtB = pt;
+        placeMapRulerMarker('B', pt, RX_COLOR);
+        setMapRulerHint('A и B заданы — клик сбрасывает и задаёт новую A');
+        loadMapRulerProfileFromPoints(mapRulerPtA, mapRulerPtB);
+        return;
+      }
+      clearMapRulerPickPoints();
+      mapRulerPtA = pt;
+      placeMapRulerMarker('A', pt, TX_COLOR);
+      setMapRulerHint('Клик на карте — точка B');
+      setMapRulerStatus('точка A');
+      drawMapRulerChart();
+    }
+
+    function interpTrackAtDist(cleaned, cum, distM) {
+      if (distM <= 0) return cleaned[0];
+      if (distM >= cum[cum.length - 1]) return cleaned[cleaned.length - 1];
+      for (let i = 1; i < cum.length; i++) {
+        if (distM <= cum[i]) {
+          const seg = cum[i] - cum[i - 1];
+          const t = seg <= 0 ? 0 : (distM - cum[i - 1]) / seg;
+          const [lat1, lon1] = cleaned[i - 1];
+          const [lat2, lon2] = cleaned[i];
+          return [lat1 + (lat2 - lat1) * t, lon1 + (lon2 - lon1) * t];
+        }
+      }
+      return cleaned[cleaned.length - 1];
+    }
+
+    function resampleTrackPath(points, stepM = 10) {
+      const cleaned = [];
+      for (const p of points) {
+        if (p.lat == null || p.lon == null) continue;
+        const lat = Number(p.lat);
+        const lon = Number(p.lon);
+        if (!cleaned.length || haversineM(cleaned[cleaned.length - 1][0], cleaned[cleaned.length - 1][1], lat, lon) > 0.5) {
+          cleaned.push([lat, lon]);
+        }
+      }
+      if (!cleaned.length) return [];
+      if (cleaned.length === 1) return [{ lat: cleaned[0][0], lon: cleaned[0][1], dist_m: 0 }];
+      const cum = [0];
+      for (let i = 1; i < cleaned.length; i++) {
+        cum.push(cum[i - 1] + haversineM(cleaned[i - 1][0], cleaned[i - 1][1], cleaned[i][0], cleaned[i][1]));
+      }
+      const total = cum[cum.length - 1];
+      const samples = [];
+      for (let dist = 0; dist <= total + 1e-6; dist += stepM) {
+        const [lat, lon] = interpTrackAtDist(cleaned, cum, dist);
+        samples.push({ lat, lon, dist_m: Math.round(dist * 10) / 10 });
+        if (dist >= total) break;
+      }
+      return samples;
+    }
+
+    function nearestElevation(points, lat, lon) {
+      let best = null;
+      let bestD = Infinity;
+      for (const p of points) {
+        const d = haversineM(lat, lon, p.lat, p.lon);
+        if (d < bestD) {
+          bestD = d;
+          best = p.elevation_m ?? p.altitude_gps ?? null;
+        }
+      }
+      return best != null ? Number(best) : null;
+    }
+
+    function elevationPointCount(profile) {
+      if (!profile?.points?.length) return 0;
+      return profile.points.filter(p => p.elevation_m != null && !Number.isNaN(p.elevation_m)).length;
+    }
+
+    function buildLocalElevationProfile(points, stepM = 10) {
+      const samples = resampleTrackPath(points, stepM);
+      if (!samples.length) return null;
+      const profilePts = samples.map(s => ({
+        dist_m: s.dist_m,
+        lat: s.lat,
+        lon: s.lon,
+        elevation_m: nearestElevation(points, s.lat, s.lon)
+      }));
+      const elevVals = profilePts.map(p => p.elevation_m).filter(v => v != null);
+      if (!elevVals.length) return null;
+      return {
+        step_m: stepM,
+        total_m: profilePts[profilePts.length - 1].dist_m,
+        min_elevation_m: Math.min(...elevVals),
+        max_elevation_m: Math.max(...elevVals),
+        points: profilePts,
+        source: 'track-cache'
+      };
+    }
+
+    let elevationHealthCache = null;
+
+    async function ensureElevationApi() {
+      if (elevationHealthCache && Date.now() - elevationHealthCache.ts < 60000) {
+        return elevationHealthCache;
+      }
+      try {
+        const res = await fetch('/api/health', { cache: 'no-store' });
+        if (!res.ok) {
+          elevationHealthCache = {
+            ok: false,
+            error: `health HTTP ${res.status}`,
+            ts: Date.now()
+          };
+          return elevationHealthCache;
+        }
+        const data = await res.json();
+        elevationHealthCache = {
+          ok: data.elevation_ok === true,
+          error: data.elevation_error || null,
+          url: data.elevation_url || null,
+          ts: Date.now()
+        };
+        return elevationHealthCache;
+      } catch (e) {
+        elevationHealthCache = {
+          ok: false,
+          error: String(e.message || e),
+          ts: Date.now()
+        };
+        return elevationHealthCache;
+      }
+    }
+
+    function normalizeServerProfile(data) {
+      if (!data?.points?.length) return null;
+      const profile = {
+        ...data,
+        source: data.api_source || 'server',
+        api_error: data.api_error || null
+      };
+      return elevationPointCount(profile) > 0 ? profile : profile;
+    }
+
+    async function fetchElevationProfile(points, trackId) {
+      if (!points || !points.length) return null;
+      let lastError = null;
+
+      const health = await ensureElevationApi();
+      if (!health.ok) {
+        const cached = buildLocalElevationProfile(points, 10);
+        if (cached) return cached;
+        return {
+          points: [],
+          source: 'error',
+          api_error: health.error
+            ? `сервис высот недоступен: ${health.error}`
+            : 'сервис высот недоступен'
+        };
+      }
+
+      if (trackId) {
+        try {
+          const res = await fetch(`/api/tracks/${trackId}/elevation-profile?step_m=10`, { cache: 'no-store' });
+          if (res.ok) {
+            const data = normalizeServerProfile(await res.json());
+            if (data && elevationPointCount(data) > 0) return data;
+            lastError = data?.api_error || 'server track profile empty';
+          } else {
+            lastError = `server track HTTP ${res.status}`;
+          }
+        } catch (e) {
+          lastError = String(e.message || e);
+        }
+      }
+
+      try {
+        const res = await fetch('/api/elevation/profile', {
+          method: 'POST',
+          headers: { 'Content-Type': 'application/json' },
+          body: JSON.stringify({ points, step_m: 10 })
+        });
+        if (res.ok) {
+          const data = normalizeServerProfile(await res.json());
+          if (data && elevationPointCount(data) > 0) return data;
+          lastError = data?.api_error || lastError || 'server profile empty';
+        } else {
+          lastError = lastError || `server HTTP ${res.status}`;
+        }
+      } catch (e) {
+        lastError = lastError || String(e.message || e);
+      }
+
+      const cached = buildLocalElevationProfile(points, 10);
+      if (cached) return cached;
+
+      return {
+        points: [],
+        source: 'error',
+        api_error: lastError || 'no elevation data'
+      };
+    }
+
+    function trackDistanceAtTime(track, t) {
+      if (!track?.points?.length) return 0;
+      const pts = track.points;
+      if (t <= pts[0].ts) return 0;
+      const last = pts[pts.length - 1];
+      if (t >= last.ts) {
+        let dist = 0;
+        for (let i = 1; i < pts.length; i++) {
+          dist += haversineM(pts[i-1].lat, pts[i-1].lon, pts[i].lat, pts[i].lon);
+        }
+        return dist;
+      }
+      let dist = 0;
+      for (let i = 1; i < pts.length; i++) {
+        const a = pts[i - 1];
+        const b = pts[i];
+        if (t <= b.ts) {
+          const span = Math.max(b.ts - a.ts, 1e-6);
+          const f = (t - a.ts) / span;
+          const lat = a.lat + (b.lat - a.lat) * f;
+          const lon = a.lon + (b.lon - a.lon) * f;
+          dist += haversineM(a.lat, a.lon, lat, lon);
+          return dist;
+        }
+        dist += haversineM(a.lat, a.lon, b.lat, b.lon);
+      }
+      return dist;
+    }
+
+    function getTimelineElevationSeries(cursors) {
+      const series = [];
+      if (dualTracksActive) {
+        if (elevationPointCount(elevProfileTx) > 0) {
+          series.push({ color: TX_COLOR, profile: elevProfileTx, cursor: cursors?.tx, label: 'TX' });
+        }
+        if (elevationPointCount(elevProfileRx) > 0) {
+          series.push({ color: RX_COLOR, profile: elevProfileRx, cursor: cursors?.rx, label: 'RX' });
+        }
+      } else if (singleTrackActive && elevationPointCount(elevProfileSingle) > 0) {
+        const color = loadedSingleTrack?.role === 'RX' ? RX_COLOR : TX_COLOR;
+        const label = loadedSingleTrack?.role === 'RX' ? 'RX' : 'TX';
+        series.push({ color, profile: elevProfileSingle, cursor: cursors?.single, label });
+      }
+      return series;
+    }
+
+    function renderElevationCanvas(canvas, series, loadState, emptyIdleMsg) {
+      if (!canvas) return;
+      const ctx = canvas.getContext('2d');
+      const w = canvas.clientWidth || 800;
+      const h = canvas.clientHeight || 100;
+      if (canvas.width !== w) canvas.width = w;
+      if (canvas.height !== h) canvas.height = h;
+      ctx.fillStyle = '#0a0a14';
+      ctx.fillRect(0, 0, w, h);
+
+      if (!series.length) {
+        ctx.fillStyle = '#888';
+        ctx.font = '12px system-ui';
+        ctx.fillText(loadState === 'loading' ? 'Загрузка…' : emptyIdleMsg, 12, h / 2);
+        return;
+      }
+
+      let maxDist = 0;
+      let minE = Infinity;
+      let maxE = -Infinity;
+      series.forEach(s => {
+        maxDist = Math.max(maxDist, s.profile.total_m || 0);
+        s.profile.points.forEach(p => {
+          if (p.elevation_m != null) {
+            minE = Math.min(minE, p.elevation_m);
+            maxE = Math.max(maxE, p.elevation_m);
+          }
+        });
+      });
+      if (!isFinite(minE)) {
+        ctx.fillStyle = '#888';
+        ctx.font = '12px system-ui';
+        ctx.fillText('Нет данных высот', 12, h / 2);
+        return;
+      }
+      const padE = Math.max((maxE - minE) * 0.1, 5);
+      minE -= padE;
+      maxE += padE;
+      const margin = { l: 36, r: 8, t: 8, b: 18 };
+      const plotW = w - margin.l - margin.r;
+      const plotH = h - margin.t - margin.b;
+
+      ctx.strokeStyle = '#333';
+      ctx.beginPath();
+      ctx.moveTo(margin.l, margin.t);
+      ctx.lineTo(margin.l, margin.t + plotH);
+      ctx.lineTo(margin.l + plotW, margin.t + plotH);
+      ctx.stroke();
+
+      ctx.fillStyle = '#888';
+      ctx.font = '9px system-ui';
+      ctx.fillText(`${Math.round(minE)}m`, 2, margin.t + plotH);
+      ctx.fillText(`${Math.round(maxE)}m`, 2, margin.t + 8);
+      ctx.fillText('0', margin.l, h - 2);
+      ctx.fillText(`${Math.round(maxDist)}m`, margin.l + plotW - 20, h - 2);
+
+      if (series.length > 1 && canvas.id === 'elevationCanvas') {
+        let lx = margin.l + plotW;
+        ctx.font = '9px system-ui';
+        series.slice().reverse().forEach(s => {
+          if (!s.label) return;
+          const tw = ctx.measureText(s.label).width;
+          lx -= tw + 14;
+          ctx.fillStyle = s.color;
+          ctx.fillRect(lx, margin.t + 1, 8, 8);
+          ctx.fillStyle = '#ccc';
+          ctx.fillText(s.label, lx + 10, margin.t + 9);
+        });
+      }
+
+      series.forEach(s => {
+        const pts = s.profile.points.filter(p => p.elevation_m != null);
+        if (pts.length < 2) return;
+        ctx.strokeStyle = s.color;
+        ctx.lineWidth = 2;
+        ctx.beginPath();
+        pts.forEach((p, i) => {
+          const x = margin.l + (p.dist_m / Math.max(maxDist, 1)) * plotW;
+          const y = margin.t + plotH - ((p.elevation_m - minE) / (maxE - minE)) * plotH;
+          if (i === 0) ctx.moveTo(x, y);
+          else ctx.lineTo(x, y);
+        });
+        ctx.stroke();
+        if (s.cursor != null && maxDist > 0) {
+          const cx = margin.l + (s.cursor / maxDist) * plotW;
+          ctx.strokeStyle = '#fff';
+          ctx.lineWidth = 1;
+          ctx.setLineDash([4, 3]);
+          ctx.beginPath();
+          ctx.moveTo(cx, margin.t);
+          ctx.lineTo(cx, margin.t + plotH);
+          ctx.stroke();
+          ctx.setLineDash([]);
+        }
+      });
+    }
+
+    function drawElevationChart(cursors) {
+      renderElevationCanvas(
+        document.getElementById('elevationCanvas'),
+        getTimelineElevationSeries(cursors),
+        elevationLoadState,
+        'Покажите трек на карте'
+      );
+    }
+
+    function drawMapRulerChart() {
+      const series = elevationPointCount(elevProfileMapLine) > 0
+        ? [{ color: '#00ff88', profile: elevProfileMapLine, cursor: null }]
+        : [];
+      const idleMsg = elevProfileMapLine?.api_error
+        ? elevProfileMapLine.api_error
+        : 'Выберите точки A и B на карте';
+      renderElevationCanvas(
+        document.getElementById('mapRulerCanvas'),
+        series,
+        mapRulerLoadState,
+        idleMsg
+      );
+    }
+
+    async function loadMapRulerProfileAuto() {
+      const { tx, rx } = getTxRxDevices(lastDevices);
+      if (!tx || !rx) {
+        elevProfileMapLine = null;
+        mapRulerLoadState = 'done';
+        setMapRulerStatus('нет TX/RX GPS');
+        clearMapRulerLineLayer();
+        drawMapRulerChart();
+        return;
+      }
+      clearMapRulerPickPoints();
+      mapRulerPtA = { lat: tx.lat, lon: tx.lon };
+      mapRulerPtB = { lat: rx.lat, lon: rx.lon };
+      placeMapRulerMarker('A', mapRulerPtA, TX_COLOR);
+      placeMapRulerMarker('B', mapRulerPtB, RX_COLOR);
+      await loadMapRulerProfileFromPoints(mapRulerPtA, mapRulerPtB);
+    }
+
+    function setMapRulerOpen(open) {
+      mapRulerOpen = open;
+      document.getElementById('mapRulerPanel').classList.toggle('open', open);
+      document.getElementById('btnMapRuler').classList.toggle('active', open);
+      if (!open) {
+        clearMapRulerPickPoints();
+        setMapRulerStatus('');
+        setMapRulerHint('');
+      } else {
+        setMapRulerMode(mapRulerMode);
+      }
+      setTimeout(() => map.invalidateSize(), 80);
+    }
+
+    async function toggleMapRuler() {
+      const willOpen = !mapRulerOpen;
+      setMapRulerOpen(willOpen);
+      if (willOpen) {
+        mapRulerMode = 'pick';
+        setMapRulerMode('pick');
+        drawMapRulerChart();
+      }
+    }
+
+    function resetMapRulerPick() {
+      clearMapRulerPickPoints();
+      mapRulerLoadState = 'idle';
+      setMapRulerStatus('');
+      setMapRulerMode('pick');
+      drawMapRulerChart();
+    }
+
+    async function loadElevationProfiles() {
+      elevProfileTx = null;
+      elevProfileRx = null;
+      elevProfileSingle = null;
+      elevationLoadState = 'loading';
+      setElevationStatus('загрузка…');
+      drawElevationChart();
+
+      if (singleTrackActive && loadedSingleTrack?.points?.length) {
+        elevProfileSingle = await fetchElevationProfile(
+          loadedSingleTrack.points, loadedSingleTrack.id);
+      } else if (dualTracksActive) {
+        const [txProf, rxProf] = await Promise.all([
+          loadedTxTrack?.points?.length
+            ? fetchElevationProfile(loadedTxTrack.points, loadedTxTrack.id) : null,
+          loadedRxTrack?.points?.length
+            ? fetchElevationProfile(loadedRxTrack.points, loadedRxTrack.id) : null
+        ]);
+        elevProfileTx = txProf;
+        elevProfileRx = rxProf;
+      }
+
+      elevationLoadState = 'done';
+      const hasData = elevationPointCount(elevProfileSingle) > 0
+        || elevationPointCount(elevProfileTx) > 0
+        || elevationPointCount(elevProfileRx) > 0;
+      if (hasData) {
+        const ref = elevProfileSingle || elevProfileTx || elevProfileRx;
+        const srcLabel = ref?.source === 'elevation' ? 'высоты'
+          : ref?.source === 'server' ? 'сервер' : (ref?.source || 'данные');
+        if (dualTracksActive && elevProfileTx && elevProfileRx) {
+          const nTx = elevationPointCount(elevProfileTx);
+          const nRx = elevationPointCount(elevProfileRx);
+          setElevationStatus(`TX + RX · ${srcLabel} · ${nTx}/${nRx} точек`);
+        } else {
+          setElevationStatus(`${srcLabel} · ${elevationPointCount(ref)} точек`);
+        }
+      } else {
+        const err = elevProfileSingle?.api_error || elevProfileTx?.api_error || elevProfileRx?.api_error;
+        setElevationStatus(err ? `ошибка: ${err}` : 'нет данных');
+      }
+      drawElevationChart();
+      requestAnimationFrame(() => drawElevationChart(
+        singleTrackActive
+          ? { single: trackDistanceAtTime(loadedSingleTrack, overlapMin + parseInt(document.getElementById('timeSlider').value, 10)) }
+          : dualTracksActive
+            ? {
+                tx: trackDistanceAtTime(loadedTxTrack, overlapMin + parseInt(document.getElementById('timeSlider').value, 10)),
+                rx: trackDistanceAtTime(loadedRxTrack, overlapMin + parseInt(document.getElementById('timeSlider').value, 10))
+              }
+            : null
+      ));
+    }
+
+    function updateGpsDistanceHeader(devices) {
+      const el = document.getElementById('gpsDistance');
+      let tx = null, rx = null;
+      devices.forEach(d => {
+        if (!isNullIsland(d.lat, d.lon) && d.lat != null) {
+          if (d.role === 'TX') tx = d;
+          if (d.role === 'RX') rx = d;
+        }
+      });
+      if (tx && rx) {
+        const dist = haversineM(tx.lat, tx.lon, rx.lat, rx.lon);
+        el.textContent = `GPS: ${dist.toFixed(0)} m между устройствами`;
+      } else {
+        el.textContent = 'GPS: —';
+      }
+    }
+
+    function centerMapOnRole(role) {
+      const bounds = [];
+      lastDevices.forEach(d => {
+        if (d.role === role && d.lat != null && !isNullIsland(d.lat, d.lon)) {
+          bounds.push([d.lat, d.lon]);
+        }
+      });
+      if (bounds.length === 1) setMapViewProgrammatically(() => map.setView(bounds[0], 14));
+      else if (bounds.length > 1) setMapViewProgrammatically(() => map.fitBounds(bounds, { padding: [40, 40], maxZoom: 16 }));
+    }
+
+    function centerMapOnBoth() {
+      const bounds = [];
+      lastDevices.forEach(d => {
+        if (d.lat != null && !isNullIsland(d.lat, d.lon)) bounds.push([d.lat, d.lon]);
+      });
+      if (!bounds.length) return;
+      userMovedMap = false;
+      if (bounds.length === 1) setMapViewProgrammatically(() => map.setView(bounds[0], 14));
+      else setMapViewProgrammatically(() => map.fitBounds(bounds, { padding: [50, 50], maxZoom: 16 }));
     }
 
     /* --- Draggable modal --- */
@@ -522,6 +1330,10 @@
       telemetryTx = [];
       telemetryRx = [];
       telemetrySingle = [];
+      elevProfileTx = null;
+      elevProfileRx = null;
+      elevProfileSingle = null;
+      drawElevationChart();
       if (playTimer) {
         clearInterval(playTimer);
         playTimer = null;
@@ -561,16 +1373,14 @@
       let html = `<b>${new Date(t * 1000).toLocaleTimeString()}</b><br>`;
       html += `Расстояние: ${dist.toFixed(0)} m (GPS)<br><br>`;
       html += `<span class="legend-tx">TX</span> ${txPos.lat.toFixed(5)}, ${txPos.lon.toFixed(5)}<br>`;
-      html += formatMeta(txPos.meta);
-      html += `<br><span class="legend-rx">RX</span> ${rxPos.lat.toFixed(5)}, ${rxPos.lon.toFixed(5)}<br>`;
-      html += formatMeta(rxPos.meta);
       const txTel = nearestTelemetry(telemetryTx, t);
       const rxTel = nearestTelemetry(telemetryRx, t);
-      if (txTel || rxTel) {
-        html += '<br><br>';
-        if (txTel) html += `<span class="legend-tx">TX stats</span><br>${formatTelemetryRow(txTel)}<br>`;
-        if (rxTel) html += `<span class="legend-rx">RX stats</span><br>${formatTelemetryRow(rxTel)}`;
-      }
+      html += renderTimelineCompare(
+        txTel || { meta: txPos.meta, role: 'TX', rssi: null },
+        rxTel || { meta: rxPos.meta, role: 'RX', rssi: null },
+        loadedTxTrack?.device_id,
+        loadedRxTrack?.device_id
+      );
       return html;
     }
 
@@ -620,10 +1430,16 @@
 
       const txTel = nearestTelemetry(telemetryTx, t);
       const rxTel = nearestTelemetry(telemetryRx, t);
-      document.getElementById('statsTx').innerHTML = txTel
-        ? formatTelemetryRow(txTel) : '<span class="muted">нет данных</span>';
-      document.getElementById('statsRx').innerHTML = rxTel
-        ? formatTelemetryRow(rxTel) : '<span class="muted">нет данных</span>';
+      document.getElementById('timelineStats').innerHTML = renderTimelineCompare(
+        txTel,
+        rxTel,
+        loadedTxTrack?.device_id,
+        loadedRxTrack?.device_id
+      );
+      drawElevationChart({
+        tx: trackDistanceAtTime(loadedTxTrack, t),
+        rx: trackDistanceAtTime(loadedRxTrack, t)
+      });
     }
 
     function updateTimelineAtSingle(t, openModal) {
@@ -644,21 +1460,29 @@
         }).addTo(map);
         let html = `<b>${new Date(t * 1000).toLocaleTimeString()}</b><br>`;
         html += `${pos.lat.toFixed(5)}, ${pos.lon.toFixed(5)}<br>`;
-        html += formatMeta(pos.meta);
         const tel = nearestTelemetry(telemetrySingle, t);
-        if (tel) html += '<br>' + formatTelemetryRow(tel);
+        const snap = tel ? telemetryToSnap(tel) : RadioUI.parseRadioSnapshot(pos.meta);
+        html += RadioUI.formatRadioPanel(snap, new Set());
+        if (tel) html += '<br>' + formatTelemetryRow(tel, new Set());
         if (openModal || (isModalOpen() && modalMode === 'timeline')) {
           openMapModal(html, 'timeline');
         }
       }
       const tel = nearestTelemetry(telemetrySingle, t);
-      document.getElementById('statsTx').innerHTML = tel
-        ? formatTelemetryRow(tel) : '<span class="muted">нет данных</span>';
+      const snap = tel ? telemetryToSnap(tel) : RadioUI.parseRadioSnapshot(null);
+      document.getElementById('timelineStats').innerHTML = tel
+        ? RadioUI.formatRadioPanel(snap, new Set())
+        : '<span class="muted">нет данных</span>';
+      drawElevationChart({ single: trackDistanceAtTime(track, t) });
     }
 
     function setTimelineVisible(visible) {
       document.getElementById('trackTimeline').classList.toggle('visible', visible);
       document.getElementById('timelineStatsPanel').classList.toggle('visible', visible);
+      setTimeout(() => {
+        map.invalidateSize();
+        if (visible) drawElevationChart();
+      }, 80);
     }
 
     function setTimelineMode(single) {
@@ -670,8 +1494,6 @@
       const range = singleTrackRange(loadedSingleTrack.points);
       const note = document.getElementById('timelineNote');
       setTimelineMode(true);
-      document.getElementById('timelineCol1Label').textContent =
-        loadedSingleTrack.role === 'RX' ? 'RX' : 'TX';
       if (!range) {
         setTimelineVisible(false);
         return;
@@ -688,6 +1510,7 @@
       note.textContent = `Трек #${loadedSingleTrack.id} · ${loadedSingleTrack.device_id || ''}`;
       setTimelineVisible(true);
       updateTimelineAtSingle(overlapMin);
+      loadElevationProfiles();
     }
 
     function setupTimeline() {
@@ -715,6 +1538,7 @@
       }
       setTimelineVisible(true);
       updateTimelineAt(overlapMin);
+      loadElevationProfiles();
     }
 
     async function refreshTimelineTelemetry() {
@@ -805,8 +1629,10 @@
       }
       const color = loadedSingleTrack.role === 'RX' ? RX_COLOR : TX_COLOR;
       drawTrackLine(loadedSingleTrack, color, 'tx');
-      const bounds = L.latLngBounds(loadedSingleTrack.points.map(p => [p.lat, p.lon]));
-      setMapViewProgrammatically(() => map.fitBounds(bounds, { padding: [50, 50] }));
+      if (!userMovedMap) {
+        const bounds = L.latLngBounds(loadedSingleTrack.points.map(p => [p.lat, p.lon]));
+        setMapViewProgrammatically(() => map.fitBounds(bounds, { padding: [50, 50], maxZoom: 16 }));
+      }
       singleTrackActive = true;
       setupTimelineSingle();
       const range = singleTrackRange(loadedSingleTrack.points);
@@ -858,9 +1684,11 @@
       drawTrackLine(loadedTxTrack, TX_COLOR, 'tx');
       drawTrackLine(loadedRxTrack, RX_COLOR, 'rx');
 
-      const bounds = L.latLngBounds([]);
-      [...loadedTxTrack.points, ...loadedRxTrack.points].forEach(p => bounds.extend([p.lat, p.lon]));
-      setMapViewProgrammatically(() => map.fitBounds(bounds, { padding: [50, 50] }));
+      if (!userMovedMap) {
+        const bounds = L.latLngBounds([]);
+        [...loadedTxTrack.points, ...loadedRxTrack.points].forEach(p => bounds.extend([p.lat, p.lon]));
+        setMapViewProgrammatically(() => map.fitBounds(bounds, { padding: [50, 50], maxZoom: 16 }));
+      }
 
       dualTracksActive = true;
       setupTimeline();
@@ -919,17 +1747,24 @@
       }
     }
 
-    document.getElementById('btnCmdAt').onclick = () => {
-      const line = document.getElementById('cmdAtInput').value.trim();
-      if (!line) return;
-      postCommand(document.getElementById('cmdTargetSelect').value, 'at', { line });
+    document.getElementById('btnCmdApply').onclick = () => {
+      const lines = buildMacroLines();
+      postCommand(document.getElementById('cmdTargetSelect').value, 'at', { lines });
     };
-    document.getElementById('btnCmdTx').onclick = () => {
-      postCommand(document.getElementById('cmdTargetSelect').value, 'mode', { role: 'TX' });
+    document.getElementById('btnMapTx').onclick = () => centerMapOnRole('TX');
+    document.getElementById('btnMapRx').onclick = () => centerMapOnRole('RX');
+    document.getElementById('btnMapBoth').onclick = () => centerMapOnBoth();
+    document.getElementById('btnMapRuler').onclick = () => toggleMapRuler();
+    document.getElementById('btnMapRulerClose').onclick = () => setMapRulerOpen(false);
+    document.getElementById('btnRulerPick').onclick = () => {
+      setMapRulerMode('pick');
+      drawMapRulerChart();
     };
-    document.getElementById('btnCmdRx').onclick = () => {
-      postCommand(document.getElementById('cmdTargetSelect').value, 'mode', { role: 'RX' });
+    document.getElementById('btnRulerAutoTxRx').onclick = async () => {
+      setMapRulerMode('auto');
+      await loadMapRulerProfileAuto();
     };
+    document.getElementById('btnRulerClear').onclick = () => resetMapRulerPick();
 
     async function refreshPairedStatus() {
       try {
@@ -985,8 +1820,11 @@
     };
 
     function buildDeviceStatsHtml(d) {
-      let html = formatMeta(d.meta);
-      html += `<b>${escapeHtml(d.device_id)}</b><br>Сигнал: ${d.rssi ?? '—'} dBm<br>Range: ${d.range_m ?? '—'} m<br>`;
+      const snap = RadioUI.parseRadioSnapshot(d.meta, d.role, d.rssi);
+      const changed = RadioUI.diffSnapshots(prevDeviceSnap, snap);
+      prevDeviceSnap = snap;
+      let html = RadioUI.formatRadioPanel(snap, changed);
+      html += `<b>${escapeHtml(d.device_id)}</b><br>Range: ${d.range_m ?? '—'} m<br>`;
       if (d.lat != null && d.lon != null && !isNullIsland(d.lat, d.lon)) {
         html += `GPS: ${d.lat.toFixed(5)}, ${d.lon.toFixed(5)}<br>`;
         Object.keys(markers).forEach(id => {
@@ -1060,6 +1898,8 @@
         }
       });
       if (!mapInitialFitDone && bounds.length) fitAllMarkers(bounds);
+      updateGpsDistanceHeader(devices);
+      if (mapRulerOpen && mapRulerMode === 'auto') loadMapRulerProfileAuto();
       updateCmdTargetSelect(devices);
       if (selectedId) {
         const sel = devices.find(d => d.device_id === selectedId);
@@ -1071,8 +1911,15 @@
       return devices;
     }
 
+    document.getElementById('cmdTargetSelect').onchange = () => {
+      const id = document.getElementById('cmdTargetSelect').value;
+      const d = lastDevices.find(x => x.device_id === id);
+      if (d) fillCmdFormFromDevice(d);
+    };
+
     function selectDevice(d) {
       selectedId = d.device_id;
+      fillCmdFormFromDevice(d);
       document.querySelectorAll('#deviceList li').forEach(li => {
         li.classList.toggle('active', li.textContent.startsWith(d.device_id));
       });
@@ -1117,13 +1964,24 @@
       if (!res.ok) throw new Error('chat ' + res.status);
       const msgs = await res.json();
       const log = document.getElementById('chatLog');
+      const myId = document.getElementById('webDeviceId').value.trim() || 'web';
       msgs.forEach(m => {
         chatSince = Math.max(chatSince, m.ts);
+        const self = m.device_id === myId;
+        const isNew = m.ts > chatLastReadTs;
         const div = document.createElement('div');
-        div.innerHTML = `<span class="muted">${new Date(m.ts*1000).toLocaleTimeString()}</span> <b>${escapeHtml(m.device_id)}</b>: ${escapeHtml(m.text)}`;
+        div.className = 'chat-msg ' + (self ? 'chat-self' : 'chat-other') + (isNew ? ' chat-new' : '');
+        const author = self ? 'Вы' : escapeHtml(m.device_id);
+        div.innerHTML = `<div class="chat-meta">${new Date(m.ts*1000).toLocaleTimeString()} · ${author}</div>${escapeHtml(m.text)}`;
         log.appendChild(div);
+        if (isNew) {
+          setTimeout(() => div.classList.remove('chat-new'), 3000);
+        }
       });
-      if (msgs.length) log.scrollTop = log.scrollHeight;
+      if (msgs.length) {
+        log.scrollTop = log.scrollHeight;
+        chatLastReadTs = Math.max(chatLastReadTs, chatSince);
+      }
     }
 
     document.getElementById('chatForm').onsubmit = async e => {
@@ -1203,6 +2061,8 @@
         sel.appendChild(opt);
       });
       if (prev) sel.value = prev;
+      const target = devices.find(d => d.device_id === sel.value);
+      if (target) fillCmdFormFromDevice(target);
     }
 
     function schedulePoll() {
@@ -1219,6 +2079,11 @@
       }
     });
 
+    window.addEventListener('resize', () => {
+      drawElevationChart();
+      if (mapRulerOpen) drawMapRulerChart();
+    });
+
     schedulePoll();
     loadAllTracks();
     refreshPairedStatus();
diff --git a/server/static/radio-ui.js b/server/static/radio-ui.js
new file mode 100644
index 0000000..730c372
--- /dev/null
+++ b/server/static/radio-ui.js
@@ -0,0 +1,157 @@
+/** Shared radio stats parsing/formatting (mirror of Android RadioSnapshot). */
+(function (global) {
+  'use strict';
+
+  const KNOWN_LABELS = new Set([
+    'send', 'receive', 'frequency', 'power', 'rssi', 'snr',
+    'spreading factor', 'bandwidth', 'packet', 'packet number', 'payload',
+    'on air', 'tx speed', 'rx speed', 'per'
+  ]);
+
+  function roleLabel(role) {
+    if (role === 'TX') return 'Передатчик (TX)';
+    if (role === 'RX') return 'Приёмник (RX)';
+    return role || '—';
+  }
+
+  function isKnownLabel(label) {
+    const n = String(label || '').toLowerCase().trim();
+    for (const k of KNOWN_LABELS) {
+      if (n === k || n.includes(k)) return true;
+    }
+    return false;
+  }
+
+  function parseRadioSnapshot(meta, roleFallback, rssiFallback) {
+    const snap = {
+      role: roleFallback || null,
+      frame: null,
+      frequencyMhz: null,
+      sf: null,
+      bwKhz: null,
+      powerDbm: null,
+      rssiDbm: rssiFallback ?? null,
+      snrDb: null,
+      packet: null,
+      payload: null,
+      onAirMs: null,
+      txPktPerS: null,
+      rxPktPerS: null,
+      perPercent: null,
+      extraFields: {}
+    };
+    if (!meta) return snap;
+    let o = meta;
+    if (typeof meta === 'string') {
+      try { o = JSON.parse(meta); } catch (e) { return snap; }
+    }
+    if (o.role) snap.role = o.role;
+    if (o.frame) snap.frame = o.frame;
+    if (o.rssi_dbm != null) snap.rssiDbm = Number(o.rssi_dbm);
+    if (o.power_dbm != null) snap.powerDbm = Number(o.power_dbm);
+    if (o.snr_db != null) snap.snrDb = Number(o.snr_db);
+    if (o.frequency_hz != null) snap.frequencyMhz = Number(o.frequency_hz) / 1e6;
+    if (o.spreading_factor != null) snap.sf = Number(o.spreading_factor);
+    if (o.bandwidth_khz != null) snap.bwKhz = Number(o.bandwidth_khz);
+    if (o.packet != null) snap.packet = Number(o.packet);
+    if (o.payload) snap.payload = String(o.payload);
+    if (o.on_air_ms != null) snap.onAirMs = Number(o.on_air_ms);
+    if (o.tx_pkt_per_s != null) snap.txPktPerS = Number(o.tx_pkt_per_s);
+    if (o.rx_pkt_per_s != null) snap.rxPktPerS = Number(o.rx_pkt_per_s);
+    if (o.per_percent != null) snap.perPercent = Number(o.per_percent);
+    if (o.fields && typeof o.fields === 'object') {
+      for (const [k, v] of Object.entries(o.fields)) {
+        if (!isKnownLabel(k)) snap.extraFields[k] = String(v);
+      }
+    }
+    return snap;
+  }
+
+  function diffSnapshots(a, b) {
+    const changed = new Set();
+    if (!a || !b) return changed;
+    const keys = ['role', 'rssiDbm', 'snrDb', 'packet', 'payload', 'perPercent',
+      'txPktPerS', 'rxPktPerS', 'frequencyMhz', 'sf', 'bwKhz', 'powerDbm'];
+    const map = { role: 'role', rssiDbm: 'rssi', snrDb: 'snr', packet: 'packet',
+      payload: 'payload', perPercent: 'per', txPktPerS: 'txSpeed', rxPktPerS: 'rxSpeed',
+      frequencyMhz: 'frequency', sf: 'sf', bwKhz: 'bw', powerDbm: 'power' };
+    for (const k of keys) {
+      if (a[k] !== b[k] && !(a[k] == null && b[k] == null)) changed.add(map[k]);
+    }
+    return changed;
+  }
+
+  const DYNAMIC_ROWS = [
+    { key: 'rssi', label: 'RSSI', fmt: s => s.rssiDbm != null ? `${s.rssiDbm} dBm` : '—' },
+    { key: 'snr', label: 'SNR', fmt: s => s.snrDb != null ? `${s.snrDb} dB` : '—' },
+    { key: 'packet', label: 'Пакет', fmt: s => s.packet != null ? String(s.packet) : '—' },
+    { key: 'payload', label: 'Payload', fmt: s => s.payload || '—' },
+    { key: 'per', label: 'PER', fmt: s => s.perPercent != null ? `${s.perPercent} %` : '—' },
+    { key: 'txSpeed', label: 'TX Speed', fmt: s => s.txPktPerS != null ? `${s.txPktPerS} pkt/s` : '—' },
+    { key: 'rxSpeed', label: 'RX Speed', fmt: s => s.rxPktPerS != null ? `${s.rxPktPerS} pkt/s` : '—' }
+  ];
+
+  const STATIC_ROWS = [
+    { key: 'role', label: 'Роль', fmt: s => roleLabel(s.role) },
+    { key: 'frequency', label: 'Частота', fmt: s => s.frequencyMhz != null ? `${s.frequencyMhz.toFixed(3)} MHz` : '—' },
+    { key: 'sf', label: 'SF', fmt: s => s.sf != null ? String(s.sf) : '—' },
+    { key: 'bw', label: 'BW', fmt: s => s.bwKhz != null ? `${s.bwKhz} kHz` : '—' },
+    { key: 'power', label: 'Мощность', fmt: s => s.powerDbm != null ? `${s.powerDbm} dBm` : '—' },
+    { key: 'onAir', label: 'On Air', fmt: s => s.onAirMs != null ? `${s.onAirMs} ms` : '—' }
+  ];
+
+  function escapeHtml(s) {
+    if (s == null) return '';
+    return String(s).replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+  }
+
+  function renderCompareGrid(txSnap, rxSnap, txId, rxId, changedTx, changedRx) {
+    let html = '<div class="radio-compare-grid">';
+    html += `<div class="radio-compare-head"><span class="legend-tx">TX</span> ${escapeHtml(txId || '—')}`;
+    html += `<span class="legend-rx">RX</span> ${escapeHtml(rxId || '—')}</div>`;
+    for (const row of DYNAMIC_ROWS) {
+      const txCls = changedTx && changedTx.has(row.key) ? ' changed' : '';
+      const rxCls = changedRx && changedRx.has(row.key) ? ' changed' : '';
+      html += `<div class="radio-row"><span class="radio-label">${row.label}</span>`;
+      html += `<span class="radio-tx${txCls}">${escapeHtml(row.fmt(txSnap))}</span>`;
+      html += `<span class="radio-rx${rxCls}">${escapeHtml(row.fmt(rxSnap))}</span></div>`;
+    }
+    html += '<details class="radio-static"><summary>Статика</summary>';
+    for (const row of STATIC_ROWS) {
+      const txCls = changedTx && changedTx.has(row.key) ? ' changed' : '';
+      const rxCls = changedRx && changedRx.has(row.key) ? ' changed' : '';
+      html += `<div class="radio-row"><span class="radio-label">${row.label}</span>`;
+      html += `<span class="radio-tx${txCls}">${escapeHtml(row.fmt(txSnap))}</span>`;
+      html += `<span class="radio-rx${rxCls}">${escapeHtml(row.fmt(rxSnap))}</span></div>`;
+    }
+    html += '</details></div>';
+    return html;
+  }
+
+  function formatRadioPanel(snap, changed) {
+    if (!snap) return '—';
+    const ch = changed || new Set();
+    let html = '';
+    for (const row of DYNAMIC_ROWS) {
+      const cls = ch.has(row.key) ? ' class="changed"' : '';
+      html += `<div${cls}><b>${row.label}:</b> ${escapeHtml(row.fmt(snap))}</div>`;
+    }
+    html += '<details><summary>Статика</summary>';
+    for (const row of STATIC_ROWS) {
+      const cls = ch.has(row.key) ? ' class="changed"' : '';
+      html += `<div${cls}><b>${row.label}:</b> ${escapeHtml(row.fmt(snap))}</div>`;
+    }
+    html += '</details>';
+    return html;
+  }
+
+  global.RadioUI = {
+    roleLabel,
+    parseRadioSnapshot,
+    diffSnapshots,
+    renderCompareGrid,
+    formatRadioPanel,
+    DYNAMIC_ROWS,
+    STATIC_ROWS
+  };
+})(typeof window !== 'undefined' ? window : globalThis);
diff --git a/server/tests/__pycache__/test_elevation.cpython-313-pytest-9.0.3.pyc b/server/tests/__pycache__/test_elevation.cpython-313-pytest-9.0.3.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..edca8576305e28051968103e9bd9b93ca3541189
GIT binary patch
literal 5771
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
Y8v^1*M_730MQc>pyV;%)`uLju4QV}Q$N&HU

literal 0
HcmV?d00001

diff --git a/server/tests/test_elevation.py b/server/tests/test_elevation.py
new file mode 100644
index 0000000..cc537a4
--- /dev/null
+++ b/server/tests/test_elevation.py
@@ -0,0 +1,64 @@
+import core.elevation as elev
+
+
+class _FakeResponse:
+    def __init__(self, payload):
+        self._payload = payload
+
+    def raise_for_status(self):
+        return None
+
+    def json(self):
+        return self._payload
+
+
+class _FakeClient:
+    def __init__(self, **kwargs):
+        self.kwargs = kwargs
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, *args):
+        return False
+
+    def get(self, url, params=None):
+        return _FakeResponse({"elevation": [152.0]})
+
+
+def test_probe_elevation_api_ok(monkeypatch):
+    monkeypatch.setattr(elev, "_probe_checked_at", 0.0)
+    monkeypatch.setattr(elev.httpx, "Client", _FakeClient)
+
+    status = elev.probe_elevation_api(force=True)
+
+    assert status["ok"] is True
+    assert status["error"] is None
+
+
+def test_fetch_skips_when_unreachable(monkeypatch):
+    monkeypatch.setattr(
+        elev,
+        "probe_elevation_api",
+        lambda force=False: {"ok": False, "url": elev.ELEVATION_API_URL, "error": "down"},
+    )
+
+    vals = elev.fetch_elevations_batch([55.75], [37.62])
+
+    assert vals == [None]
+
+
+def test_build_profile_reports_unreachable(monkeypatch):
+    monkeypatch.setattr(
+        elev,
+        "probe_elevation_api",
+        lambda force=False: {"ok": False, "url": elev.ELEVATION_API_URL, "error": "down"},
+    )
+
+    profile = elev.build_elevation_profile(
+        [{"lat": 55.75, "lon": 37.62}, {"lat": 55.76, "lon": 37.63}],
+        10,
+    )
+
+    assert profile["points"] == []
+    assert "unreachable" in profile["api_error"]