Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 06:28:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_FETTecOneWire: Fix the recent change of NUM_SERVO_CHANNELS > 24

Browse Source
This commit is contained in:
Dr.-Ing. Amilcar do Carmo Lucas 2022-06-13 14:17:30 +02:00 committed by Peter Barker
parent c334fbe069
commit f7d21b63a7
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libraries/AP_FETtecOneWire/AP_FETtecOneWire.cpp
View File

@ -122,12 +122,13 @@ void AP_FETtecOneWire::init()
_motor_mask = uint32_t(_motor_mask_parameter); // take a copy that will not change after we leave this function _motor_mask = uint32_t(_motor_mask_parameter); // take a copy that will not change after we leave this function
_esc_count = __builtin_popcount(_motor_mask); _esc_count = __builtin_popcount(_motor_mask);
#if HAL_WITH_ESC_TELEM #if HAL_WITH_ESC_TELEM
// OneWire supports at most 15 ESCs, because of the 4 bit limitation // OneWire supports telemetry in at most 15 ESCs, because of the 4 bit limitation
// on the fast-throttle command. But we are still limited to the // on the fast-throttle command. But we are still limited to the
// number of ESCs the telem library will collect data for. // number of ESCs the telem library will collect data for.
if (_esc_count == 0 || _motor_mask >= (1U << MIN(15,ESC_TELEM_MAX_ESCS))) { if (_esc_count == 0 || _motor_mask >= (1U << MIN(15, ESC_TELEM_MAX_ESCS))) {
#else #else
if (_esc_count == 0 || _motor_mask >= (1U << MIN(15,NUM_SERVO_CHANNELS))) { // OneWire supports at most 24 ESCs without telemetry
if (_esc_count == 0 || _motor_mask >= (1U << MIN(24, NUM_SERVO_CHANNELS))) {
#endif #endif
_invalid_mask = true; _invalid_mask = true;
return; return;

4
libraries/AP_FETtecOneWire/README.md
View File

@ -41,7 +41,7 @@ For purchase, connection and configuration information please see the [ArduPilot
## ArduPilot to ESC protocol ## ArduPilot to ESC protocol
The FETtec OneWire protocol supports up to 24 ESCs. As most copters only use at most 12 motors, ArduPilot's implementation supports only 12 (`ESC_TELEM_MAX_ESCS`)to save memory. The FETtec OneWire protocol supports up to 24 ESCs without telemetry and up to 15 ESCs with telemetry.
There are two types of messages sent to the ESCs configuration and fast-throttle messages: There are two types of messages sent to the ESCs configuration and fast-throttle messages:
@ -165,7 +165,7 @@ pre_arm_check()
The `SERVO_FTW_MASK` parameter selects which servo outputs, if any, will be routed to FETtec ESCs. The `SERVO_FTW_MASK` parameter selects which servo outputs, if any, will be routed to FETtec ESCs.
You need to reboot after changing this parameter. You need to reboot after changing this parameter.
When `HAL_WITH_ESC_TELEM` is active (default) only the first 12 (`ESC_TELEM_MAX_ESCS`) can be used. When `HAL_WITH_ESC_TELEM` is active (default) only the first 15 (`ESC_TELEM_MAX_ESCS`) can be used.
The FETtec ESC IDs set inside the FETtec firmware by the FETtec configuration tool are one-indexed. The FETtec ESC IDs set inside the FETtec firmware by the FETtec configuration tool are one-indexed.
These IDs must start at ID 1 and be in a single contiguous block. These IDs must start at ID 1 and be in a single contiguous block.
You do not need to change these FETtec IDs if you change the servo output assignments inside ArduPilot the using the `SERVO_FTW_MASK` parameter. You do not need to change these FETtec IDs if you change the servo output assignments inside ArduPilot the using the `SERVO_FTW_MASK` parameter.