1 files changed, 18 insertions, 9 deletions

diff --git a/src/main.cpp b/src/main.cpp
index e699c6a..ed98cb4 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,15 +1,22 @@
-#include <asio.hpp>
+// Standard C++
+#include <array>
 #include <ctime>
+#include <exception>
+#include <format>
 #include <iostream>
 #include <string>
 
+// Asio
+#include <asio.hpp>
+
+// minmea
 #include "minmea.h"
 
 using namespace std;
 
-// constexpr auto PORT     = "/dev/cuaU0";
-constexpr auto PORT     = "/dev/ugen0.14";
-constexpr auto BAUDRATE = 9600;
+constexpr auto PORT         = "/dev/cuaU0";
+constexpr auto BAUDRATE     = 9600;
+constexpr auto KNOTS_TO_KMH = 1.852F;
 
 namespace {
 
@@ -32,7 +39,7 @@ read_line(asio::serial_port& com)
 }
 
 string
-get_gps_timestamp(const minmea_time& time, const minmea_date& date)
+get_gps_datetime(const minmea_time& time, const minmea_date& date)
 {
         tm tm_utc{};
         ::minmea_getdatetime(&tm_utc, &date, &time);
@@ -73,11 +80,13 @@ main()
                                 continue;
                         }
 
-                        auto timestamp = get_gps_timestamp(frame.time, frame.date);
+                        auto timestamp = get_gps_datetime(frame.time, frame.date);
 
-                        cout << timestamp << ": $RMC floating point degree coordinates and speed: ("
-                             << ::minmea_tocoord(&frame.latitude) << "," << ::minmea_tocoord(&frame.longitude) << ") "
-                             << ::minmea_tofloat(&frame.speed) << '\n';
+                        cout << format("{}: $RMC floating point degree coordinates and speed: ({},{}) {} km/h\n",
+                                       timestamp,
+                                       ::minmea_tocoord(&frame.latitude),
+                                       ::minmea_tocoord(&frame.longitude),
+                                       ::minmea_tofloat(&frame.speed) * KNOTS_TO_KMH);
                 }
         }
         catch ( exception& e ) {