From 9bfbd6231d04d436781badb3cbfa745b5be09b19 Mon Sep 17 00:00:00 2001
From: Smittix <jamessmith1@outlook.com>
Date: Tue, 10 Feb 2026 11:43:13 +0000
Subject: [PATCH] Add P25 Phase 2 option for DMR decoder

---
 routes/dmr.py                     | 8 ++++++--
 templates/partials/modes/dmr.html | 3 ++-
 tests/test_dmr.py                 | 2 ++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/routes/dmr.py b/routes/dmr.py
index 7a4f832..8d0d725 100644
--- a/routes/dmr.py
+++ b/routes/dmr.py
@@ -51,7 +51,7 @@ dmr_active_device: Optional[int] = None
 # freeze stderr / text data output).
 _active_ffmpeg_stdin: Optional[object] = None  # set by stream endpoint
 
-VALID_PROTOCOLS = ['auto', 'dmr', 'p25', 'nxdn', 'dstar', 'provoice']
+VALID_PROTOCOLS = ['auto', 'dmr', 'p25', 'p25p2', 'nxdn', 'dstar', 'provoice']
 
 # Classic dsd flags
 _DSD_PROTOCOL_FLAGS = {
@@ -72,6 +72,7 @@ _DSD_FME_PROTOCOL_FLAGS = {
     'auto': ['-ft'],       # XDMA: auto-detect DMR/P25/YSF
     'dmr': ['-fs'],        # DMR Simplex (-fd is D-STAR in dsd-fme!)
     'p25': ['-f1'],        # P25 Phase 1 (-fp is ProVoice in dsd-fme!)
+    'p25p2': ['-f2'],      # P25 Phase 2
     'nxdn': ['-fn'],       # NXDN96
     'dstar': ['-fd'],      # D-STAR (-fd in dsd-fme, NOT DMR!)
     'provoice': ['-fp'],   # ProVoice (-fp in dsd-fme, not -fv)
@@ -81,7 +82,8 @@ _DSD_FME_PROTOCOL_FLAGS = {
 # sync reliability vs letting dsd-fme auto-detect modulation type.
 _DSD_FME_MODULATION = {
     'dmr': ['-mc'],        # C4FM
-    'p25': ['-mc'],        # C4FM (Phase 1; Phase 2 would use -mq)
+    'p25': ['-mc'],        # C4FM (Phase 1)
+    'p25p2': ['-mq'],      # CQPSK (Phase 2)
     'nxdn': ['-mc'],       # C4FM
 }
 
@@ -492,6 +494,8 @@ def start_dmr() -> Response:
 
     if protocol not in VALID_PROTOCOLS:
         return jsonify({'status': 'error', 'message': f'Invalid protocol. Use: {", ".join(VALID_PROTOCOLS)}'}), 400
+    if protocol == 'p25p2' and not is_fme:
+        return jsonify({'status': 'error', 'message': 'P25 Phase 2 requires dsd-fme.'}), 400
 
     # Clear stale queue
     try:
diff --git a/templates/partials/modes/dmr.html b/templates/partials/modes/dmr.html
index bb9983d..730345e 100644
--- a/templates/partials/modes/dmr.html
+++ b/templates/partials/modes/dmr.html
@@ -21,7 +21,8 @@
                             <select id="dmrProtocol">
                                 <option value="auto" selected>Auto Detect</option>
                                 <option value="dmr">DMR</option>
-                                <option value="p25">P25</option>
+                                <option value="p25">P25 Phase 1</option>
+                                <option value="p25p2">P25 Phase 2</option>
                                 <option value="nxdn">NXDN</option>
                                 <option value="dstar">D-STAR</option>
                                 <option value="provoice">ProVoice</option>
diff --git a/tests/test_dmr.py b/tests/test_dmr.py
index d245663..ddf9544 100644
--- a/tests/test_dmr.py
+++ b/tests/test_dmr.py
@@ -135,6 +135,7 @@ def test_dsd_fme_protocol_flags_known_values():
     assert _DSD_FME_PROTOCOL_FLAGS['auto'] == ['-ft']       # XDMA
     assert _DSD_FME_PROTOCOL_FLAGS['dmr'] == ['-fs']        # Simplex (-fd is D-STAR!)
     assert _DSD_FME_PROTOCOL_FLAGS['p25'] == ['-f1']        # NOT -fp (ProVoice in fme)
+    assert _DSD_FME_PROTOCOL_FLAGS['p25p2'] == ['-f2']      # Phase 2
     assert _DSD_FME_PROTOCOL_FLAGS['nxdn'] == ['-fn']
     assert _DSD_FME_PROTOCOL_FLAGS['dstar'] == ['-fd']      # -fd is D-STAR in dsd-fme
     assert _DSD_FME_PROTOCOL_FLAGS['provoice'] == ['-fp']   # NOT -fv
@@ -154,6 +155,7 @@ def test_dsd_fme_modulation_hints():
     """C4FM modulation hints should be set for C4FM protocols."""
     assert _DSD_FME_MODULATION['dmr'] == ['-mc']
     assert _DSD_FME_MODULATION['p25'] == ['-mc']
+    assert _DSD_FME_MODULATION['p25p2'] == ['-mq']
     assert _DSD_FME_MODULATION['nxdn'] == ['-mc']
     # D-Star and ProVoice should not have forced modulation
     assert 'dstar' not in _DSD_FME_MODULATION