Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-19 22:35:23 +03:00
Code Issues Wiki Activity

add RC_MAP, BF_CONFIG for storing new info that is now available, working channelLetter mapping, unfinished MISCv2

Browse source
This commit is contained in:
cTn 2014-09-16 14:48:36 +02:00
parent 97d3a24787
commit 7e8b1781da
2 changed files with 45 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

30
js/data_storage.js
View file

@ -23,12 +23,24 @@ var CONFIG = {
accelerometerTrims: [0, 0] accelerometerTrims: [0, 0]
}; };
var BF_CONFIG = {
mixerConfiguration: 0,
features: 0,
serialrx_type: 0,
board_align_roll: 0,
board_align_pitch: 0,
board_align_yaw: 0
// TBD
};
var PID_names = []; var PID_names = [];
var PIDs = new Array(10); var PIDs = new Array(10);
for (var i = 0; i < 10; i++) { for (var i = 0; i < 10; i++) {
PIDs[i] = new Array(3); PIDs[i] = new Array(3);
} }
var RC_MAP = [];
// defaults // defaults
// roll, pitch, yaw, throttle, aux 1, ... aux n // roll, pitch, yaw, throttle, aux 1, ... aux n
var RC = { var RC = {
@ -104,3 +116,21 @@ var MISC = {
vbatmaxcellvoltage: 0, vbatmaxcellvoltage: 0,
empty: 0 // unknown empty: 0 // unknown
}; };
var MISCV2 = { // TODO temporary, will figure out a better solution in the future
midrc: 0,
minthrottle: 0,
maxthrottle: 0,
mincommand: 0,
failsafe_throttle: 0,
gps_type: 0,
gps_baudrate: 0,
gps_ubx_sbas: 0,
placeholder1: 0,
placeholder2: 0,
mag_declination: 0, // not checked
vbatscale: 0,
vbatmincellvoltage: 0,
vbatmaxcellvoltage: 0,
placeholder3: 0
};

15
js/msp.js
View file

@ -457,14 +457,29 @@ MSP.process_data = function(code, message_buffer, message_length) {
break; break;
// Additional private MSP for baseflight configurator // Additional private MSP for baseflight configurator
case MSP_codes.MSP_RCMAP: case MSP_codes.MSP_RCMAP:
var channelLetters = ['A', 'E', 'R', 'T', '1', '2', '3', '4'];
RC_MAP = []; // empty the array as new data is coming in
for (var i = 0; i < data.byteLength; i++) {
RC_MAP.push(channelLetters[data.getUint8(i)]);
}
break; break;
case MSP_codes.MSP_SET_RCMAP: case MSP_codes.MSP_SET_RCMAP:
console.log('RCMAP Updated');
break; break;
case MSP_codes.MSP_CONFIG: case MSP_codes.MSP_CONFIG:
BF_CONFIG.mixerConfiguration = data.getUint8(0);
BF_CONFIG.features = data.getUint32(1, 1);
BF_CONFIG.serialrx_type = data.getUint8(5);
BF_CONFIG.board_align_roll = data.getInt16(6, 1);
BF_CONFIG.board_align_pitch = data.getInt16(8, 1);
BF_CONFIG.board_align_yaw = data.getInt16(10, 1);
break; break;
case MSP_codes.MSP_SET_CONFIG: case MSP_codes.MSP_SET_CONFIG:
break; break;
case MSP_codes.MSP_SET_REBOOT: case MSP_codes.MSP_SET_REBOOT:
console.log('Reboot request accepted');
break; break;
default: default: