Skip to content

Commit a9e9a95

Browse files
committed
[ESP32-C3] get rid of some useless debug in UAV (MAVLINK V1) mode [skip ci]
1 parent 4a820d6 commit a9e9a95

File tree

1 file changed

+36
-29
lines changed
  • software/firmware/source/SoftRF/src/platform

1 file changed

+36
-29
lines changed

software/firmware/source/SoftRF/src/platform/ESP32.cpp

Lines changed: 36 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2521,37 +2521,42 @@ static void ESP32_post_init()
25212521
Diag->println();
25222522
Diag->println(F("Data output device(s):"));
25232523

2524-
Diag->print(F("NMEA - "));
2525-
switch (settings->nmea_out)
2526-
{
2527-
case NMEA_UART : Diag->println(F("UART")); break;
2528-
case NMEA_USB : Diag->println(F("USB CDC")); break;
2529-
case NMEA_UDP : Diag->println(F("UDP")); break;
2530-
case NMEA_TCP : Diag->println(F("TCP")); break;
2531-
case NMEA_BLUETOOTH : Diag->println(F("Bluetooth")); break;
2532-
case NMEA_OFF :
2533-
default : Diag->println(F("NULL")); break;
2534-
}
2524+
if (settings->mode == SOFTRF_MODE_UAV) {
2525+
Diag->println(F("MAV V1 - UART"));
2526+
} else {
25352527

2536-
Diag->print(F("GDL90 - "));
2537-
switch (settings->gdl90)
2538-
{
2539-
case GDL90_UART : Diag->println(F("UART")); break;
2540-
case GDL90_USB : Diag->println(F("USB CDC")); break;
2541-
case GDL90_UDP : Diag->println(F("UDP")); break;
2542-
case GDL90_BLUETOOTH : Diag->println(F("Bluetooth")); break;
2543-
case GDL90_OFF :
2544-
default : Diag->println(F("NULL")); break;
2545-
}
2528+
Diag->print(F("NMEA - "));
2529+
switch (settings->nmea_out)
2530+
{
2531+
case NMEA_UART : Diag->println(F("UART")); break;
2532+
case NMEA_USB : Diag->println(F("USB CDC")); break;
2533+
case NMEA_UDP : Diag->println(F("UDP")); break;
2534+
case NMEA_TCP : Diag->println(F("TCP")); break;
2535+
case NMEA_BLUETOOTH : Diag->println(F("Bluetooth")); break;
2536+
case NMEA_OFF :
2537+
default : Diag->println(F("NULL")); break;
2538+
}
25462539

2547-
Diag->print(F("D1090 - "));
2548-
switch (settings->d1090)
2549-
{
2550-
case D1090_UART : Diag->println(F("UART")); break;
2551-
case D1090_USB : Diag->println(F("USB CDC")); break;
2552-
case D1090_BLUETOOTH : Diag->println(F("Bluetooth")); break;
2553-
case D1090_OFF :
2554-
default : Diag->println(F("NULL")); break;
2540+
Diag->print(F("GDL90 - "));
2541+
switch (settings->gdl90)
2542+
{
2543+
case GDL90_UART : Diag->println(F("UART")); break;
2544+
case GDL90_USB : Diag->println(F("USB CDC")); break;
2545+
case GDL90_UDP : Diag->println(F("UDP")); break;
2546+
case GDL90_BLUETOOTH : Diag->println(F("Bluetooth")); break;
2547+
case GDL90_OFF :
2548+
default : Diag->println(F("NULL")); break;
2549+
}
2550+
2551+
Diag->print(F("D1090 - "));
2552+
switch (settings->d1090)
2553+
{
2554+
case D1090_UART : Diag->println(F("UART")); break;
2555+
case D1090_USB : Diag->println(F("USB CDC")); break;
2556+
case D1090_BLUETOOTH : Diag->println(F("Bluetooth")); break;
2557+
case D1090_OFF :
2558+
default : Diag->println(F("NULL")); break;
2559+
}
25552560
}
25562561

25572562
Diag->println();
@@ -4349,6 +4354,7 @@ static void ESP32_swSer_begin(unsigned long baud)
43494354
} else if (esp32_board == ESP32_RADIOMASTER_XR1) {
43504355
Serial_GNSS_In.begin(baud, SERIAL_IN_BITS,
43514356
SOC_GPIO_PIN_ELRS_MAV_RX, SOC_GPIO_PIN_ELRS_MAV_TX);
4357+
Serial_GNSS_Out.println();
43524358
Serial_GNSS_Out.println(F("INFO: RadioMaster XR1 is detected."));
43534359
#endif /* CONFIG_IDF_TARGET_ESP32C3 */
43544360
#if defined(CONFIG_IDF_TARGET_ESP32C5)
@@ -4394,6 +4400,7 @@ static void ESP32_swSer_begin(unsigned long baud)
43944400
{ Diag = &SerialOutput; } else { Diag = &Serial; }
43954401
Diag->print(F("Flash memory ID: "));
43964402
Diag->println(ESP32_getFlashId(), HEX);
4403+
Diag->flush();
43974404
}
43984405

43994406
static void ESP32_swSer_enableRx(boolean arg)

0 commit comments

Comments
 (0)