mirror of
https://github.com/iNavFlight/inav-configurator.git
synced 2025-07-17 05:15:20 +03:00
Drop MSP_BF_CONFIG in favor of MSP_BOARD_ALIGNMENT
This commit is contained in:
parent
23d434e52d
commit
b224549ccd
4 changed files with 43 additions and 4 deletions
9
js/fc.js
9
js/fc.js
|
@ -63,7 +63,8 @@ var CONFIG,
|
||||||
OUTPUT_MAPPING,
|
OUTPUT_MAPPING,
|
||||||
SETTINGS,
|
SETTINGS,
|
||||||
BRAKING_CONFIG,
|
BRAKING_CONFIG,
|
||||||
SAFEHOMES;
|
SAFEHOMES,
|
||||||
|
BOARD_ALIGNMENT;
|
||||||
|
|
||||||
var FC = {
|
var FC = {
|
||||||
MAX_SERVO_RATE: 125,
|
MAX_SERVO_RATE: 125,
|
||||||
|
@ -138,6 +139,12 @@ var FC = {
|
||||||
currentoffset: 0
|
currentoffset: 0
|
||||||
};
|
};
|
||||||
|
|
||||||
|
BOARD_ALIGNMENT = {
|
||||||
|
roll: 0,
|
||||||
|
pitch: 0,
|
||||||
|
yaw: 0
|
||||||
|
}
|
||||||
|
|
||||||
LED_STRIP = [];
|
LED_STRIP = [];
|
||||||
LED_COLORS = [];
|
LED_COLORS = [];
|
||||||
LED_MODE_COLORS = [];
|
LED_MODE_COLORS = [];
|
||||||
|
|
|
@ -33,6 +33,8 @@ var MSPCodes = {
|
||||||
MSP_SET_CHANNEL_FORWARDING: 33,
|
MSP_SET_CHANNEL_FORWARDING: 33,
|
||||||
MSP_MODE_RANGES: 34,
|
MSP_MODE_RANGES: 34,
|
||||||
MSP_SET_MODE_RANGE: 35,
|
MSP_SET_MODE_RANGE: 35,
|
||||||
|
MSP_BOARD_ALIGNMENT: 38,
|
||||||
|
MSP_SET_BOARD_ALIGNMENT: 39,
|
||||||
MSP_RX_CONFIG: 44,
|
MSP_RX_CONFIG: 44,
|
||||||
MSP_SET_RX_CONFIG: 45,
|
MSP_SET_RX_CONFIG: 45,
|
||||||
MSP_LED_COLORS: 46,
|
MSP_LED_COLORS: 46,
|
||||||
|
|
|
@ -747,6 +747,16 @@ var mspHelper = (function (gui) {
|
||||||
case MSPCodes.MSP_SET_BF_CONFIG:
|
case MSPCodes.MSP_SET_BF_CONFIG:
|
||||||
console.log('BF_CONFIG saved');
|
console.log('BF_CONFIG saved');
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case MSPCodes.MSP_BOARD_ALIGNMENT:
|
||||||
|
BOARD_ALIGNMENT.roll = data.getInt16(0, true); // -180 - 360
|
||||||
|
BOARD_ALIGNMENT.pitch = data.getInt16(2, true); // -180 - 360
|
||||||
|
BOARD_ALIGNMENT.yaw = data.getInt16(4, true); // -180 - 360
|
||||||
|
break;
|
||||||
|
case MSPCodes.MSP_SET_BOARD_ALIGNMENT:
|
||||||
|
console.log('MSP_SET_BOARD_ALIGNMENT saved');
|
||||||
|
break;
|
||||||
|
|
||||||
case MSPCodes.MSP_SET_REBOOT:
|
case MSPCodes.MSP_SET_REBOOT:
|
||||||
console.log('Reboot request accepted');
|
console.log('Reboot request accepted');
|
||||||
break;
|
break;
|
||||||
|
@ -1559,6 +1569,16 @@ var mspHelper = (function (gui) {
|
||||||
i;
|
i;
|
||||||
|
|
||||||
switch (code) {
|
switch (code) {
|
||||||
|
|
||||||
|
case MSPCodes.MSP_SET_BOARD_ALIGNMENT:
|
||||||
|
buffer.push(specificByte(BOARD_ALIGNMENT.roll, 0));
|
||||||
|
buffer.push(specificByte(BOARD_ALIGNMENT.roll, 1));
|
||||||
|
buffer.push(specificByte(BOARD_ALIGNMENT.pitch, 0));
|
||||||
|
buffer.push(specificByte(BOARD_ALIGNMENT.pitch, 1));
|
||||||
|
buffer.push(specificByte(BOARD_ALIGNMENT.yaw, 0));
|
||||||
|
buffer.push(specificByte(BOARD_ALIGNMENT.yaw, 1));
|
||||||
|
break;
|
||||||
|
|
||||||
case MSPCodes.MSP_SET_BF_CONFIG:
|
case MSPCodes.MSP_SET_BF_CONFIG:
|
||||||
buffer.push(BF_CONFIG.mixerConfiguration);
|
buffer.push(BF_CONFIG.mixerConfiguration);
|
||||||
buffer.push(specificByte(BF_CONFIG.features, 0));
|
buffer.push(specificByte(BF_CONFIG.features, 0));
|
||||||
|
@ -2804,6 +2824,10 @@ var mspHelper = (function (gui) {
|
||||||
MSP.send_message(MSPCodes.MSP_BF_CONFIG, false, false, callback);
|
MSP.send_message(MSPCodes.MSP_BF_CONFIG, false, false, callback);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
self.loadBoardAlignment = function (callback) {
|
||||||
|
MSP.send_message(MSPCodes.MSP_BOARD_ALIGNMENT, false, false, callback);
|
||||||
|
};
|
||||||
|
|
||||||
self.queryFcStatus = function (callback) {
|
self.queryFcStatus = function (callback) {
|
||||||
MSP.send_message(MSPCodes.MSPV2_INAV_STATUS, false, false, callback);
|
MSP.send_message(MSPCodes.MSPV2_INAV_STATUS, false, false, callback);
|
||||||
};
|
};
|
||||||
|
@ -2908,6 +2932,10 @@ var mspHelper = (function (gui) {
|
||||||
MSP.send_message(MSPCodes.MSP_SET_BF_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_BF_CONFIG), false, callback);
|
MSP.send_message(MSPCodes.MSP_SET_BF_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_BF_CONFIG), false, callback);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
self.saveBoardAlignment = function (callback) {
|
||||||
|
MSP.send_message(MSPCodes.MSP_SET_BOARD_ALIGNMENT, mspHelper.crunch(MSPCodes.MSP_SET_BOARD_ALIGNMENT), false, callback);
|
||||||
|
};
|
||||||
|
|
||||||
self.saveMisc = function (callback) {
|
self.saveMisc = function (callback) {
|
||||||
MSP.send_message(MSPCodes.MSP_SET_MISC, mspHelper.crunch(MSPCodes.MSP_SET_MISC), false, callback);
|
MSP.send_message(MSPCodes.MSP_SET_MISC, mspHelper.crunch(MSPCodes.MSP_SET_MISC), false, callback);
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
/*global chrome,GUI,FC_CONFIG,$,mspHelper,googleAnalytics,ADVANCED_CONFIG,VTX_CONFIG,CONFIG,MSPChainerClass*/
|
/*global chrome,GUI,FC_CONFIG,$,mspHelper,googleAnalytics,ADVANCED_CONFIG,VTX_CONFIG,CONFIG,MSPChainerClass,BOARD_ALIGNMENT,TABS*/
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
TABS.configuration = {};
|
TABS.configuration = {};
|
||||||
|
@ -39,6 +39,7 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
|
||||||
mspHelper.loadINAVPidConfig,
|
mspHelper.loadINAVPidConfig,
|
||||||
mspHelper.loadVTXConfig,
|
mspHelper.loadVTXConfig,
|
||||||
mspHelper.loadMixerConfig,
|
mspHelper.loadMixerConfig,
|
||||||
|
mspHelper.loadBoardAlignment,
|
||||||
loadCraftName,
|
loadCraftName,
|
||||||
mspHelper.loadMiscV2
|
mspHelper.loadMiscV2
|
||||||
];
|
];
|
||||||
|
@ -59,6 +60,7 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
|
||||||
mspHelper.saveAdvancedConfig,
|
mspHelper.saveAdvancedConfig,
|
||||||
mspHelper.saveINAVPidConfig,
|
mspHelper.saveINAVPidConfig,
|
||||||
mspHelper.saveVTXConfig,
|
mspHelper.saveVTXConfig,
|
||||||
|
mspHelper.saveBoardAlignment,
|
||||||
saveCraftName,
|
saveCraftName,
|
||||||
mspHelper.saveMiscV2,
|
mspHelper.saveMiscV2,
|
||||||
saveSettings,
|
saveSettings,
|
||||||
|
@ -255,7 +257,7 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
|
||||||
$('#content').scrollTop((scrollPosition) ? scrollPosition : 0);
|
$('#content').scrollTop((scrollPosition) ? scrollPosition : 0);
|
||||||
|
|
||||||
// fill board alignment
|
// fill board alignment
|
||||||
$('input[name="board_align_yaw"]').val((BF_CONFIG.board_align_yaw / 10.0).toFixed(1));
|
$('input[name="board_align_yaw"]').val((BOARD_ALIGNMENT.yaw / 10.0).toFixed(1));
|
||||||
|
|
||||||
// fill magnetometer
|
// fill magnetometer
|
||||||
$('#mag_declination').val(MISC.mag_declination);
|
$('#mag_declination').val(MISC.mag_declination);
|
||||||
|
@ -377,7 +379,7 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
|
||||||
helper.features.reset();
|
helper.features.reset();
|
||||||
helper.features.fromUI($('.tab-configuration'));
|
helper.features.fromUI($('.tab-configuration'));
|
||||||
helper.features.execute(function () {
|
helper.features.execute(function () {
|
||||||
BF_CONFIG.board_align_yaw = Math.round(parseFloat($('input[name="board_align_yaw"]').val()) * 10);
|
BOARD_ALIGNMENT.yaw = Math.round(parseFloat($('input[name="board_align_yaw"]').val()) * 10);
|
||||||
BF_CONFIG.currentscale = parseInt($('#currentscale').val());
|
BF_CONFIG.currentscale = parseInt($('#currentscale').val());
|
||||||
BF_CONFIG.currentoffset = Math.round(parseFloat($('#currentoffset').val()) * 10);
|
BF_CONFIG.currentoffset = Math.round(parseFloat($('#currentoffset').val()) * 10);
|
||||||
saveChainer.execute();
|
saveChainer.execute();
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue