Skip to content

Commit 9c88eaf

Browse files
Merge branch 'ArduPilot:master' into DTS6012M
2 parents 507de09 + 655aea1 commit 9c88eaf

File tree

45 files changed

+109
-132
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+109
-132
lines changed

.github/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ If you are reading this page, you are possibly interested in contributing to our
88
* Adding new features
99
* Reviewing existing pull requests, and notifying the maintainer if it passes your code review.
1010

11-
## How to make a good bug report...
11+
## How to make a good bug report
1212

1313
* Make sure your bug is not a support issue. Support issues should go to [the support forums](http://discuss.ardupilot.org) and include a .bin log file if possible. If you're not sure you have a bug, you should seek support first.
1414
* Search for your bug, make sure it is not already reported. If it is already reported, make a comment on that issue.

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ If there was a previous discussion in the forum, link to it
1414
## Bug report
1515

1616
### Issue details
17+
1718
Please describe the problem
1819

1920
**Version**

.markdownlint-cli2.jsonc

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,10 @@
99
"config": {
1010
// Disable rules that are currently violated in the codebase
1111
// These can be re-enabled incrementally as files are fixed
12-
"MD012": false, // Multiple consecutive blank lines
1312
"MD013": false, // Line length
1413
"MD014": false, // Dollar signs used before commands without showing output
15-
"MD022": false, // Headings should be surrounded by blank lines
1614
"MD024": false, // Multiple headings with the same content
17-
"MD026": false, // Trailing punctuation in heading
1815
"MD029": false, // Ordered list item prefix
19-
"MD032": false, // Lists should be surrounded by blank lines
20-
"MD033": true, // Inline HTML - no inline HTML allowed
21-
"MD036": false, // Emphasis used instead of a heading
2216
"MD037": false, // Spaces inside emphasis markers
2317
"MD045": false // Images should have alternate text
2418
}

Tools/debug/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ or to open in gdb for further postmortem do the following:
122122

123123
`arm-none-eabi-gdb -nx path/to/elf/file -ex "set target-charset ASCII" -ex "target remote | modules/CrashDebug/bins/lin64/CrashDebug --elf path/to/elf/file --dump crash_dump.bin"`
124124

125-
## Debugging faults using GDB:
125+
## Debugging faults using GDB
126126

127127
* Connect hardware over SWD
128128
* Place breakpoint at hardfault using `b *&HardFault_Handler`
@@ -134,7 +134,7 @@ and then `set $sp = $psp` and do `backtrace`
134134

135135
* One can also log the RAM, refer crash_debugger app and Tools/debug/crash_dump.scr for the same.
136136

137-
### References:
137+
### References
138138

139139
[Memfault Interrupt](https://interrupt.memfault.com/blog/cortex-m-fault-debug)
140140

Tools/ros2/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ cd ~/ros2_ws
127127
source /{path_to_your_ros_distro_workspace}/install/setup.zsh
128128
```
129129

130-
### 4.1. Build microxrcedds_gen:
130+
### 4.1. Build microxrcedds_gen
131131

132132
```bash
133133
cd ~/ros2_ws/src/microxrcedds_gen
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
# Placeholder for `ardupilot_dds_tests` launch files.
1+
# Placeholder for `ardupilot_dds_tests` launch files

Tools/scripts/sitl-on-hardware/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ and quadplane:
2323
cd $HOME/ardupilot
2424
./Tools/scripts/sitl-on-hardware/sitl-on-hw.py --board MatekH743 --vehicle plane --simclass QuadPlane
2525

26-
### Copter :
26+
### Copter
2727

2828
Only the default quad frame is enable by default, to enable another frame type, you need to enable the right compile flag :
2929
e.g. for octa-quad frame, AP_MOTORS_FRAME_OCTAQUAD_ENABLED 1 in the hwdef file. Compile flags list is in AP_Motors_class.h

Tools/simulink/arducopter/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
The Simulink file [arducopter.slx](https://github.com/fbredeme/ardupilot_simulink/blob/master/arducopter.slx) contains a model of the ArduCopter Stabilize and Althold controllers. The plant models of the copter itself can be generated by [system identification](https://ardupilot.org/copter/docs/systemid-mode.html).
44

5-
![](simulink_model.PNG?raw=true "Simulink screenshot")
5+
![Simulink screenshot](simulink_model.PNG)
66

77
To run the simulation, the relevant data from a *.bin log file needs to be loaded to the MATLAB workspace. This can be done with the two scripts that are provided:
88

libraries/AC_CustomControl/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Custom controller library allows you to implement and easily run your own contro
77
- In-flight switching between main and custom controller with RC switch, option 109.
88
- Bitmask to choose which axis to use the custom controller output
99
- Filter, integrator reset mechanism when switching between controller
10-
  - Bumpless transfer when switching from custom to the main controller
10+
- Bumpless transfer when switching from custom to the main controller
1111
- Ground and in-flight spool state separation to avoid build-up during arming and take-off with the custom controller
1212
- Frontend-backend separation that allows adding a new controller with very little overhead
1313
- Flag to compile out custom controller related code on hardware, --enable-custom-controller
@@ -19,9 +19,9 @@ Custom controller library allows you to implement and easily run your own contro
1919
The frontend library has the following parameters
2020

2121
- `CC_TYPE`: choose which custom controller backend to use, reboot required.
22-
  - Setting it to 0 will turn this feature off, GCS will not display parameters related to the custom controller
22+
- Setting it to 0 will turn this feature off, GCS will not display parameters related to the custom controller
2323
- `CC_AXIS_MASK`: choose which axis to use custom controller output
24-
  - This is a bitmask type parameter. Set 7 to use all output
24+
- This is a bitmask type parameter. Set 7 to use all output
2525

2626
## Interaction With Main Controller
2727

libraries/AP_HAL_ChibiOS/hwdef/ACNS-CM4Pilot/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ The CM4PILOT is a low-cost and compact flight controller which integrated a Rasp
99
## Features
1010

1111
- Raspberry Pi CM4 + Ardupilot, Companion Computers in cockpit structure
12-
- Small Footprint and Lightweight, 58mm X 50mm X 18mm26g(without shell)
12+
- Small Footprint and Lightweight, 58mm x 50mm x 18mm, 26g (without shell)
1313
- Broadcom BCM2711, quad-core Cortex-A72 (ARM v8) 64-bit SoC @ 1.5GHz
1414
- STM32F405 microcontroller
1515
- IMU: BMI088

0 commit comments

Comments
 (0)