diff --git a/reports/2022-09-04_TRS_monkin.md b/reports/2022-09-04_TRS_monkin.md index 884ae9a..4faca42 100644 --- a/reports/2022-09-04_TRS_monkin.md +++ b/reports/2022-09-04_TRS_monkin.md @@ -33,7 +33,7 @@ Lastly, the ground station has an event-driven architecture, based on events fro Project for collecting, logging, emitting, and visualizing telemetry data from a model rocket containing an **inboard Raspberry Pi Zero** with an **Arduino receiving telemetry**. As opposed to the previous example, this one uses a **LoRa radio transceiver**. This system is more detailed and contains better documentation, which can be seen in the references [2] and [3]. The software architecture is presented below: -![White Vest's Software Architecture](assets/COTS/softwareArc2.png) +![White Vest's Software Architecture](assets/WhiteVest/software.png) ### Air Program diff --git a/reports/2022-11-04_tm_afonsob.md b/reports/2022-11-04_tm_afonsob.md index 7e0ba26..131820e 100644 --- a/reports/2022-11-04_tm_afonsob.md +++ b/reports/2022-11-04_tm_afonsob.md @@ -1,4 +1,3 @@ - # SITUATION REPORT 1 (04/11/2022) ## Study White Vest @@ -7,7 +6,7 @@ The goal of this report is to understand what are the White Vests features and This project is divided into 2 parts the **Air** and the **Ground**. -![white vests](/sit-rep1-img/air-ground.png) +![white vests](assets/WhiteVest/software.png) The **Air** is the system that is in the rocket itself (on-board computer), this part is the one that handles reading the sensors, logging, and sending the data to the **Ground Station**. In our case the **Air** will be the EggTimer itself. The Ground Station has the task of receiving and storing the data sent by the rocket and allows you to view it through a web application (made with go). @@ -50,7 +49,7 @@ The Arduino receives the data, encodes it in base64, and sends it to the dashboa ### DashBoard The white vests dashboard shows the altitude, speed, temperature, pressure, pitch, yaw, signal info, and a map of the rocket's location. I think it shows all the information we need for our project, but if more is needed it doesn't seem too difficult to add. -![dashboard](/sit-rep1-img/dashboard.png) +![dashboard](assets/WhiteVest/dashboard.png) ### White Vests Problems Some of the problems that the devs of this project pointed out, in our case don't apply: @@ -61,7 +60,7 @@ Some of the problems that the devs of this project pointed out, in our case don' ## How eggtimer sends data The document that explains how eggtimer transmits the data is in the references of this document, point 3 ([Eggtimer Telemetry Data Format Specification](http://eggtimerrocketry.com/wp-content/uploads/2021/05/Eggtimer-Telemetry-Data-Format.pdf)) The data sent by eggtimer depends on the model we are using, as shown in the following table. -![eggtimer data](/sit-rep1-img/eggtimer_data.png) +![eggtimer data](assets/COTS/eggtimer_data.png) (I haven't had much time to understand how it works, I will do that in the next few weeks.) @@ -72,6 +71,7 @@ So the next task will be just that, to better study the format of the data that ## References -* [1] [White Vest github](https://github.com/johnjones4/white-vest) -* [2] [johnjonesfour](https://johnjonesfour.com/2020/10/03/model-rocket-telemetry-part-1/) -* [3] [Eggtimer Telemetry Data Format Specification](http://eggtimerrocketry.com/wp-content/uploads/2021/05/Eggtimer-Telemetry-Data-Format.pdf) \ No newline at end of file + +* \[1\] [White Vest github](https://github.com/johnjones4/white-vest) +* \[2\] [johnjonesfour](https://johnjonesfour.com/2020/10/03/model-rocket-telemetry-part-1/) +* \[3\] [Eggtimer Telemetry Data Format Specification](http://eggtimerrocketry.com/wp-content/uploads/2021/05/Eggtimer-Telemetry-Data-Format.pdf) diff --git a/reports/assets/COTS/softwareArc2.png b/reports/assets/COTS/softwareArc2.png deleted file mode 100644 index d39f88b..0000000 Binary files a/reports/assets/COTS/softwareArc2.png and /dev/null differ diff --git a/reports/assets/COTS/whitevest_dashboard.png b/reports/assets/WhiteVest/dashboard.png similarity index 100% rename from reports/assets/COTS/whitevest_dashboard.png rename to reports/assets/WhiteVest/dashboard.png diff --git a/reports/assets/WhiteVest/software.png b/reports/assets/WhiteVest/software.png new file mode 100644 index 0000000..3c1cd06 Binary files /dev/null and b/reports/assets/WhiteVest/software.png differ