diff --git a/src/main/blackbox/blackbox.c b/src/main/blackbox/blackbox.c index d7fe182599..374c72b1bf 100644 --- a/src/main/blackbox/blackbox.c +++ b/src/main/blackbox/blackbox.c @@ -1143,7 +1143,7 @@ static bool sendFieldDefinition(char mainFrameChar, char deltaFrameChar, const v // The first header is a field name if (xmitState.headerIndex == 0) { - blackboxPrint(def->name); + blackboxWriteString(def->name); // Do we need to print an index in brackets after the name? if (def->fieldNameIndex != -1) { @@ -1359,7 +1359,7 @@ void blackboxLogEvent(FlightLogEvent event, flightLogEventData_t *data) blackboxWriteUnsignedVB(data->loggingResume.currentTime); break; case FLIGHT_LOG_EVENT_LOG_END: - blackboxPrint("End of log"); + blackboxWriteString("End of log"); blackboxWrite(0); break; } diff --git a/src/main/blackbox/blackbox_encoding.c b/src/main/blackbox/blackbox_encoding.c index d0893bca81..35476b7ea5 100644 --- a/src/main/blackbox/blackbox_encoding.c +++ b/src/main/blackbox/blackbox_encoding.c @@ -51,7 +51,7 @@ void blackboxPrintfHeaderLine(const char *name, const char *fmt, ...) blackboxWrite('H'); blackboxWrite(' '); - blackboxPrint(name); + blackboxWriteString(name); blackboxWrite(':'); va_start(va, fmt); diff --git a/src/main/blackbox/blackbox_encoding.h b/src/main/blackbox/blackbox_encoding.h index 2cdb6d8388..4f2fa39e4c 100644 --- a/src/main/blackbox/blackbox_encoding.h +++ b/src/main/blackbox/blackbox_encoding.h @@ -19,7 +19,6 @@ int blackboxPrintf(const char *fmt, ...); void blackboxPrintfHeaderLine(const char *name, const char *fmt, ...); -int blackboxPrint(const char *s); void blackboxWriteUnsignedVB(uint32_t value); void blackboxWriteSignedVB(int32_t value); diff --git a/src/main/blackbox/blackbox_io.c b/src/main/blackbox/blackbox_io.c index d74f243a2d..5084916833 100644 --- a/src/main/blackbox/blackbox_io.c +++ b/src/main/blackbox/blackbox_io.c @@ -84,7 +84,7 @@ void blackboxWrite(uint8_t value) } // Print the null-terminated string 's' to the blackbox device and return the number of bytes written -int blackboxPrint(const char *s) +int blackboxWriteString(const char *s) { int length; const uint8_t *pos; diff --git a/src/main/blackbox/blackbox_io.h b/src/main/blackbox/blackbox_io.h index c59b0df2c1..06d5ef0e0c 100644 --- a/src/main/blackbox/blackbox_io.h +++ b/src/main/blackbox/blackbox_io.h @@ -39,6 +39,7 @@ extern int32_t blackboxHeaderBudget; void blackboxOpen(void); void blackboxWrite(uint8_t value); +int blackboxWriteString(const char *s); void blackboxDeviceFlush(void); bool blackboxDeviceFlushForce(void); diff --git a/src/test/unit/blackbox_encoding_unittest.cc b/src/test/unit/blackbox_encoding_unittest.cc index 16ba59aa65..99902d55a7 100644 --- a/src/test/unit/blackbox_encoding_unittest.cc +++ b/src/test/unit/blackbox_encoding_unittest.cc @@ -246,7 +246,7 @@ PG_REGISTER(blackboxConfig_t, blackboxConfig, PG_BLACKBOX_CONFIG, 0); int32_t blackboxHeaderBudget; void mspSerialAllocatePorts(void) {} void blackboxWrite(uint8_t value) {serialWrite(blackboxPort, value);} -int blackboxPrint(const char *s) +int blackboxWriteString(const char *s) { const uint8_t *pos = (uint8_t*)s; while (*pos) {