From 80adee7144ca1eccbe582ca8ced563c9a4a4f8c1 Mon Sep 17 00:00:00 2001
From: erikkaashoek <erik@kaashoek.com>
Date: Thu, 23 Feb 2023 10:33:56 +0100
Subject: [PATCH] clean

---
 NANOVNA_STM32_F303/board.h | 4 ++--
 main.c                     | 9 ++++-----
 sa_core.c                  | 3 +++
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/NANOVNA_STM32_F303/board.h b/NANOVNA_STM32_F303/board.h
index 71f9f9f..1962485 100644
--- a/NANOVNA_STM32_F303/board.h
+++ b/NANOVNA_STM32_F303/board.h
@@ -162,7 +162,7 @@
                                      PIN_MODE_INPUT(1U) |           \
                                      PIN_MODE_INPUT(2U) |           \
                                      PIN_MODE_INPUT(3U) |           \
-                                     PIN_MODE_ALTERNATE(GPIO_SD_DAT2) |           \
+                                     PIN_MODE_ANALOG(GPIO_SD_DAT2) |           \
                                      PIN_MODE_ANALOG(GPIOA_DAC2) |  \
                                      PIN_MODE_ANALOG(GPIOA_XP) |    \
                                      PIN_MODE_ANALOG(GPIOA_YP) |    \
@@ -242,7 +242,7 @@
                                      PIN_AFIO_AF(1, 0) |           \
                                      PIN_AFIO_AF(2, 0) |       \
                                      PIN_AFIO_AF(3, 0) |       \
-                                     PIN_AFIO_AF(GPIO_SD_DAT2, 2) |           \
+                                     PIN_AFIO_AF(GPIO_SD_DAT2, 0) |           \
                                      PIN_AFIO_AF(5, 0) |           \
                                      PIN_AFIO_AF(6, 0) |           \
                                      PIN_AFIO_AF(7, 0))
diff --git a/main.c b/main.c
index bb94623..04c4058 100644
--- a/main.c
+++ b/main.c
@@ -2550,7 +2550,7 @@ static PWMConfig pwmcfg = {
   NULL,
   {
    {PWM_OUTPUT_DISABLED, NULL},
-   {PWM_OUTPUT_ACTIVE_HIGH, audio_toggle},
+   {PWM_OUTPUT_ACTIVE_HIGH, NULL},
    {PWM_OUTPUT_DISABLED, NULL},
    {PWM_OUTPUT_DISABLED, NULL}
   },
@@ -2561,11 +2561,10 @@ static PWMConfig pwmcfg = {
 #define PWM_TIMER   PWMD3
 #define PWM_CHANNEL 1           // Channel 2
 void pwm_init(void) {
-  palSetPadMode(GPIOA, 9, PAL_MODE_ALTERNATE(6)); // PA9
   palSetPadMode(GPIOA, 4, PAL_MODE_ALTERNATE(2)); // PA4 Time 3 channel 2
-  pwmStart(&PWM_TIMER, &pwmcfg);
-  pwmEnableChannel(&PWM_TIMER, PWM_CHANNEL, PWM_PERCENTAGE_TO_WIDTH(&PWM_TIMER, 5000));
-  pwmEnableChannelNotification(&PWM_TIMER, PWM_CHANNEL);
+//  pwmStart(&PWM_TIMER, &pwmcfg);
+//  pwmEnableChannel(&PWM_TIMER, PWM_CHANNEL, PWM_PERCENTAGE_TO_WIDTH(&PWM_TIMER, 5000));
+//  pwmEnableChannelNotification(&PWM_TIMER, PWM_CHANNEL);
 }
 
 void pwm_start(int f)
diff --git a/sa_core.c b/sa_core.c
index c1109fc..c0c972f 100644
--- a/sa_core.c
+++ b/sa_core.c
@@ -4879,8 +4879,11 @@ static bool sweep(bool break_on_operation)
       set_rbw(8000);
       set_sweep_points((setting.guards[current_guard].end - setting.guards[current_guard].start) / 800000);
     }
+    pwm_init();
     pwm_stop();
   }
+  else
+    palSetPadMode(GPIOA, 4, PAL_MODE_INPUT);        // Back to DAC mode
 #endif
 
   setting.measure_sweep_time_us = 0;                   // start measure sweep time