From f1094062564c2fdd3cdfce82f6855f959fe73c6c Mon Sep 17 00:00:00 2001
From: Rob Riggs <rob@pangalactic.org>
Date: Mon, 21 Jun 2021 22:00:45 -0500
Subject: [PATCH] Update 1200 baud modem to use same timing on both TNC3 and
 NucleoTNC.

---
 TNC/AFSKModulator.cpp       | 5 -----
 TNC/Afsk1200Demodulator.hpp | 6 +-----
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/TNC/AFSKModulator.cpp b/TNC/AFSKModulator.cpp
index 3fb5271..d4d1c66 100644
--- a/TNC/AFSKModulator.cpp
+++ b/TNC/AFSKModulator.cpp
@@ -11,13 +11,8 @@ void AFSKModulator::init(const kiss::Hardware& hw)
 
     SysClock48();
 
-#ifndef NUCLEOTNC
     // Configure 48MHz clock for 26.4ksps.
     htim7.Init.Period = 1817;
-#else
-    // Using an 80MHz clock on NucleoTNC.
-    htim7.Init.Period = 3029;
-#endif
     if (HAL_TIM_Base_Init(&htim7) != HAL_OK)
     {
         ERROR("htim7 init failed");
diff --git a/TNC/Afsk1200Demodulator.hpp b/TNC/Afsk1200Demodulator.hpp
index cf00443..30c601f 100644
--- a/TNC/Afsk1200Demodulator.hpp
+++ b/TNC/Afsk1200Demodulator.hpp
@@ -90,16 +90,12 @@ struct Afsk1200Demodulator : IDemodulator
         sConfig.Channel = AUDIO_IN;
         sConfig.Rank = ADC_REGULAR_RANK_1;
         sConfig.SingleDiff = ADC_SINGLE_ENDED;
-        sConfig.SamplingTime = ADC_SAMPLETIME_12CYCLES_5;
+        sConfig.SamplingTime = ADC_SAMPLETIME_24CYCLES_5;
         sConfig.OffsetNumber = ADC_OFFSET_NONE;
         sConfig.Offset = 0;
         if (HAL_ADC_ConfigChannel(&hadc1, &sConfig) != HAL_OK)
             CxxErrorHandler();
-#ifndef NUCLEOTNC
         startADC(1817, ADC_BLOCK_SIZE);
-#else
-        startADC(3029, ADC_BLOCK_SIZE);
-#endif
     }
 
     void stop() override