Been a mentor and programme organiser at GNU social for Google Summer of Code (2019 to 2021), entrepreneur,
- among other activities.
-
-
For detailed information, please take a look at my Curriculum Vitae.
-
-
About
-
Ahoy-hoy! I'm a Computer Programmer from Porto, Portugal.
-
I've always been passionate about interdisciplinary projects, namely robotics. Space is one of these unique
- fields where research and development brings together various branches of STEM, and naturally catches my
- attention.
-
Other than studying and working, I also dance, read books, and hang out with friends.
Been a mentor and programme organiser at GNU social for Google Summer of Code (2019 to 2021),
+ entrepreneur,
+ among other activities.
+
+
For detailed information, please take a look at my Curriculum Vitae.
+
+
About
+
Ahoy-hoy! I'm a Computer Programmer from Porto, Portugal.
+
I've always been passionate about interdisciplinary projects, namely robotics. Space is one of these unique
+ fields where research and development brings together various branches of STEM, and naturally catches my
+ attention.
+
Other than studying and working, I also dance, read books, and hang out with friends.
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/members/luis-jesus/index.html b/members/floater3.html
similarity index 65%
rename from members/luis-jesus/index.html
rename to members/floater3.html
index a950f47..9ea14b0 100644
--- a/members/luis-jesus/index.html
+++ b/members/floater3.html
@@ -3,9 +3,9 @@
- Staff Details: Luís Jesus | E-42 SoftEng Dept. - Porto Space Team
+ Staff Details: Luís Jesus | E-42 Computing Dept. - Porto Space Team
-
+
@@ -13,16 +13,8 @@
FCUP (2019): 1 week Engineering Physics mini-course where I learnt basis of Restrict Relativity and
developed a group project.
diff --git a/members/sergio-gama/index.html b/members/gama.html
similarity index 65%
rename from members/sergio-gama/index.html
rename to members/gama.html
index f354ed7..5182d07 100644
--- a/members/sergio-gama/index.html
+++ b/members/gama.html
@@ -3,9 +3,9 @@
- Staff Details: Sérgio da Gama | E-42 SoftEng Dept. - Porto Space Team
+ Staff Details: Sérgio da Gama | E-42 Computing Dept. - Porto Space Team
-
+
@@ -13,15 +13,8 @@
- Hi! I'm an Informatics and Computer Engineering student at FEUP, Portugal.
- I have always liked to learn new things and improve my knowledge of different areas.
- Therefore, joining Porto Space Team was a great opportunity to learn more about space related topics, as well as about all the engineering's involved in space projects.
-
+ Hi! I'm an Informatics and Computer Engineering student at FEUP, Portugal.
+ I have always liked to learn new things and improve my knowledge of different areas.
+ Therefore, joining Porto Space Team was a great opportunity to learn more about space related
+ topics, as well as about all the engineering's involved in space projects.
Contacts
diff --git a/members/joao-gil/reports/assets-sitrep2/componentsInteractions3.png b/members/joao-gil/reports/assets-sitrep2/componentsInteractions3.png
deleted file mode 100644
index 3ea3380..0000000
Binary files a/members/joao-gil/reports/assets-sitrep2/componentsInteractions3.png and /dev/null differ
diff --git a/members/joao-gil/reports/assets-sitrep2/softwareFlow3.png b/members/joao-gil/reports/assets-sitrep2/softwareFlow3.png
deleted file mode 100644
index 37572ed..0000000
Binary files a/members/joao-gil/reports/assets-sitrep2/softwareFlow3.png and /dev/null differ
diff --git a/members/luis-teixeira.html b/members/luis-teixeira.html
new file mode 100644
index 0000000..38dddb0
--- /dev/null
+++ b/members/luis-teixeira.html
@@ -0,0 +1,53 @@
+
+
+
+
+
+ Staff Details: Luís Teixeira | E-42 Computing Dept. - Porto Space Team
+
+
+
+
+
+
+
+
+
+
E-42 Computing Dept. | Porto Space Team
+
Staff Details: Luís Teixeira
+
+
+
+
+
+
+
+ TERMINATED.
+
Achievements
+
+
+
Nothing to declare, left the team.
+
+
+
Relevant Education background
+
+
+
ISEP/LEI Year 1 completed.
+
+
+
About
+
TODO
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/members/luis-teixeira/index.html b/members/luis-teixeira/index.html
deleted file mode 100644
index 9d6ac68..0000000
--- a/members/luis-teixeira/index.html
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
-
-
- Staff Details: Luís Teixeira | E-42 SoftEng Dept. - Porto Space Team
-
-
-
-
-
-
-
-
-
Experiment with selected Open Source COTS TRS Receiver;
-
Design specification for our own either using paper or figma;
-
Implement possibly using FreePascal.
-
-
-
Relevant Education background
-
-
-
LEEC at FEUP, first year completed.
-
-
-
About
-
TODO
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/members/joao-gil/index.html b/members/monkin.html
similarity index 59%
rename from members/joao-gil/index.html
rename to members/monkin.html
index 47d0a8f..1c3af47 100644
--- a/members/joao-gil/index.html
+++ b/members/monkin.html
@@ -3,9 +3,9 @@
- Staff Details: João Gil | E-42 SoftEng Dept. - Porto Space Team
+ Staff Details: João Gil | E-42 Computing Dept. - Porto Space Team
-
+
@@ -13,19 +13,8 @@
+ Hi everyone, I'm currently in my 1th year of Masters in Informatics and Computing Engineering
+ at Feup, Portugal. I'm from Chaves, Vila Real, but I'm living in Porto.
+
+ I'm a person who likes to know everything that goes around me, and how Physics and
+ Maths is present on those things. Saying this, I sooner found interest in joining the
+ Porto Space Team and this project. With this project I know I'll learn a lot about space
+ technology and more specific topics.
+
+ Along with these technical interests, I'm also passionate about sports, especially football (every
+ kind,
+ from futsal
+ to beach football). Thus, my free time is fulfilled with doing sports, playing video games,
+ obviously
+ watching tv
+ (anime/movies/series) and hang out with friends.
+
Bachelor's in Informatics and Computing Engineering at FEUP
-
Mobile Developer at Smartex.ai (Internship)
-
-
- For more information, check my CV on LinkedIn
-
-
-
About
-
- Hi everyone, I'm currently in my 1th year of Masters in Informatics and Computing Engineering
- at Feup, Portugal. I'm from Chaves, Vila Real, but I'm living in Porto.
-
- I'm a person who likes to know everything that goes around me, and how Physics and
- Maths is present on those things. Saying this, I sooner found interest in joining the
- Porto Space Team and this project. With this project I know I'll learn a lot about space
- technology and more specific topics.
-
- Along with these technical interests, I'm also passionate about sports, especially football (every kind,
- from futsal
- to beach football). Thus, my free time is fulfilled with doing sports, playing video games, obviously
- watching tv
- (anime/movies/series) and hang out with friends.
-
Codeberg as our GIT host, and markdown for periodic reports;
-
Google Drive for storing documents. This department will always present more formal final reports in
- LaTeX, these are produced by the Project Manager;
-
-
Learning resources
-
-
GIT
+
+
+
+
E-42 Software and Computer Engineering Dept. | Porto Space Team
Welcome to E-42, and thank you for your interest in joining us!
+
Please read the Final Report (sitrep), a continuous Work In Progress, linked in the top menu so you
+ understand the State of The
+ Art (SoTA) of this department.
+
We use certain tools and methodologies here, and it's important that you know how they work and be
+ consistent.
+
+
This department has three levels of command:
+
+
Product Owner - External to the E-42 dept., specifies mission goals;
+
Project Manager - Manages and Coordinates the department, reviews the progress and
+ produces the final report;
+
Project Master - Implementation team leader.
+
+
+
In the project INVICTUS (our rocket), Diogo Peralta Cordeiro is
+ working as Project Manager, and João Gil as Project Master. The
+ Product Owner is Pedro Afonso from the E-20 Electrical and
+ Electronics Engineering Department.
Codeberg as our GIT host, and markdown for periodic reports;
+
Google Drive for storing documents. This department will always present more formal final reports
+ in
+ LaTeX, these are produced by the Project Manager;
+
+
-
+
-
\ No newline at end of file
+
+
+
+
+
diff --git a/members/luis-jesus/reports/euroc_cap3.5_resumo.md b/reports/2022-08-13_euroc_floater3.md
similarity index 100%
rename from members/luis-jesus/reports/euroc_cap3.5_resumo.md
rename to reports/2022-08-13_euroc_floater3.md
diff --git a/members/luis-jesus/reports/sitrep2.md b/reports/2022-08-25_logging_floater3.md
similarity index 100%
rename from members/luis-jesus/reports/sitrep2.md
rename to reports/2022-08-25_logging_floater3.md
diff --git a/members/joao-gil/reports/sitRep2.md b/reports/2022-09-04_TRS_monkin.md
similarity index 95%
rename from members/joao-gil/reports/sitRep2.md
rename to reports/2022-09-04_TRS_monkin.md
index f74b434..884ae9a 100644
--- a/members/joao-gil/reports/sitRep2.md
+++ b/reports/2022-09-04_TRS_monkin.md
@@ -3,9 +3,11 @@
# Comparison between different TRS Receiver Systems
## Introduction
+
The aim of this report is to analyze and compare existing Total Recovery Systems (TRS), in order to know the requirements of such a system and help us taking important technical decisions, such as the software's architecture and tech stack.
Unfortunately, I wasn't able to find many projects with source code that fitted exactly our own. However, I've narrowed it down to 3 that are very similar, namely:
+
1. Rocket Tracker 1 - Model Rocket tracking system
2. White Vest Model Rocket 2 - A more complete model rocket tracking system
3. Vehicle Tracking System 3 - Vehicle tracking system
@@ -13,8 +15,9 @@ Unfortunately, I wasn't able to find many projects with source code that fitted
Since there isn't a decision yet made regarding the radio transceiver that will be used, I've included examples with both LoRa and XBee modules.
## 1 - Rocket Tracker
+
This tracking system objective is to find a model rocket via GPS and display its location in a map, via a client app. To have an idea of the structure and the relationship between its components, I've made the following simplified diagram:
-![Rocket Tracker's components diagram](assets-sitrep2/componentsDiagram1.png)
+![Rocket Tracker's components diagram](assets/COTS/componentsDiagram1.png)
Please note that the arrows in the diagram represent a dependency association.
Since this report's main focus is on the receiver system, I will not give many details about the transmitter. Anyhow, it is important to know that the radio system is an **XBee radio** in both the sender and receiver. Furthermore, the transmission packets are 9-byte packets made up of a status byte, then 4 bytes for latitude, and 4 bytes for longitude. Thus, it's important to note that this tracking system does not send as much data as we seek.
@@ -26,30 +29,35 @@ Lastly, the ground station has an event-driven architecture, based on events fro
---
## 2 - White Vest Model Rocket
-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**.
+
+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-sitrep2/softwareArc2.png)
-
+![White Vest's Software Architecture](assets/COTS/softwareArc2.png)
### Air Program
-In the Sensor Reading Thread, 2 devices are accessed, the BMP388 and LSM303. To fetch the value of pressure, temperature, acceleration, and magnetic orientation. These values are added to a thread-safe queue and a thread-safe single value holder. This thread can capture about 4 sets of sensor readings per second (the BMP388 reads out data quite slowly).
+
+In the Sensor Reading Thread, 2 devices are accessed, the BMP388 and LSM303. To fetch the value of pressure, temperature, acceleration, and magnetic orientation. These values are added to a thread-safe queue and a thread-safe single value holder. This thread can capture about 4 sets of sensor readings per second (the BMP388 reads out data quite slowly).
A separate thread reads the thread-safe queue and logs that data to a CSV file on the device. Further, an additional thread reads that thread-safe single value and transmits that data via the LoRa transceiver as floats packed into a byte array (only the most recently read data is transmitted rather than everything from the queue to have near-real-time data).
### Ground Program
+
On the ground, the LoRa transceiver receives those byte arrays, unpacks them to floats, and puts the data into a thread-safe queue. Another thread reads from that queue, logs that data to a CSV file, and appends the data to a thread-safe data buffer.
A 3rd thread acts as a webserver to serve the dashboard web app, and a final thread listens for WebSocket connections to stream the contents of the data buffer as data becomes available.
### Data Transmission
+
The transmitted data is a simple binary sequence of doubles in the following order: unix timestamp, barometric pressure, temperature, acceleration X, acceleration Y, acceleration Z, magnetic direction X, Y and Z, latitude, longitude, GPS signal quality, number of GPS sats.
### Tech Stack
+
- Transmitter - Python
-- Ground Station - Go (handle telemetry data), Javascript(frontend) & Arduino(Configure the LoRa transceiver)
+- Ground Station - Go (handle telemetry data), Javascript(frontend) & Arduino(Configure the LoRa transceiver)
### Relevant Libraries
+
For python, the [adafruit_rfm9x](https://docs.circuitpython.org/projects/rfm9x/en/latest/api.html) library provides an interface that allows sending/receiving bytes of data in long range LoRa mode.
For the arduino, the [RH_RF95.h](https://www.airspayce.com/mikem/arduino/RadioHead/classRH__RF95.html) library provides a driver to send/receive unaddressed, unreliable datagram via a LoRa transceiver. This library helps to change the transceiver configuration and to receive data from it. Furthermore, [Serial](https://www.arduino.cc/reference/en/language/functions/communication/serial/) is frequently used for the communication between the arduino board and the computer.
@@ -57,22 +65,26 @@ For the arduino, the [RH_RF95.h](https://www.airspayce.com/mikem/arduino/RadioHe
---
## 3 - Vehicle Tracking System
+
This project is not a *Rocket TRS*. Nonetheless, it consists of a secure Vehicle Tracking System that uses **XBee's wireless technology**, like the first project, and displays the results on *Google Earth*, making it very similar software-wise. This one, however, lacks the source code, so it's not as thorough. As usual, below is an image representing the interactions between the components of this system:
-![Vehicle Tracking System components' interactions](assets-sitrep2/componentsInteractions3.png)
+![Vehicle Tracking System components' interactions](assets/COTS/componentsInteractions3.png)
As you can see, the vehicle contains an Arduino UNO that communicates with a GPS device and sends the received data to the Zigbee Transmitter. On the other hand, the ground station has an **Xbee module** connected to the PC through USB. Thus, when this module receives data, it will be sent to the computer and parsed, showing it on Google Earth in real time.
### Tech Stack
+
- Transmitter - Arduino
- Receiver - Arduino
### Software Flow
+
The operation of the entire system is best described by the following Flowchart:
-![Vehicle Tracking System Flowchart](assets-sitrep2/softwareFlow3.png)
+![Vehicle Tracking System Flowchart](assets/COTS/softwareFlow3.png)
### Relevant Tools / Libraries
+
- [*XCTU* Program](https://www.digi.com/products/embedded-systems/digi-xbee/digi-xbee-tools/xctu) - Used to monitor the communication between *XBees* and list the data received from the transmitter.
- *wiring* library - Arduino library which makes IO operations much easier.
- [TinyGPS](https://www.arduino.cc/reference/en/libraries/tinygps/) - GPS NMEA parsing library
@@ -81,17 +93,19 @@ The operation of the entire system is best described by the following Flowchart:
---
## Conclusion
+
After analyzing various examples of Total Recovery Systems, the 3 displayed in this report were the ones I found to be more useful to learn from. Especially the first 2, since they go into more detail and include the source code.
The integration of GPS with XBee/LoRa is a valid solution for a continuous and real-time tracking system, replacing the traditional *GSM* and *GPRS* protocols, which had a higher transmission cost and complexity.
-There are still decisions to be made regarding the software solution we are building and one of the main purposes of this report was to raise and help answer them. As an example, in the *Rocket Tracker* project, the ground station stores the received telemetry data in a database, making it available to multiple devices, such as smartphones. As in the other 2, the ground station uses the data directly to display information.
+There are still decisions to be made regarding the software solution we are building and one of the main purposes of this report was to raise and help answer them. As an example, in the *Rocket Tracker* project, the ground station stores the received telemetry data in a database, making it available to multiple devices, such as smartphones. As in the other 2, the ground station uses the data directly to display information.
There are also many useful tools and libraries mentioned in this report that could be effective in our software, such as the *XCTU* program. Furthermore, I've included ground station implementations with an event-driven architecture (*Rocket Tracker*) and thread-based (*White Vest*) as they are both valid options to be considered. Certainly, event-based concurrency is also an option to have the best of both worlds.
Finally, regarding the *Tech Stack*, there are various options for both the Transmitter and Receiver. For the ground station, this report includes solutions using *Node.js*, *Go* along with *Arduino* for the configuration of the XBee module and *Arduino*. However, there are certainly more possibilities to take into account, such as Java or C++, but to make the right decision, I believe we need more information, such as how optimized our program must be and how the telemetry data will be displayed.
## References
+
\[1\] [Rocket Tracker Project](https://github.com/lectroidmarc/rocket-tracker)
\[2\] [White Vest GitHub](https://github.com/johnjones4/white-vest)
@@ -102,10 +116,5 @@ Finally, regarding the *Tech Stack*, there are various options for both the Tran
\[5\] Arduino Documentation
-
Published by João Mesquita
-
-
-
-
diff --git a/members/luis-jesus/reports/sitrep3/sitrep3.md b/reports/2022-10-08_parachute_floater3.md
similarity index 98%
rename from members/luis-jesus/reports/sitrep3/sitrep3.md
rename to reports/2022-10-08_parachute_floater3.md
index d25e3c2..b07a3c4 100644
--- a/members/luis-jesus/reports/sitrep3/sitrep3.md
+++ b/reports/2022-10-08_parachute_floater3.md
@@ -62,7 +62,7 @@ Considering this, there is not information about parachute deployment
using Pixhawk + Ardupilot on rocketry, but we can see a more \"typical\"
case (for example, how it is used in drones).
-![image](assets/missionplanner.png)
+![image](assets/Pixhawk/missionplanner.png)
Parachute Deployment System
===========================
@@ -108,7 +108,7 @@ because there are many subjects crossing our theoretical implementation.
This terms and configurations are important to discuss with other
departments:
-![image](assets/mpsetup.png)
+![image](assets/Pixhawk/mpsetup.png)
Apart from this, there is a project called
[ArduRocket](https://diydrones.com/forum/topics/ardurocket?xg_source=activity)
diff --git a/members/joao-gil/reports/sitRep3.md b/reports/2022-11-02_pixhawk_monkin.md
similarity index 94%
rename from members/joao-gil/reports/sitRep3.md
rename to reports/2022-11-02_pixhawk_monkin.md
index 22c6f89..ff986c7 100644
--- a/members/joao-gil/reports/sitRep3.md
+++ b/reports/2022-11-02_pixhawk_monkin.md
@@ -3,28 +3,33 @@
# How we can introduce a Rocket Model to a Pixhawk-based board
## Introduction
+
This report aims to study the viability of using a *Pixhawk* board as the central controller of a model rocket. The system must be able to capture relevant data from sensors, send telemetry information to a ground station, store logs in persistent memory, and trigger parachute systems.
----
+---
+
## High-level perspective of a Flight Stack
+
To understand the requirements of the model rocket system, I'll present an overview of a typical flight system for drones, since the architecture is very similar.
-![System Overview 1](assets-sitrep3/systemOverview1.png)
+![System Overview 1](assets/Pixhawk/systemOverview1.png)
Fig. 1 - System Overview
In the image above, to translate the system to the context of a rocket, the only component that differs is the **Drone Hardware**. This component represents the elementary drone components, such as the battery, the motors, and the GPS. Thankfully, some of these elementary components are common to both drones and rockets.
### Drone Section
+
Now focusing on the Drone section:
-![System Overview 1](assets-sitrep3/droneOverview.png)
+![System Overview 1](assets/Pixhawk/droneOverview.png)
Fig. 2 - Drone Overview
As we can see, above the Drone hardware is the *Flight Controller Hardware*. This is the responsibility of the **Pixhawk Board**, which is the object of study. Focusing on the *Pixhawk*, the sensors and components from the layer below (GPS, telemetry modules, etc.) hook into it, forming an essential **hardware hub**. This hub is then used by the *Software layer* to control the drones' basic components.
-Regarding the top layer, the most common *Flight Controller Software* are:
+Regarding the top layer, the most common *Flight Controller Software* are:
+
1. *Ardupilot*
- Oldest software
- More examples are using this software
@@ -32,23 +37,24 @@ Regarding the top layer, the most common *Flight Controller Software* are:
2. *PX4*
- Created based on *Ardupilot*
- Feature-wise they seem to equivalent
- - Official documentation available.
+ - Official documentation available.
- Operates under the BSD license, i.e changes made to the source code don't need to be updated to the master branch
For our system, any of the two software should work. Based on the official docs, I prefer the *PX4* organization.
### Simulation
+
Thankfully, it is possible to test the *Flight Controller Software* without acquiring the hardware, through *STL (Software In The Loop)*.
-![Drone STL](assets-sitrep3/droneSTL.png)
+![Drone STL](assets/Pixhawk/droneSTL.png)
Fig. 3 - STL Simulation
-
### Ground Control Station
+
Now focusing on the Ground Control Station:
-![Ground Control Station](assets-sitrep3/groundStationOverview.png)
+![Ground Control Station](assets/Pixhawk/groundStationOverview.png)
Fig. 4 - Ground Control Station
@@ -61,43 +67,44 @@ Additionally, this layer also contains packages that can control vehicles, with
---
## PX4 Deep Dive
+
As mentioned above, PX4 is one of the most popular *Flight Controller Software*. For that reason, we will explore it in more detail since its supported features are very similar to *Ardupilot* and the documentation is easier to follow.
### Supported Vehicles
+
Although PX4 supports a high variety of vehicles, model rockets are not part of that list. Nonetheless, I believe that is not an issue since this list is targeted for the usage of the software as a *Professional Autopilot*, that is, controlling the vehicle's trajectory and moving it as desired. In our use case, that feature isn't required so it should be fine as long as the features mentioned in the [Introduction](##Introduction) are supported.
### System Architecture
+
The *PX4* documentation provides a high-level overview of a typical PX4 system based around a flight controller.
- ![PX4 System Architecture](assets-sitrep3/px4SimpleDiagram.png)
+ ![PX4 System Architecture](assets/Pixhawk/px4SimpleDiagram.png)
Fig. 5 - PX4 System Architecture
Note that this architecture is similar to what we wish to achieve, as it contains most of the sensors required for the model rocket. The missing pieces in the diagram are the [*parachute triggering*](https://docs.px4.io/main/en/peripherals/parachute.html) and [*persistent storage*](https://docs.px4.io/main/en/dev_log/logging.html), which are also supported and documented.
### Flight Controllers
+
There are many *Pixhawk* boards to choose from, such as the [Pixhawk 4](https://docs.px4.io/main/en/flight_controller/pixhawk4.html). The comparison and analysis of the most suitable board should be made in collaboration with the *Electrical Engineering Department*.
### Supported Sensors
+
It is confirmed that the Pixhawk + PX4 combination supports the sensors and radio systems we are looking for. Anyhow, there are a lot of options to choose from and, once again, contact with the *Electrical Engineering Department* is needed to reach a consensus.
---
## Conclusion and Next Steps
+
After analyzing this information, *Pixhawk* seems to be a promising board to introduce in our model rocket. However, the current information isn't enough to reach a conclusion. To do so, we must convert this theoretical information into a practical example. Thankfully, the *Software in the Loop* solution mentioned in this report provides a way to simulate the *Pixhawk* and the rocket model. Thus, the next steps involve testing this *PX4* and *Ardupilot* software, to ensure they fit our needs and are capable of adapting to our scenario.
-
## References
+
\[1\] [Drone Programming Course](https://www.youtube.com/playlist?list=PLgiealSjeVyx3t4N9GroE29SbVwhYrOtL)
\[2\] [PX4 User Guide](https://docs.px4.io/main/en/)
\[3\] [Ardupilot](https://ardupilot.org/)
-
Published by João Mesquita
-
-
-
-
diff --git a/members/afonso-baldo/reports/sitrep1.md b/reports/2022-11-04_tm_afonsob.md
similarity index 100%
rename from members/afonso-baldo/reports/sitrep1.md
rename to reports/2022-11-04_tm_afonsob.md
diff --git a/members/joao-gil/reports/assets-sitrep2/componentsDiagram1.png b/reports/assets/COTS/componentsDiagram1.png
similarity index 100%
rename from members/joao-gil/reports/assets-sitrep2/componentsDiagram1.png
rename to reports/assets/COTS/componentsDiagram1.png
diff --git a/reports/assets/COTS/componentsInteractions3.png b/reports/assets/COTS/componentsInteractions3.png
new file mode 100644
index 0000000..c261356
Binary files /dev/null and b/reports/assets/COTS/componentsInteractions3.png differ
diff --git a/members/afonso-baldo/reports/sit-rep1-img/eggtimer_data.png b/reports/assets/COTS/eggtimer_data.png
similarity index 100%
rename from members/afonso-baldo/reports/sit-rep1-img/eggtimer_data.png
rename to reports/assets/COTS/eggtimer_data.png
diff --git a/members/joao-gil/reports/assets-sitrep2/softwareArc2.png b/reports/assets/COTS/softwareArc2.png
similarity index 100%
rename from members/joao-gil/reports/assets-sitrep2/softwareArc2.png
rename to reports/assets/COTS/softwareArc2.png
diff --git a/reports/assets/COTS/softwareFlow3.png b/reports/assets/COTS/softwareFlow3.png
new file mode 100644
index 0000000..2623524
Binary files /dev/null and b/reports/assets/COTS/softwareFlow3.png differ
diff --git a/members/afonso-baldo/reports/sit-rep1-img/dashboard.png b/reports/assets/COTS/whitevest_dashboard.png
similarity index 100%
rename from members/afonso-baldo/reports/sit-rep1-img/dashboard.png
rename to reports/assets/COTS/whitevest_dashboard.png
diff --git a/members/joao-gil/reports/assets-sitrep3/droneOverview.png b/reports/assets/Pixhawk/droneOverview.png
similarity index 100%
rename from members/joao-gil/reports/assets-sitrep3/droneOverview.png
rename to reports/assets/Pixhawk/droneOverview.png
diff --git a/members/joao-gil/reports/assets-sitrep3/droneSTL.png b/reports/assets/Pixhawk/droneSTL.png
similarity index 100%
rename from members/joao-gil/reports/assets-sitrep3/droneSTL.png
rename to reports/assets/Pixhawk/droneSTL.png
diff --git a/members/joao-gil/reports/assets-sitrep3/groundStationOverview.png b/reports/assets/Pixhawk/groundStationOverview.png
similarity index 100%
rename from members/joao-gil/reports/assets-sitrep3/groundStationOverview.png
rename to reports/assets/Pixhawk/groundStationOverview.png
diff --git a/members/luis-jesus/reports/sitrep3/assets/missionplanner.png b/reports/assets/Pixhawk/missionplanner.png
similarity index 100%
rename from members/luis-jesus/reports/sitrep3/assets/missionplanner.png
rename to reports/assets/Pixhawk/missionplanner.png
diff --git a/members/luis-jesus/reports/sitrep3/assets/mpsetup.png b/reports/assets/Pixhawk/mpsetup.png
similarity index 100%
rename from members/luis-jesus/reports/sitrep3/assets/mpsetup.png
rename to reports/assets/Pixhawk/mpsetup.png
diff --git a/members/joao-gil/reports/assets-sitrep3/px4SimpleDiagram.png b/reports/assets/Pixhawk/px4SimpleDiagram.png
similarity index 100%
rename from members/joao-gil/reports/assets-sitrep3/px4SimpleDiagram.png
rename to reports/assets/Pixhawk/px4SimpleDiagram.png
diff --git a/members/joao-gil/reports/assets-sitrep3/systemOverview1.png b/reports/assets/Pixhawk/systemOverview1.png
similarity index 100%
rename from members/joao-gil/reports/assets-sitrep3/systemOverview1.png
rename to reports/assets/Pixhawk/systemOverview1.png