Put ergocub sw doc under icub sw major section

icub-tech-iit · Sep 20, 2023 · 009b1e6 · 009b1e6
1 parent d5e457c
commit 009b1e6
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 19 deletions.
diff --git a/docs/ergocub_operating_systems/ergocub_torso/install_from_scratch.md b/docs/ergocub_operating_systems/ergocub_torso/install_from_scratch.md
@@ -60,4 +60,3 @@ NTPDATE_USE_NTP_CONF="no"
 ...
 NTPSERVERS="10.0.2.1 ntp.ubuntu.com"
 ```
-
diff --git a/docs/ergocub_operating_systems/index.md b/docs/ergocub_operating_systems/index.md
@@ -11,4 +11,4 @@ The following guides will help you to properly configure the OS for the specific
 - [ergocub-head](ergocub_head/jetpack_installation.md)
 - [ergocub-torso](ergocub_torso/install_from_scratch.md)
 
-Alternatively, you can download the OS pre-built images [here](../icub_operating_systems/download.md).
+Alternatively, you can download the OS pre-built images [here](../icub_operating_systems/download.md).
diff --git a/docs/ergocub_sw.md b/docs/ergocub_sw.md
diff --git a/docs/icub_sw.md b/docs/icub_sw.md
@@ -3,8 +3,10 @@
 - [`Software Installation`](./sw_installation/index.md)
 - [`Software Versioning Table`](./sw_versioning_table/index.md)
 - [`The OS for the iCub environment`](./icub_operating_systems/index.md)
+- [`The OS for the ergoCub environment`](./ergocub_operating_systems/index.md)
 - [`The YARP Documentation`](https://yarp.it/latest/)
 - [`The iCub Software Documentation`](https://robotology.github.io/robotology-documentation/doc/html/index.html)
+- [`The ergoCub Software Documentation`](https://icub-tech-iit.github.io/ergocub-software/)
 - [`How to set up multiple iCubs on the same network`](./icub_setup_multiple_robots/index.md)
 - [`iCub Firmware`](./icub_firmware/index.md)
 - [`iCub Microphones`](./icub_microphones/icub_microphones.md)

diff --git a/docs/index.md b/docs/index.md
@@ -9,6 +9,4 @@
 
 #### [:gear:{.blink} Documentation resources on the `iCub Hardware`](icub_hw.md)
 
-#### [:computer:{.blink} Documentation resources on the `iCub Software`](icub_sw.md)
-
-#### [:computer:{.blink} Documentation resources on the `ergoCub Software`](ergocub_sw.md)
+#### [:computer:{.blink} Documentation resources on the `iCub Software`](icub_sw.md)
diff --git a/mkdocs.yml b/mkdocs.yml
@@ -209,6 +209,14 @@ nav:
           - Manual Installation:
             - icub-head: sw_installation/icub_head_manual.md
       - Software Versioning Table: sw_versioning_table/index.md
+      - The OS for the ergoCub environment:
+        - Summary: ergocub_operating_systems/index.md
+        - Network: ergocub_operating_systems/network.md
+        - ergocub-head:
+          - Jetpack installation: ergocub_operating_systems/ergocub_head/jetpack_installation.md
+          - Post-flashing operations: ergocub_operating_systems/ergocub_head/post_flashing.md
+        - ergocub-torso:
+          - Installation from scratch: ergocub_operating_systems/ergocub_torso/install_from_scratch.md
       - The OS for the iCub environment:
         - Summary: icub_operating_systems/index.md
         - The OS on icub-head:
@@ -294,13 +302,3 @@ nav:
         - Reading Tactile Data: tactile_sensors/software/reading_data.md
         - Visualizing Tactile Data: tactile_sensors/software/visualizing_data.md
         - Tactile Data Flow: tactile_sensors/software/dataflow.md
-    - 💻 ergoCub SW:
-      - Summary: ergocub_sw.md
-      - ergoCub environment: 
-        - Summary: ergocub_operating_systems/index.md
-        - Network: ergocub_operating_systems/network.md
-        - ergocub-head: 
-          - Jetpack installation: ergocub_operating_systems/ergocub_head/jetpack_installation.md
-          - Post-flashing operations: ergocub_operating_systems/ergocub_head/post_flashing.md
-        - ergocub-torso:
-          - Install from scratch: ergocub_operating_systems/ergocub_torso/install_from_scratch.md
Original file line number	Diff line number	Diff line change
Expand Up		@@ -60,4 +60,3 @@ NTPDATE_USE_NTP_CONF="no"
		...
		NTPSERVERS="10.0.2.1 ntp.ubuntu.com"
		```