Update added parameter

betaflight · May 21, 2024 · a1dfb48 · a1dfb48
1 parent 9afc5b4
commit a1dfb48
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 8 deletions.
diff --git a/src/js/backup_restore.js b/src/js/backup_restore.js
@@ -491,8 +491,8 @@ export function configuration_restore(callback) {
 
             if (configuration.ARMING_CONFIG == undefined) {
                 configuration.ARMING_CONFIG = {
-                    auto_disarm_delay:     5,
-                    gyro_cal_on_first_arm: 0,
+                    auto_disarm_delay:      5,
+                    disarm_kill_switch:     1,
                 };
             }
 

diff --git a/src/js/fc.js b/src/js/fc.js
@@ -390,8 +390,9 @@ const FC = {
 
         this.ARMING_CONFIG = {
             auto_disarm_delay:          0,
-            gyro_cal_on_first_arm:      0,
+            disarm_kill_switch:         0,
             small_angle:                0,
+            gyro_cal_on_first_arm:      0,
         };
 
         this.FC_CONFIG = {

diff --git a/src/js/msp/MSPHelper.js b/src/js/msp/MSPHelper.js
@@ -8,7 +8,7 @@ import semver from 'semver';
 import vtxDeviceStatusFactory from "../utils/VtxDeviceStatus/VtxDeviceStatusFactory";
 import MSP from "../msp";
 import MSPCodes from "./MSPCodes";
-import { API_VERSION_1_42, API_VERSION_1_43, API_VERSION_1_44, API_VERSION_1_45, API_VERSION_1_46 } from '../data_storage';
+import { API_VERSION_1_42, API_VERSION_1_43, API_VERSION_1_44, API_VERSION_1_45, API_VERSION_1_46, API_VERSION_1_47 } from '../data_storage';
 import EscProtocols from "../utils/EscProtocols";
 import huffmanDecodeBuf from "../huffman";
 import { defaultHuffmanTree, defaultHuffmanLenIndex } from "../default_huffman_tree";
@@ -17,6 +17,7 @@ import { showErrorDialog } from "../utils/showErrorDialog";
 import GUI, { TABS } from "../gui";
 import { OSD } from "../tabs/osd";
 import { reinitializeConnection } from "../serial_backend";
+import { s } from 'vitest/dist/index-2dd51af4.js';
 
 // Used for LED_STRIP
 const ledDirectionLetters    = ['n', 'e', 's', 'w', 'u', 'd'];      // in LSB bit order
@@ -466,8 +467,11 @@ MspHelper.prototype.process_data = function(dataHandler) {
 
             case MSPCodes.MSP_ARMING_CONFIG:
                 FC.ARMING_CONFIG.auto_disarm_delay = data.readU8();
-                FC.ARMING_CONFIG.gyro_cal_on_first_arm = data.readU8();
+                FC.ARMING_CONFIG.disarm_kill_switch = data.readU8();
                 FC.ARMING_CONFIG.small_angle = data.readU8();
+                if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_47)) {
+                    FC.ARMING_CONFIG.gyro_cal_on_first_arm = data.readU8();
+                }
                 break;
             case MSPCodes.MSP_LOOP_TIME:
                 FC.FC_CONFIG.loopTime = data.readU16();
@@ -1792,8 +1796,11 @@ MspHelper.prototype.crunch = function(code, modifierCode = undefined) {
             break;
         case MSPCodes.MSP_SET_ARMING_CONFIG:
             buffer.push8(FC.ARMING_CONFIG.auto_disarm_delay)
-                .push8(FC.ARMING_CONFIG.gyro_cal_on_first_arm)
+                .push8(FC.ARMING_CONFIG.disarm_kill_switch)
                 .push8(FC.ARMING_CONFIG.small_angle);
+                if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_47)) {
+                    buffer.push8(FC.ARMING_CONFIG.gyro_cal_on_first_arm);
+                }
             break;
         case MSPCodes.MSP_SET_LOOP_TIME:
             buffer.push16(FC.FC_CONFIG.loopTime);

diff --git a/src/js/tabs/configuration.js b/src/js/tabs/configuration.js
@@ -9,6 +9,7 @@ import MSPCodes from '../msp/MSPCodes';
 import { API_VERSION_1_42, API_VERSION_1_43, API_VERSION_1_45, API_VERSION_1_47 } from '../data_storage';
 import { updateTabList } from '../utils/updateTabList';
 import $ from 'jquery';
+import { s } from 'vitest/dist/index-2dd51af4.js';
 
 const configuration = {
     analyticsChanges: {},
@@ -407,8 +408,10 @@ configuration.initialize = function (callback) {
             FC.CONFIG.accelerometerTrims[1] = parseInt($('input[name="roll"]').val());
             FC.CONFIG.accelerometerTrims[0] = parseInt($('input[name="pitch"]').val());
 
-            FC.ARMING_CONFIG.auto_disarm_delay = parseInt($('input[id="configurationAutoDisarmDelay"]').val());
-            FC.ARMING_CONFIG.gyro_cal_on_first_arm = $('input[id="configurationGyroCalOnFirstArm"]').is(':checked') ? 1 : 0;
+            if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_47)) {
+                FC.ARMING_CONFIG.gyro_cal_on_first_arm = $('input[id="configurationGyroCalOnFirstArm"]').is(':checked') ? 1 : 0;
+                FC.ARMING_CONFIG.auto_disarm_delay = parseInt($('input[id="configurationAutoDisarmDelay"]').val());
+            }
             FC.ARMING_CONFIG.small_angle = parseInt($('input[id="configurationSmallAngle"]').val());
 
             FC.SENSOR_ALIGNMENT.gyro_to_use = parseInt(orientation_gyro_to_use_e.val());