Merge pull request #10261 from bkleiner/increase-sa-level-max

Increase SMARTAUDIO_MAX_POWER_COUNT to 8
iNavFlight · Jul 30, 2024 · d2f15ee · d2f15ee
2 parents 2ac8b7d + 13edf9c
commit d2f15ee
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/main/io/vtx_smartaudio.c b/src/main/io/vtx_smartaudio.c
@@ -73,7 +73,7 @@ static vtxDevice_t vtxSmartAudio = {
     .vTable = &saVTable,
     .capability.bandCount = VTX_SMARTAUDIO_BAND_COUNT,
     .capability.channelCount = VTX_SMARTAUDIO_CHANNEL_COUNT,
-    .capability.powerCount = VTX_SMARTAUDIO_MAX_POWER_COUNT,
+    .capability.powerCount = VTX_SMARTAUDIO_MAX_POWER_COUNT, // Should this be VTX_SMARTAUDIO_DEFAULT_POWER_COUNT?
     .capability.bandNames = (char **)vtx58BandNames,
     .capability.channelNames = (char **)vtx58ChannelNames,
     .capability.powerNames = (char**)saPowerNames
@@ -124,7 +124,10 @@ saPowerTable_t saPowerTable[VTX_SMARTAUDIO_MAX_POWER_COUNT] = {
     { 200,  16 },
     { 500,  25 },
     { 800,  40 },
-    {   0,   0 } // Placeholder
+    {   0,   0 }, // Placeholders
+    {   0,   0 },
+    {   0,   0 },
+    {   0,   0 }
 };
 
 // Last received device ('hard') states

diff --git a/src/main/io/vtx_smartaudio.h b/src/main/io/vtx_smartaudio.h
@@ -33,7 +33,7 @@
 #define VTX_SMARTAUDIO_BAND_COUNT (VTX_SMARTAUDIO_MAX_BAND - VTX_SMARTAUDIO_MIN_BAND + 1)
 #define VTX_SMARTAUDIO_CHANNEL_COUNT (VTX_SMARTAUDIO_MAX_CHANNEL - VTX_SMARTAUDIO_MIN_CHANNEL + 1)
 
-#define VTX_SMARTAUDIO_MAX_POWER_COUNT 5
+#define VTX_SMARTAUDIO_MAX_POWER_COUNT 8
 #define VTX_SMARTAUDIO_DEFAULT_POWER_COUNT 4
 #define VTX_SMARTAUDIO_DEFAULT_POWER 1