1 files changed, 35 insertions, 35 deletions

diff --git a/projects/board-test/rtc-test.c b/projects/board-test/rtc-test.c
index b8a7511..f1c2db1 100644
--- a/projects/board-test/rtc-test.c
+++ b/projects/board-test/rtc-test.c
@@ -8,7 +8,6 @@
  */
 #include <string.h>
 
-#include "stm32f4xx_hal.h"
 #include "stm-init.h"
 #include "stm-led.h"
 #include "stm-uart.h"
@@ -23,18 +22,18 @@ uint32_t i;
 
 uint32_t device_ready(uint16_t i2c_addr)
 {
-    uart_send_string2(STM_UART_MGMT, "Checking readiness of 0x");
-    uart_send_number2(STM_UART_MGMT, i2c_addr, 4, 16);
-    uart_send_string2(STM_UART_MGMT, "...");
+    uart_send_string("Checking readiness of 0x");
+    uart_send_hex(i2c_addr, 4);
+    uart_send_string("...");
 
     if (rtc_device_ready(i2c_addr) == HAL_OK) {
-	uart_send_string2(STM_UART_MGMT, "OK\r\n");
+	uart_send_string("OK\r\n");
 	return 1;
     }
 
-    uart_send_string2(STM_UART_MGMT, "Not ready (0x");
-    uart_send_number2(STM_UART_MGMT, i, 4, 16);
-    uart_send_string2(STM_UART_MGMT, ")\r\n");
+    uart_send_string("Not ready (0x");
+    uart_send_hex(i, 4);
+    uart_send_string(")\r\n");
 
     return 0;
 }
@@ -44,34 +43,34 @@ void send_byte(const uint16_t i2c_addr, const uint8_t value)
 {
     uint8_t ch = value;
 
-    uart_send_string2(STM_UART_MGMT, "Sending ");
-    uart_send_number2(STM_UART_MGMT, ch, 2, 16);
-    uart_send_string2(STM_UART_MGMT, " to 0x");
-    uart_send_number2(STM_UART_MGMT, i2c_addr, 4, 16);
-    uart_send_string2(STM_UART_MGMT, "...");
+    uart_send_string("Sending ");
+    uart_send_hex(ch, 2);
+    uart_send_string(" to 0x");
+    uart_send_hex(i2c_addr, 4);
+    uart_send_string("...");
 
     if (rtc_send_byte(i2c_addr, ch, 1000) != HAL_OK) {
-	uart_send_string2(STM_UART_MGMT, "Timeout\r\n");
+	uart_send_string("Timeout\r\n");
 	Error_Handler();
     }
 
-    uart_send_string2(STM_UART_MGMT, "OK\r\n");
+    uart_send_string("OK\r\n");
 }
 
 void read_bytes (uint8_t *buf, const uint16_t i2c_addr, const uint8_t len)
 {
-    uart_send_string2(STM_UART_MGMT, "Reading ");
-    uart_send_number2(STM_UART_MGMT, len, 3, 10);
-    uart_send_string2(STM_UART_MGMT, " bytes from 0x");
-    uart_send_number2(STM_UART_MGMT, i2c_addr, 4, 16);
-    uart_send_string2(STM_UART_MGMT, "...");
+    uart_send_string("Reading ");
+    uart_send_integer(len, 1);
+    uart_send_string(" bytes from 0x");
+    uart_send_hex(i2c_addr, 4);
+    uart_send_string("...");
 
     if (rtc_read_bytes(i2c_addr, buf, len, 1000) != HAL_OK) {
-	uart_send_string2(STM_UART_MGMT, "Timeout\r\n");
+	uart_send_string("Timeout\r\n");
 	Error_Handler();
     }
 
-    uart_send_string2(STM_UART_MGMT, "OK\r\n");
+    uart_send_string("OK\r\n");
 }
 
 void request_data(uint8_t *buf, const uint16_t i2c_addr, const uint8_t offset, const uint8_t bytes)
@@ -85,8 +84,8 @@ void print_time()
     request_data(buf, RTC_RTC_ADDR, RTC_TIME_OFFSET, RTC_TIME_BYTES);
 
     for (i = 0; i < RTC_TIME_BYTES; i++) {
-	uart_send_number2(STM_UART_MGMT, buf[i], 2, 16);
-	uart_send_string2(STM_UART_MGMT, " ");
+	uart_send_hex(buf[i], 2);
+	uart_send_string(" ");
     }
 }
 
@@ -94,37 +93,37 @@ void dump_sram()
 {
     request_data(buf, RTC_RTC_ADDR, 0x0, RTC_SRAM_TOTAL_BYTES);
 
-    uart_send_string2(STM_UART_MGMT, "SRAM contents:\r\n");
+    uart_send_string("SRAM contents:\r\n");
     uart_send_hexdump(STM_UART_MGMT, buf, 0, RTC_SRAM_TOTAL_BYTES);
 
-    uart_send_string2(STM_UART_MGMT, "\r\n");
+    uart_send_string("\r\n");
 }
 
 void dump_eeprom()
 {
     request_data(buf, RTC_EEPROM_ADDR, 0x0, RTC_EEPROM_TOTAL_BYTES);
 
-    uart_send_string2(STM_UART_MGMT, "EEPROM contents:\r\n");
+    uart_send_string("EEPROM contents:\r\n");
     uart_send_hexdump(STM_UART_MGMT, buf, 0, RTC_EEPROM_TOTAL_BYTES);
-    uart_send_string2(STM_UART_MGMT, "\r\n");
+    uart_send_string("\r\n");
 
     request_data(buf, RTC_EEPROM_ADDR, RTC_EEPROM_EUI48_OFFSET, RTC_EEPROM_EUI48_BYTES);
-    uart_send_string2(STM_UART_MGMT, "EEPROM EUI-48:\r\n");
+    uart_send_string("EEPROM EUI-48:\r\n");
     uart_send_hexdump(STM_UART_MGMT, buf, RTC_EEPROM_EUI48_OFFSET, RTC_EEPROM_EUI48_BYTES);
 
-    uart_send_string2(STM_UART_MGMT, "\r\n");
+    uart_send_string("\r\n");
 }
 
 void enable_oscillator()
 {
-    uart_send_string2(STM_UART_MGMT, "Enabling oscillator...\r\n");
+    uart_send_string("Enabling oscillator...\r\n");
 
     if (rtc_enable_oscillator() != HAL_OK) {
-	uart_send_string2(STM_UART_MGMT, "Timeout\r\n");
+	uart_send_string("Timeout\r\n");
 	Error_Handler();
     }
 
-    uart_send_string2(STM_UART_MGMT, "OK\r\n");
+    uart_send_string("OK\r\n");
 }
 
 
@@ -132,7 +131,8 @@ int
 main()
 {
     stm_init();
-    uart_send_string2(STM_UART_MGMT, "\r\n\r\n*** Init done\r\n");
+    uart_set_default(STM_UART_MGMT);
+    uart_send_string("\r\n\r\n*** Init done\r\n");
 
     dump_sram();
     dump_eeprom();
@@ -148,7 +148,7 @@ main()
 
 	print_time(buf);
 
-	uart_send_string2(STM_UART_MGMT, "\r\n\r\n");
+	uart_send_string("\r\n\r\n");
 
 	HAL_GPIO_TogglePin(LED_PORT, LED_GREEN);
 	DELAY();