Skip to content

Commit

Permalink
Merge pull request #10306 from iNavFlight/jh_remove_leftover_sd_debug
Browse files Browse the repository at this point in the history
remove excessive `SD` debug from MSP processing
  • Loading branch information
mmosca authored Aug 15, 2024
2 parents 65fb071 + 858210e commit a5c0c58
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 12 deletions.
11 changes: 4 additions & 7 deletions src/main/fc/fc_msp.c
Original file line number Diff line number Diff line change
Expand Up @@ -1034,7 +1034,7 @@ static bool mspFcProcessOutCommand(uint16_t cmdMSP, sbuf_t *dst, mspPostProcessF
case MSP_MIXER:
sbufWriteU8(dst, 3); // mixerMode no longer supported, send 3 (QuadX) as fallback
break;


case MSP_RX_CONFIG:
sbufWriteU8(dst, rxConfig()->serialrx_provider);
Expand Down Expand Up @@ -1274,7 +1274,7 @@ static bool mspFcProcessOutCommand(uint16_t cmdMSP, sbuf_t *dst, mspPostProcessF
sbufWriteU16(dst, accelerometerConfig()->acc_notch_cutoff);

sbufWriteU16(dst, 0); //Was gyroConfig()->gyro_stage2_lowpass_hz
break;
break;

case MSP_PID_ADVANCED:
sbufWriteU16(dst, 0); // pidProfile()->rollPitchItermIgnoreRate
Expand Down Expand Up @@ -1618,7 +1618,7 @@ static bool mspFcProcessOutCommand(uint16_t cmdMSP, sbuf_t *dst, mspPostProcessF
}
}
break;


case MSP2_INAV_MC_BRAKING:
#ifdef USE_MR_BRAKING_MODE
Expand Down Expand Up @@ -2892,7 +2892,7 @@ static mspResult_e mspFcProcessInCommand(uint16_t cmdMSP, sbuf_t *src)
} else
return MSP_RESULT_ERROR;
break;

case MSP_SET_FAILSAFE_CONFIG:
if (dataSize == 20) {
failsafeConfigMutable()->failsafe_delay = sbufReadU8(src);
Expand Down Expand Up @@ -3291,11 +3291,9 @@ static mspResult_e mspFcProcessInCommand(uint16_t cmdMSP, sbuf_t *src)
#endif
case MSP2_INAV_GPS_UBLOX_COMMAND:
if(dataSize < 8 || !isGpsUblox()) {
SD(fprintf(stderr, "[GPS] Not ublox!\n"));
return MSP_RESULT_ERROR;
}

SD(fprintf(stderr, "[GPS] Sending ubx command: %i!\n", dataSize));
gpsUbloxSendCommand(src->ptr, dataSize, 0);
break;

Expand Down Expand Up @@ -4145,7 +4143,6 @@ mspResult_e mspFcProcessCommand(mspPacket_t *cmd, mspPacket_t *reply, mspPostPro
// initialize reply by default
reply->cmd = cmd->cmd;

SD(fprintf(stderr, "[MSP] CommandId: 0x%04x bytes: %i!\n", cmdMSP, sbufBytesRemaining(src)));
if (MSP2_IS_SENSOR_MESSAGE(cmdMSP)) {
ret = mspProcessSensorCommand(cmdMSP, src);
} else if (mspFcProcessOutCommand(cmdMSP, dst, mspPostProcessFn)) {
Expand Down
5 changes: 0 additions & 5 deletions src/main/msp/msp_serial.c
Original file line number Diff line number Diff line change
Expand Up @@ -173,10 +173,8 @@ static bool mspSerialProcessReceivedData(mspPort_t *mspPort, uint8_t c)
case MSP_CHECKSUM_V1:
if (mspPort->checksum1 == c) {
mspPort->c_state = MSP_COMMAND_RECEIVED;
SD(fprintf(stderr, "[MSPV1] Command received\n"));
} else {
mspPort->c_state = MSP_IDLE;
SD(fprintf(stderr, "[MSPV1] Checksum error!\n"));
}
break;

Expand Down Expand Up @@ -229,7 +227,6 @@ static bool mspSerialProcessReceivedData(mspPort_t *mspPort, uint8_t c)
// Check for potential buffer overflow
if (hdrv2->size > MSP_PORT_INBUF_SIZE) {
mspPort->c_state = MSP_IDLE;
SD(fprintf(stderr, "[MSPV2] Potential buffer overflow!\n"));
}
else {
mspPort->dataSize = hdrv2->size;
Expand All @@ -253,9 +250,7 @@ static bool mspSerialProcessReceivedData(mspPort_t *mspPort, uint8_t c)
case MSP_CHECKSUM_V2_NATIVE:
if (mspPort->checksum2 == c) {
mspPort->c_state = MSP_COMMAND_RECEIVED;
SD(fprintf(stderr, "[MSPV2] command received!\n"));
} else {
SD(fprintf(stderr, "[MSPV2] Checksum error!\n"));
mspPort->c_state = MSP_IDLE;
}
break;
Expand Down

0 comments on commit a5c0c58

Please sign in to comment.