Mirror/inav-configurator
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav-configurator.git synced 2025-07-15 12:25:13 +03:00
Code Wiki Activity

Clean up ARMING_CONFIG MSP frames as not used

Browse source
This commit is contained in:
Pawel Spychalski (DzikuVx) 2024-03-25 21:44:06 +01:00
parent c9534358d1
commit 6f20b43fc9
4 changed files with 0 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

6
js/fc.js
View file

@ -32,7 +32,6 @@ var CONFIG,
ADSB_VEHICLES, ADSB_VEHICLES,
MISSION_PLANNER, MISSION_PLANNER,
ANALOG, ANALOG,
ARMING_CONFIG,
FC_CONFIG, FC_CONFIG,
MISC, MISC,
REVERSIBLE_MOTORS, REVERSIBLE_MOTORS,
@ -275,11 +274,6 @@ var FC = {
battery_flags: 0 battery_flags: 0
}; };
ARMING_CONFIG = {
auto_disarm_delay: 0,
disarm_kill_switch: 0
};
FC_CONFIG = { FC_CONFIG = {
loopTime: 0 loopTime: 0
}; };

2
js/msp/MSPCodes.js
View file

@ -50,8 +50,6 @@ var MSPCodes = {
MSP_CF_SERIAL_CONFIG: 54, MSP_CF_SERIAL_CONFIG: 54,
MSP_SET_CF_SERIAL_CONFIG: 55, MSP_SET_CF_SERIAL_CONFIG: 55,
MSP_SONAR: 58, MSP_SONAR: 58,
MSP_ARMING_CONFIG: 61,
MSP_SET_ARMING_CONFIG: 62,
MSP_DATAFLASH_SUMMARY: 70, MSP_DATAFLASH_SUMMARY: 70,
MSP_DATAFLASH_READ: 71, MSP_DATAFLASH_READ: 71,
MSP_DATAFLASH_ERASE: 72, MSP_DATAFLASH_ERASE: 72,

19
js/msp/MSPHelper.js
View file

@ -284,10 +284,6 @@ var mspHelper = (function (gui) {
PIDs[i][3] = data.getUint8(needle + 3); PIDs[i][3] = data.getUint8(needle + 3);
} }
break; break;
case MSPCodes.MSP_ARMING_CONFIG:
ARMING_CONFIG.auto_disarm_delay = data.getUint8(0);
ARMING_CONFIG.disarm_kill_switch = data.getUint8(1);
break;
case MSPCodes.MSP_LOOP_TIME: case MSPCodes.MSP_LOOP_TIME:
FC_CONFIG.loopTime = data.getInt16(0, true); FC_CONFIG.loopTime = data.getInt16(0, true);
break; break;
@ -1403,9 +1399,6 @@ var mspHelper = (function (gui) {
case MSPCodes.MSP_SET_LOOP_TIME: case MSPCodes.MSP_SET_LOOP_TIME:
console.log('Looptime saved'); console.log('Looptime saved');
break; break;
case MSPCodes.MSP_SET_ARMING_CONFIG:
console.log('Arming config saved');
break;
case MSPCodes.MSP_SET_RESET_CURR_PID: case MSPCodes.MSP_SET_RESET_CURR_PID:
console.log('Current PID profile reset'); console.log('Current PID profile reset');
break; break;
@ -1745,10 +1738,6 @@ var mspHelper = (function (gui) {
buffer.push(lowByte(CONFIG.accelerometerTrims[1])); buffer.push(lowByte(CONFIG.accelerometerTrims[1]));
buffer.push(highByte(CONFIG.accelerometerTrims[1])); buffer.push(highByte(CONFIG.accelerometerTrims[1]));
break; break;
case MSPCodes.MSP_SET_ARMING_CONFIG:
buffer.push(ARMING_CONFIG.auto_disarm_delay);
buffer.push(ARMING_CONFIG.disarm_kill_switch);
break;
case MSPCodes.MSP_SET_LOOP_TIME: case MSPCodes.MSP_SET_LOOP_TIME:
buffer.push(lowByte(FC_CONFIG.loopTime)); buffer.push(lowByte(FC_CONFIG.loopTime));
buffer.push(highByte(FC_CONFIG.loopTime)); buffer.push(highByte(FC_CONFIG.loopTime));
@ -2938,10 +2927,6 @@ var mspHelper = (function (gui) {
MSP.send_message(MSPCodes.MSPV2_BATTERY_CONFIG, false, false, callback); MSP.send_message(MSPCodes.MSPV2_BATTERY_CONFIG, false, false, callback);
}; };
self.loadArmingConfig = function (callback) {
MSP.send_message(MSPCodes.MSP_ARMING_CONFIG, false, false, callback);
};
self.loadRxConfig = function (callback) { self.loadRxConfig = function (callback) {
MSP.send_message(MSPCodes.MSP_RX_CONFIG, false, false, callback); MSP.send_message(MSPCodes.MSP_RX_CONFIG, false, false, callback);
}; };
@ -3050,10 +3035,6 @@ var mspHelper = (function (gui) {
MSP.send_message(MSPCodes.MSP_SET_ACC_TRIM, mspHelper.crunch(MSPCodes.MSP_SET_ACC_TRIM), false, callback); MSP.send_message(MSPCodes.MSP_SET_ACC_TRIM, mspHelper.crunch(MSPCodes.MSP_SET_ACC_TRIM), false, callback);
}; };
self.saveArmingConfig = function (callback) {
MSP.send_message(MSPCodes.MSP_SET_ARMING_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_ARMING_CONFIG), false, callback);
};
self.saveRxConfig = function (callback) { self.saveRxConfig = function (callback) {
MSP.send_message(MSPCodes.MSP_SET_RX_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_RX_CONFIG), false, callback); MSP.send_message(MSPCodes.MSP_SET_RX_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_RX_CONFIG), false, callback);
}; };

4
tabs/configuration.js
View file

@ -14,7 +14,6 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
var loadChain = [ var loadChain = [
mspHelper.loadFeatures, mspHelper.loadFeatures,
mspHelper.loadArmingConfig,
mspHelper.loadSensorAlignment, mspHelper.loadSensorAlignment,
mspHelper.loadAdvancedConfig, mspHelper.loadAdvancedConfig,
mspHelper.loadVTXConfig, mspHelper.loadVTXConfig,
@ -31,7 +30,6 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
var saveChain = [ var saveChain = [
mspHelper.saveAccTrim, mspHelper.saveAccTrim,
mspHelper.saveArmingConfig,
mspHelper.saveAdvancedConfig, mspHelper.saveAdvancedConfig,
mspHelper.saveVTXConfig, mspHelper.saveVTXConfig,
mspHelper.saveCurrentMeterConfig, mspHelper.saveCurrentMeterConfig,
@ -258,8 +256,6 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
//UPDATE: moved to GPS tab and hidden //UPDATE: moved to GPS tab and hidden
//MISC.mag_declination = parseFloat($('#mag_declination').val()); //MISC.mag_declination = parseFloat($('#mag_declination').val());
ARMING_CONFIG.auto_disarm_delay = parseInt($('input[name="autodisarmdelay"]').val());
MISC.battery_cells = parseInt($('#cells').val()); MISC.battery_cells = parseInt($('#cells').val());
MISC.voltage_source = parseInt($('#voltagesource').val()); MISC.voltage_source = parseInt($('#voltagesource').val());
MISC.vbatdetectcellvoltage = parseFloat($('#celldetectvoltage').val()); MISC.vbatdetectcellvoltage = parseFloat($('#celldetectvoltage').val());