diff --git a/.github/workflows/test-Windows.yml b/.github/workflows/test-Windows.yml index d5623c6fe1..1966ea5719 100644 --- a/.github/workflows/test-Windows.yml +++ b/.github/workflows/test-Windows.yml @@ -17,9 +17,9 @@ jobs: python-version: ["3.8", "3.10"] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: Setting environment diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8039b3754f..c57bff3a0e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,16 +10,16 @@ jobs: build-linux: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: fail-fast: false # don't cancel if a job from the matrix fails matrix: python-version: ["3.8", "3.10"] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: Setting environment diff --git a/Dockerfile b/Dockerfile index 42164f39e6..4207323136 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10-slim-bullseye +FROM python:3.11-slim-bookworm diff --git a/Sphinxsetup.bat b/Sphinxsetup.bat index 5bfcd95731..1f8a9b9a72 100644 --- a/Sphinxsetup.bat +++ b/Sphinxsetup.bat @@ -2,7 +2,7 @@ rem remove any existing packages that may cause conflicts pip uninstall -y sphinx lxml sphinx-rtd-theme sphinxcontrib-youtube beautifulsoup4 rem Install sphinx -pip install --upgrade sphinx==5.1.1 docutils==0.16 +pip install --upgrade sphinx==7.1.2 "docutils<0.19" requests>=2.31.0 rem lxml for parameter parsing: pip install --upgrade lxml @@ -13,8 +13,5 @@ pip install --upgrade git+https://github.com/ArduPilot/sphinx_rtd_theme.git rem and a youtube plugin: pip install --upgrade git+https://github.com/ArduPilot/sphinxcontrib-youtube.git -rem and a parser to use getting posts from Discourse (forum) and insert in FrontEnd -pip install --upgrade beautifulsoup4 - echo "Setup completed successfully!" pause diff --git a/Sphinxsetup.sh b/Sphinxsetup.sh index 71c4a2b882..602e17d9a8 100755 --- a/Sphinxsetup.sh +++ b/Sphinxsetup.sh @@ -38,15 +38,20 @@ if [ "$(python --version)" == "Python 3.6.9" ]; then GET_PIP_URL="https://bootstrap.pypa.io/pip/3.6/get-pip.py" fi +PYTHON_VERSION=$(python3 --version | cut -d' ' -f2) +if [[ "${PYTHON_VERSION:0:3}" = "3.8" ]]; then + SPHINX_VERSION="7.1.2" +else + SPHINX_VERSION="7.2.6" +fi + curl "$GET_PIP_URL" -o get-pip.py python3 get-pip.py rm -f get-pip.py # Install python packages using known working versions # Install sphinx with a specific docutils version -# Docutils version is for correct bullet point rendering. Can be rolled forward after theme is updated to >=0.5.1 -# See https://stackoverflow.com/a/68685753/2578171 -python3 -m pip install --user --upgrade sphinx==5.1.1 docutils==0.16 +python3 -m pip install --user --upgrade sphinx==${SPHINX_VERSION} "docutils<0.19" requests>=2.31.0 # lxml for parameter parsing: python3 -m pip install --user --upgrade lxml @@ -59,9 +64,6 @@ python3 -m pip install --user --upgrade git+https://github.com/ArduPilot/sphinx_ # Rerun Sphinxsetup.sh after doing that python3 -m pip install --user --upgrade git+https://github.com/ArduPilot/sphinxcontrib-youtube.git -# and a parser to use getting posts from Discourse (forum) and insert in FrontEnd -python3 -m pip install --user --upgrade beautifulsoup4 - # Install flake8 python3 -m pip install --user --upgrade flake8==3.7.9 diff --git a/antennatracker/source/_static/parameters_versioning_script.inc b/antennatracker/source/_static/parameters_versioning_script.inc index 88c7d01b73..21f8eee886 100644 --- a/antennatracker/source/_static/parameters_versioning_script.inc +++ b/antennatracker/source/_static/parameters_versioning_script.inc @@ -1,11 +1,27 @@ -

You can change and check the parameters for another version: - - +

You can change and check the parameters for another version: + +

+ + document.getElementById('selectPicker').addEventListener('change', function() { + window.location.href = this.value; + }); + + function appendToSelect(json) { + var selectPicker = document.getElementById('selectPicker'); + for (var key in json) { + var opt = document.createElement('option'); + opt.value = json[key]; + opt.innerHTML = key; + selectPicker.appendChild(opt); + } + } +}); + diff --git a/blimp/source/_static/parameters_versioning_script.inc b/blimp/source/_static/parameters_versioning_script.inc index 14633c00bb..a6b8508d1a 100644 --- a/blimp/source/_static/parameters_versioning_script.inc +++ b/blimp/source/_static/parameters_versioning_script.inc @@ -1,11 +1,27 @@ -

You can change and check the parameters for another version: - - +

You can change and check the parameters for another version: + +

\ No newline at end of file + + document.getElementById('selectPicker').addEventListener('change', function() { + window.location.href = this.value; + }); + + function appendToSelect(json) { + var selectPicker = document.getElementById('selectPicker'); + for (var key in json) { + var opt = document.createElement('option'); + opt.value = json[key]; + opt.innerHTML = key; + selectPicker.appendChild(opt); + } + } +}); + diff --git a/common/source/docs/common-all-vehicle-types.rst b/common/source/docs/common-all-vehicle-types.rst index 426cb6061b..74c8dfadf4 100644 --- a/common/source/docs/common-all-vehicle-types.rst +++ b/common/source/docs/common-all-vehicle-types.rst @@ -518,7 +518,7 @@ Supported Vehicles +------+-------------------------------------------------+--------------------------------------------------+ + **Balance Bot** + +------+----------------------------------------------------------------------------------------------------+ -+ Desc | Fundametally unstable wheeled platform actively kept balanced by the autopilot + ++ Desc | Fundamentally unstable wheeled platform actively kept balanced by the autopilot + +------+-------------------------------------------------+--------------------------------------------------+ + Sim | Yes + .. youtube:: EmhTBPNDpWw + +------+-------------------------------------------------+ :width: 100% + @@ -552,6 +552,18 @@ Supported Vehicles +------+-------------------------------------------------+ + + Info | + + +------+-------------------------------------------------+--------------------------------------------------+ ++ **Blimp (flapping fin)** + ++------+----------------------------------------------------------------------------------------------------+ ++ Desc | Flapping Fin Blimps + ++------+-------------------------------------------------+--------------------------------------------------+ ++ Sim | Yes + .. youtube:: t-qaqH-AO2c + ++------+-------------------------------------------------+ :width: 100% + ++ R/W | Yes + + ++------+-------------------------------------------------+ + ++ Code | Blimp + + ++------+-------------------------------------------------+ + ++ Info | + + ++------+-------------------------------------------------+--------------------------------------------------+ [copywiki destination="ardupilot"] diff --git a/common/source/docs/common-esp8266-telemetry.rst b/common/source/docs/common-esp8266-telemetry.rst index c8c753798a..148fe7b5e0 100644 --- a/common/source/docs/common-esp8266-telemetry.rst +++ b/common/source/docs/common-esp8266-telemetry.rst @@ -39,7 +39,7 @@ If all is well the ground station will connect, download parameters and the HUD Flashing the device with the MAVESP8266 firmware ------------------------------------------------ -We recommend flashing the ArduPilot specific version of MAVESP8266 (`binaries `__, `source code `__) over the original `MAVESP8266 `__ because it includes two additional features: +We recommend flashing the ArduPilot specific version of MAVESP8266 (`binaries `__, `source code `__) over the original `MAVESP8266 `__ because it includes two additional features: - mavlink2 support - subsequent firmware uploads can be done over wifi diff --git a/common/source/docs/common-generators.rst b/common/source/docs/common-generators.rst index 6e60cc1968..5bed8a5549 100644 --- a/common/source/docs/common-generators.rst +++ b/common/source/docs/common-generators.rst @@ -18,6 +18,9 @@ The following are all currently supported within ArduPilot: RichenPower generator Intelligent Energy 650W/800W Hydrogen Fuel Cell Intelligent Energy 2.4kW Hydrogen Fuel Cell + Shang Fei Aviation + +.. note:: Shang Fei generator uses a LUA script driver `here `__ [/site] [copywiki destination="plane,copter,rover"] diff --git a/common/source/docs/common-hobbywing-dronecan-esc.rst b/common/source/docs/common-hobbywing-dronecan-esc.rst index 2b783f5958..80b212d2b7 100644 --- a/common/source/docs/common-hobbywing-dronecan-esc.rst +++ b/common/source/docs/common-hobbywing-dronecan-esc.rst @@ -10,6 +10,8 @@ Hobbywing DroneCAN ESC Hobbywing ESCs with CAN interfaces (`including these `__) support DroneCAN which allows the autopilot to control the ESC/motor via CAN and also retrieve the individual rpm, voltage, current and temperature. +.. note:: be sure that the CAN version of the ESC is being ordered. Contact Hobbywing if there is doubt. Some ESCs may require special ordering to get CAN interface. + The contents of this page were verified using a `Hobbywing X6 Plus (6218-150KV CW motor) `__. Some images courtesy of hobbywing.com diff --git a/common_conf.py b/common_conf.py index 7c75affdd5..1cdd4a6a86 100644 --- a/common_conf.py +++ b/common_conf.py @@ -14,6 +14,7 @@ 'sphinx.ext.imgmath', 'sphinx.ext.ifconfig', 'sphinxcontrib.youtube', # For youtube embedding + 'sphinxcontrib.jquery', ] # Set False to re-enable warnings for non-local images. @@ -59,8 +60,6 @@ # http://stackoverflow.com/questions/12772927/specifying-an-online-image-in-sphinx-restructuredtext-format # And https://github.com/sphinx-doc/sphinx/issues/2429 -# Set False to re-enable warnings for non-local images. -disable_non_local_image_warnings = True if disable_non_local_image_warnings: import sphinx.environment diff --git a/copter/source/_static/parameters_versioning_script.inc b/copter/source/_static/parameters_versioning_script.inc index 1bce0e78ab..8b0a9fe2e7 100644 --- a/copter/source/_static/parameters_versioning_script.inc +++ b/copter/source/_static/parameters_versioning_script.inc @@ -1,11 +1,27 @@ -

You can change and check the parameters for another version: - - +

You can change and check the parameters for another version: + +

\ No newline at end of file + + document.getElementById('selectPicker').addEventListener('change', function() { + window.location.href = this.value; + }); + + function appendToSelect(json) { + var selectPicker = document.getElementById('selectPicker'); + for (var key in json) { + var opt = document.createElement('option'); + opt.value = json[key]; + opt.innerHTML = key; + selectPicker.appendChild(opt); + } + } +}); + diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 0a2b5d1460..16e19fab50 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -1,5 +1,5 @@ # Use an official Python runtime as a parent image -FROM python:3.8-slim +FROM python:3.11-slim # Set the working directory in the container to /app WORKDIR /frontend diff --git a/frontend/css/main.css b/frontend/css/main.css index 244b89757b..b038566639 100644 --- a/frontend/css/main.css +++ b/frontend/css/main.css @@ -67,7 +67,13 @@ html { } +/*#blog_posts .row .col-md-4 a {*/ +/* min-height: 485px; !* Modify to your preference *!*/ +/*}*/ +.col_min { + min-height: 300px; +} .bg-dark { /* background-color: #343a40 !important; */ diff --git a/frontend/includes/_footer.html b/frontend/includes/_footer.html deleted file mode 100644 index 0da678b97c..0000000000 --- a/frontend/includes/_footer.html +++ /dev/null @@ -1,10 +0,0 @@ -
- - - - - \ No newline at end of file diff --git a/frontend/includes/_topbar.html b/frontend/includes/_topbar.html index 813671b90c..8b4b422c44 100644 --- a/frontend/includes/_topbar.html +++ b/frontend/includes/_topbar.html @@ -3,17 +3,17 @@
- ArduPilot - -