bug: adds fixes to xbee radio config and coms

Astraeus-Library · Oct 24, 2023 · 8379aa6 · 8379aa6
1 parent a72b18d
commit 8379aa6
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 18 deletions.
diff --git a/demos/applications/telemetry-recorder.cpp b/demos/applications/telemetry-recorder.cpp
@@ -50,7 +50,7 @@ hal::status application(hardware_map& p_map)
   auto spi2 = HAL_CHECK(hal::lpc40::spi::get(2));
   auto chip_select = HAL_CHECK(hal::lpc40::output_pin::get(1, 8));
 
-  hal::print(console, "\n\nTelemetry Recorder Starting...\n\n");
+  hal::print(console, "\n\nTelemetry Recorder Starting. May take a few seconds...\n\n");
 
   // Device initialization
   auto micro_sd =
@@ -130,26 +130,29 @@ hal::status application(hardware_map& p_map)
              telemetry_recorder_data.gps_time);
 
 
+
     hal::print<512>(console, telem_data);
     float heading = computeHeading(telemetry_recorder_data.mag_x, telemetry_recorder_data.mag_y, 0.0);
     hal::print<128>(console, "\n\nHeading: %f°", heading);
 
     hal::print(console, "\n\n============================================\n\n");
 
     hal::print(console, "Transmitting Data to Ground Station...\n\n");
-    telemetry_recorder.transmit("Here is some data!\n");
-    telemetry_recorder.transmit(telem_data);
 
-    hal::print(console, "Storing Data to SD Card...\n\n");
-    telemetry_recorder.store(telem_data);
+    std::string_view message = "\nHello here is some data\n";
+
+    telemetry_recorder.transmit(message);
+    telemetry_recorder.transmit(telem_data);
 
     hal::print(console, "Recieveing Data from Ground Station...\n\n");
-    auto recieved_data = HAL_CHECK(telemetry_recorder.recieve());
+    auto recieved_data1 = HAL_CHECK(telemetry_recorder.recieve());
     hal::print(console,
                "\n=================== RECIEVED DATA ===================\n");
-    hal::print(console, recieved_data);
+    hal::print(console, recieved_data1);
     hal::print(console,
-               "======================================================\n\n");
+               "\n======================================================\n\n");
+
+    // hal::delay(clock, 500ms); // enable to see status of XBEE radio
 
   }
 

diff --git a/demos/platforms/lpc4078.cpp b/demos/platforms/lpc4078.cpp
@@ -51,12 +51,6 @@ hal::result<hardware_map> initialize_platform()
                                                         .baud_rate = 115200,
                                                       }));
 
-  static auto uart1 = HAL_CHECK(hal::lpc40::uart::get(1,
-                                                      uart1_buffer,
-                                                      hal::serial::settings{
-                                                        .baud_rate = 115200,
-                                                      }));
-
   static auto i2c = HAL_CHECK((hal::lpc40::i2c::get(2,
                                                   hal::i2c::settings{
                                                     .clock_rate = 100.0_kHz,
@@ -68,6 +62,11 @@ hal::result<hardware_map> initialize_platform()
                                                         .baud_rate = 38400,
                                                       }));
 
+  static auto uart1 = HAL_CHECK(hal::lpc40::uart::get(1,
+                                                      uart1_buffer,
+                                                      hal::serial::settings{
+                                                        .baud_rate = 9600,
+                                                      }));
 
 
   return hardware_map{

diff --git a/include/telemetry-recorder/telemetry-recorder.hpp b/include/telemetry-recorder/telemetry-recorder.hpp
@@ -65,6 +65,7 @@ class telemetry_recorder
   hal::result<float> gps_baro_altitude_offset();
   hal::result<std::span<hal::byte>> recieve();
   hal::status transmit(std::string_view message);
+  hal::status transmit(const char* formatted_data);
   hal::status store(std::string_view message);
 
 private:

diff --git a/src/telemetry-recorder.cpp b/src/telemetry-recorder.cpp
@@ -75,10 +75,14 @@ hal::result<std::span<hal::byte>> telemetry_recorder::recieve()
   return data;
 }
 
-hal::status telemetry_recorder::transmit(std::string_view message)
-{
-  m_xbee->write(hal::as_bytes(message));
-  return hal::success();
+hal::status telemetry_recorder::transmit(std::string_view message) {
+    auto byte_data = hal::as_bytes(message);
+    m_xbee->write(byte_data);
+    return hal::success();
+}
+
+hal::status telemetry_recorder::transmit(const char* formatted_data) {
+    return this->transmit(std::string_view(formatted_data));
 }
 
 hal::status telemetry_recorder::store(std::string_view message)