Skip to content

Commit 9c47d73

Browse files
authored
Merge branch 'master' into merge-i18n-po-strings
2 parents c41ea0c + 388216c commit 9c47d73

17 files changed

+1156
-370
lines changed

.github/workflows/i18n-extract.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ on:
66
- master
77
paths:
88
- '**/*.py'
9-
- '!**/tests/**'
9+
paths-ignore:
10+
- 'tests/**'
1011
workflow_dispatch:
1112

1213
# prevent race conditions
@@ -82,7 +83,7 @@ jobs:
8283
8384
- name: Extract strings
8485
run: |
85-
pygettext3 -d $PYGETTEXT_DOMAIN -o $PYGETTEXT_LOCALEDIR/$PYGETTEXT_DOMAIN.pot $(git ls-files '*.py') || exit 1
86+
python create_pot_file.py
8687
8788
- name: Stage changes
8889
run: |

TUNING_GUIDE_ArduCopter.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1185,7 +1185,7 @@ Now do the flight to collect the data and analyze the logs to see if the baromet
11851185

11861186
# 11. System identification for analytical PID optimization (optional)
11871187

1188-
This uses [Ardupilot's system identification flight mode](https://ardupilot.org/copter/docs/systemid-mode-operation.html) to collect data to [build a mathematical model of the vehicle](https://ardupilot.org/copter/docs/systemid-mode-operation.html#identification-of-a-multicopter) that can later be used to further [optimize the control loops of the vehicle according to a set of constraints (requirements)](https://discuss.ardupilot.org/t/analitical-multicopter-flight-controller-pid-optimization/109759).
1188+
This uses [Ardupilot's system identification flight mode](https://ardupilot.org/copter/docs/common-systemid-mode-operation.html) to collect data to [build a mathematical model of the vehicle](https://ardupilot.org/copter/docs/systemid-model-development.html#identification-of-a-multicopter) that can later be used to further [optimize the control loops of the vehicle according to a set of constraints (requirements)](https://discuss.ardupilot.org/t/analitical-multicopter-flight-controller-pid-optimization/109759).
11891189

11901190
## 11.1 System Identification Flights
11911191

TUNING_GUIDE_ArduPlane.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1089,7 +1089,7 @@ Now do the flight to collect the data and analyze the logs to see if the baromet
10891089

10901090
# 11. System identification for analytical PID optimization (optional)
10911091

1092-
This uses [Ardupilot's system identification flight mode](https://ardupilot.org/copter/docs/systemid-mode-operation.html) to collect data to [build a mathematical model of the vehicle](https://ardupilot.org/copter/docs/systemid-mode-operation.html#identification-of-a-multicopter) that can later be used to further [optimize the control loops of the vehicle according to a set of constraints (requirements)](https://discuss.ardupilot.org/t/analitical-multicopter-flight-controller-pid-optimization/109759).
1092+
This uses [Ardupilot's system identification flight mode](https://ardupilot.org/copter/docs/common-systemid-mode-operation.html) to collect data to [build a mathematical model of the vehicle](https://ardupilot.org/copter/docs/systemid-model-development.html#identification-of-a-multicopter) that can later be used to further [optimize the control loops of the vehicle according to a set of constraints (requirements)](https://discuss.ardupilot.org/t/analitical-multicopter-flight-controller-pid-optimization/109759).
10931093

10941094
## 11.1 System Identification Flights
10951095

TUNING_GUIDE_Heli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1030,7 +1030,7 @@ Now do the flight to collect the data and analyze the logs to see if the baromet
10301030

10311031
# 11. System identification for analytical PID optimization (optional)
10321032

1033-
This uses [Ardupilot's system identification flight mode](https://ardupilot.org/copter/docs/systemid-mode-operation.html) to collect data to [build a mathematical model of the vehicle](https://ardupilot.org/copter/docs/systemid-mode-operation.html#identification-of-a-multicopter) that can later be used to further [optimize the control loops of the vehicle according to a set of constraints (requirements)](https://discuss.ardupilot.org/t/analitical-multicopter-flight-controller-pid-optimization/109759).
1033+
This uses [Ardupilot's system identification flight mode](https://ardupilot.org/copter/docs/common-systemid-mode-operation.html) to collect data to [build a mathematical model of the vehicle](https://ardupilot.org/copter/docs/systemid-model-development.html#identification-of-a-multicopter) that can later be used to further [optimize the control loops of the vehicle according to a set of constraints (requirements)](https://discuss.ardupilot.org/t/analitical-multicopter-flight-controller-pid-optimization/109759).
10341034

10351035
## 11.1 System Identification Flights
10361036

TUNING_GUIDE_Rover.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1084,7 +1084,7 @@ Now do the flight to collect the data and analyze the logs to see if the baromet
10841084

10851085
# 11. System identification for analytical PID optimization (optional)
10861086

1087-
This uses [Ardupilot's system identification flight mode](https://ardupilot.org/copter/docs/systemid-mode-operation.html) to collect data to [build a mathematical model of the vehicle](https://ardupilot.org/copter/docs/systemid-mode-operation.html#identification-of-a-multicopter) that can later be used to further [optimize the control loops of the vehicle according to a set of constraints (requirements)](https://discuss.ardupilot.org/t/analitical-multicopter-flight-controller-pid-optimization/109759).
1087+
This uses [Ardupilot's system identification flight mode](https://ardupilot.org/copter/docs/common-systemid-mode-operation.html) to collect data to [build a mathematical model of the vehicle](https://ardupilot.org/copter/docs/systemid-model-development.html#identification-of-a-multicopter) that can later be used to further [optimize the control loops of the vehicle according to a set of constraints (requirements)](https://discuss.ardupilot.org/t/analitical-multicopter-flight-controller-pid-optimization/109759).
10881088

10891089
## 11.1 System Identification Flights
10901090

ardupilot_methodic_configurator/configuration_steps_ArduCopter.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -668,7 +668,7 @@
668668
"blog_text": "Configure parameters for the roll axis system identification to create a mathematical model of the vehicle",
669669
"blog_url": "https://ardupilot.github.io/MethodicConfigurator/TUNING_GUIDE_ArduCopter#11-system-identification-for-analytical-pid-optimization-optional",
670670
"wiki_text": "Matlab and Simulink IAV scripts for system identification",
671-
"wiki_url": "https://ardupilot.org/copter/docs/systemid-mode-operation.html#identification-of-a-multicopter",
671+
"wiki_url": "https://ardupilot.org/copter/docs/systemid-model-development.html#identification-of-a-multicopter",
672672
"external_tool_text": "ArduCopter Simulink Model",
673673
"external_tool_url": "https://github.com/ArduPilot/ardupilot/blob/master/Tools/simulink/arducopter/README.md",
674674
"mandatory_text": "20% mandatory (80% optional)",
@@ -686,7 +686,7 @@
686686
"blog_text": "Configure parameters for the pitch axis system identification to create a mathematical model of the vehicle",
687687
"blog_url": "https://ardupilot.github.io/MethodicConfigurator/TUNING_GUIDE_ArduCopter#1112-pitch-rate-mathematical-model",
688688
"wiki_text": "Matlab and Simulink IAV scripts for system identification",
689-
"wiki_url": "https://ardupilot.org/copter/docs/systemid-mode-operation.html#identification-of-a-multicopter",
689+
"wiki_url": "https://ardupilot.org/copter/docs/systemid-model-development.html#identification-of-a-multicopter",
690690
"external_tool_text": "ArduCopter Simulink Model",
691691
"external_tool_url": "https://github.com/ArduPilot/ardupilot/blob/master/Tools/simulink/arducopter/README.md",
692692
"mandatory_text": "20% mandatory (80% optional)",
@@ -702,7 +702,7 @@
702702
"blog_text": "Configure parameters for the yaw axis system identification to create a mathematical model of the vehicle",
703703
"blog_url": "https://ardupilot.github.io/MethodicConfigurator/TUNING_GUIDE_ArduCopter#1113-yaw-rate-mathematical-model",
704704
"wiki_text": "Matlab and Simulink IAV scripts for system identification",
705-
"wiki_url": "https://ardupilot.org/copter/docs/systemid-mode-operation.html#identification-of-a-multicopter",
705+
"wiki_url": "https://ardupilot.org/copter/docs/systemid-model-development.html#identification-of-a-multicopter",
706706
"external_tool_text": "ArduCopter Simulink Model",
707707
"external_tool_url": "https://github.com/ArduPilot/ardupilot/blob/master/Tools/simulink/arducopter/README.md",
708708
"mandatory_text": "20% mandatory (80% optional)",
@@ -718,7 +718,7 @@
718718
"blog_text": "Configure parameters for the thrust axis system identification to create a mathematical model of the vehicle",
719719
"blog_url": "https://ardupilot.github.io/MethodicConfigurator/TUNING_GUIDE_ArduCopter#1114-thrust-mathematical-model",
720720
"wiki_text": "Matlab and Simulink IAV scripts for system identification",
721-
"wiki_url": "https://ardupilot.org/copter/docs/systemid-mode-operation.html#identification-of-a-multicopter",
721+
"wiki_url": "https://ardupilot.org/copter/docs/systemid-model-development.html#identification-of-a-multicopter",
722722
"external_tool_text": "ArduCopter Simulink Model",
723723
"external_tool_url": "https://github.com/ArduPilot/ardupilot/blob/master/Tools/simulink/arducopter/README.md",
724724
"mandatory_text": "20% mandatory (80% optional)",

ardupilot_methodic_configurator/configuration_steps_ArduPlane.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -662,7 +662,7 @@
662662
"blog_text": "Configure parameters for the roll axis system identification to create a mathematical model of the vehicle",
663663
"blog_url": "https://ardupilot.github.io/MethodicConfigurator/TUNING_GUIDE_ArduPlane#11-system-identification-for-analytical-pid-optimization-optional",
664664
"wiki_text": "Matlab and Simulink IAV scripts for system identification",
665-
"wiki_url": "https://ardupilot.org/copter/docs/systemid-mode-operation.html#identification-of-a-multicopter",
665+
"wiki_url": "https://ardupilot.org/copter/docs/systemid-model-development.html#identification-of-a-multicopter",
666666
"external_tool_text": "ArduCopter Simulink Model",
667667
"external_tool_url": "https://github.com/ArduPilot/ardupilot/blob/master/Tools/simulink/arducopter/README.md",
668668
"mandatory_text": "20% mandatory (80% optional)",
@@ -680,7 +680,7 @@
680680
"blog_text": "Configure parameters for the pitch axis system identification to create a mathematical model of the vehicle",
681681
"blog_url": "https://ardupilot.github.io/MethodicConfigurator/TUNING_GUIDE_ArduPlane#1112-pitch-rate-mathematical-model",
682682
"wiki_text": "Matlab and Simulink IAV scripts for system identification",
683-
"wiki_url": "https://ardupilot.org/copter/docs/systemid-mode-operation.html#identification-of-a-multicopter",
683+
"wiki_url": "https://ardupilot.org/copter/docs/systemid-model-development.html#identification-of-a-multicopter",
684684
"external_tool_text": "ArduCopter Simulink Model",
685685
"external_tool_url": "https://github.com/ArduPilot/ardupilot/blob/master/Tools/simulink/arducopter/README.md",
686686
"mandatory_text": "20% mandatory (80% optional)",
@@ -696,7 +696,7 @@
696696
"blog_text": "Configure parameters for the yaw axis system identification to create a mathematical model of the vehicle",
697697
"blog_url": "https://ardupilot.github.io/MethodicConfigurator/TUNING_GUIDE_ArduPlane#1113-yaw-rate-mathematical-model",
698698
"wiki_text": "Matlab and Simulink IAV scripts for system identification",
699-
"wiki_url": "https://ardupilot.org/copter/docs/systemid-mode-operation.html#identification-of-a-multicopter",
699+
"wiki_url": "https://ardupilot.org/copter/docs/systemid-model-development.html#identification-of-a-multicopter",
700700
"external_tool_text": "ArduCopter Simulink Model",
701701
"external_tool_url": "https://github.com/ArduPilot/ardupilot/blob/master/Tools/simulink/arducopter/README.md",
702702
"mandatory_text": "20% mandatory (80% optional)",
@@ -712,7 +712,7 @@
712712
"blog_text": "Configure parameters for the thrust axis system identification to create a mathematical model of the vehicle",
713713
"blog_url": "https://ardupilot.github.io/MethodicConfigurator/TUNING_GUIDE_ArduPlane#1114-thrust-mathematical-model",
714714
"wiki_text": "Matlab and Simulink IAV scripts for system identification",
715-
"wiki_url": "https://ardupilot.org/copter/docs/systemid-mode-operation.html#identification-of-a-multicopter",
715+
"wiki_url": "https://ardupilot.org/copter/docs/systemid-model-development.html#identification-of-a-multicopter",
716716
"external_tool_text": "ArduCopter Simulink Model",
717717
"external_tool_url": "https://github.com/ArduPilot/ardupilot/blob/master/Tools/simulink/arducopter/README.md",
718718
"mandatory_text": "20% mandatory (80% optional)",

ardupilot_methodic_configurator/configuration_steps_Heli.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -661,7 +661,7 @@
661661
"blog_text": "Configure parameters for the roll axis system identification to create a mathematical model of the vehicle",
662662
"blog_url": "https://ardupilot.github.io/MethodicConfigurator/TUNING_GUIDE_Heli#11-system-identification-for-analytical-pid-optimization-optional",
663663
"wiki_text": "Matlab and Simulink IAV scripts for system identification",
664-
"wiki_url": "https://ardupilot.org/copter/docs/systemid-mode-operation.html#identification-of-a-multicopter",
664+
"wiki_url": "https://ardupilot.org/copter/docs/systemid-model-development.html#identification-of-a-multicopter",
665665
"external_tool_text": "ArduCopter Simulink Model",
666666
"external_tool_url": "https://github.com/ArduPilot/ardupilot/blob/master/Tools/simulink/arducopter/README.md",
667667
"mandatory_text": "20% mandatory (80% optional)",
@@ -679,7 +679,7 @@
679679
"blog_text": "Configure parameters for the pitch axis system identification to create a mathematical model of the vehicle",
680680
"blog_url": "https://ardupilot.github.io/MethodicConfigurator/TUNING_GUIDE_Heli#1112-pitch-rate-mathematical-model",
681681
"wiki_text": "Matlab and Simulink IAV scripts for system identification",
682-
"wiki_url": "https://ardupilot.org/copter/docs/systemid-mode-operation.html#identification-of-a-multicopter",
682+
"wiki_url": "https://ardupilot.org/copter/docs/systemid-model-development.html#identification-of-a-multicopter",
683683
"external_tool_text": "ArduCopter Simulink Model",
684684
"external_tool_url": "https://github.com/ArduPilot/ardupilot/blob/master/Tools/simulink/arducopter/README.md",
685685
"mandatory_text": "20% mandatory (80% optional)",
@@ -695,7 +695,7 @@
695695
"blog_text": "Configure parameters for the yaw axis system identification to create a mathematical model of the vehicle",
696696
"blog_url": "https://ardupilot.github.io/MethodicConfigurator/TUNING_GUIDE_Heli#1113-yaw-rate-mathematical-model",
697697
"wiki_text": "Matlab and Simulink IAV scripts for system identification",
698-
"wiki_url": "https://ardupilot.org/copter/docs/systemid-mode-operation.html#identification-of-a-multicopter",
698+
"wiki_url": "https://ardupilot.org/copter/docs/systemid-model-development.html#identification-of-a-multicopter",
699699
"external_tool_text": "ArduCopter Simulink Model",
700700
"external_tool_url": "https://github.com/ArduPilot/ardupilot/blob/master/Tools/simulink/arducopter/README.md",
701701
"mandatory_text": "20% mandatory (80% optional)",
@@ -711,7 +711,7 @@
711711
"blog_text": "Configure parameters for the thrust axis system identification to create a mathematical model of the vehicle",
712712
"blog_url": "https://ardupilot.github.io/MethodicConfigurator/TUNING_GUIDE_Heli#1114-thrust-mathematical-model",
713713
"wiki_text": "Matlab and Simulink IAV scripts for system identification",
714-
"wiki_url": "https://ardupilot.org/copter/docs/systemid-mode-operation.html#identification-of-a-multicopter",
714+
"wiki_url": "https://ardupilot.org/copter/docs/systemid-model-development.html#identification-of-a-multicopter",
715715
"external_tool_text": "ArduCopter Simulink Model",
716716
"external_tool_url": "https://github.com/ArduPilot/ardupilot/blob/master/Tools/simulink/arducopter/README.md",
717717
"mandatory_text": "20% mandatory (80% optional)",

ardupilot_methodic_configurator/configuration_steps_Rover.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -662,7 +662,7 @@
662662
"blog_text": "Configure parameters for the roll axis system identification to create a mathematical model of the vehicle",
663663
"blog_url": "https://ardupilot.github.io/MethodicConfigurator/TUNING_GUIDE_Rover#11-system-identification-for-analytical-pid-optimization-optional",
664664
"wiki_text": "Matlab and Simulink IAV scripts for system identification",
665-
"wiki_url": "https://ardupilot.org/copter/docs/systemid-mode-operation.html#identification-of-a-multicopter",
665+
"wiki_url": "https://ardupilot.org/copter/docs/systemid-model-development.html#identification-of-a-multicopter",
666666
"external_tool_text": "ArduCopter Simulink Model",
667667
"external_tool_url": "https://github.com/ArduPilot/ardupilot/blob/master/Tools/simulink/arducopter/README.md",
668668
"mandatory_text": "20% mandatory (80% optional)",
@@ -680,7 +680,7 @@
680680
"blog_text": "Configure parameters for the pitch axis system identification to create a mathematical model of the vehicle",
681681
"blog_url": "https://ardupilot.github.io/MethodicConfigurator/TUNING_GUIDE_Rover#1112-pitch-rate-mathematical-model",
682682
"wiki_text": "Matlab and Simulink IAV scripts for system identification",
683-
"wiki_url": "https://ardupilot.org/copter/docs/systemid-mode-operation.html#identification-of-a-multicopter",
683+
"wiki_url": "https://ardupilot.org/copter/docs/systemid-model-development.html#identification-of-a-multicopter",
684684
"external_tool_text": "ArduCopter Simulink Model",
685685
"external_tool_url": "https://github.com/ArduPilot/ardupilot/blob/master/Tools/simulink/arducopter/README.md",
686686
"mandatory_text": "20% mandatory (80% optional)",
@@ -696,7 +696,7 @@
696696
"blog_text": "Configure parameters for the yaw axis system identification to create a mathematical model of the vehicle",
697697
"blog_url": "https://ardupilot.github.io/MethodicConfigurator/TUNING_GUIDE_Rover#1113-yaw-rate-mathematical-model",
698698
"wiki_text": "Matlab and Simulink IAV scripts for system identification",
699-
"wiki_url": "https://ardupilot.org/copter/docs/systemid-mode-operation.html#identification-of-a-multicopter",
699+
"wiki_url": "https://ardupilot.org/copter/docs/systemid-model-development.html#identification-of-a-multicopter",
700700
"external_tool_text": "ArduCopter Simulink Model",
701701
"external_tool_url": "https://github.com/ArduPilot/ardupilot/blob/master/Tools/simulink/arducopter/README.md",
702702
"mandatory_text": "20% mandatory (80% optional)",
@@ -712,7 +712,7 @@
712712
"blog_text": "Configure parameters for the thrust axis system identification to create a mathematical model of the vehicle",
713713
"blog_url": "https://ardupilot.github.io/MethodicConfigurator/TUNING_GUIDE_Rover#1114-thrust-mathematical-model",
714714
"wiki_text": "Matlab and Simulink IAV scripts for system identification",
715-
"wiki_url": "https://ardupilot.org/copter/docs/systemid-mode-operation.html#identification-of-a-multicopter",
715+
"wiki_url": "https://ardupilot.org/copter/docs/systemid-model-development.html#identification-of-a-multicopter",
716716
"external_tool_text": "ArduCopter Simulink Model",
717717
"external_tool_url": "https://github.com/ArduPilot/ardupilot/blob/master/Tools/simulink/arducopter/README.md",
718718
"mandatory_text": "20% mandatory (80% optional)",

0 commit comments

Comments
 (0)