From 2903847ac232e6965abbdcbc605145e91bfdf023 Mon Sep 17 00:00:00 2001
From: Andy CA6JAU <juribeparada@gmail.com>
Date: Mon, 4 Feb 2019 14:23:41 -0300
Subject: [PATCH] Change deviation and power for POCSAG cal

---
 ADF7021.cpp    | 11 +++++++++--
 SerialPort.cpp |  9 ++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/ADF7021.cpp b/ADF7021.cpp
index 4def500..ef3d200 100644
--- a/ADF7021.cpp
+++ b/ADF7021.cpp
@@ -1007,8 +1007,15 @@ void CIO::updateCal()
   Send_AD7021_control();
 
   ADF7021_REG2  = (uint32_t) 0b10              << 28;  // invert data (and RC alpha = 0.5)
-  ADF7021_REG2 |= (uint32_t) (m_dmrDev / div2) << 19;  // deviation
-  ADF7021_REG2 |= (uint32_t) 0b111             << 4;   // modulation (RC 4FSK)
+
+  if (m_modemState == STATE_DMR) {
+    ADF7021_REG2 |= (uint32_t) (m_dmrDev / div2)    << 19;  // DMR deviation
+    ADF7021_REG2 |= (uint32_t) 0b111                << 4;   // modulation (RC 4FSK)
+  } else if (m_modemState == STATE_POCSAG) {
+    ADF7021_REG2 |= (uint32_t) (m_pocsagDev / div2) << 19;  // POCSAG deviation
+    ADF7021_REG2 |= (uint32_t) 0b000                << 4;   // modulation (2FSK)
+  }
+
   ADF7021_REG2 |= (uint32_t) 0b0010;                   // register 2
   ADF7021_REG2 |= (uint32_t) m_power           << 13;  // power level
   ADF7021_REG2 |= (uint32_t) 0b110001          << 7;   // PA
diff --git a/SerialPort.cpp b/SerialPort.cpp
index a05ca72..dd7e045 100644
--- a/SerialPort.cpp
+++ b/SerialPort.cpp
@@ -294,9 +294,8 @@ uint8_t CSerialPort::setConfig(const uint8_t* data, uint8_t length)
     m_pocsagEnable = true;
     m_modemState = STATE_POCSAG;
     m_calState = modemState;
-    //if (m_firstCal)
-    //  io.updateCal();
-    io.ifConf(STATE_POCSAG, true);
+    if (m_firstCal)
+      io.updateCal();
   }
   else {
     m_modemState = modemState;
@@ -392,8 +391,8 @@ uint8_t CSerialPort::setMode(const uint8_t* data, uint8_t length)
     m_pocsagEnable = true;
     tmpState = STATE_POCSAG;
     m_calState = modemState;
-    //if (m_firstCal)
-    //  io.updateCal();
+    if (m_firstCal)
+      io.updateCal();
   }
   else {
     tmpState  = modemState;