From: sjlongland <sjlongland@01035d8c-6547-0410-b346-abe4f91aad63>
Date: Thu, 24 Sep 2015 08:12:07 +0000 (+0000)
Subject: sm1000_leds_switches: Clean up and move remainder of logic.
X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=008cf366ce79dd19a90b167c3b7070621f46fdc2;p=freetel-svn-tracking.git

sm1000_leds_switches: Clean up and move remainder of logic.

git-svn-id: https://svn.code.sf.net/p/freetel/code@2364 01035d8c-6547-0410-b346-abe4f91aad63
---

diff --git a/codec2-dev/stm32/inc/sm1000_leds_switches.h b/codec2-dev/stm32/inc/sm1000_leds_switches.h
index a7fadd4f..33de73fe 100644
--- a/codec2-dev/stm32/inc/sm1000_leds_switches.h
+++ b/codec2-dev/stm32/inc/sm1000_leds_switches.h
@@ -28,6 +28,8 @@
 #ifndef __LEDS_SWITCHES__
 #define __LEDS_SWITCHES__
 
+#include <stdint.h>
+
 void sm1000_leds_switches_init(void);
 
 void led_pwr(int state);
@@ -41,6 +43,11 @@ int switch_select(void);
 int switch_back(void);
 int ext_ptt(void);
 
+#define DEBOUNCE_DELAY 500 /*!< Delay to wait while switch bounces */
+
+#define SW_STEADY   0   /*!< Switch is in steady-state */
+#define SW_DEBOUNCE 1   /*!< Switch is being debounced */
+
 /*! Switch debounce and logic handling */
 struct switch_t {
     /*! Debounce/hold timer */
diff --git a/codec2-dev/stm32/src/sm1000_leds_switches.c b/codec2-dev/stm32/src/sm1000_leds_switches.c
index b08d5333..129d54ef 100644
--- a/codec2-dev/stm32/src/sm1000_leds_switches.c
+++ b/codec2-dev/stm32/src/sm1000_leds_switches.c
@@ -160,7 +160,7 @@ void BusFault_Handler(void)  { ColorfulRingOfDeath(3); }
 void UsageFault_Handler(void){ ColorfulRingOfDeath(4); }
 
 
-static void switch_tick(struct switch_t* const sw)
+void switch_tick(struct switch_t* const sw)
 {
     if (sw->sw != sw->raw) {
         /* State transition, reset timer */
diff --git a/codec2-dev/stm32/src/sm1000_main.c b/codec2-dev/stm32/src/sm1000_main.c
index 22c183e4..9519e4f4 100644
--- a/codec2-dev/stm32/src/sm1000_main.c
+++ b/codec2-dev/stm32/src/sm1000_main.c
@@ -43,7 +43,6 @@
 
 #define FREEDV_NSAMPLES_16K (2*FREEDV_NSAMPLES)
 
-#define DEBOUNCE_DELAY     500
 #define ANNOUNCE_DELAY  300000  /* Supposed to be msec, seems not */
 
 #define MAX_MODES  3
@@ -51,9 +50,6 @@
 #define DV         1
 #define TONE       2
 
-#define SW_STEADY   0   /*!< Switch is in steady-state */
-#define SW_DEBOUNCE 1   /*!< Switch is being debounced */
-
 struct switch_t sw_select;  /*!< Switch driver for SELECT button */
 struct switch_t sw_back;    /*!< Switch driver for BACK button */
 struct switch_t sw_ptt;     /*!< Switch driver for PTT buttons */