From 20d9359de9e74fafd1058782dd25ad296c3a41c6 Mon Sep 17 00:00:00 2001
From: Martin Budden <mjbudden@gmail.com>
Date: Thu, 23 Nov 2017 08:45:38 +0000
Subject: [PATCH] Removed duplicate SA VTX power names

---
 src/main/cms/cms_menu_vtx_smartaudio.c | 10 +--------
 src/main/io/vtx_smartaudio.c           |  2 +-
 src/main/io/vtx_smartaudio.h           | 31 +-------------------------
 3 files changed, 3 insertions(+), 40 deletions(-)

diff --git a/src/main/cms/cms_menu_vtx_smartaudio.c b/src/main/cms/cms_menu_vtx_smartaudio.c
index 9c4bd1c8f4..9adb2865fe 100644
--- a/src/main/cms/cms_menu_vtx_smartaudio.c
+++ b/src/main/cms/cms_menu_vtx_smartaudio.c
@@ -361,15 +361,7 @@ static OSD_TAB_t saCmsEntBand = { &saCmsBand, VTX_SMARTAUDIO_BAND_COUNT, vtx58Ba
 
 static OSD_TAB_t saCmsEntChan = { &saCmsChan, VTX_SMARTAUDIO_CHANNEL_COUNT, vtx58ChannelNames };
 
-static const char * const saCmsPowerNames[] = {
-    "---",
-    "25 ",
-    "200",
-    "500",
-    "800",
-};
-
-static OSD_TAB_t saCmsEntPower = { &saCmsPower, VTX_SMARTAUDIO_POWER_COUNT, saCmsPowerNames};
+static OSD_TAB_t saCmsEntPower = { &saCmsPower, VTX_SMARTAUDIO_POWER_COUNT, saPowerNames};
 
 static OSD_UINT16_t saCmsEntFreqRef = { &saCmsFreqRef, 5600, 5900, 0 };
 
diff --git a/src/main/io/vtx_smartaudio.c b/src/main/io/vtx_smartaudio.c
index ca865b61ce..e11c29c725 100644
--- a/src/main/io/vtx_smartaudio.c
+++ b/src/main/io/vtx_smartaudio.c
@@ -71,7 +71,7 @@ serialPort_t *debugSerialPort = NULL;
 static serialPort_t *smartAudioSerialPort = NULL;
 
 #if defined(USE_CMS) || defined(VTX_COMMON)
-static const char * const saPowerNames[VTX_SMARTAUDIO_POWER_COUNT+1] = {
+const char * const saPowerNames[VTX_SMARTAUDIO_POWER_COUNT+1] = {
     "---", "25 ", "200", "500", "800",
 };
 #endif
diff --git a/src/main/io/vtx_smartaudio.h b/src/main/io/vtx_smartaudio.h
index c7fba6c15c..be3362acf7 100644
--- a/src/main/io/vtx_smartaudio.h
+++ b/src/main/io/vtx_smartaudio.h
@@ -86,6 +86,7 @@ typedef struct smartAudioStat_s {
 
 extern smartAudioDevice_t saDevice;
 extern saPowerTable_t saPowerTable[];
+extern const char * const saPowerNames[];
 extern smartAudioStat_t saStat;
 
 extern uint16_t sa_smartbaud;
@@ -110,33 +111,3 @@ extern serialPort_t *debugSerialPort;
 #else
 #define dprintf(x)
 #endif // SMARTAUDIO_DPRINTF
-
-#if 0
-#ifdef USE_CMS
-
-uint16_t smartAudioSmartbaud;
-
-uint16_t saerr_badpre;
-uint16_t saerr_badlen;
-uint16_t saerr_crcerr;
-uint16_t saerr_oooresp;
-
-uint8_t smartAudioOpModel;
-uint8_t smartAudioStatus;
-uint8_t smartAudioBand;
-uint8_t smartAudioChan;
-uint16_t smartAudioFreq;
-uint8_t smartAudioPower;
-uint8_t smartAudioTxMode;
-uint8_t smartAudioPitFMode;
-uint16_t smartAudioORFreq;
-
-long smartAudioConfigureOpModelByGvar(displayPort_t *, const void *self);
-long smartAudioConfigurePitFModeByGvar(displayPort_t *, const void *self);
-long smartAudioConfigureBandByGvar(displayPort_t *, const void *self);
-long smartAudioConfigureChanByGvar(displayPort_t *, const void *self);
-long smartAudioConfigurePowerByGvar(displayPort_t *, const void *self);
-long smartAudioSetTxModeByGvar(displayPort_t *, const void *self);
-
-#endif
-#endif