diff --git a/apps/battery-monitor/src/freertos-tasks.c b/apps/battery-monitor/src/freertos-tasks.c index e41fc394..9a10edb9 100644 --- a/apps/battery-monitor/src/freertos-tasks.c +++ b/apps/battery-monitor/src/freertos-tasks.c @@ -1,5 +1,6 @@ #include "freertos-tasks.h" +#include #include #include "adc.h" @@ -14,7 +15,6 @@ // STM32Common #include "error.h" #include "postmaster-hal.h" -#include "print.h" // CK #include "mayor.h" @@ -157,7 +157,7 @@ void process_letter(void *unused) { for (;;) { if (HAL_CAN_ActivateNotification(&peripherals->common_peripherals->hcan, CAN_IT_RX_FIFO0_MSG_PENDING) != HAL_OK) { - print("Error activating interrupt.\r\n"); + printf("Error activating interrupt.\r\n"); error(); } ulTaskNotifyTake(pdTRUE, portMAX_DELAY); @@ -166,7 +166,7 @@ void process_letter(void *unused) { while (HAL_CAN_GetRxMessage(&peripherals->common_peripherals->hcan, CAN_RX_FIFO0, &header, data) == HAL_OK) { if (ck_correct_letter_received() != CK_OK) { - print("CAN Kingdom error in ck_correct_letter_received().\r\n"); + printf("CAN Kingdom error in ck_correct_letter_received().\r\n"); } letter = frame_to_letter(&header, data); dispatch_letter(&letter); @@ -208,13 +208,13 @@ void send_docs(void) { ck_data_t *ck_data = get_ck_data(); if (ck_send_document(ck_data->cell_folder->folder_no) != CK_OK) { - print("failed to send doc.\r\n"); + printf("failed to send doc.\r\n"); } if (ck_send_document(ck_data->reg_out_folder->folder_no) != CK_OK) { - print("failed to send doc.\r\n"); + printf("failed to send doc.\r\n"); } if (ck_send_document(ck_data->vbat_out_current_folder->folder_no) != CK_OK) { - print("failed to send doc.\r\n"); + printf("failed to send doc.\r\n"); } } @@ -224,19 +224,19 @@ void dispatch_letter(ck_letter_t *letter) { // Check for default letter if (ck_is_default_letter(letter) == CK_OK) { if (ck_default_letter_received() != CK_OK) { - print("CAN Kingdom error in ck_default_letter_received().\r\n"); + printf("CAN Kingdom error in ck_default_letter_received().\r\n"); } } // Check for king's letter else if (ck_is_kings_envelope(&letter->envelope) == CK_OK) { if (ck_process_kings_letter(letter) != CK_OK) { - print("failed to process king's letter.\r\n"); + printf("failed to process king's letter.\r\n"); } } // Check for any other letter else if (ck_get_envelopes_folder(&letter->envelope, &folder) == CK_OK) { if (handle_letter(folder, letter) != APP_OK) { - print("failed to process page.\r\n"); + printf("failed to process page.\r\n"); } } } diff --git a/apps/battery-monitor/src/main.c b/apps/battery-monitor/src/main.c index 9cefe3ab..d9953deb 100644 --- a/apps/battery-monitor/src/main.c +++ b/apps/battery-monitor/src/main.c @@ -1,3 +1,5 @@ +#include + #include "ck-data.h" #include "freertos-tasks.h" #include "peripherals.h" @@ -11,7 +13,6 @@ // STM32Common #include "clock.h" #include "error.h" -#include "print.h" // FreeRTOS #include "FreeRTOS.h" @@ -39,7 +40,7 @@ int main(void) { task_init(); mayor_init(); - print("Starting application...\r\n"); + printf("Starting application...\r\n"); // Start scheduler vTaskStartScheduler(); @@ -79,7 +80,7 @@ void mayor_init(void) { }; if (ck_mayor_init(&mayor) != CK_OK) { - print("Error setting up mayor.\r\n"); + printf("Error setting up mayor.\r\n"); error(); } } @@ -88,7 +89,7 @@ void default_letter_timer_callback(TimerHandle_t timer) { (void)timer; if (ck_default_letter_timeout() != CK_OK) { - print("CAN Kingdom error in ck_default_letter_timeout().\r\n"); + printf("CAN Kingdom error in ck_default_letter_timeout().\r\n"); } } diff --git a/apps/joystick/src/main.c b/apps/joystick/src/main.c index 0368b247..ca5fc861 100644 --- a/apps/joystick/src/main.c +++ b/apps/joystick/src/main.c @@ -1,4 +1,5 @@ #include +#include #include #include "app.h" @@ -6,7 +7,6 @@ #include "error.h" #include "flash.h" #include "peripherals.h" -#include "print.h" // FreeRTOS #include "FreeRTOS.h" @@ -43,7 +43,7 @@ int main(void) { task_init(); - print("Starting application...\n"); + printf("Starting application...\n"); // Start scheduler vTaskStartScheduler(); diff --git a/apps/sbus-receiver/src/freertos-tasks.c b/apps/sbus-receiver/src/freertos-tasks.c index 10c4b36b..c8963cc6 100644 --- a/apps/sbus-receiver/src/freertos-tasks.c +++ b/apps/sbus-receiver/src/freertos-tasks.c @@ -1,5 +1,6 @@ #include "freertos-tasks.h" +#include #include #include "ck-data.h" @@ -13,8 +14,6 @@ // STM32Common #include "error.h" #include "peripherals.h" -#include "print.h" -#include "printf.h" // FreeRTOS #include "FreeRTOS.h" @@ -87,13 +86,13 @@ void sbus_read(void *unused) { // connection loss (heavy). This will be handled by the radio receiver, // so we do nothing. if (sbus_packet.failsafe_activated) { - print("Failsafe activated\r\n"); + printf("Failsafe activated\r\n"); } // Indicates slight connection loss or issue with frame. // Also handled by the receiver. if (sbus_packet.frame_lost) { - print("Frame lost\r\n"); + printf("Frame lost\r\n"); } steering_command = sbus_packet_to_steering_command(&sbus_packet); @@ -122,9 +121,7 @@ int sbus_read_header(uint8_t *sbus_data) { // Error check uart_error = HAL_UART_GetError(&peripherals->huart2); if (uart_error != HAL_UART_ERROR_NONE) { - char str[32]; // NOLINT - sprintf(str, "UART error in SBUS header: %u\r\n", uart_error); - print(str); + printf("UART error in SBUS header: %u\r\n", uart_error); // Handle overrun by clearing receive register if (uart_error == HAL_UART_ERROR_ORE) { __HAL_UART_FLUSH_DRREGISTER(&peripherals->huart2); @@ -162,9 +159,7 @@ int sbus_read_data(uint8_t *sbus_data) { // Check for uart errors uart_error = HAL_UART_GetError(&peripherals->huart2); if (uart_error != HAL_UART_ERROR_NONE) { - char str[32]; // NOLINT - sprintf(str, "UART error in SBUS data: %u\r\n", uart_error); - print(str); + printf("UART error in SBUS data: %u\r\n", uart_error); // Handle overrun by clearing receive register if (uart_error == HAL_UART_ERROR_ORE) { __HAL_UART_FLUSH_DRREGISTER(&peripherals->huart2); @@ -188,16 +183,16 @@ void send_steering_command(steering_command_t *command) { sizeof(command->throttle_trim)); if (ck_send_document(ck_data->steering_folder->folder_no) != CK_OK) { - print("failed to send doc.\r\n"); + printf("failed to send doc.\r\n"); } if (ck_send_document(ck_data->steering_trim_folder->folder_no) != CK_OK) { - print("failed to send doc.\r\n"); + printf("failed to send doc.\r\n"); } if (ck_send_document(ck_data->throttle_folder->folder_no) != CK_OK) { - print("failed to send doc.\r\n"); + printf("failed to send doc.\r\n"); } if (ck_send_document(ck_data->throttle_trim_folder->folder_no) != CK_OK) { - print("failed to send doc.\r\n"); + printf("failed to send doc.\r\n"); } } @@ -213,7 +208,7 @@ void process_letter(void *unused) { for (;;) { if (HAL_CAN_ActivateNotification(&peripherals->common_peripherals->hcan, CAN_IT_RX_FIFO0_MSG_PENDING) != HAL_OK) { - print("Error activating interrupt.\r\n"); + printf("Error activating interrupt.\r\n"); error(); } ulTaskNotifyTake(pdTRUE, portMAX_DELAY); @@ -222,7 +217,7 @@ void process_letter(void *unused) { while (HAL_CAN_GetRxMessage(&peripherals->common_peripherals->hcan, CAN_RX_FIFO0, &header, data) == HAL_OK) { if (ck_correct_letter_received() != CK_OK) { - print("CAN Kingdom error in ck_correct_letter_received().\r\n"); + printf("CAN Kingdom error in ck_correct_letter_received().\r\n"); } letter = frame_to_letter(&header, data); dispatch_letter(&letter); @@ -234,13 +229,13 @@ void dispatch_letter(ck_letter_t *letter) { // Check for default letter if (ck_is_default_letter(letter) == CK_OK) { if (ck_default_letter_received() != CK_OK) { - print("CAN Kingdom error in ck_default_letter_received().\r\n"); + printf("CAN Kingdom error in ck_default_letter_received().\r\n"); } } // Check for king's letter else if (ck_is_kings_envelope(&letter->envelope) == CK_OK) { if (ck_process_kings_letter(letter) != CK_OK) { - print("failed to process king's letter.\r\n"); + printf("failed to process king's letter.\r\n"); } } // Check for any other letter diff --git a/apps/sbus-receiver/src/main.c b/apps/sbus-receiver/src/main.c index 183507b9..5764ca4f 100644 --- a/apps/sbus-receiver/src/main.c +++ b/apps/sbus-receiver/src/main.c @@ -1,3 +1,4 @@ +#include #include #include "ck-data.h" @@ -12,7 +13,6 @@ #include "clock.h" #include "error.h" #include "peripherals.h" -#include "print.h" // FreeRTOS #include "FreeRTOS.h" @@ -41,7 +41,7 @@ int main(void) { task_init(); mayor_init(); - print("Starting application...\r\n"); + printf("Starting application...\r\n"); // Start scheduler vTaskStartScheduler(); @@ -81,7 +81,7 @@ void mayor_init(void) { }; if (ck_mayor_init(&mayor) != CK_OK) { - print("Error setting up mayor.\r\n"); + printf("Error setting up mayor.\r\n"); error(); } } @@ -90,7 +90,7 @@ void default_letter_timer_callback(TimerHandle_t timer) { (void)timer; if (ck_default_letter_timeout() != CK_OK) { - print("CAN Kingdom error in ck_default_letter_timeout().\r\n"); + printf("CAN Kingdom error in ck_default_letter_timeout().\r\n"); } } diff --git a/apps/sbus-receiver/src/peripherals.c b/apps/sbus-receiver/src/peripherals.c index a473f953..83d40747 100644 --- a/apps/sbus-receiver/src/peripherals.c +++ b/apps/sbus-receiver/src/peripherals.c @@ -2,7 +2,6 @@ #include "error.h" #include "ports.h" -#include "print.h" #include "stm32f3xx_hal.h" #define USART2_IRQ_PRIORITY 5 diff --git a/apps/servo/src/freertos-tasks.c b/apps/servo/src/freertos-tasks.c index e22fa531..3f3dc9ec 100644 --- a/apps/servo/src/freertos-tasks.c +++ b/apps/servo/src/freertos-tasks.c @@ -1,5 +1,6 @@ #include "freertos-tasks.h" +#include #include #include "adc.h" @@ -11,7 +12,6 @@ // STM32Common #include "error.h" #include "postmaster-hal.h" -#include "print.h" #include "rover.h" #include "stm32f3xx_hal.h" @@ -115,14 +115,14 @@ void king(void *unused) { // There is already traffic on the CAN bus, so don't act as king. // TODO: how to handle traffic that is not detected due to incorrect bitrate? if (ck_get_comm_mode() == CK_COMM_MODE_LISTEN_ONLY) { - print("Someone else is king. Suspending king task.\r\n"); + printf("Someone else is king. Suspending king task.\r\n"); vTaskSuspend(king_task); // Task will never be resumed } // Spoof a default letter reception if (ck_default_letter_received() != CK_OK) { - print("Error receiving fake default letter.\r\n"); + printf("Error receiving fake default letter.\r\n"); error(); } @@ -143,7 +143,7 @@ void king(void *unused) { // Start up our own communications if (ck_set_comm_mode(CK_COMM_MODE_COMMUNICATE) != CK_OK) { - print("Error starting king.\r\n"); + printf("Error starting king.\r\n"); error(); } @@ -185,7 +185,7 @@ void send_base_number(void) { .mayor_response_no = 0, }; if (ck_create_kings_page_1(&kp1_args, &page) != CK_OK) { - print("Error creating king's page.\r\n"); + printf("Error creating king's page.\r\n"); error(); } @@ -259,7 +259,7 @@ void assign_envelopes(void) { }; if (ck_create_kings_page_2(&kp2_args, &page) != CK_OK) { - print("Error creating king's page.\r\n"); + printf("Error creating king's page.\r\n"); error(); } @@ -292,7 +292,7 @@ void start_communication(void) { }; if (ck_create_kings_page_0(&kp0_args, &page) != CK_OK) { - print("Error creating king's page.\r\n"); + printf("Error creating king's page.\r\n"); error(); } @@ -392,7 +392,7 @@ void process_letter(void *unused) { for (;;) { if (HAL_CAN_ActivateNotification(&peripherals->common_peripherals->hcan, CAN_IT_RX_FIFO0_MSG_PENDING) != HAL_OK) { - print("Error activating interrupt.\r\n"); + printf("Error activating interrupt.\r\n"); error(); } ulTaskNotifyTake(pdTRUE, portMAX_DELAY); @@ -401,7 +401,7 @@ void process_letter(void *unused) { while (HAL_CAN_GetRxMessage(&peripherals->common_peripherals->hcan, CAN_RX_FIFO0, &header, data) == HAL_OK) { if (ck_correct_letter_received() != CK_OK) { - print("CAN Kingdom error in ck_correct_letter_received().\r\n"); + printf("CAN Kingdom error in ck_correct_letter_received().\r\n"); } letter = frame_to_letter(&header, data); dispatch_letter(&letter); @@ -423,19 +423,19 @@ void send_docs(void) { ck_data_t *ck_data = get_ck_data(); if (ck_send_document(ck_data->sensor_power_folder->folder_no) != CK_OK) { - print("failed to send doc.\r\n"); + printf("failed to send doc.\r\n"); } if (ck_send_document(ck_data->servo_current_folder->folder_no) != CK_OK) { - print("failed to send doc.\r\n"); + printf("failed to send doc.\r\n"); } if (ck_send_document(ck_data->battery_voltage_folder->folder_no) != CK_OK) { - print("failed to send doc.\r\n"); + printf("failed to send doc.\r\n"); } if (ck_send_document(ck_data->servo_voltage_folder->folder_no) != CK_OK) { - print("failed to send doc.\r\n"); + printf("failed to send doc.\r\n"); } if (ck_send_document(ck_data->h_bridge_current_folder->folder_no) != CK_OK) { - print("failed to send doc.\r\n"); + printf("failed to send doc.\r\n"); } } @@ -445,19 +445,19 @@ void dispatch_letter(ck_letter_t *letter) { // Check for default letter if (ck_is_default_letter(letter) == CK_OK) { if (ck_default_letter_received() != CK_OK) { - print("CAN Kingdom error in ck_default_letter_received().\r\n"); + printf("CAN Kingdom error in ck_default_letter_received().\r\n"); } } // Check for king's letter else if (ck_is_kings_envelope(&letter->envelope) == CK_OK) { if (ck_process_kings_letter(letter) != CK_OK) { - print("failed to process king's letter.\r\n"); + printf("failed to process king's letter.\r\n"); } } // Check for any other letter else if (ck_get_envelopes_folder(&letter->envelope, &folder) == CK_OK) { if (handle_letter(folder, letter) != APP_OK) { - print("failed to process page.\r\n"); + printf("failed to process page.\r\n"); } } } diff --git a/apps/servo/src/main.c b/apps/servo/src/main.c index 995a6487..5b435faf 100644 --- a/apps/servo/src/main.c +++ b/apps/servo/src/main.c @@ -1,3 +1,5 @@ +#include + #include "ck-data.h" #include "freertos-tasks.h" #include "peripherals.h" @@ -11,7 +13,6 @@ // STM32Common #include "clock.h" #include "error.h" -#include "print.h" // FreeRTOS #include "FreeRTOS.h" @@ -47,7 +48,7 @@ int main(void) { task_init(); mayor_init(); - print("Starting application...\r\n"); + printf("Starting application...\r\n"); // Start scheduler vTaskStartScheduler(); @@ -91,7 +92,7 @@ void mayor_init(void) { }; if (ck_mayor_init(&mayor) != CK_OK) { - print("Error setting up mayor.\r\n"); + printf("Error setting up mayor.\r\n"); error(); } } @@ -100,7 +101,7 @@ void default_letter_timer_callback(TimerHandle_t timer) { (void)timer; if (ck_default_letter_timeout() != CK_OK) { - print("CAN Kingdom error in ck_default_letter_timeout().\r\n"); + printf("CAN Kingdom error in ck_default_letter_timeout().\r\n"); } } diff --git a/bootloader/src/main.c b/bootloader/src/main.c index 69b48765..a3510a21 100644 --- a/bootloader/src/main.c +++ b/bootloader/src/main.c @@ -1,12 +1,11 @@ #include +#include #include #include "ck-data.h" #include "clock.h" #include "common-peripherals.h" #include "error.h" -#include "print.h" -#include "printf.h" // CK #include "mayor.h" @@ -126,12 +125,12 @@ static void mayor_init(void) { }; if (ck_mayor_init(&mayor) != CK_OK) { - print("Error setting up mayor.\r\n"); + printf("Error setting up mayor.\r\n"); error(); } if (ck_add_mayors_page(ck_data->bootloader_page) != CK_OK) { - print("Error adding bootloader page to mayor.\r\n"); + printf("Error adding bootloader page to mayor.\r\n"); error(); } } @@ -141,7 +140,7 @@ static void default_letter_timer_callback(TimerHandle_t timer) { (void)timer; if (ck_default_letter_timeout() != CK_OK) { - print("CAN Kingdom error in ck_default_letter_timeout().\r\n"); + printf("CAN Kingdom error in ck_default_letter_timeout().\r\n"); } if (!bootloader_entered) { @@ -175,7 +174,7 @@ static void process_letter(void *unused) { for (;;) { if (HAL_CAN_ActivateNotification(&peripherals->hcan, CAN_IT_RX_FIFO0_MSG_PENDING) != HAL_OK) { - print("Error activating interrupt.\r\n"); + printf("Error activating interrupt.\r\n"); error(); } ulTaskNotifyTake(pdTRUE, portMAX_DELAY); @@ -184,7 +183,7 @@ static void process_letter(void *unused) { while (HAL_CAN_GetRxMessage(&peripherals->hcan, CAN_RX_FIFO0, &header, data) == HAL_OK) { if (ck_correct_letter_received() != CK_OK) { - print("CAN Kingdom error in ck_correct_letter_received().\r\n"); + printf("CAN Kingdom error in ck_correct_letter_received().\r\n"); } letter = frame_to_letter(&header, data); dispatch_letter(&letter); @@ -198,21 +197,21 @@ static void dispatch_letter(ck_letter_t *letter) { // Check for default letter if (ck_is_default_letter(letter) == CK_OK) { if (ck_default_letter_received() != CK_OK) { - print("CAN Kingdom error in ck_default_letter_received().\r\n"); + printf("CAN Kingdom error in ck_default_letter_received().\r\n"); } } // Check for king's letter else if (ck_is_kings_envelope(&letter->envelope) == CK_OK) { if (ck_process_kings_letter(letter) != CK_OK) { - print("failed to process king's letter.\r\n"); + printf("failed to process king's letter.\r\n"); } } // Check for any other letter else if (ck_get_envelopes_folder(&letter->envelope, &folder) == CK_OK) { if (handle_letter(folder, letter) != APP_OK) { - print("failed to process page.\r\n"); + printf("failed to process page.\r\n"); } } } @@ -239,7 +238,7 @@ int handle_letter(const ck_folder_t *folder, const ck_letter_t *letter) { } static void enter_bootloader(const ck_letter_t *letter) { - print("Entered bootloader.\r\n"); + printf("Entered bootloader.\r\n"); bootloader_entered = true; send_ack(letter); } @@ -250,7 +249,7 @@ static void exit_bootloader(const ck_letter_t *letter) { send_ack(letter); } - print("Exiting bootloader...\r\n"); + printf("Exiting bootloader...\r\n"); // Resets the peripheral buses, so no need for additional deinit. HAL_DeInit(); @@ -273,12 +272,12 @@ static int process_flash_erase_letter(const ck_letter_t *letter) { ck_data_t *ck_data = get_ck_data(); if (letter->page.line_count != ck_data->flash_erase_folder->dlc) { - print("Incorrect flash erase page length.\r\n"); + printf("Incorrect flash erase page length.\r\n"); send_nack(letter); return APP_NOT_OK; } - print("Erasing flash...\r\n"); + printf("Erasing flash...\r\n"); // Get start and end addresses of erase operation uint32_t bytes_to_erase = 0; @@ -316,14 +315,14 @@ static int process_flash_erase_letter(const ck_letter_t *letter) { if (err != flash_erase_ok || status != HAL_OK) { flash_failed = true; - print("Failed to erase flash.\r\n"); + printf("Failed to erase flash.\r\n"); send_nack(letter); return APP_NOT_OK; } send_ack(letter); - print("Finished erasing flash.\r\n"); + printf("Finished erasing flash.\r\n"); return APP_OK; } @@ -334,7 +333,7 @@ static int process_flash_program_letter(const ck_letter_t *letter) { // Fatal error, something is wrong with the flash. if (flash_failed) { - print("Fatal flash error. Aborting.\r\n"); + printf("Fatal flash error. Aborting.\r\n"); send_abort_page(); transfer_started = false; // Reset transfer state return APP_NOT_OK; @@ -344,7 +343,7 @@ static int process_flash_program_letter(const ck_letter_t *letter) { if (letter->page.line_count != ck_data->flash_program_receive_folder->dlc || (letter->page.lines[0] != 1 && letter->page.lines[0] != 3 && letter->page.lines[0] != 4)) { - print("Incorrect flash program letter. Aborting.\r\n"); + printf("Incorrect flash program letter. Aborting.\r\n"); send_abort_page(); transfer_started = false; // Reset transfer state return APP_NOT_OK; @@ -364,7 +363,7 @@ static int process_flash_program_letter(const ck_letter_t *letter) { memcpy(&bytes_to_receive, &letter->page.lines[1], sizeof(bytes_to_receive)); // Check if we can receive that many bytes if (bytes_to_receive > approm_size) { - print("Bytes to receive larger than approm size. Aborting.\r\n"); + printf("Bytes to receive larger than approm size. Aborting.\r\n"); send_abort_page(); return APP_NOT_OK; } @@ -375,11 +374,11 @@ static int process_flash_program_letter(const ck_letter_t *letter) { if (ck_send_page(ck_data->flash_program_transmit_folder->folder_no, ck_data->flash_program_bundle_request_page->lines[0]) != CK_OK) { - print("Error sending block transfer bundle request page.\r\n"); + printf("Error sending block transfer bundle request page.\r\n"); return APP_NOT_OK; } - print("Flashing app...\r\n"); + printf("Flashing app...\r\n"); // Initial state for flashing transfer_started = true; @@ -390,7 +389,7 @@ static int process_flash_program_letter(const ck_letter_t *letter) { } if (!transfer_started) { - print("Block transfer not initialized, Aborting.\r\n"); + printf("Block transfer not initialized, Aborting.\r\n"); send_abort_page(); return APP_NOT_OK; } @@ -399,7 +398,7 @@ static int process_flash_program_letter(const ck_letter_t *letter) { // Duplicate transmission, discard message if (letter->page.lines[0] != expected_data_page) { - print("Duplicate received, skipping.\r\n"); + printf("Duplicate received, skipping.\r\n"); return APP_OK; } @@ -436,11 +435,11 @@ static int process_flash_program_letter(const ck_letter_t *letter) { if (ck_send_page(ck_data->flash_program_transmit_folder->folder_no, ck_data->flash_program_bundle_request_page->lines[0]) != CK_OK) { - print("Error sending block transfer bundle request page.\r\n"); + printf("Error sending block transfer bundle request page.\r\n"); return APP_NOT_OK; } - print("Finished flashing app.\r\n"); + printf("Finished flashing app.\r\n"); } return APP_OK; @@ -499,11 +498,11 @@ static void flash_program(void *unused) { if (status != HAL_OK) { ck_data_t *ck_data = get_ck_data(); - print("Fatal error, flashing failed.\r\n"); + printf("Fatal error, flashing failed.\r\n"); if (ck_send_page(ck_data->flash_program_transmit_folder->folder_no, ck_data->flash_program_abort_page->lines[0]) != CK_OK) { - print("Error sending block transfer abort page.\r\n"); + printf("Error sending block transfer abort page.\r\n"); } flash_failed = true; break; @@ -519,7 +518,7 @@ static void send_abort_page(void) { ck_data_t *ck_data = get_ck_data(); if (ck_send_page(ck_data->flash_program_transmit_folder->folder_no, ck_data->flash_program_abort_page->lines[0]) != CK_OK) { - print("Error sending block transfer abort page.\r\n"); + printf("Error sending block transfer abort page.\r\n"); } } @@ -532,10 +531,7 @@ static void send_ack(const ck_letter_t *letter) { // Don't raise error here since this is an error on the flasher's part. if (ck_send_document(ck_data->command_ack_folder->folder_no) != CK_OK) { - char str[32]; // NOLINT(*-magic-numbers) - sprintf(str, "Error sending ACK with ID 0x%x.\r\n", - letter->envelope.envelope_no); - print(str); + printf("Error sending ACK with ID 0x%x.\r\n", letter->envelope.envelope_no); } } @@ -547,10 +543,8 @@ static void send_nack(const ck_letter_t *letter) { // Don't raise error here since this is an error on the flasher's part. if (ck_send_document(ck_data->command_ack_folder->folder_no) != CK_OK) { - char str[32]; // NOLINT(*-magic-numbers) - sprintf(str, "Error sending NACK with ID 0x%x.\r\n", - letter->envelope.envelope_no); - print(str); + printf("Error sending NACK with ID 0x%x.\r\n", + letter->envelope.envelope_no); } } diff --git a/libs/meson.build b/libs/meson.build index 90567c3e..b41b1179 100644 --- a/libs/meson.build +++ b/libs/meson.build @@ -14,7 +14,6 @@ common_libs_src = [ # third-party drivers_src, freertos_src, - printf_src, ] # Convenience include dir list @@ -27,7 +26,6 @@ common_libs_inc = [ # third-party drivers_inc, freertos_inc, - printf_inc, ] common_libs_tidy_files = [ diff --git a/libs/stm32-common/include/print.h b/libs/stm32-common/include/print.h deleted file mode 100644 index c67f55c1..00000000 --- a/libs/stm32-common/include/print.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef PRINT_H -#define PRINT_H - -#ifdef __cplusplus -extern "C" { -#endif - -void print(char *str); - -#ifdef __cplusplus -} -#endif - -#endif /* PRINT_H */ diff --git a/libs/stm32-common/src/print.c b/libs/stm32-common/src/print.c index 949ddb3d..47fbdf1e 100644 --- a/libs/stm32-common/src/print.c +++ b/libs/stm32-common/src/print.c @@ -1,11 +1,24 @@ -#include "print.h" +#include "common-peripherals.h" -#include +// Enable printf usage with uart -#include "common-peripherals.h" +#ifdef __GNUC__ +#define PUTCHAR_PROTOTYPE int __io_putchar(int ch) +#else +#define PUTCHAR_PROTOTYPE int fputc(int ch, FILE *f) +#endif -void print(char *str) { +PUTCHAR_PROTOTYPE { // NOLINT common_peripherals_t *common_peripherals = get_common_peripherals(); - HAL_UART_Transmit(&common_peripherals->huart1, (uint8_t *)str, strlen(str), + HAL_UART_Transmit(&common_peripherals->huart1, (uint8_t *)&ch, 1, HAL_MAX_DELAY); + return ch; +} + +int _write(int file, char *ptr, int len) { // NOLINT + (void)file; + for (int i = 0; i < len; i++) { + __io_putchar(*ptr++); + } + return len; } diff --git a/libs/third-party/meson.build b/libs/third-party/meson.build index 7b637e0a..ae6c2fa8 100644 --- a/libs/third-party/meson.build +++ b/libs/third-party/meson.build @@ -46,7 +46,3 @@ freertos_src = files( 'FreeRTOS' / 'Source' / 'portable/MemMang/heap_4.c', 'FreeRTOS' / 'Source' / 'portable/GCC/ARM_CM4F/port.c', ) - -printf_inc = include_directories('printf') - -printf_src = files('printf' / 'printf.c') diff --git a/libs/third-party/printf/LICENSE b/libs/third-party/printf/LICENSE deleted file mode 100644 index 8f7ebd0b..00000000 --- a/libs/third-party/printf/LICENSE +++ /dev/null @@ -1,22 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2014 Marco Paland - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - diff --git a/libs/third-party/printf/printf.c b/libs/third-party/printf/printf.c deleted file mode 100644 index 93029741..00000000 --- a/libs/third-party/printf/printf.c +++ /dev/null @@ -1,914 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// \author (c) Marco Paland (info@paland.com) -// 2014-2019, PALANDesign Hannover, Germany -// -// \license The MIT License (MIT) -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. -// -// \brief Tiny printf, sprintf and (v)snprintf implementation, optimized for speed on -// embedded systems with a very limited resources. These routines are thread -// safe and reentrant! -// Use this instead of the bloated standard/newlib printf cause these use -// malloc for printf (and may not be thread safe). -// -/////////////////////////////////////////////////////////////////////////////// - -#include -#include - -#include "printf.h" - - -// define this globally (e.g. gcc -DPRINTF_INCLUDE_CONFIG_H ...) to include the -// printf_config.h header file -// default: undefined -#ifdef PRINTF_INCLUDE_CONFIG_H -#include "printf_config.h" -#endif - - -// 'ntoa' conversion buffer size, this must be big enough to hold one converted -// numeric number including padded zeros (dynamically created on stack) -// default: 32 byte -#ifndef PRINTF_NTOA_BUFFER_SIZE -#define PRINTF_NTOA_BUFFER_SIZE 32U -#endif - -// 'ftoa' conversion buffer size, this must be big enough to hold one converted -// float number including padded zeros (dynamically created on stack) -// default: 32 byte -#ifndef PRINTF_FTOA_BUFFER_SIZE -#define PRINTF_FTOA_BUFFER_SIZE 32U -#endif - -// support for the floating point type (%f) -// default: activated -#ifndef PRINTF_DISABLE_SUPPORT_FLOAT -#define PRINTF_SUPPORT_FLOAT -#endif - -// support for exponential floating point notation (%e/%g) -// default: activated -#ifndef PRINTF_DISABLE_SUPPORT_EXPONENTIAL -#define PRINTF_SUPPORT_EXPONENTIAL -#endif - -// define the default floating point precision -// default: 6 digits -#ifndef PRINTF_DEFAULT_FLOAT_PRECISION -#define PRINTF_DEFAULT_FLOAT_PRECISION 6U -#endif - -// define the largest float suitable to print with %f -// default: 1e9 -#ifndef PRINTF_MAX_FLOAT -#define PRINTF_MAX_FLOAT 1e9 -#endif - -// support for the long long types (%llu or %p) -// default: activated -#ifndef PRINTF_DISABLE_SUPPORT_LONG_LONG -#define PRINTF_SUPPORT_LONG_LONG -#endif - -// support for the ptrdiff_t type (%t) -// ptrdiff_t is normally defined in as long or long long type -// default: activated -#ifndef PRINTF_DISABLE_SUPPORT_PTRDIFF_T -#define PRINTF_SUPPORT_PTRDIFF_T -#endif - -/////////////////////////////////////////////////////////////////////////////// - -// internal flag definitions -#define FLAGS_ZEROPAD (1U << 0U) -#define FLAGS_LEFT (1U << 1U) -#define FLAGS_PLUS (1U << 2U) -#define FLAGS_SPACE (1U << 3U) -#define FLAGS_HASH (1U << 4U) -#define FLAGS_UPPERCASE (1U << 5U) -#define FLAGS_CHAR (1U << 6U) -#define FLAGS_SHORT (1U << 7U) -#define FLAGS_LONG (1U << 8U) -#define FLAGS_LONG_LONG (1U << 9U) -#define FLAGS_PRECISION (1U << 10U) -#define FLAGS_ADAPT_EXP (1U << 11U) - - -// import float.h for DBL_MAX -#if defined(PRINTF_SUPPORT_FLOAT) -#include -#endif - - -// output function type -typedef void (*out_fct_type)(char character, void* buffer, size_t idx, size_t maxlen); - - -// wrapper (used as buffer) for output function type -typedef struct { - void (*fct)(char character, void* arg); - void* arg; -} out_fct_wrap_type; - - -// internal buffer output -static inline void _out_buffer(char character, void* buffer, size_t idx, size_t maxlen) -{ - if (idx < maxlen) { - ((char*)buffer)[idx] = character; - } -} - - -// internal null output -static inline void _out_null(char character, void* buffer, size_t idx, size_t maxlen) -{ - (void)character; (void)buffer; (void)idx; (void)maxlen; -} - - -// internal _putchar wrapper -static inline void _out_char(char character, void* buffer, size_t idx, size_t maxlen) -{ - (void)buffer; (void)idx; (void)maxlen; - if (character) { - _putchar(character); - } -} - - -// internal output function wrapper -static inline void _out_fct(char character, void* buffer, size_t idx, size_t maxlen) -{ - (void)idx; (void)maxlen; - if (character) { - // buffer is the output fct pointer - ((out_fct_wrap_type*)buffer)->fct(character, ((out_fct_wrap_type*)buffer)->arg); - } -} - - -// internal secure strlen -// \return The length of the string (excluding the terminating 0) limited by 'maxsize' -static inline unsigned int _strnlen_s(const char* str, size_t maxsize) -{ - const char* s; - for (s = str; *s && maxsize--; ++s); - return (unsigned int)(s - str); -} - - -// internal test if char is a digit (0-9) -// \return true if char is a digit -static inline bool _is_digit(char ch) -{ - return (ch >= '0') && (ch <= '9'); -} - - -// internal ASCII string to unsigned int conversion -static unsigned int _atoi(const char** str) -{ - unsigned int i = 0U; - while (_is_digit(**str)) { - i = i * 10U + (unsigned int)(*((*str)++) - '0'); - } - return i; -} - - -// output the specified string in reverse, taking care of any zero-padding -static size_t _out_rev(out_fct_type out, char* buffer, size_t idx, size_t maxlen, const char* buf, size_t len, unsigned int width, unsigned int flags) -{ - const size_t start_idx = idx; - - // pad spaces up to given width - if (!(flags & FLAGS_LEFT) && !(flags & FLAGS_ZEROPAD)) { - for (size_t i = len; i < width; i++) { - out(' ', buffer, idx++, maxlen); - } - } - - // reverse string - while (len) { - out(buf[--len], buffer, idx++, maxlen); - } - - // append pad spaces up to given width - if (flags & FLAGS_LEFT) { - while (idx - start_idx < width) { - out(' ', buffer, idx++, maxlen); - } - } - - return idx; -} - - -// internal itoa format -static size_t _ntoa_format(out_fct_type out, char* buffer, size_t idx, size_t maxlen, char* buf, size_t len, bool negative, unsigned int base, unsigned int prec, unsigned int width, unsigned int flags) -{ - // pad leading zeros - if (!(flags & FLAGS_LEFT)) { - if (width && (flags & FLAGS_ZEROPAD) && (negative || (flags & (FLAGS_PLUS | FLAGS_SPACE)))) { - width--; - } - while ((len < prec) && (len < PRINTF_NTOA_BUFFER_SIZE)) { - buf[len++] = '0'; - } - while ((flags & FLAGS_ZEROPAD) && (len < width) && (len < PRINTF_NTOA_BUFFER_SIZE)) { - buf[len++] = '0'; - } - } - - // handle hash - if (flags & FLAGS_HASH) { - if (!(flags & FLAGS_PRECISION) && len && ((len == prec) || (len == width))) { - len--; - if (len && (base == 16U)) { - len--; - } - } - if ((base == 16U) && !(flags & FLAGS_UPPERCASE) && (len < PRINTF_NTOA_BUFFER_SIZE)) { - buf[len++] = 'x'; - } - else if ((base == 16U) && (flags & FLAGS_UPPERCASE) && (len < PRINTF_NTOA_BUFFER_SIZE)) { - buf[len++] = 'X'; - } - else if ((base == 2U) && (len < PRINTF_NTOA_BUFFER_SIZE)) { - buf[len++] = 'b'; - } - if (len < PRINTF_NTOA_BUFFER_SIZE) { - buf[len++] = '0'; - } - } - - if (len < PRINTF_NTOA_BUFFER_SIZE) { - if (negative) { - buf[len++] = '-'; - } - else if (flags & FLAGS_PLUS) { - buf[len++] = '+'; // ignore the space if the '+' exists - } - else if (flags & FLAGS_SPACE) { - buf[len++] = ' '; - } - } - - return _out_rev(out, buffer, idx, maxlen, buf, len, width, flags); -} - - -// internal itoa for 'long' type -static size_t _ntoa_long(out_fct_type out, char* buffer, size_t idx, size_t maxlen, unsigned long value, bool negative, unsigned long base, unsigned int prec, unsigned int width, unsigned int flags) -{ - char buf[PRINTF_NTOA_BUFFER_SIZE]; - size_t len = 0U; - - // no hash for 0 values - if (!value) { - flags &= ~FLAGS_HASH; - } - - // write if precision != 0 and value is != 0 - if (!(flags & FLAGS_PRECISION) || value) { - do { - const char digit = (char)(value % base); - buf[len++] = digit < 10 ? '0' + digit : (flags & FLAGS_UPPERCASE ? 'A' : 'a') + digit - 10; - value /= base; - } while (value && (len < PRINTF_NTOA_BUFFER_SIZE)); - } - - return _ntoa_format(out, buffer, idx, maxlen, buf, len, negative, (unsigned int)base, prec, width, flags); -} - - -// internal itoa for 'long long' type -#if defined(PRINTF_SUPPORT_LONG_LONG) -static size_t _ntoa_long_long(out_fct_type out, char* buffer, size_t idx, size_t maxlen, unsigned long long value, bool negative, unsigned long long base, unsigned int prec, unsigned int width, unsigned int flags) -{ - char buf[PRINTF_NTOA_BUFFER_SIZE]; - size_t len = 0U; - - // no hash for 0 values - if (!value) { - flags &= ~FLAGS_HASH; - } - - // write if precision != 0 and value is != 0 - if (!(flags & FLAGS_PRECISION) || value) { - do { - const char digit = (char)(value % base); - buf[len++] = digit < 10 ? '0' + digit : (flags & FLAGS_UPPERCASE ? 'A' : 'a') + digit - 10; - value /= base; - } while (value && (len < PRINTF_NTOA_BUFFER_SIZE)); - } - - return _ntoa_format(out, buffer, idx, maxlen, buf, len, negative, (unsigned int)base, prec, width, flags); -} -#endif // PRINTF_SUPPORT_LONG_LONG - - -#if defined(PRINTF_SUPPORT_FLOAT) - -#if defined(PRINTF_SUPPORT_EXPONENTIAL) -// forward declaration so that _ftoa can switch to exp notation for values > PRINTF_MAX_FLOAT -static size_t _etoa(out_fct_type out, char* buffer, size_t idx, size_t maxlen, double value, unsigned int prec, unsigned int width, unsigned int flags); -#endif - - -// internal ftoa for fixed decimal floating point -static size_t _ftoa(out_fct_type out, char* buffer, size_t idx, size_t maxlen, double value, unsigned int prec, unsigned int width, unsigned int flags) -{ - char buf[PRINTF_FTOA_BUFFER_SIZE]; - size_t len = 0U; - double diff = 0.0; - - // powers of 10 - static const double pow10[] = { 1, 10, 100, 1000, 10000, 100000, 1000000, 10000000, 100000000, 1000000000 }; - - // test for special values - if (value != value) - return _out_rev(out, buffer, idx, maxlen, "nan", 3, width, flags); - if (value < -DBL_MAX) - return _out_rev(out, buffer, idx, maxlen, "fni-", 4, width, flags); - if (value > DBL_MAX) - return _out_rev(out, buffer, idx, maxlen, (flags & FLAGS_PLUS) ? "fni+" : "fni", (flags & FLAGS_PLUS) ? 4U : 3U, width, flags); - - // test for very large values - // standard printf behavior is to print EVERY whole number digit -- which could be 100s of characters overflowing your buffers == bad - if ((value > PRINTF_MAX_FLOAT) || (value < -PRINTF_MAX_FLOAT)) { -#if defined(PRINTF_SUPPORT_EXPONENTIAL) - return _etoa(out, buffer, idx, maxlen, value, prec, width, flags); -#else - return 0U; -#endif - } - - // test for negative - bool negative = false; - if (value < 0) { - negative = true; - value = 0 - value; - } - - // set default precision, if not set explicitly - if (!(flags & FLAGS_PRECISION)) { - prec = PRINTF_DEFAULT_FLOAT_PRECISION; - } - // limit precision to 9, cause a prec >= 10 can lead to overflow errors - while ((len < PRINTF_FTOA_BUFFER_SIZE) && (prec > 9U)) { - buf[len++] = '0'; - prec--; - } - - int whole = (int)value; - double tmp = (value - whole) * pow10[prec]; - unsigned long frac = (unsigned long)tmp; - diff = tmp - frac; - - if (diff > 0.5) { - ++frac; - // handle rollover, e.g. case 0.99 with prec 1 is 1.0 - if (frac >= pow10[prec]) { - frac = 0; - ++whole; - } - } - else if (diff < 0.5) { - } - else if ((frac == 0U) || (frac & 1U)) { - // if halfway, round up if odd OR if last digit is 0 - ++frac; - } - - if (prec == 0U) { - diff = value - (double)whole; - if ((!(diff < 0.5) || (diff > 0.5)) && (whole & 1)) { - // exactly 0.5 and ODD, then round up - // 1.5 -> 2, but 2.5 -> 2 - ++whole; - } - } - else { - unsigned int count = prec; - // now do fractional part, as an unsigned number - while (len < PRINTF_FTOA_BUFFER_SIZE) { - --count; - buf[len++] = (char)(48U + (frac % 10U)); - if (!(frac /= 10U)) { - break; - } - } - // add extra 0s - while ((len < PRINTF_FTOA_BUFFER_SIZE) && (count-- > 0U)) { - buf[len++] = '0'; - } - if (len < PRINTF_FTOA_BUFFER_SIZE) { - // add decimal - buf[len++] = '.'; - } - } - - // do whole part, number is reversed - while (len < PRINTF_FTOA_BUFFER_SIZE) { - buf[len++] = (char)(48 + (whole % 10)); - if (!(whole /= 10)) { - break; - } - } - - // pad leading zeros - if (!(flags & FLAGS_LEFT) && (flags & FLAGS_ZEROPAD)) { - if (width && (negative || (flags & (FLAGS_PLUS | FLAGS_SPACE)))) { - width--; - } - while ((len < width) && (len < PRINTF_FTOA_BUFFER_SIZE)) { - buf[len++] = '0'; - } - } - - if (len < PRINTF_FTOA_BUFFER_SIZE) { - if (negative) { - buf[len++] = '-'; - } - else if (flags & FLAGS_PLUS) { - buf[len++] = '+'; // ignore the space if the '+' exists - } - else if (flags & FLAGS_SPACE) { - buf[len++] = ' '; - } - } - - return _out_rev(out, buffer, idx, maxlen, buf, len, width, flags); -} - - -#if defined(PRINTF_SUPPORT_EXPONENTIAL) -// internal ftoa variant for exponential floating-point type, contributed by Martijn Jasperse -static size_t _etoa(out_fct_type out, char* buffer, size_t idx, size_t maxlen, double value, unsigned int prec, unsigned int width, unsigned int flags) -{ - // check for NaN and special values - if ((value != value) || (value > DBL_MAX) || (value < -DBL_MAX)) { - return _ftoa(out, buffer, idx, maxlen, value, prec, width, flags); - } - - // determine the sign - const bool negative = value < 0; - if (negative) { - value = -value; - } - - // default precision - if (!(flags & FLAGS_PRECISION)) { - prec = PRINTF_DEFAULT_FLOAT_PRECISION; - } - - // determine the decimal exponent - // based on the algorithm by David Gay (https://www.ampl.com/netlib/fp/dtoa.c) - union { - uint64_t U; - double F; - } conv; - - conv.F = value; - int exp2 = (int)((conv.U >> 52U) & 0x07FFU) - 1023; // effectively log2 - conv.U = (conv.U & ((1ULL << 52U) - 1U)) | (1023ULL << 52U); // drop the exponent so conv.F is now in [1,2) - // now approximate log10 from the log2 integer part and an expansion of ln around 1.5 - int expval = (int)(0.1760912590558 + exp2 * 0.301029995663981 + (conv.F - 1.5) * 0.289529654602168); - // now we want to compute 10^expval but we want to be sure it won't overflow - exp2 = (int)(expval * 3.321928094887362 + 0.5); - const double z = expval * 2.302585092994046 - exp2 * 0.6931471805599453; - const double z2 = z * z; - conv.U = (uint64_t)(exp2 + 1023) << 52U; - // compute exp(z) using continued fractions, see https://en.wikipedia.org/wiki/Exponential_function#Continued_fractions_for_ex - conv.F *= 1 + 2 * z / (2 - z + (z2 / (6 + (z2 / (10 + z2 / 14))))); - // correct for rounding errors - if (value < conv.F) { - expval--; - conv.F /= 10; - } - - // the exponent format is "%+03d" and largest value is "307", so set aside 4-5 characters - unsigned int minwidth = ((expval < 100) && (expval > -100)) ? 4U : 5U; - - // in "%g" mode, "prec" is the number of *significant figures* not decimals - if (flags & FLAGS_ADAPT_EXP) { - // do we want to fall-back to "%f" mode? - if ((value >= 1e-4) && (value < 1e6)) { - if ((int)prec > expval) { - prec = (unsigned)((int)prec - expval - 1); - } - else { - prec = 0; - } - flags |= FLAGS_PRECISION; // make sure _ftoa respects precision - // no characters in exponent - minwidth = 0U; - expval = 0; - } - else { - // we use one sigfig for the whole part - if ((prec > 0) && (flags & FLAGS_PRECISION)) { - --prec; - } - } - } - - // will everything fit? - unsigned int fwidth = width; - if (width > minwidth) { - // we didn't fall-back so subtract the characters required for the exponent - fwidth -= minwidth; - } else { - // not enough characters, so go back to default sizing - fwidth = 0U; - } - if ((flags & FLAGS_LEFT) && minwidth) { - // if we're padding on the right, DON'T pad the floating part - fwidth = 0U; - } - - // rescale the float value - if (expval) { - value /= conv.F; - } - - // output the floating part - const size_t start_idx = idx; - idx = _ftoa(out, buffer, idx, maxlen, negative ? -value : value, prec, fwidth, flags & ~FLAGS_ADAPT_EXP); - - // output the exponent part - if (minwidth) { - // output the exponential symbol - out((flags & FLAGS_UPPERCASE) ? 'E' : 'e', buffer, idx++, maxlen); - // output the exponent value - idx = _ntoa_long(out, buffer, idx, maxlen, (expval < 0) ? -expval : expval, expval < 0, 10, 0, minwidth-1, FLAGS_ZEROPAD | FLAGS_PLUS); - // might need to right-pad spaces - if (flags & FLAGS_LEFT) { - while (idx - start_idx < width) out(' ', buffer, idx++, maxlen); - } - } - return idx; -} -#endif // PRINTF_SUPPORT_EXPONENTIAL -#endif // PRINTF_SUPPORT_FLOAT - - -// internal vsnprintf -static int _vsnprintf(out_fct_type out, char* buffer, const size_t maxlen, const char* format, va_list va) -{ - unsigned int flags, width, precision, n; - size_t idx = 0U; - - if (!buffer) { - // use null output function - out = _out_null; - } - - while (*format) - { - // format specifier? %[flags][width][.precision][length] - if (*format != '%') { - // no - out(*format, buffer, idx++, maxlen); - format++; - continue; - } - else { - // yes, evaluate it - format++; - } - - // evaluate flags - flags = 0U; - do { - switch (*format) { - case '0': flags |= FLAGS_ZEROPAD; format++; n = 1U; break; - case '-': flags |= FLAGS_LEFT; format++; n = 1U; break; - case '+': flags |= FLAGS_PLUS; format++; n = 1U; break; - case ' ': flags |= FLAGS_SPACE; format++; n = 1U; break; - case '#': flags |= FLAGS_HASH; format++; n = 1U; break; - default : n = 0U; break; - } - } while (n); - - // evaluate width field - width = 0U; - if (_is_digit(*format)) { - width = _atoi(&format); - } - else if (*format == '*') { - const int w = va_arg(va, int); - if (w < 0) { - flags |= FLAGS_LEFT; // reverse padding - width = (unsigned int)-w; - } - else { - width = (unsigned int)w; - } - format++; - } - - // evaluate precision field - precision = 0U; - if (*format == '.') { - flags |= FLAGS_PRECISION; - format++; - if (_is_digit(*format)) { - precision = _atoi(&format); - } - else if (*format == '*') { - const int prec = (int)va_arg(va, int); - precision = prec > 0 ? (unsigned int)prec : 0U; - format++; - } - } - - // evaluate length field - switch (*format) { - case 'l' : - flags |= FLAGS_LONG; - format++; - if (*format == 'l') { - flags |= FLAGS_LONG_LONG; - format++; - } - break; - case 'h' : - flags |= FLAGS_SHORT; - format++; - if (*format == 'h') { - flags |= FLAGS_CHAR; - format++; - } - break; -#if defined(PRINTF_SUPPORT_PTRDIFF_T) - case 't' : - flags |= (sizeof(ptrdiff_t) == sizeof(long) ? FLAGS_LONG : FLAGS_LONG_LONG); - format++; - break; -#endif - case 'j' : - flags |= (sizeof(intmax_t) == sizeof(long) ? FLAGS_LONG : FLAGS_LONG_LONG); - format++; - break; - case 'z' : - flags |= (sizeof(size_t) == sizeof(long) ? FLAGS_LONG : FLAGS_LONG_LONG); - format++; - break; - default : - break; - } - - // evaluate specifier - switch (*format) { - case 'd' : - case 'i' : - case 'u' : - case 'x' : - case 'X' : - case 'o' : - case 'b' : { - // set the base - unsigned int base; - if (*format == 'x' || *format == 'X') { - base = 16U; - } - else if (*format == 'o') { - base = 8U; - } - else if (*format == 'b') { - base = 2U; - } - else { - base = 10U; - flags &= ~FLAGS_HASH; // no hash for dec format - } - // uppercase - if (*format == 'X') { - flags |= FLAGS_UPPERCASE; - } - - // no plus or space flag for u, x, X, o, b - if ((*format != 'i') && (*format != 'd')) { - flags &= ~(FLAGS_PLUS | FLAGS_SPACE); - } - - // ignore '0' flag when precision is given - if (flags & FLAGS_PRECISION) { - flags &= ~FLAGS_ZEROPAD; - } - - // convert the integer - if ((*format == 'i') || (*format == 'd')) { - // signed - if (flags & FLAGS_LONG_LONG) { -#if defined(PRINTF_SUPPORT_LONG_LONG) - const long long value = va_arg(va, long long); - idx = _ntoa_long_long(out, buffer, idx, maxlen, (unsigned long long)(value > 0 ? value : 0 - value), value < 0, base, precision, width, flags); -#endif - } - else if (flags & FLAGS_LONG) { - const long value = va_arg(va, long); - idx = _ntoa_long(out, buffer, idx, maxlen, (unsigned long)(value > 0 ? value : 0 - value), value < 0, base, precision, width, flags); - } - else { - const int value = (flags & FLAGS_CHAR) ? (char)va_arg(va, int) : (flags & FLAGS_SHORT) ? (short int)va_arg(va, int) : va_arg(va, int); - idx = _ntoa_long(out, buffer, idx, maxlen, (unsigned int)(value > 0 ? value : 0 - value), value < 0, base, precision, width, flags); - } - } - else { - // unsigned - if (flags & FLAGS_LONG_LONG) { -#if defined(PRINTF_SUPPORT_LONG_LONG) - idx = _ntoa_long_long(out, buffer, idx, maxlen, va_arg(va, unsigned long long), false, base, precision, width, flags); -#endif - } - else if (flags & FLAGS_LONG) { - idx = _ntoa_long(out, buffer, idx, maxlen, va_arg(va, unsigned long), false, base, precision, width, flags); - } - else { - const unsigned int value = (flags & FLAGS_CHAR) ? (unsigned char)va_arg(va, unsigned int) : (flags & FLAGS_SHORT) ? (unsigned short int)va_arg(va, unsigned int) : va_arg(va, unsigned int); - idx = _ntoa_long(out, buffer, idx, maxlen, value, false, base, precision, width, flags); - } - } - format++; - break; - } -#if defined(PRINTF_SUPPORT_FLOAT) - case 'f' : - case 'F' : - if (*format == 'F') flags |= FLAGS_UPPERCASE; - idx = _ftoa(out, buffer, idx, maxlen, va_arg(va, double), precision, width, flags); - format++; - break; -#if defined(PRINTF_SUPPORT_EXPONENTIAL) - case 'e': - case 'E': - case 'g': - case 'G': - if ((*format == 'g')||(*format == 'G')) flags |= FLAGS_ADAPT_EXP; - if ((*format == 'E')||(*format == 'G')) flags |= FLAGS_UPPERCASE; - idx = _etoa(out, buffer, idx, maxlen, va_arg(va, double), precision, width, flags); - format++; - break; -#endif // PRINTF_SUPPORT_EXPONENTIAL -#endif // PRINTF_SUPPORT_FLOAT - case 'c' : { - unsigned int l = 1U; - // pre padding - if (!(flags & FLAGS_LEFT)) { - while (l++ < width) { - out(' ', buffer, idx++, maxlen); - } - } - // char output - out((char)va_arg(va, int), buffer, idx++, maxlen); - // post padding - if (flags & FLAGS_LEFT) { - while (l++ < width) { - out(' ', buffer, idx++, maxlen); - } - } - format++; - break; - } - - case 's' : { - const char* p = va_arg(va, char*); - unsigned int l = _strnlen_s(p, precision ? precision : (size_t)-1); - // pre padding - if (flags & FLAGS_PRECISION) { - l = (l < precision ? l : precision); - } - if (!(flags & FLAGS_LEFT)) { - while (l++ < width) { - out(' ', buffer, idx++, maxlen); - } - } - // string output - while ((*p != 0) && (!(flags & FLAGS_PRECISION) || precision--)) { - out(*(p++), buffer, idx++, maxlen); - } - // post padding - if (flags & FLAGS_LEFT) { - while (l++ < width) { - out(' ', buffer, idx++, maxlen); - } - } - format++; - break; - } - - case 'p' : { - width = sizeof(void*) * 2U; - flags |= FLAGS_ZEROPAD | FLAGS_UPPERCASE; -#if defined(PRINTF_SUPPORT_LONG_LONG) - const bool is_ll = sizeof(uintptr_t) == sizeof(long long); - if (is_ll) { - idx = _ntoa_long_long(out, buffer, idx, maxlen, (uintptr_t)va_arg(va, void*), false, 16U, precision, width, flags); - } - else { -#endif - idx = _ntoa_long(out, buffer, idx, maxlen, (unsigned long)((uintptr_t)va_arg(va, void*)), false, 16U, precision, width, flags); -#if defined(PRINTF_SUPPORT_LONG_LONG) - } -#endif - format++; - break; - } - - case '%' : - out('%', buffer, idx++, maxlen); - format++; - break; - - default : - out(*format, buffer, idx++, maxlen); - format++; - break; - } - } - - // termination - out((char)0, buffer, idx < maxlen ? idx : maxlen - 1U, maxlen); - - // return written chars without terminating \0 - return (int)idx; -} - - -/////////////////////////////////////////////////////////////////////////////// - -int printf_(const char* format, ...) -{ - va_list va; - va_start(va, format); - char buffer[1]; - const int ret = _vsnprintf(_out_char, buffer, (size_t)-1, format, va); - va_end(va); - return ret; -} - - -int sprintf_(char* buffer, const char* format, ...) -{ - va_list va; - va_start(va, format); - const int ret = _vsnprintf(_out_buffer, buffer, (size_t)-1, format, va); - va_end(va); - return ret; -} - - -int snprintf_(char* buffer, size_t count, const char* format, ...) -{ - va_list va; - va_start(va, format); - const int ret = _vsnprintf(_out_buffer, buffer, count, format, va); - va_end(va); - return ret; -} - - -int vprintf_(const char* format, va_list va) -{ - char buffer[1]; - return _vsnprintf(_out_char, buffer, (size_t)-1, format, va); -} - - -int vsnprintf_(char* buffer, size_t count, const char* format, va_list va) -{ - return _vsnprintf(_out_buffer, buffer, count, format, va); -} - - -int fctprintf(void (*out)(char character, void* arg), void* arg, const char* format, ...) -{ - va_list va; - va_start(va, format); - const out_fct_wrap_type out_fct_wrap = { out, arg }; - const int ret = _vsnprintf(_out_fct, (char*)(uintptr_t)&out_fct_wrap, (size_t)-1, format, va); - va_end(va); - return ret; -} diff --git a/libs/third-party/printf/printf.h b/libs/third-party/printf/printf.h deleted file mode 100644 index 8f7a4c8f..00000000 --- a/libs/third-party/printf/printf.h +++ /dev/null @@ -1,117 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// \author (c) Marco Paland (info@paland.com) -// 2014-2019, PALANDesign Hannover, Germany -// -// \license The MIT License (MIT) -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. -// -// \brief Tiny printf, sprintf and snprintf implementation, optimized for speed on -// embedded systems with a very limited resources. -// Use this instead of bloated standard/newlib printf. -// These routines are thread safe and reentrant. -// -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _PRINTF_H_ -#define _PRINTF_H_ - -#include -#include - - -#ifdef __cplusplus -extern "C" { -#endif - - -/** - * Output a character to a custom device like UART, used by the printf() function - * This function is declared here only. You have to write your custom implementation somewhere - * \param character Character to output - */ -void _putchar(char character); - - -/** - * Tiny printf implementation - * You have to implement _putchar if you use printf() - * To avoid conflicts with the regular printf() API it is overridden by macro defines - * and internal underscore-appended functions like printf_() are used - * \param format A string that specifies the format of the output - * \return The number of characters that are written into the array, not counting the terminating null character - */ -#define printf printf_ -int printf_(const char* format, ...); - - -/** - * Tiny sprintf implementation - * Due to security reasons (buffer overflow) YOU SHOULD CONSIDER USING (V)SNPRINTF INSTEAD! - * \param buffer A pointer to the buffer where to store the formatted string. MUST be big enough to store the output! - * \param format A string that specifies the format of the output - * \return The number of characters that are WRITTEN into the buffer, not counting the terminating null character - */ -#define sprintf sprintf_ -int sprintf_(char* buffer, const char* format, ...); - - -/** - * Tiny snprintf/vsnprintf implementation - * \param buffer A pointer to the buffer where to store the formatted string - * \param count The maximum number of characters to store in the buffer, including a terminating null character - * \param format A string that specifies the format of the output - * \param va A value identifying a variable arguments list - * \return The number of characters that COULD have been written into the buffer, not counting the terminating - * null character. A value equal or larger than count indicates truncation. Only when the returned value - * is non-negative and less than count, the string has been completely written. - */ -#define snprintf snprintf_ -#define vsnprintf vsnprintf_ -int snprintf_(char* buffer, size_t count, const char* format, ...); -int vsnprintf_(char* buffer, size_t count, const char* format, va_list va); - - -/** - * Tiny vprintf implementation - * \param format A string that specifies the format of the output - * \param va A value identifying a variable arguments list - * \return The number of characters that are WRITTEN into the buffer, not counting the terminating null character - */ -#define vprintf vprintf_ -int vprintf_(const char* format, va_list va); - - -/** - * printf with output function - * You may use this as dynamic alternative to printf() with its fixed _putchar() output - * \param out An output function which takes one character and an argument pointer - * \param arg An argument pointer for user data passed to output function - * \param format A string that specifies the format of the output - * \return The number of characters that are sent to the output function, not counting the terminating null character - */ -int fctprintf(void (*out)(char character, void* arg), void* arg, const char* format, ...); - - -#ifdef __cplusplus -} -#endif - - -#endif // _PRINTF_H_