Skip to content

Commit

Permalink
Merge branch 'master' into patch-4
Browse files Browse the repository at this point in the history
  • Loading branch information
lida2003 authored Nov 5, 2023
2 parents 71263ba + 526d60f commit 5f725c5
Show file tree
Hide file tree
Showing 25 changed files with 1,056 additions and 918 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/test-Windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.10-slim-bullseye
FROM python:3.11-slim-bookworm



Expand Down
5 changes: 1 addition & 4 deletions Sphinxsetup.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
14 changes: 8 additions & 6 deletions Sphinxsetup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
32 changes: 24 additions & 8 deletions antennatracker/source/_static/parameters_versioning_script.inc
Original file line number Diff line number Diff line change
@@ -1,11 +1,27 @@
<p>You can change and check the parameters for another version: <script type="text/javascript" src="../_static/jquery-3.2.1.min.js">
</script>

<select class="selectpicker" onChange="window.document.location.href=this.options[this.selectedIndex].value;"></select>
<p>You can change and check the parameters for another version:
<select class="selectpicker" id="selectPicker"></select>
</p>

<script type="text/javascript">
jQuery.getJSON("../_static/parameters-AntennaTracker.json", {}, function(json) {
$.each(json, function(key, value) {
$('.selectpicker').append('<option value="' + json[key] + '">' + key + '</option>');
document.addEventListener("DOMContentLoaded", function() {
fetch("../_static/parameters-AntennaTracker.json")
.then(function(response) { return response.json(); })
.then(function(json) {
appendToSelect(json);
});
}); </script> </p>

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);
}
}
});
</script>
32 changes: 24 additions & 8 deletions blimp/source/_static/parameters_versioning_script.inc
Original file line number Diff line number Diff line change
@@ -1,11 +1,27 @@
<p>You can change and check the parameters for another version: <script type="text/javascript" src="../_static/jquery-3.2.1.min.js">
</script>

<select class="selectpicker" onChange="window.document.location.href=this.options[this.selectedIndex].value;"></select>
<p>You can change and check the parameters for another version:
<select class="selectpicker" id="selectPicker"></select>
</p>

<script type="text/javascript">
jQuery.getJSON("../_static/parameters-Blimp.json", {}, function(json) {
$.each(json, function(key, value) {
$('.selectpicker').append('<option value="' + json[key] + '">' + key + '</option>');
document.addEventListener("DOMContentLoaded", function() {
fetch("../_static/parameters-Blimp.json")
.then(function(response) { return response.json(); })
.then(function(json) {
appendToSelect(json);
});
}); </script> </p>

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);
}
}
});
</script>
14 changes: 13 additions & 1 deletion common/source/docs/common-all-vehicle-types.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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% +
Expand Down Expand Up @@ -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"]
2 changes: 1 addition & 1 deletion common/source/docs/common-esp8266-telemetry.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 <https://firmware.ardupilot.org/Tools/MAVESP8266/latest/>`__, `source code <https://github.com/tridge/mavesp8266>`__) over the original `MAVESP8266 <https://github.com/dogmaphobic/mavesp8266>`__ because it includes two additional features:
We recommend flashing the ArduPilot specific version of MAVESP8266 (`binaries <https://firmware.ardupilot.org/Tools/MAVESP8266/latest/>`__, `source code <https://github.com/ArduPilot/mavesp8266>`__) over the original `MAVESP8266 <https://github.com/dogmaphobic/mavesp8266>`__ because it includes two additional features:

- mavlink2 support
- subsequent firmware uploads can be done over wifi
Expand Down
3 changes: 3 additions & 0 deletions common/source/docs/common-generators.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ The following are all currently supported within ArduPilot:
RichenPower generator <common-richenpower-generator>
Intelligent Energy 650W/800W Hydrogen Fuel Cell <common-ie650-fuelcell>
Intelligent Energy 2.4kW Hydrogen Fuel Cell <common-ie24-fuelcell>
Shang Fei Aviation <http://www.svffi.com/en>

.. note:: Shang Fei generator uses a LUA script driver `here <https://github.com/ArduPilot/ardupilot/tree/master/libraries/AP_Scripting/drivers>`__
[/site]

[copywiki destination="plane,copter,rover"]
2 changes: 2 additions & 0 deletions common/source/docs/common-hobbywing-dronecan-esc.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ Hobbywing DroneCAN ESC

Hobbywing ESCs with CAN interfaces (`including these <https://www.hobbywing.com/en/products?id=46>`__) 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) <https://www.hobbywingdirect.com/collections/xrotor-x8-series/products/xrotor-pro-x6-series>`__.

Some images courtesy of hobbywing.com
Expand Down
3 changes: 1 addition & 2 deletions common_conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down
32 changes: 24 additions & 8 deletions copter/source/_static/parameters_versioning_script.inc
Original file line number Diff line number Diff line change
@@ -1,11 +1,27 @@
<p>You can change and check the parameters for another version: <script type="text/javascript" src="../_static/jquery-3.2.1.min.js">
</script>

<select class="selectpicker" onChange="window.document.location.href=this.options[this.selectedIndex].value;"></select>
<p>You can change and check the parameters for another version:
<select class="selectpicker" id="selectPicker"></select>
</p>

<script type="text/javascript">
jQuery.getJSON("../_static/parameters-Copter.json", {}, function(json) {
$.each(json, function(key, value) {
$('.selectpicker').append('<option value="' + json[key] + '">' + key + '</option>');
document.addEventListener("DOMContentLoaded", function() {
fetch("../_static/parameters-Copter.json")
.then(function(response) { return response.json(); })
.then(function(json) {
appendToSelect(json);
});
}); </script> </p>

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);
}
}
});
</script>
2 changes: 1 addition & 1 deletion frontend/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 6 additions & 0 deletions frontend/css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -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; */
Expand Down
10 changes: 0 additions & 10 deletions frontend/includes/_footer.html

This file was deleted.

6 changes: 3 additions & 3 deletions frontend/includes/_topbar.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
<div class="container">

<a class="navbar-brand ml-auto mr-auto" href="#">
<img src="images/ArduPilot-Motto.png" alt="ArduPilot" title="ArduPilot" class="embed-responsive"
<img src="images/ArduPilot-Motto.png" alt="ArduPilot" title="ArduPilot" class="img-fluid"
media="(max-width: 767.98px)">
</a>

<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent"
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent"
aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>


<div class="navbar-collapse collapse" id="navbarSupportedContent">
<div class="collapse navbar-collapse" id="navbarSupportedContent">

<ul class="navbar-nav mr-auto ">

Expand Down
Loading

0 comments on commit 5f725c5

Please sign in to comment.