Skip to content

Commit

Permalink
Migrate to MkDocs
Browse files Browse the repository at this point in the history
  • Loading branch information
PeterBowman committed Nov 14, 2023
1 parent 7fce094 commit 2ece46b
Show file tree
Hide file tree
Showing 111 changed files with 578 additions and 319 deletions.
31 changes: 31 additions & 0 deletions .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: GitHub Pages

on:
push:
branches:
- master
paths-ignore:
- README.md
- CONTRIBUTING.md
- CMakeLists.txt
workflow_dispatch:

jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: fkirc/skip-duplicate-actions@v5
with:
cancel_others: 'true'
- uses: actions/checkout@v4
with:
fetch-depth: 0 # for the 'Last updated' timestamp
- name: Install requirements
run: pip install -r requirements.txt
- name: Build site
run: mkdocs build
- uses: crazy-max/ghaction-github-pages@v4
with:
build_dir: site
env:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
30 changes: 0 additions & 30 deletions .github/workflows/gitbook.yml

This file was deleted.

16 changes: 3 additions & 13 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,22 +1,12 @@
# .gitignore
## Files we want to have locally, but do not want to push to remote

## Editor swap files
*~
*.swp
*.orig

## CMake and C/C++
## CMake build system
**/build*/
CMakeLists.txt.user
*.cproject
*.project
tags

## doxygen
doc/html
doc/doxygen_sqlite3.db

## gitbook generated
/_book/
/node_modules/
## mkdocs generated
/site/
11 changes: 6 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,19 @@ Please read the Developer Manual's [Asking Questions](https://robots.uc3m.es/dev

It is useful to serve on `localhost` to modify the website and see changes locally.

1. From the root of the project, run the following command (which is universal for all [Gitbook (legacy)](https://github.com/GitbookIO/gitbook)-based projects):
1. From the root of the project, run the following command:

```bash
gitbook serve # command builds and serves; for installing required plugins, before first run please: gitbook install
pip install -r requirements.txt
mkdocs serve
```

1. You can now browse the site at the default location: <http://127.0.0.1:4000>
1. You can now browse the site at the default location: <http://127.0.0.1:8000>

### How to upload changes to GitHub

This project is managed as any project on [GitHub](https://www.github.com). You may use [Git](https://git-scm.com) or even the GitHub web interface, both on which you can find many tutorials online. The following points are specific to the [Gitbook (legacy)](https://github.com/asrob-uc3m/actas/issues/148#issuecomment-449748350) mechanism used:
This project is managed as any project on [GitHub](https://www.github.com). You may use [Git](https://git-scm.com) or even the GitHub web interface, both on which you can find many tutorials online. The following points are specific to the MkDocs mechanism used:

1. Please **do not upload** the `_book/` folder. It is auto-generated locally, and the same should happen on the Gitbook (legacy) servers.
1. Please **do not upload** the `site/` folder. It is auto-generated locally, and the same should happen on the MkDocs servers.

1. It is safe to `git push` to any upstream branch, just remember that what is on `master` is what will be actually rendered as the website.
27 changes: 0 additions & 27 deletions SUMMARY.md

This file was deleted.

18 changes: 0 additions & 18 deletions book.json

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
6 changes: 3 additions & 3 deletions demo-procedure.md → docs/demo-procedure.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
1. Place the robot in a position where it can have space and cannot hit any obstacle.
1. Make sure all emergency stop buttons (main and per robot part) are closed.
1. Turn on both [42V power supplies](fig/power-supply.jpg) (check they are actually at 42V before proceeding further) and open the main emergency button.
1. On the [rear panel](/fig/main-switches.jpg) of the robot, press the "General" red button first. The button should light up.
1. On the [rear panel](fig/main-switches.jpg) of the robot, press the "General" red button first. The button should light up.
1. Press other relevant buttons and make sure they light up: manipulation PC and the robot parts you want to use.
1. Turn on the manipulation PC.
1. Wait until the manipulation PC has finished booting. You can monitor this through `ping manipulation` issued from another PC connected to the robot's local network.
1. Open the [emergency buttons](/fig/emergency-buttons.jpg) for the robot parts you need. Keep these buttons close and ready to be used.
1. Open the [emergency buttons](fig/emergency-buttons.jpg) for the robot parts you need. Keep these buttons close and ready to be used.

## Demonstration Instructions

Expand All @@ -24,4 +24,4 @@ Refer to the specific instructions of the demo you want to launch:
## See also

- [driver check procedure](driver-check-procedure.md)
- <https://apps-robots.uc3m.es/robots/wiki/Qu%C3%A9_llevar_a_Demos_(TEO)>
- wiki: [Qué llevar a Demos (TEO)](https://apps-robots.uc3m.es/robots/wiki/Qu%C3%A9_llevar_a_Demos_(TEO))
22 changes: 13 additions & 9 deletions diagrams.md → docs/diagrams.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,12 @@
## Link Names

```mermaid
!INCLUDE "./fig/editable/teo.mermaid"
{% include "fig/editable/teo.mermaid" %}
```

- Github: [teo-link-names.pdf](fig/teo-link-names.pdf)
- Gitbook: {% pdf src="fig/teo-link-names.pdf", width="100%", height="1100" %}{% endpdf %}
[teo-link-names.pdf](fig/teo-link-names.pdf)

![TEO link names](fig/teo-link-names.pdf){ type=application/pdf style="width: 100%; height: 967px;" }

## COGs

Expand All @@ -46,19 +47,22 @@

### F/T sensors (Mechanical)

- Github: [Jr3 50M31 corregido.pdf](fig/Jr3_50M31_corregido.pdf)
- Gitbook: {% pdf src="fig/Jr3_50M31_corregido.pdf", width="100%", height="590" %}{% endpdf %}
[Jr3 50M31 corregido.pdf](fig/Jr3_50M31_corregido.pdf)

![Jr3 50M31 corregido](fig/Jr3_50M31_corregido.pdf){ type=application/pdf style="width: 100%; height: 509px;" }

## Lacquey Fetch

This sketches were made with SolidWorks in order to provide the position of the next joints, in this case the fingers from the origin of the hand, not to provide detailed mechanical annotations for the hand.

### Lacquey Fetch (Hand)

- Github: [fetch-hand.pdf](fig/fetch-hand.pdf)
- Gitbook: {% pdf src="fig/fetch-hand.pdf", width="100%", height="590" %}{% endpdf %}
[fetch-hand.pdf](fig/fetch-hand.pdf)

![fetch-hand](fig/fetch-hand.pdf){ type=application/pdf style="width: 100%; height: 509px;" }

### Lacquey Fetch (Proximal Falange)

- Github: [fetch-proximal-falange.pdf](fig/fetch-proximal-falange.pdf)
- Gitbook: {% pdf src="fig/fetch-proximal-falange.pdf", width="100%", height="590" %}{% endpdf %}
[fetch-proximal-falange.pdf](fig/fetch-proximal-falange.pdf)

![fetch-proximal-falange](fig/fetch-proximal-falange.pdf){ type=application/pdf style="width: 100%; height: 509px;" }
4 changes: 2 additions & 2 deletions driver-check-procedure.md → docs/driver-check-procedure.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Basic steps to power things up and check the drivers of the robot:

1. Make sure all emergency stop buttons (main and per robot part) are closed.
1. Turn on both [42V power supplies](fig/power-supply.jpg) (check they are actually at 42V before proceeding further) and open the main emergency button.
1. On the [rear panel](/fig/main-switches.jpg) of the robot, press the "General" red button first. The button should light up.
1. On the [rear panel](fig/main-switches.jpg) of the robot, press the "General" red button first. The button should light up.
1. Press other relevant buttons and make sure they light up: manipulation PC and the desired robot part.
1. Turn on the manipulation PC.
1. Wait until the manipulation PC has finished booting. You can monitor this through `ping manipulation` issued from another PC connected to the robot's local network.
Expand All @@ -25,7 +25,7 @@ Once all connection issues (if present) have been sorted out, you can proceed to

1. Assuming we want to send joint commands to the right arm, while still logged in via SSH to the manipulation PC: `launchCanBus --from manipulation-rightArm.ini`.
1. Identify any errors, if present. The controller has restart mechanisms that may attempt to recover from errors and may or may not succeed.
1. [Absolute encoders](/fig/cui-absolute-circuit.jpg) are prone to fail. They are given a fixed number of retries. If it is not possible to establish communication, the YARP plugin related to this iPOS drive and encoder also fails on initialization. Terminate the `launchCanBus` process and try again.
1. [Absolute encoders](fig/cui-absolute-circuit.jpg) are prone to fail. They are given a fixed number of retries. If it is not possible to establish communication, the YARP plugin related to this iPOS drive and encoder also fails on initialization. Terminate the `launchCanBus` process and try again.
1. On either the robot's PC through another SSH session or on an external PC connected to the robot's local network, issue `yarp rpc /teo/rightArm/rpc:i`.
1. On startup, robot joints should be set in position control mode. Within the RPC session, issue `get icmd cmds`. This should return a list of `pos` vocabs.
1. If any vocab is not equal to `pos` (usually in case of failure its value is `cfgn`, which means "not configured"), identify the error in the console output.
Expand Down
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes
Binary file added docs/fig/favicon.ico
Binary file not shown.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Loading

0 comments on commit 2ece46b

Please sign in to comment.