Update folder system @Home (#36)

Change folder system of @Home
RoBorregos · Oct 15, 2024 · 0e8ccbe · 0e8ccbe
2 parents 7308e7d + 2460b7a
commit 0e8ccbe
Show file tree

Hide file tree

Showing 52 changed files with 57 additions and 11 deletions.
diff --git a/docs/home/.pages b/docs/home/.pages
@@ -2,5 +2,4 @@ nav:
     - index.md
     - Overview
     - Areas
-    - Aug 2023 - Jun 2024
-    - Aug 2022 - Jun 2023
+    - ...
diff --git a/... Vision/Human Analysis/Pose Estimation.md → ... Vision/Human Analysis/Pose Estimation.md b/... Vision/Human Analysis/Pose Estimation.md → ... Vision/Human Analysis/Pose Estimation.md
diff --git a/...3/Computer Vision/Human Analysis/index.md → ...3/Computer Vision/Human Analysis/index.md b/...3/Computer Vision/Human Analysis/index.md → ...3/Computer Vision/Human Analysis/index.md
diff --git a/...ction/Custom Models/TFLite Model Maker.md → ...ction/Custom Models/TFLite Model Maker.md b/...ction/Custom Models/TFLite Model Maker.md → ...ction/Custom Models/TFLite Model Maker.md
diff --git a/.../Object Detection/Custom Models/yolov5.md → .../Object Detection/Custom Models/yolov5.md b/.../Object Detection/Custom Models/yolov5.md → .../Object Detection/Custom Models/yolov5.md
diff --git a/...bject Detection/Dataset Automatization.md → ...bject Detection/Dataset Automatization.md b/...bject Detection/Dataset Automatization.md → ...bject Detection/Dataset Automatization.md
diff --git a/...Computer Vision/Object Detection/index.md → ...Computer Vision/Object Detection/index.md b/...Computer Vision/Object Detection/index.md → ...Computer Vision/Object Detection/index.md
diff --git a/... 2022 - Jun 2023/Computer Vision/index.md → .../2022 - Jun 2023/Computer Vision/index.md b/... 2022 - Jun 2023/Computer Vision/index.md → .../2022 - Jun 2023/Computer Vision/index.md
diff --git a/.../Electronics and Control/Boards/Boards.md → .../Electronics and Control/Boards/Boards.md b/.../Electronics and Control/Boards/Boards.md → .../Electronics and Control/Boards/Boards.md
diff --git a/...ics and Control/Boards/stepperPruebas.ino → ...ics and Control/Boards/stepperPruebas.ino b/...ics and Control/Boards/stepperPruebas.ino → ...ics and Control/Boards/stepperPruebas.ino
diff --git a/...n 2023/Electronics and Control/Control.md → ...n 2023/Electronics and Control/Control.md b/...n 2023/Electronics and Control/Control.md → ...n 2023/Electronics and Control/Control.md
diff --git a/...23/Electronics and Control/Electronics.md → ...23/Electronics and Control/Electronics.md b/...23/Electronics and Control/Electronics.md → ...23/Electronics and Control/Electronics.md
diff --git a/...Jun 2023/Human Robot Interaction/index.md → ...Jun 2023/Human Robot Interaction/index.md b/...Jun 2023/Human Robot Interaction/index.md → ...Jun 2023/Human Robot Interaction/index.md
diff --git a/...man Robot Interaction/speech/GPT-3 API.md → ...man Robot Interaction/speech/GPT-3 API.md b/...man Robot Interaction/speech/GPT-3 API.md → ...man Robot Interaction/speech/GPT-3 API.md
diff --git a/...3/Human Robot Interaction/speech/index.md → ...3/Human Robot Interaction/speech/index.md b/...3/Human Robot Interaction/speech/index.md → ...3/Human Robot Interaction/speech/index.md
diff --git a/...obot Interaction/speech/speech_to_text.md → ...obot Interaction/speech/speech_to_text.md b/...obot Interaction/speech/speech_to_text.md → ...obot Interaction/speech/speech_to_text.md
diff --git a/...obot Interaction/speech/text_to_speech.md → ...obot Interaction/speech/text_to_speech.md b/...obot Interaction/speech/text_to_speech.md → ...obot Interaction/speech/text_to_speech.md
diff --git a/...3/Integration and Networks/Jetson Nano.md → ...3/Integration and Networks/Jetson Nano.md b/...3/Integration and Networks/Jetson Nano.md → ...3/Integration and Networks/Jetson Nano.md
diff --git a/...gration and Networks/Jetson Xavier Agx.md → ...gration and Networks/Jetson Xavier Agx.md b/...gration and Networks/Jetson Xavier Agx.md → ...gration and Networks/Jetson Xavier Agx.md
diff --git a/... 2023/Integration and Networks/Network.md → ... 2023/Integration and Networks/Network.md b/... 2023/Integration and Networks/Network.md → ... 2023/Integration and Networks/Network.md
diff --git a/...un 2023/Integration and Networks/index.md → ...un 2023/Integration and Networks/index.md b/...un 2023/Integration and Networks/index.md → ...un 2023/Integration and Networks/index.md
diff --git a/...Jun 2023/Mechanics/DashGO x ARM/Design.md → ...Jun 2023/Mechanics/DashGO x ARM/Design.md b/...Jun 2023/Mechanics/DashGO x ARM/Design.md → ...Jun 2023/Mechanics/DashGO x ARM/Design.md
diff --git a/...ug 2022 - Jun 2023/Mechanics/RBGS/Base.md → ...me/2022 - Jun 2023/Mechanics/RBGS/Base.md b/...ug 2022 - Jun 2023/Mechanics/RBGS/Base.md → ...me/2022 - Jun 2023/Mechanics/RBGS/Base.md
diff --git a/.../home/Aug 2022 - Jun 2023/Team Members.md → docs/home/2022 - Jun 2023/Team Members.md b/.../home/Aug 2022 - Jun 2023/Team Members.md → docs/home/2022 - Jun 2023/Team Members.md
diff --git a/docs/home/Aug 2022 - Jun 2023/index.md → docs/home/2022 - Jun 2023/index.md b/docs/home/Aug 2022 - Jun 2023/index.md → docs/home/2022 - Jun 2023/index.md
@@ -1,4 +1,5 @@
-# Developments from 2022-2023
+# Achievements from 2022 - June 2023
+This period was characterized by the acquisition of a new hardware platform (Dashgo B1 + xArm 5) which was assembled with the purpose of having a functional platform to compete on the Mexican Robotics Tournament 2023. The main focus during this period was pure development, paved with hardware and integration issues.
 
 ## Electronics and Control
 Designed and manufactured a PCB for handling the SCARA robot's motors and arm. 

diff --git a/...Vision/Human Analysis/Face Recognition.md → ...Vision/Human Analysis/Face Recognition.md b/...Vision/Human Analysis/Face Recognition.md → ...Vision/Human Analysis/Face Recognition.md
diff --git a/... Vision/Human Analysis/Person Counting.md → ... Vision/Human Analysis/Person Counting.md b/... Vision/Human Analysis/Person Counting.md → ... Vision/Human Analysis/Person Counting.md
diff --git a/... Vision/Human Analysis/Person Tracking.md → ... Vision/Human Analysis/Person Tracking.md b/... Vision/Human Analysis/Person Tracking.md → ... Vision/Human Analysis/Person Tracking.md
diff --git a/...Vision/Object Detection/Seat Detection.md → ...Vision/Object Detection/Seat Detection.md b/...Vision/Object Detection/Seat Detection.md → ...Vision/Object Detection/Seat Detection.md
diff --git a/...Vision/Object Detection/ShelfDetection.md → ...Vision/Object Detection/ShelfDetection.md b/...Vision/Object Detection/ShelfDetection.md → ...Vision/Object Detection/ShelfDetection.md
diff --git a/...4/Computer Vision/Utils/ZED_Simulation.md → ...3/Computer Vision/Utils/ZED_Simulation.md b/...4/Computer Vision/Utils/ZED_Simulation.md → ...3/Computer Vision/Utils/ZED_Simulation.md
diff --git a/... 2023 - Jun 2024/Computer Vision/index.md → docs/home/2023/Computer Vision/index.md b/... 2023 - Jun 2024/Computer Vision/index.md → docs/home/2023/Computer Vision/index.md
diff --git a/...Jun 2024/Electronics and Control/index.md → ...ome/2023/Electronics and Control/index.md b/...Jun 2024/Electronics and Control/index.md → ...ome/2023/Electronics and Control/index.md
diff --git a/...Human Physical Analysis/Face Following.md → ...Human Physical Analysis/Face Following.md b/...Human Physical Analysis/Face Following.md → ...Human Physical Analysis/Face Following.md
diff --git a/...ot Interaction/Robot Interface/Display.md → ...ot Interaction/Robot Interface/Display.md b/...ot Interaction/Robot Interface/Display.md → ...ot Interaction/Robot Interface/Display.md
diff --git a/...teraction/Speech/Action Interpretation.md → ...teraction/Speech/Action Interpretation.md b/...teraction/Speech/Action Interpretation.md → ...teraction/Speech/Action Interpretation.md
diff --git a/...raction/Speech/Human Speech Processing.md → ...raction/Speech/Human Speech Processing.md b/...raction/Speech/Human Speech Processing.md → ...raction/Speech/Human Speech Processing.md
diff --git a/...Jun 2024/Human Robot Interaction/index.md → ...ome/2023/Human Robot Interaction/index.md b/...Jun 2024/Human Robot Interaction/index.md → ...ome/2023/Human Robot Interaction/index.md
diff --git a/...un 2024/Integration and Networks/index.md → ...me/2023/Integration and Networks/index.md b/...un 2024/Integration and Networks/index.md → ...me/2023/Integration and Networks/index.md
diff --git a/...- Jun 2024/Manipulation/Pick and Place.md → .../home/2023/Manipulation/Pick and Place.md b/...- Jun 2024/Manipulation/Pick and Place.md → .../home/2023/Manipulation/Pick and Place.md
diff --git a/...024/Manipulation/Planning and Hardware.md → ...023/Manipulation/Planning and Hardware.md b/...024/Manipulation/Planning and Hardware.md → ...023/Manipulation/Planning and Hardware.md
diff --git a/...Aug 2023 - Jun 2024/Manipulation/index.md → docs/home/2023/Manipulation/index.md b/...Aug 2023 - Jun 2024/Manipulation/index.md → docs/home/2023/Manipulation/index.md
diff --git a/...me/Aug 2023 - Jun 2024/Mechanics/index.md → docs/home/2023/Mechanics/index.md b/...me/Aug 2023 - Jun 2024/Mechanics/index.md → docs/home/2023/Mechanics/index.md
diff --git a/...e/Aug 2023 - Jun 2024/Navigation/index.md → docs/home/2023/Navigation/index.md b/...e/Aug 2023 - Jun 2024/Navigation/index.md → docs/home/2023/Navigation/index.md
diff --git a/.../home/Aug 2023 - Jun 2024/Team Members.md → docs/home/2023/Team Members.md b/.../home/Aug 2023 - Jun 2024/Team Members.md → docs/home/2023/Team Members.md
diff --git a/docs/home/Aug 2023 - Jun 2024/index.md → docs/home/2023/index.md b/docs/home/Aug 2023 - Jun 2024/index.md → docs/home/2023/index.md
@@ -1,6 +1,9 @@
-# Developments from 2023-2024
+# Achievements from 2023
 
-This year development is focused around expanding and updating the software areas of our current hardware setup, with a new project based on the development of a custom omnidirectional mobile base.
+This year was focused around expanding and updating the software areas of our current hardware setup, focusing in the tasks for the competition, and a side new project based on the development of a custom omnidirectional mobile base.
+After participating in the Mexican Robotics Tournament, a lot of senior college member of the team graduated, transfering the knowledge and leadership. New features were built on top of the previous developments, with the purpose of submitting the qualification material for the RoboCup 2024 competition.
+
+Here is our uploaded [Team Description Paper](https://athome.robocup.org/wp-content/uploads/OPL-RoBorregosTDP2023.pdf) and [Video](https://www.youtube.com/watch?v=rPmSxZlzO78), for the Second Call for Participation for the Open Platform League.
 
 ## [Electronics and Control](Electronics%20and%20Control/index.md)
 - Started development of PCBs for the omnidirectional mobile base.
@@ -25,7 +28,6 @@ This year development is focused around expanding and updating the software area
 ## [Integration and Networks](Integration%20and%20Networks/index.md)
 ### ROS
 - Replaced a previous web socket solution for communicating two roscores with a multimaster solution, allowing for more robust and faster communication between the robot software modules.
-- Started development of ROS2 migration.
 
 ## [Computer Vision](Computer%20Vision/index.md)
 ### Human Recognition

diff --git a/docs/home/2024/Human-Robot Interaction/index.md b/docs/home/2024/Human-Robot Interaction/index.md
@@ -0,0 +1 @@
+# HRI
diff --git a/docs/home/2024/Integration/index.md b/docs/home/2024/Integration/index.md
@@ -0,0 +1 @@
+# Integration
diff --git a/docs/home/2024/Manipulation/index.md b/docs/home/2024/Manipulation/index.md
@@ -0,0 +1 @@
+# Manipulation
diff --git a/docs/home/2024/Navigation/index.md b/docs/home/2024/Navigation/index.md
@@ -0,0 +1 @@
+# Navigation
diff --git a/docs/home/2024/index.md b/docs/home/2024/index.md
@@ -0,0 +1,38 @@
+# Achievements from 2024
+
+This year, after being [accepted](https://athome.robocup.org/2024-qualified-teams/) to participate in RoboCup 2024 held in Eindhoven, Netherlands, the team focused in developing a robust and reliable set of software modules, tailored to the specific needs for the tasks for the updated rulebook. This approach, had the purpose of showcasing a functional robot for both the Mexican Robotics Tournament (April; Monterrey, Mexico) and the RoboCup (July; Eindhoven, Netherlands).
+
+The robot was renamed as FRIDA (Friendly Robotic Interactive Domestic Assistant), an acronym reflecting the purporse of the robot, and the name in reference to Mexican culture.
+
+With the vast knowledge acquired during the international tournament, the team defined the new objectives for the remainder of the year to be: an increased focus in research and literature review, and centralized and offline refactorization of the software and systems.
+
+These are the major achievements divided by area:
+
+## [Integration](Integration/index.md)
+### Software Architecture
+- A new empty repository was created, alongside separate repositories for each area, added as submodules of the first. This allowed us to work of different branches of development in the central computational unit (Jetson AGX inside robot).
+- Every submodule was containerized, using Docker, to ease the installation process and dependency management.
+
+### Task manager
+- A new package named `task_manager` was created to handle the flow of each task using general python submodules per area.
+- There's a Python ROS node for each task, following a state machine architecture.
+
+## [Human-Robot Interaction](Human-Robot%20Interaction/index.md)
+### Natural Language Processing
+- Following the update of GPSR task, a new model was fine-tuned to cover for more complex scenarios, using GPT3.5 API as the base
+- The package `frida_language_processing` was created, with the command interpreter capable of storing context throughout the execution, a cleaner implementation of the embeddings match process for actual items in the scene, and specific features for the **Receptionist** task.
+
+### Speech
+- Keyword spotting (@Oscar-gg)
+
+### Display
+- Nadota (@FranciscoSP)
+
+## [Computer vision](Computer%20vision/index.md)
+- Nadota (@Ale-Coeto)
+
+## [Manipulation](Manipulation/index.md)
+- Nadota (@deivideich, @emilianh)
+
+## [Navigation](Navigation/index.md)
+- Nadota (@deivideich, @Chapa-1810)
diff --git a/docs/home/index.md b/docs/home/index.md
@@ -1,6 +1,6 @@
 # @Home
 
-Welcome to the @Home competition documentation of [RoBorregos](https://roborregos.com), Robotics Representative Group of [Tecnológico de Monterrey](https://tec.mx). This documentation serves as a guide for our project, which focuses on developing multiproposal software modules for the [RoboCup@Home](https://athome.robocup.org/) competition. Our goal is to create a comprehensive software architecture that enables robots to perform various tasks that humans typically handle on a daily basis.
+Welcome to the @Home competition documentation of [RoBorregos](https://roborregos.com), Robotics Representative Group of [Tecnológico de Monterrey](https://tec.mx). This documentation serves as a guide for our project, which focuses on developing a multiproposal modular service robot for the [RoboCup@Home](https://athome.robocup.org/) competition. Our goal is to create a comprehensive software architecture that enables robots to perform various tasks that humans typically handle on a daily basis.
 
 ## About the Competition
 
@@ -13,20 +13,22 @@ The focus areas include:
 - Object Manipulation
 - System Integration
 
-The RoboCup@Home competition is divided into three categories: the [Domestic Standard Platform League](https://www.robocup.org/leagues/34) (DSPL), the [Social Standard Platform League](https://www.robocup.org/leagues/15) (SSPL), and the [Open Platform League](https://www.robocup.org/leagues/14) (OPL). Our team competes in the Open Platform League.
+The RoboCup@Home competition is divided into two categories: the [Domestic Standard Platform League](https://www.robocup.org/leagues/34) (DSPL) and the [Open Platform League](https://www.robocup.org/leagues/14) (OPL). Our team competes in the Open Platform League.
 
 In the [Open Platform League](https://www.robocup.org/leagues/14), we have the opportunity to explore and showcase our innovations and advancements without limitations on the choice of hardware platforms. This category allows us to push the boundaries of robotics and demonstrate our capabilities in a variety of areas.
 
 ## Project Objective
 
-The main objective  is to actively explore and integrate state-of-the-art technologies in the field of robotics. Through our participation in the RoboCup@Home competition's Open Platform League, we aim to demonstrate our knowledge, skills, and innovative thinking in developing advanced robotic systems. By leveraging cutting-edge hardware and software, we strive to push the boundaries of current technology and create innovative solutions for real-world problems.
+The main objective is to actively research, integrate and develop state-of-the-art technologies in the field of robotics. Through our participation in the RoboCup@Home competition's Open Platform League, we aim to demonstrate our knowledge, skills, and innovative thinking in developing advanced robotic systems. By leveraging cutting-edge hardware and software, we strive to push the boundaries of current technology and create innovative solutions for real-world problems.
+
+Each year, in order to qualify for the international competition, the team has to upload a Team Description Paper with the most important scientific contributions during the last months.
 
 ## Contributing
 
-We welcome contributions from the open-source community. If you are interested in contributing to our project, please refer to the "Contributing" section for guidelines on how to get involved.
+We welcome contributions from the open-source community. If you are interested in contributing to our project, please contact the team-members to explore how to get involved.
 
 ## Contact Us
 
-If you have any questions, suggestions, or feedback regarding our project or this documentation, please feel free to reach out to us. You can find our contact information in the "Contact Us" section.
+If you have any questions, suggestions, or feedback regarding our project or this documentation, please feel free to reach out to us. 
 
 We hope you find our documentation helpful, and we wish you success in exploring and utilizing our software modules for the RoboCup@Home competition.