Skip to content

Commit

Permalink
Merge pull request #2026 from iNavFlight/dzikuvx-drop-MSP_MISC
Browse files Browse the repository at this point in the history 
Do not use MSP_MISC frame
  • Loading branch information
@DzikuVx
DzikuVx authored Apr 15, 2024
2 parents d5059f2 + 38b1702 commit b9aad4f
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 63 deletions.
2 changes: 0 additions & 2 deletions js/msp/MSPCodes.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ var MSPCodes = {
MSP_RC_TUNING: 111,
MSP_PID: 112,
MSP_ACTIVEBOXES: 113,
MSP_MISC: 114,
MSP_MOTOR_PINS: 115,
MSP_BOXNAMES: 116,
MSP_PIDNAMES: 117,
Expand All @@ -105,7 +104,6 @@ var MSPCodes = {
MSP_SET_RC_TUNING: 204,
MSP_ACC_CALIBRATION: 205,
MSP_MAG_CALIBRATION: 206,
MSP_SET_MISC: 207,
MSP_RESET_CONF: 208,
MSP_SET_WP: 209,
MSP_SELECT_SETTING: 210,
Expand Down
60 changes: 1 addition & 59 deletions js/msp/MSPHelper.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -287,30 +287,7 @@ var mspHelper = (function (gui) {
case MSPCodes.MSP_LOOP_TIME:
FC_CONFIG.loopTime = data.getInt16(0, true);
break;
case MSPCodes.MSP_MISC: // 22 bytes
MISC.midrc = data.getInt16(offset, true);
offset += 2;
MISC.minthrottle = data.getUint16(offset, true); // 0-2000
offset += 2;
MISC.maxthrottle = data.getUint16(offset, true); // 0-2000
offset += 2;
MISC.mincommand = data.getUint16(offset, true); // 0-2000
offset += 2;
MISC.failsafe_throttle = data.getUint16(offset, true); // 1000-2000
offset += 2;
MISC.gps_type = data.getUint8(offset++);
MISC.sensors_baudrate = data.getUint8(offset++);
MISC.gps_ubx_sbas = data.getInt8(offset++);
MISC.multiwiicurrentoutput = data.getUint8(offset++);
MISC.rssi_channel = data.getUint8(offset++);
MISC.placeholder2 = data.getUint8(offset++);
MISC.mag_declination = data.getInt16(offset, 1) / 10; // -18000-18000
offset += 2;
MISC.vbatscale = data.getUint8(offset++); // 10-200
MISC.vbatmincellvoltage = data.getUint8(offset++) / 10; // 10-50
MISC.vbatmaxcellvoltage = data.getUint8(offset++) / 10; // 10-50
MISC.vbatwarningcellvoltage = data.getUint8(offset++) / 10; // 10-50
break;

case MSPCodes.MSPV2_INAV_MISC:
MISC.midrc = data.getInt16(offset, true);
offset += 2;
Expand Down Expand Up @@ -617,9 +594,6 @@ var mspHelper = (function (gui) {
case MSPCodes.MSP2_INAV_OPFLOW_CALIBRATION:
console.log('Optic flow calibration executed');
break;
case MSPCodes.MSP_SET_MISC:
console.log('MISC Configuration saved');
break;
case MSPCodes.MSP_RESET_CONF:
console.log('Settings Reset');
break;
Expand Down Expand Up @@ -1741,30 +1715,6 @@ var mspHelper = (function (gui) {
buffer.push(lowByte(FC_CONFIG.loopTime));
buffer.push(highByte(FC_CONFIG.loopTime));
break;
case MSPCodes.MSP_SET_MISC:
buffer.push(lowByte(MISC.midrc));
buffer.push(highByte(MISC.midrc));
buffer.push(lowByte(MISC.minthrottle));
buffer.push(highByte(MISC.minthrottle));
buffer.push(lowByte(MISC.maxthrottle));
buffer.push(highByte(MISC.maxthrottle));
buffer.push(lowByte(MISC.mincommand));
buffer.push(highByte(MISC.mincommand));
buffer.push(lowByte(MISC.failsafe_throttle));
buffer.push(highByte(MISC.failsafe_throttle));
buffer.push(MISC.gps_type);
buffer.push(MISC.sensors_baudrate);
buffer.push(MISC.gps_ubx_sbas);
buffer.push(MISC.multiwiicurrentoutput);
buffer.push(MISC.rssi_channel);
buffer.push(MISC.placeholder2);
buffer.push(lowByte(Math.round(MISC.mag_declination * 10)));
buffer.push(highByte(Math.round(MISC.mag_declination * 10)));
buffer.push(MISC.vbatscale);
buffer.push(Math.round(MISC.vbatmincellvoltage * 10));
buffer.push(Math.round(MISC.vbatmaxcellvoltage * 10));
buffer.push(Math.round(MISC.vbatwarningcellvoltage * 10));
break;
case MSPCodes.MSPV2_INAV_SET_MISC:
buffer.push(lowByte(MISC.midrc));
buffer.push(highByte(MISC.midrc));
Expand Down Expand Up @@ -2796,10 +2746,6 @@ var mspHelper = (function (gui) {
MSP.send_message(MSPCodes.MSPV2_INAV_STATUS, false, false, callback);
};

self.loadMisc = function (callback) {
MSP.send_message(MSPCodes.MSP_MISC, false, false, callback);
};

self.loadMiscV2 = function (callback) {
MSP.send_message(MSPCodes.MSPV2_INAV_MISC, false, false, callback);
};
Expand Down Expand Up @@ -2937,10 +2883,6 @@ var mspHelper = (function (gui) {
MSP.send_message(MSPCodes.MSP_SET_BOARD_ALIGNMENT, mspHelper.crunch(MSPCodes.MSP_SET_BOARD_ALIGNMENT), false, callback);
};

self.saveMisc = function (callback) {
MSP.send_message(MSPCodes.MSP_SET_MISC, mspHelper.crunch(MSPCodes.MSP_SET_MISC), false, callback);
};

self.saveMiscV2 = function (callback) {
MSP.send_message(MSPCodes.MSPV2_INAV_SET_MISC, mspHelper.crunch(MSPCodes.MSPV2_INAV_SET_MISC), false, callback);
};
Expand Down
4 changes: 2 additions & 2 deletions tabs/receiver.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ TABS.receiver.initialize = function (callback) {
var loadChainer = new MSPChainerClass();

var loadChain = [
mspHelper.loadMisc,
mspHelper.loadMiscV2,
mspHelper.loadRcData,
mspHelper.loadRcMap,
mspHelper.loadRxConfig,
Expand Down Expand Up @@ -317,7 +317,7 @@ TABS.receiver.initialize = function (callback) {
}

function save_misc() {
MSP.send_message(MSPCodes.MSP_SET_MISC, mspHelper.crunch(MSPCodes.MSP_SET_MISC), false, save_rc_configs);
MSP.send_message(MSPCodes.MSPV2_INAV_SET_MISC, mspHelper.crunch(MSPCodes.MSPV2_INAV_SET_MISC), false, save_rc_configs);
}

function save_rc_configs() {
Expand Down

0 comments on commit b9aad4f

Please sign in to comment.