diff --git a/_data/navigation.yml b/_data/navigation.yml
index fa7b2cc..97494c5 100644
--- a/_data/navigation.yml
+++ b/_data/navigation.yml
@@ -4,36 +4,38 @@ main:
url: /projects
# url: /projects/index/
- title: Activities
- url: /activities/
+ url: /activities
- title: Community
# url: /community/index/
url: /community
- title: About
- url: /about/
+ url: /about
# left side bar
docs:
- title: "Projects"
url: /projects
children:
- - title: "Robotics Education & Games"
+ - title: "Robotics Education"
url: /projects/robotics_education/
- - title: "Machine Learning in Robotics"
+ - title: "AI driven Robotics"
url: /projects/machine_learning/
- - title: "Reconfigurable Computing in Robotics"
- url: /projects/fpga_robotics/
-# - title: "Robot Programming Tools"
-# url: /projects/robots_programming_tools/
+# - title: "Reconfigurable Computing in Robotics"
+# url: /projects/fpga_robotics/
+ - title: "Robot Programming Tools"
+ url: /projects/robot_programming_tools/
# - title: "Visual SLAM"
# url: /projects/visual_slam/visual_slam
# - title: "Drones"
# url: /projects/drones/drones/
- title: "Activities"
- url: /activities/
+ url: /activities
children:
- title: "Google Summer of Code"
url: /activities/gsoc/
+ - title: "Internships"
+ url: /activities/internships/
- title: "Robotics courses"
url: /activities/robotics_courses/
- title: "Tech Talks"
@@ -46,8 +48,8 @@ docs:
children:
- title: "Contributors"
url: /community/contributors/
- - title: "Students"
- url: /community/students/
- - title: "Robotics Club"
- url: /community/robotics_club/
+ # - title: "Students"
+ # url: /community/students/
+ # - title: "Robotics Club"
+ # url: /community/robotics_club/
diff --git a/_pages/about.md b/_pages/about.md
index 2e105d8..6ef3bff 100644
--- a/_pages/about.md
+++ b/_pages/about.md
@@ -9,17 +9,15 @@ sidebar:
---
-2019 Non-profit Association of Robotics and Artificial Intelligence JdeRobot.
+Non-profit Association of Robotics and Artificial Intelligence JdeRobot. VAT number: G88145909.
-G88145909.
+Alcorcón, Spain.
-Alcorcón, Madrid.
-
-JdeRobot is open source. All its code is licensed under [GPL v3](http://www.gnu.org/licenses/gpl-3.0-standalone.html).
+JdeRobot software is open source. It is licensed under [GPL v3](http://www.gnu.org/licenses/gpl-3.0-standalone.html).
![](/assets/images/about/GPLv3.png){: .align-left}
-All the documentation of JdeRobot project is licensed under [Creative Commons by-sa](https://creativecommons.org/licenses/by-sa/2.5/es/).
+All the documentation from JdeRobot org is licensed under [Creative Commons by-sa](https://creativecommons.org/licenses/by-sa/2.5/es/).
![](/assets/images/about/CC_BY-SA_3.0.png){: .align-left}
diff --git a/_pages/activities.md b/_pages/activities.md
index 058d4b6..583dff6 100644
--- a/_pages/activities.md
+++ b/_pages/activities.md
@@ -21,11 +21,19 @@ feature_row:
url: "/activities/gsoc/"
btn_class: "btn--primary"
btn_label: "Go!"
+
+ - image_path: /assets/images/activities/internships1.jpg
+ alt: "Internships"
+ title: "Internships"
+ excerpt: "Contribute to our robotics open source software projects while being mentored by our experts. Become an experienced robotics developer!"
+ url: "/activities/internships/"
+ btn_class: "btn--primary"
+ btn_label: "Go!"
- image_path: /assets/images/activities/courses.jpg
alt: "Robotics Courses"
title: "Robotics Courses"
- excerpt: "JdeRobot Robotics Academy has been used since 2006 for the teaching of robotics in various courses, both undergraduate and master."
+ excerpt: "Our RoboticsAcademy has been used since 2006 for the teaching of robotics in various courses, both undergraduate and master."
url: "/activities/robotics_courses/"
btn_class: "btn--primary"
btn_label: "Go!"
@@ -33,7 +41,7 @@ feature_row:
- image_path: /assets/images/activities/talks.jpg
alt: "Talks"
title: "Talks"
- excerpt: "All these Technological Talks have been celebrated at the Universidad Rey Juan Carlos in the last years, fostered by the JdeRobot Foundation."
+ excerpt: "All these Technological Talks have been celebrated at the Universidad Rey Juan Carlos in the last years, fostered by JdeRobot org."
url: "/activities/talks/"
btn_class: "btn--primary"
btn_label: "Go!"
@@ -41,7 +49,7 @@ feature_row:
- image_path: /assets/images/activities/competition.jpg
alt: "Competitions"
title: "Competitions"
- excerpt: "JdeRobot organizes every year robotics championships where you will have to demonstrate your skills as a programmer."
+ excerpt: "We organize every year robotics competitions where you have to demonstrate your skills as a robotics programmer."
url: "/activities/competitions/"
btn_class: "btn--primary"
btn_label: "Go!"
diff --git a/_pages/home.md b/_pages/home.md
index c5d6f3a..69192d5 100644
--- a/_pages/home.md
+++ b/_pages/home.md
@@ -14,7 +14,7 @@ feature_row:
- image_path: /assets/images/cover/projects.png
alt: "Projects"
title: "Projects"
- excerpt: "Several development areas: robot programming tools, DeepLearning, FPGAs, Education, drones, SLAM algorithms. Open for collaboration."
+ excerpt: "In several areas: robot programming tools, AI driven Robotics, Education, drones..."
url: "/projects/"
btn_class: "btn--primary"
btn_label: "Learn more"
@@ -22,7 +22,7 @@ feature_row:
- image_path: /assets/images/cover/activities.jpg
alt: "Activities"
title: "Activities"
- excerpt: "Some of the activities of the organization where students from different areas come together to put together a common project."
+ excerpt: "Google Summer of Code, internships, etc."
url: "/activities/"
btn_class: "btn--primary"
btn_label: "Learn more"
@@ -30,7 +30,7 @@ feature_row:
- image_path: /assets/images/cover/community.jpg
alt: "Community"
title: "Community"
- excerpt: "The JdeRobot organization is open to contributions at development, documentation, testing, integration and research."
+ excerpt: "Who we are. Join us contributing in some development, testing, integrating, writting documentation or doing research."
url: "/community/"
btn_class: "btn--primary"
btn_label: "Learn more"
@@ -48,17 +48,12 @@ youTube_id: ID7qaEcIu4k
{% include feature_row %}
-Robotics applications are typically distributed, made up of a collection of concurrent asynchronous components which communicate using some middleware (ROS messages, ICE, DDS...). Building robotics applications is a complex task. Integrating existing nodes or libraries, which provide already solved functionality, and using several tools may increase the software robustness and shorten the development time. JdeRobot toolkit provides several tools, libraries and reusable nodes for Robotics, Artificial Intelligence and Computer Vision.
+Currently robotics applications are typically distributed, made up of a collection of concurrent asynchronous components which communicate using some middleware. Building robotics applications is a complex task. Integrating existing software pieces and using several tools may increase the software robustness and shorten the development time. JdeRobot toolkit provides several tools, resources, libraries and reusable nodes for **Robotics**, **Artificial Intelligence** and **Computer Vision** applications.
-| Main Features |
-| :--- |
-| ROS friendly (full compatible with ROS-Kinetic) |
-| C++, Python, JavaScript |
-| Open Source |
-| Easy installation from debian, PIP and npm packages |
+We love open source software. All our software is ROS friendly. It has been developed mainly in Python, C++ and even JavaScript. Our mission is threefold: **develop useful open source robotics software**, **foster robotics education** worldwide, and also do some **research in robotics**.
+We are registered as **non-profit organization** in Spain Ref.#615800. Our international community mainly works on three areas:
-Our (international) community mainly works on three fields inside Robotics and Computer Vision:
+
-
-## Roadmap
-We are working on:
-* Update of underlying infrastructure: jump to Ubuntu 20.04, ROS Noetic, Gazebo11 simulator, Python 3.5.
-* Use of reconfigurable hardware (FPGAs) in robotics, with third party open tools like IceStudio
-* [VisualStates tool](https://jderobot.github.io/VisualStates) for visual programming of the robot intelligence with Finite State Machines. It creates a C++ or a Python component from the visual description of the automata.
-
-* [RoboticsAcademy](https://jderobot.github.io/RoboticsAcademy): a framework to learn Robotics, Artificial Intelligence and Computer Vision in a practical way. It is a collection of Python exercises. Our goal is to provide its functionality as a web service and create new exercises.
-* (*done*) All our web pages are finally being migrated to GitHub Pages: nice, under version control and convenient
-* (*done*) Compatibility with ROS robotics middleware: interoperation between ROS nodes and JdeRobot components, use of ROS drivers, use of ROS bag files... JdeRobot (>= 5.6) is fully compatible with ROS Kinetic including its official debian packages
-* (*done*) Update of underlying infrastructure: jump to Ubuntu 16.04, OpenCV-3, migration to Gazebo-7 simulator (revisit existing plugins and models), PCL-1.8, ICE-3.6
-* (*done*) Use of Web technologies in robotics: ICE-JS, WebRTC, HTML5, electron, nodeJS... Many webtools have been developed: viewers, teleoperators and drivers.
+## Published research papers
+
+* (2024) *Behavior Metrics: An Open-Source Assessment Tool for Autonomous Driving Tasks*. Sergio Paniego, Roberto Calvo-Palomino, José M. Cañas. SoftwareX, Volume 26, Elsevier, 2024. DOI: https://doi.org/10.1016/j.softx.2024.101702
+* (2024) *Model Optimization in Deep Learning based Robot Control for Autonomous Driving*. Sergio Paniego, Nikhil Paliwal, José M. Cañas. IEEE Robotics and Automation Letters (RA-L), Volume 9, Issue 1, Pages 715-722, 2024. DOI: https://doi.org/10.1109/LRA.2023.3336244
+* (2023) *Unibotics: open ROS-based online framework for practical learning of Robotics in higher education*. David Roldán-Álvarez, José M. Cañas, David Valladares, Pedro Arias-Perez, Sakshay Mahna. Multimedia Tools and Applications, Springer 2023. DOI: https://doi.org/10.1007/s11042-023-17514-z
+* (2023) *Vision-based robotics using open FPGAs*. Felipe Machado, Rubén Nieto, Jesus Fernández-Conde, David Lobato, José M. Cañas. Microprocessors and Microsystems, Volume 103, November 2023, 104974, Elsevier 2023. DOI:https://doi.org/10.1016/j.micpro.2023.104974
+* (2022) *Open Source Assessment of Deep Learning Visual Object Detection*. Sergio Paniego, Vinay Sharma, José Marı́a Cañas. Sensors 2022, 22(12), 4575; MDPI. DOI: https://doi.org/10.3390/s22124575
## License
-* JdeRobot is open source. All its code is licensed under GPL v3.
-* All the documentation of JdeRobot project is licensed under Creative Commons by-sa
+* JdeRobot is open source. Its code is licensed under GPL v3.
+* All the documentation of JdeRobot software is licensed under Creative Commons by-sa
## Sponsors
diff --git a/_pages/projects.md b/_pages/projects.md
index fdaa45c..f76d217 100644
--- a/_pages/projects.md
+++ b/_pages/projects.md
@@ -20,36 +20,36 @@ sidebar:
projects:
- image_path: /assets/images/projects/robotics-academy-action.jpg
- alt: "Robotics Education and Games"
- title: "Robotics Education & Games"
- excerpt: "RoboticsAcademy is an open source collection of exercises to learn robotics in a practical way. Programmed in Python, the Gazebo simulator and the ROS framework are used."
+ alt: "Robotics Education"
+ title: "Robotics Education"
+ excerpt: "RoboticsAcademy is an open source collection of exercises to learn robotics in a practical way. Programmed in Python, Gazebo simulator and ROS middleware are used."
url: "/projects/robotics_education/"
btn_class: "btn--primary"
btn_label: "Go!"
- image_path: /assets/images/projects/detection_suite.png
- alt: "Machine Learning"
- title: "Machine Learning in Robotics"
- excerpt: "DeepLearning for control, Reinforcement Learning for control, Deeplearnig for visual object detection, DeepLearning for prediction..."
+ alt: "AI driven Robotics"
+ title: "AI driven Robotics"
+ excerpt: "DeepLearning for control, Reinforcement Learning for control, Deeplearnig for visual object detection..."
url: "/projects/machine_learning/"
btn_class: "btn--primary"
btn_label: "Go!"
- - image_path: /assets/images/projects/fpga.jpg
- alt: "Reconfigurable Computing in Robotics"
- title: "Reconfigurable Computing in Robotics"
- excerpt: "[Neural FPGA project](https://github.com/JdeRobot/neuralFPGA) goal is to produce custom hardware able to do inference with generic neural networks. We rely on hardware simulations and real FPGAs."
- url: "/projects/fpga_robotics/fpga_robotics"
- btn_class: "btn--primary"
- btn_label: "Go!"
-
-# - image_path: /assets/images/projects/visual_states.png
-# alt: "Robot Programming Tools"
-# title: "Robot Programming Tools"
-# excerpt: "Several development areas: robot programming tools, learning robotics, drones, SLAM algorithms, DeepLearning. All of them are open for collaboration."
-# url: "/projects/robots_programming_tools/"
+# - image_path: /assets/images/projects/fpga.jpg
+# alt: "Reconfigurable Computing in Robotics"
+# title: "Reconfigurable Computing in Robotics"
+# excerpt: "[Neural FPGA project](https://github.com/JdeRobot/neuralFPGA) goal is to produce custom hardware able to do inference with generic neural networks. We rely on hardware simulations and real FPGAs."
+# url: "/projects/fpga_robotics/fpga_robotics"
# btn_class: "btn--primary"
-# btn_label: "Go!"
+# btn_label: "Go!"
+
+ - image_path: /assets/images/projects/visual_states.png
+ alt: "Robot Programming Tools"
+ title: "Robot Programming Tools"
+ excerpt: "BT Studio (for BehaviorTree based applications), VisualCircuit (visual robot programming), FPGA-Robotics (robot programming in Verilog), dockerized RoboticsBackend..."
+ url: "/projects/robot_programming_tools/"
+ btn_class: "btn--primary"
+ btn_label: "Go!"
# - image_path: /assets/images/projects/visual_slam.png
# alt: "Visual Slam"
@@ -77,7 +77,8 @@ Our (international) community mainly works on three lines inside Robotics and Co
## Previous lines and projects
-- [**Robot Programming Tools**](/projects/robots_programming_tools/)
+
+
- [**Drones**](/projects/drones/drones)
- [**Visual SLAM**](/projects/visual_slam/visual_slam)
- [People Tracking](http://wiki.jderobot.org/ElderCare)
diff --git a/_pages/projects/robots_programming_tools/pyonarduino.md b/_pages/projects/robot_programming_tools/pyonarduino.md
similarity index 100%
rename from _pages/projects/robots_programming_tools/pyonarduino.md
rename to _pages/projects/robot_programming_tools/pyonarduino.md
diff --git a/_pages/projects/robots_programming_tools/robot_programming_tools.md b/_pages/projects/robot_programming_tools/robot_programming_tools.md
similarity index 57%
rename from _pages/projects/robots_programming_tools/robot_programming_tools.md
rename to _pages/projects/robot_programming_tools/robot_programming_tools.md
index 0b119c4..92a6a44 100644
--- a/_pages/projects/robots_programming_tools/robot_programming_tools.md
+++ b/_pages/projects/robot_programming_tools/robot_programming_tools.md
@@ -1,6 +1,6 @@
---
-permalink: /projects/robots_programming_tools/
-title: "Robots Programming Tools"
+permalink: /projects/robot_programming_tools/
+title: "Robot Programming Tools"
sidebar:
nav: "docs"
@@ -9,6 +9,39 @@ classes: wide
feature_row:
+ - image_path: /assets/images/projects/robot_programming_tools/unibotics.png
+ alt: "Unibotics"
+ title: "Unibotics"
+ excerpt: "The robot programming website."
+ url: "https://unibotics.org"
+ btn_class: "btn--primary"
+ btn_label: "Go!"
+
+ - image_path: /assets/images/projects/robot_programming_tools/btstudio-followperson.png
+ alt: "BT-Studio IDE"
+ title: "BT-Studio IDE"
+ excerpt: "Tool for programming robotics applications using Behavior Trees."
+ url: "https://jderobot.github.io/bt-studio"
+ btn_class: "btn--primary"
+ btn_label: "Go!"
+
+ - image_path: /assets/images/projects/robot_programming_tools/visual_circuit.png
+ alt: "Visual Circuit Tool"
+ title: "Visual Circuit Tool"
+ excerpt: "Tool for visual programming robotics applications using a digital electronics language and abstractions (blocks, wires...)."
+# url: "/projects/robots_programming_tools/visual_circuit_tool/"
+ url: "https://jderobot.github.io/VisualCircuit"
+ btn_class: "btn--primary"
+ btn_label: "Go!"
+
+ - image_path: /assets/images/projects/robot_programming_tools/docker-ros.png
+ alt: "RoboticsBackend"
+ title: "RoboticsBackend"
+ excerpt: "Docker image with most common robotics dependencies, including ROS and Gazebo, for dockerized development and execution of robotics applications."
+ url: "https://github.com/JdeRobot/RoboticsInfrastructure"
+ btn_class: "btn--primary"
+ btn_label: "Go!"
+
# - image_path: /assets/images/projects/robot_programming_tools/color_tuner.png
# alt: "Scratch4Robots"
# title: "Scratch4Robots"
@@ -72,6 +105,7 @@ feature_row:
# url: "https://github.com/JdeRobot/WebSim2D"
# btn_class: "btn--primary"
# btn_label: "Go!"
+
- image_path: /assets/images/projects/robot_programming_tools/visual_states.png
alt: "Visual States Tool"
title: "Visual States Tool"
@@ -80,37 +114,29 @@ feature_row:
btn_class: "btn--primary"
btn_label: "Go!"
- - image_path: /assets/images/projects/robot_programming_tools/scratch4robots.jpg
- alt: "Scratch4Robots"
- title: "Scratch4Robots"
- excerpt: "Allows to program complex robots or drones with the visual language Scratch."
- url: "/projects/robotics_programming_tools/scratch4robots/"
- btn_class: "btn--primary"
- btn_label: "Go!"
+# - image_path: /assets/images/projects/robot_programming_tools/scratch4robots.jpg
+# alt: "Scratch4Robots"
+# title: "Scratch4Robots"
+# excerpt: "Allows to program complex robots or drones with the visual language Scratch."
+# url: "/projects/robotics_programming_tools/scratch4robots/"
+# btn_class: "btn--primary"
+# btn_label: "Go!"
- - image_path: /assets/images/projects/robot_programming_tools/pyonarduino.png
- alt: "PyOnArduino"
- title: "PyOnArduino"
- excerpt: "Tool that can translate Python-like code to Arduino code for educational robot."
- url: "/projects/robotics_programming_tools/pyonarduino/"
- btn_class: "btn--primary"
- btn_label: "Go!"
+# - image_path: /assets/images/projects/robot_programming_tools/pyonarduino.png
+# alt: "PyOnArduino"
+# title: "PyOnArduino"
+# excerpt: "Tool that can translate Python-like code to Arduino code for educational robot."
+# url: "/projects/robotics_programming_tools/pyonarduino/"
+# btn_class: "btn--primary"
+# btn_label: "Go!"
- - image_path: /assets/images/projects/robot_programming_tools/visual_circuit.png
- alt: "Visual Circuit Tool"
- title: "Visual Circuit Tool"
- excerpt: "Tool for programming robot behaviors using a digital electronics language and abstractions."
- url: "/projects/robots_programming_tools/visual_circuit_tool/"
- btn_class: "btn--primary"
- btn_label: "Go!"
-
- - image_path: /assets/images/projects/robot_programming_tools/websim_2D.png
- alt: "WebSim"
- title: "WebSim"
- excerpt: "Robot simulator using web technologies and just the web browser. Written in JavaScript."
- url: "/projects/robotics_programming_tools/websim/"
- btn_class: "btn--primary"
- btn_label: "Go!"
+# - image_path: /assets/images/projects/robot_programming_tools/websim_2D.png
+# alt: "WebSim"
+# title: "WebSim"
+# excerpt: "Robot simulator using web technologies and just the web browser. Written in JavaScript."
+# url: "/projects/robotics_programming_tools/websim/"
+# btn_class: "btn--primary"
+# btn_label: "Go!"
---
@@ -120,10 +146,21 @@ feature_row:
{% include feature_row %}
+## Unibotics
+
+Online open platform to learn Robotics for engineering students. [Take a look!](https://www.youtube.com/channel/UCS9IvIytJNqQqImT99g-d6g/videos)
+
+
+
-## More Tools
+## Archive
- [Color Tuner](https://github.com/JdeRobot/ColorTuner")
- [3DViz](https://github.com/JdeRobot/3DViz")
diff --git a/_pages/projects/robots_programming_tools/scratch4robots.md b/_pages/projects/robot_programming_tools/scratch4robots.md
similarity index 100%
rename from _pages/projects/robots_programming_tools/scratch4robots.md
rename to _pages/projects/robot_programming_tools/scratch4robots.md
diff --git a/_pages/projects/robots_programming_tools/visual_circuit_tool.md b/_pages/projects/robot_programming_tools/visual_circuit_tool.md
similarity index 100%
rename from _pages/projects/robots_programming_tools/visual_circuit_tool.md
rename to _pages/projects/robot_programming_tools/visual_circuit_tool.md
diff --git a/_pages/projects/robots_programming_tools/visual_states.md b/_pages/projects/robot_programming_tools/visual_states.md
similarity index 100%
rename from _pages/projects/robots_programming_tools/visual_states.md
rename to _pages/projects/robot_programming_tools/visual_states.md
diff --git a/_pages/projects/robots_programming_tools/websim.md b/_pages/projects/robot_programming_tools/websim.md
similarity index 100%
rename from _pages/projects/robots_programming_tools/websim.md
rename to _pages/projects/robot_programming_tools/websim.md
diff --git a/assets/images/projects/robot_programming_tools/btstudio-followperson.png b/assets/images/projects/robot_programming_tools/btstudio-followperson.png
new file mode 100644
index 0000000..b8060b8
Binary files /dev/null and b/assets/images/projects/robot_programming_tools/btstudio-followperson.png differ
diff --git a/assets/images/projects/robot_programming_tools/docker-ros.png b/assets/images/projects/robot_programming_tools/docker-ros.png
new file mode 100644
index 0000000..d12a550
Binary files /dev/null and b/assets/images/projects/robot_programming_tools/docker-ros.png differ
diff --git a/assets/images/projects/robot_programming_tools/unibotics.png b/assets/images/projects/robot_programming_tools/unibotics.png
new file mode 100644
index 0000000..fadf0c2
Binary files /dev/null and b/assets/images/projects/robot_programming_tools/unibotics.png differ