Fix VTX power levels

Power levels are 1-5 for Tramp and 1-4 for SmartAudio, not 0-4 for both.
bforbort · Jul 11, 2018 · f6407a9 · f6407a9
1 parent 8e82374
commit f6407a9
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 29 deletions.
diff --git a/js/fc.js b/js/fc.js
@@ -301,7 +301,7 @@ var FC = {
         };
 
         VTX_CONFIG = {
-            device_type: VTXDEV_UNKNOWN,
+            device_type: VTX.DEV_UNKNOWN,
             band: 0,
             channel: 1,
             power: 0,

diff --git a/js/msp/MSPHelper.js b/js/msp/MSPHelper.js
@@ -1102,7 +1102,7 @@ var mspHelper = (function (gui) {
                 break;
             case MSPCodes.MSP_VTX_CONFIG:
                 VTX_CONFIG.device_type = data.getUint8(offset++);
-                if (VTX_CONFIG.device_type != VTXDEV_UNKNOWN) {
+                if (VTX_CONFIG.device_type != VTX.DEV_UNKNOWN) {
                     VTX_CONFIG.band = data.getUint8(offset++);
                     VTX_CONFIG.channel = data.getUint8(offset++);
                     VTX_CONFIG.power = data.getUint8(offset++);
@@ -1463,7 +1463,7 @@ var mspHelper = (function (gui) {
                     buffer.push16(((VTX_CONFIG.band - 1) * 8) + (VTX_CONFIG.channel - 1));
                 } else {
                     // This tells the firmware to ignore this value.
-                    buffer.push16(VTX_MAX_FREQUENCY_MHZ + 1);
+                    buffer.push16(VTX.MAX_FREQUENCY_MHZ + 1);
                 }
                 buffer.push(VTX_CONFIG.power);
                 // Don't enable PIT mode

diff --git a/js/vtx.js b/js/vtx.js
@@ -1,23 +1,39 @@
-var VTXDEV_UNKNOWN = 0xFF;
+var VTX = (function() {
+    var self = {};
 
-var VTX_BANDS = [
-    {code: 1, name: 'Boscam A'},
-    {code: 2, name: 'Boscam B'},
-    {code: 3, name: 'Boscam E'},
-    {code: 4, name: 'Fatshark'},
-    {code: 5, name: 'Raceband'},
-];
+    self.DEV_SMARTAUDIO = 3;
+    self.DEV_TRAMP = 4;
+    self.DEV_UNKNOWN = 0xFF;
 
-var VTX_BAND_MIN = 1;
-var VTX_BAND_MAX = 5;
+    self.BANDS = [
+        {code: 1, name: 'Boscam A'},
+        {code: 2, name: 'Boscam B'},
+        {code: 3, name: 'Boscam E'},
+        {code: 4, name: 'Fatshark'},
+        {code: 5, name: 'Raceband'},
+    ];
 
-var VTX_CHANNEL_MIN = 1;
-var VTX_CHANNEL_MAX = 8;
+    self.BAND_MIN = 1;
+    self.BAND_MAX = 5;
 
-var VTX_POWER_MIN = 0;
-var VTX_POWER_MAX = 4;
+    self.CHANNEL_MIN = 1;
+    self.CHANNEL_MAX = 8;
 
-var VTX_LOW_POWER_DISARM_MIN = 0;
-var VTX_LOW_POWER_DISARM_MAX = 2;
+    self.getMinPower = function(vtxDev) {
+        return 1;
+    }
 
-var VTX_MAX_FREQUENCY_MHZ = 5999;
+    self.getMaxPower = function(vtxDev) {
+        if (vtxDev == self.DEV_SMARTAUDIO) {
+            return 4;
+        }
+        return 5;
+    }
+
+    self.LOW_POWER_DISARM_MIN = 0;
+    self.LOW_POWER_DISARM_MAX = 2;
+
+    self.MAX_FREQUENCY_MHZ = 5999;
+
+    return self;
+})();
diff --git a/tabs/configuration.js b/tabs/configuration.js
@@ -273,22 +273,22 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
 
         // VTX
         var config_vtx = $('.config-vtx');
-        if (VTX_CONFIG.device_type != VTXDEV_UNKNOWN) {
+        if (VTX_CONFIG.device_type != VTX.DEV_UNKNOWN) {
 
             var vtx_band = $('#vtx_band');
             vtx_band.empty();
             var vtx_no_band_note = $('#vtx_no_band');
-            if (VTX_CONFIG.band < VTX_BAND_MIN || VTX_CONFIG.band > VTX_BAND_MAX) {
+            if (VTX_CONFIG.band < VTX.BAND_MIN || VTX_CONFIG.band > VTX.BAND_MAX) {
                 var noBandName = chrome.i18n.getMessage("configurationNoBand");
                 $('<option value="0">' + noBandName + '</option>').appendTo(vtx_band);
                 vtx_no_band_note.show();
             } else {
                 vtx_no_band_note.hide();
             }
-            for (var ii = 0; ii < VTX_BANDS.length; ii++) {
-                var band_name = VTX_BANDS[ii].name;
-                var option = $('<option value="' + VTX_BANDS[ii].code + '">' + band_name + '</option>');
-                if (VTX_BANDS[ii].code == VTX_CONFIG.band) {
+            for (var ii = 0; ii < VTX.BANDS.length; ii++) {
+                var band_name = VTX.BANDS[ii].name;
+                var option = $('<option value="' + VTX.BANDS[ii].code + '">' + band_name + '</option>');
+                if (VTX.BANDS[ii].code == VTX_CONFIG.band) {
                     option.prop('selected', true);
                 }
                 option.appendTo(vtx_band);
@@ -299,7 +299,7 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
 
             var vtx_channel = $('#vtx_channel');
             vtx_channel.empty();
-            for (var ii = VTX_CHANNEL_MIN; ii <= VTX_CHANNEL_MAX; ii++) {
+            for (var ii = VTX.CHANNEL_MIN; ii <= VTX.CHANNEL_MAX; ii++) {
                 var option = $('<option value="' + ii + '">' + ii + '</option>');
                 if (ii == VTX_CONFIG.channel) {
                     option.prop('selected', true);
@@ -312,7 +312,9 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
 
             var vtx_power = $('#vtx_power');
             vtx_power.empty();
-            for (var ii = VTX_POWER_MIN; ii <= VTX_POWER_MAX; ii++) {
+            var minPower = VTX.getMinPower(VTX_CONFIG.device_type);
+            var maxPower = VTX.getMaxPower(VTX_CONFIG.device_type);
+            for (var ii = minPower; ii <= maxPower; ii++) {
                 var option = $('<option value="' + ii + '">' + ii + '</option>');
                 if (ii == VTX_CONFIG.power) {
                     option.prop('selected', true);
@@ -325,7 +327,7 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
 
             var vtx_low_power_disarm = $('#vtx_low_power_disarm');
             vtx_low_power_disarm.empty();
-            for (var ii = VTX_LOW_POWER_DISARM_MIN; ii <= VTX_LOW_POWER_DISARM_MAX; ii++) {
+            for (var ii = VTX.LOW_POWER_DISARM_MIN; ii <= VTX.LOW_POWER_DISARM_MAX; ii++) {
                 var name = chrome.i18n.getMessage("configurationVTXLowPowerDisarmValue_" + ii);
                 if (!name) {
                     name = ii;