66#include < pb.h>
77#include < sstream>
88
9+ #include " defs.h"
910#include " errors.h"
1011
1112namespace TeslaBLE
@@ -19,36 +20,33 @@ namespace TeslaBLE
1920 // Validate input parameters
2021 if (!output_buffer || !output_length || !fields || !src_struct)
2122 {
22- printf ( " [E][ pb_encode] Invalid parameters: output_buffer =%p, output_length =%p, fields=%p, src_struct =%p\n " ,
23- output_buffer, output_length, fields, src_struct);
23+ LOG_ERROR ( " pb_encode: Invalid parameters (buffer =%p, length =%p, fields=%p, struct =%p) " ,
24+ output_buffer, output_length, fields, src_struct);
2425 return TeslaBLE_Status_E_ERROR_PB_ENCODING;
2526 }
2627
2728 pb_ostream_t unsigned_message_size_stream = {nullptr , 0 , 0 , 0 , nullptr };
2829 bool status_encode_length = pb_encode (&unsigned_message_size_stream, fields, src_struct);
2930 if (!status_encode_length)
3031 {
31- printf ( " [E][ pb_encode] Failed to get encoded message size (err: %s)\n " ,
32- PB_GET_ERROR (&unsigned_message_size_stream));
32+ LOG_ERROR ( " pb_encode: Failed to get encoded message size (err: %s)" ,
33+ PB_GET_ERROR (&unsigned_message_size_stream));
3334 return TeslaBLE_Status_E_ERROR_PB_ENCODING;
3435 }
35- // printf("Bytes written: %zu\n", unsigned_message_size_stream.bytes_written);
3636 if (unsigned_message_size_stream.bytes_written == 0 )
3737 {
38- printf ( " [E][ pb_encode] No bytes written\n " );
38+ LOG_ERROR ( " pb_encode: No bytes written" );
3939 return TeslaBLE_Status_E_ERROR_PB_ENCODING;
4040 }
4141 *output_length = unsigned_message_size_stream.bytes_written ;
42- // printf("Message size: %hhu\n", *output_length);
4342
4443 // now encode proper
45- // printf("Encoding message\n");
4644 pb_ostream_t unsigned_message_stream = pb_ostream_from_buffer (output_buffer, *output_length);
4745 bool status_encode_bytes = pb_encode (&unsigned_message_stream, fields, src_struct);
4846 if (!status_encode_bytes)
4947 {
50- printf ( " [E][ pb_encode] Failed to encode message (err: %s)\n " ,
51- PB_GET_ERROR (&unsigned_message_stream));
48+ LOG_ERROR ( " pb_encode: Failed to encode message (err: %s)" ,
49+ PB_GET_ERROR (&unsigned_message_stream));
5250 return TeslaBLE_Status_E_ERROR_PB_ENCODING;
5351 }
5452 return TeslaBLE_Status_E_OK;
0 commit comments