diff --git a/src/main/fc/fc_msp.c b/src/main/fc/fc_msp.c index cba93fb59cf..9b8f4b1be07 100644 --- a/src/main/fc/fc_msp.c +++ b/src/main/fc/fc_msp.c @@ -729,47 +729,6 @@ static bool mspFcProcessOutCommand(uint16_t cmdMSP, sbuf_t *dst, mspPostProcessF serializeBoxReply(dst); break; - case MSP_MISC: - sbufWriteU16(dst, PWM_RANGE_MIDDLE); - - sbufWriteU16(dst, 0); // Was min_throttle - sbufWriteU16(dst, motorConfig()->maxthrottle); - sbufWriteU16(dst, motorConfig()->mincommand); - - sbufWriteU16(dst, currentBatteryProfile->failsafe_throttle); - -#ifdef USE_GPS - sbufWriteU8(dst, gpsConfig()->provider); // gps_type - sbufWriteU8(dst, 0); // TODO gps_baudrate (an index, cleanflight uses a uint32_t - sbufWriteU8(dst, gpsConfig()->sbasMode); // gps_ubx_sbas -#else - sbufWriteU8(dst, 0); // gps_type - sbufWriteU8(dst, 0); // TODO gps_baudrate (an index, cleanflight uses a uint32_t - sbufWriteU8(dst, 0); // gps_ubx_sbas -#endif - sbufWriteU8(dst, 0); // multiwiiCurrentMeterOutput - sbufWriteU8(dst, rxConfig()->rssi_channel); - sbufWriteU8(dst, 0); - -#ifdef USE_MAG - sbufWriteU16(dst, compassConfig()->mag_declination / 10); -#else - sbufWriteU16(dst, 0); -#endif - -#ifdef USE_ADC - sbufWriteU8(dst, batteryMetersConfig()->voltage.scale / 10); - sbufWriteU8(dst, currentBatteryProfile->voltage.cellMin / 10); - sbufWriteU8(dst, currentBatteryProfile->voltage.cellMax / 10); - sbufWriteU8(dst, currentBatteryProfile->voltage.cellWarning / 10); -#else - sbufWriteU8(dst, 0); - sbufWriteU8(dst, 0); - sbufWriteU8(dst, 0); - sbufWriteU8(dst, 0); -#endif - break; - case MSP2_INAV_MISC: sbufWriteU16(dst, PWM_RANGE_MIDDLE); @@ -1853,54 +1812,6 @@ static mspResult_e mspFcProcessInCommand(uint16_t cmdMSP, sbuf_t *src) } break; - case MSP_SET_MISC: - if (dataSize == 22) { - sbufReadU16(src); // midrc - - sbufReadU16(src); //Was min_throttle - motorConfigMutable()->maxthrottle = constrain(sbufReadU16(src), PWM_RANGE_MIN, PWM_RANGE_MAX); - motorConfigMutable()->mincommand = constrain(sbufReadU16(src), 0, PWM_RANGE_MAX); - - currentBatteryProfileMutable->failsafe_throttle = constrain(sbufReadU16(src), PWM_RANGE_MIN, PWM_RANGE_MAX); - -#ifdef USE_GPS - gpsConfigMutable()->provider = sbufReadU8(src); // gps_type - sbufReadU8(src); // gps_baudrate - gpsConfigMutable()->sbasMode = sbufReadU8(src); // gps_ubx_sbas -#else - sbufReadU8(src); // gps_type - sbufReadU8(src); // gps_baudrate - sbufReadU8(src); // gps_ubx_sbas -#endif - sbufReadU8(src); // multiwiiCurrentMeterOutput - tmp_u8 = sbufReadU8(src); - if (tmp_u8 <= MAX_SUPPORTED_RC_CHANNEL_COUNT) { - rxConfigMutable()->rssi_channel = tmp_u8; - rxUpdateRSSISource(); // Changing rssi_channel might change the RSSI source - } - sbufReadU8(src); - -#ifdef USE_MAG - compassConfigMutable()->mag_declination = sbufReadU16(src) * 10; -#else - sbufReadU16(src); -#endif - -#ifdef USE_ADC - batteryMetersConfigMutable()->voltage.scale = sbufReadU8(src) * 10; - currentBatteryProfileMutable->voltage.cellMin = sbufReadU8(src) * 10; // vbatlevel_warn1 in MWC2.3 GUI - currentBatteryProfileMutable->voltage.cellMax = sbufReadU8(src) * 10; // vbatlevel_warn2 in MWC2.3 GUI - currentBatteryProfileMutable->voltage.cellWarning = sbufReadU8(src) * 10; // vbatlevel when buzzer starts to alert -#else - sbufReadU8(src); - sbufReadU8(src); - sbufReadU8(src); - sbufReadU8(src); -#endif - } else - return MSP_RESULT_ERROR; - break; - case MSP2_INAV_SET_MISC: if (dataSize == 41) { sbufReadU16(src); // midrc diff --git a/src/main/msp/msp_protocol.h b/src/main/msp/msp_protocol.h index 692f8fbffa8..f848fd8bbbd 100644 --- a/src/main/msp/msp_protocol.h +++ b/src/main/msp/msp_protocol.h @@ -232,7 +232,6 @@ #define MSP_ANALOG 110 //out message vbat, powermetersum, rssi if available on RX #define MSP_RC_TUNING 111 //out message rc rate, rc expo, rollpitch rate, yaw rate, dyn throttle PID #define MSP_ACTIVEBOXES 113 //out message Active box flags (full width, more than 32 bits) -#define MSP_MISC 114 //out message powermeter trig #define MSP_MOTOR_PINS 115 //out message which pins are in use for motors & servos, for GUI #define MSP_BOXNAMES 116 //out message the aux switch names #define MSP_WP 118 //out message get a WP, WP# is in the payload, returns (WP#, lat, lon, alt, flags) WP#0-home, WP#16-poshold @@ -251,7 +250,6 @@ #define MSP_SET_RC_TUNING 204 //in message rc rate, rc expo, rollpitch rate, yaw rate, dyn throttle PID, yaw expo #define MSP_ACC_CALIBRATION 205 //in message no param #define MSP_MAG_CALIBRATION 206 //in message no param -#define MSP_SET_MISC 207 //in message powermeter trig + 8 free for future use #define MSP_RESET_CONF 208 //in message no param #define MSP_SET_WP 209 //in message sets a given WP (WP#,lat, lon, alt, flags) #define MSP_SELECT_SETTING 210 //in message Select Setting Number (0-2)