implement missing cal options;

src/fw/hotspot

@@ -1 +1 @@
-Subproject commit 13e51c67719f4983be7504967baf591f21375cb7
+Subproject commit 40f9083e6117c48761f61d3a873a167e1f74b0b4

src/fw/modem

@@ -1 +1 @@
-Subproject commit 041bd8563ef68d75c69acbab25a517921b5d8015
+Subproject commit 5623f5c5ec7bcc777850bbcc83414a64e44fadb0

src/host/calibrate/HostCal.cpp

@@ -242,6 +242,65 @@ int HostCal::run(int argc, char **argv)
             }
             break;
 
+        case 'X':
+        {
+            char value[5] = { '\0' };
+            ::fprintf(stdout, "> FDMA Preambles [%u] ? ", m_modem->m_fdmaPreamble);
+            ::fflush(stdout);
+
+            m_console.getLine(value, 5, 0);
+            if (value[0] != '\0') {
+                // bryanb: appease the compiler...
+                uint32_t fdmaPreamble = m_modem->m_fdmaPreamble;
+                sscanf(value, "%u", &fdmaPreamble);
+
+                m_modem->m_fdmaPreamble = (uint8_t)fdmaPreamble;
+
+                writeConfig();
+            }
+        }
+        break;
+
+        case 'W':
+        {
+            char value[5] = { '\0' };
+            ::fprintf(stdout, "> DMR Rx Delay [%u] ? ", m_modem->m_dmrRxDelay);
+            ::fflush(stdout);
+
+            m_console.getLine(value, 5, 0);
+            if (value[0] != '\0') {
+                // bryanb: appease the compiler...
+                uint32_t dmrRxDelay = m_modem->m_dmrRxDelay;
+                sscanf(value, "%u", &dmrRxDelay);
+
+                m_modem->m_dmrRxDelay = (uint8_t)dmrRxDelay;
+
+                writeConfig();
+            }
+        }
+        break;
+
+        case 'w':
+        {
+            if (!m_isHotspot) {
+                char value[5] = { '\0' };
+                ::fprintf(stdout, "> P25 Correlation Count [%u] ? ", m_modem->m_p25CorrCount);
+                ::fflush(stdout);
+
+                m_console.getLine(value, 5, 0);
+                if (value[0] != '\0') {
+                    // bryanb: appease the compiler...
+                    uint32_t p25CorrCount = m_modem->m_p25CorrCount;
+                    sscanf(value, "%u", &p25CorrCount);
+
+                    m_modem->m_p25CorrCount = (uint8_t)p25CorrCount;
+
+                    writeConfig();
+                }
+            }
+        }
+        break;
+
         case 'F':
         {
             char value[10] = { '\0' };