Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-31 02:16:53 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

dshot: remove dshot 1200
FLASH usage analysis / Analyzing px4_fmu-v5x (push) Has been cancelled
Details
FLASH usage analysis / Analyzing px4_fmu-v6x (push) Has been cancelled
Details
MAVROS Mission Tests / build (map[mission:MC_mission_box vehicle:iris]) (push) Has been cancelled
Details
MAVROS Mission Tests / build (map[mission:rover_mission_1 vehicle:rover]) (push) Has been cancelled
Details
MAVROS Offboard Tests / build (map[test_file:mavros_posix_tests_offboard_posctl.test vehicle:iris]) (push) Has been cancelled
Details
Nuttx Target with extra env config / build (px4_fmu-v5_default) (push) Has been cancelled
Details
Python CI Checks / build (push) Has been cancelled
Details
SITL Tests / Testing PX4 tailsitter (push) Has been cancelled
Details
SITL Tests / Testing PX4 iris (push) Has been cancelled
Details
SITL Tests / Testing PX4 standard_vtol (push) Has been cancelled
Details
FLASH usage analysis / Publish Results (push) Has been cancelled
Details
ClusterFuzzLite batch fuzzing / BatchFuzzing (address) (push) Has been cancelled
Details
ClusterFuzzLite batch fuzzing / BatchFuzzing (memory) (push) Has been cancelled
Details
ClusterFuzzLite batch fuzzing / BatchFuzzing (undefined) (push) Has been cancelled
Details
Build all targets / Scan for Board Targets (push) Waiting to run
Details
Build all targets / Build Group [${{ matrix.group }}] (push) Blocked by required conditions
Details
Build all targets / Upload Artifacts to S3 (push) Blocked by required conditions
Details
Build all targets / Create Release and Upload Artifacts (push) Blocked by required conditions
Details
Checks / build (NO_NINJA_BUILD=1 px4_fmu-v5_default) (push) Waiting to run
Details
Checks / build (NO_NINJA_BUILD=1 px4_sitl_default) (push) Waiting to run
Details
Checks / build (check_format) (push) Waiting to run
Details
Checks / build (check_newlines) (push) Waiting to run
Details
Checks / build (module_documentation) (push) Waiting to run
Details
Checks / build (px4_fmu-v2_default stack_check) (push) Waiting to run
Details
Checks / build (px4_sitl_allyes) (push) Waiting to run
Details
Checks / build (shellcheck_all) (push) Waiting to run
Details
Checks / build (tests) (push) Waiting to run
Details
Checks / build (tests_coverage) (push) Waiting to run
Details
Checks / build (validate_module_configs) (push) Waiting to run
Details
Clang Tidy / build (push) Waiting to run
Details
MacOS build / build (px4_fmu-v5_default) (push) Waiting to run
Details
MacOS build / build (px4_sitl) (push) Waiting to run
Details
Ubuntu environment build / Build and Test (ubuntu:22.04) (push) Waiting to run
Details
Ubuntu environment build / Build and Test (ubuntu:24.04) (push) Waiting to run
Details
Container build / Build and Push Container (push) Waiting to run
Details
Failsafe Simulator Build / build (failsafe_web) (push) Waiting to run
Details
EKF Update Change Indicator / unit_tests (push) Waiting to run
Details

Browse Source
This commit is contained in:
alexklimaj
2025-01-21 23:00:37 -07:00
committed by Daniel Agar
parent 1aab194f9e
commit c3ba39f931
4 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/drv_dshot.h
+1 -1
View File
@@ -88,7 +88,7 @@ typedef enum {
* @param channel_mask Bitmask of channels (LSB = channel 0) to enable. * @param channel_mask Bitmask of channels (LSB = channel 0) to enable.
* This allows some of the channels to remain configured * This allows some of the channels to remain configured
* as GPIOs or as another function. Already used channels/timers will not be configured as DShot * as GPIOs or as another function. Already used channels/timers will not be configured as DShot
* @param dshot_pwm_freq Frequency of DSHOT signal. Usually DSHOT150, DSHOT300, DSHOT600 or DSHOT1200 * @param dshot_pwm_freq Frequency of DSHOT signal. Usually DSHOT150, DSHOT300, or DSHOT600
* @return <0 on error, the initialized channels mask. * @return <0 on error, the initialized channels mask.
*/ */
__EXPORT extern int up_dshot_init(uint32_t channel_mask, unsigned dshot_pwm_freq, bool enable_bidirectional_dshot); __EXPORT extern int up_dshot_init(uint32_t channel_mask, unsigned dshot_pwm_freq, bool enable_bidirectional_dshot);
src/drivers/dshot/DShot.cpp
+1 -4
View File
@@ -125,9 +125,6 @@ void DShot::enable_dshot_outputs(const bool enabled)
} else if (tim_config == -3) { } else if (tim_config == -3) {
dshot_frequency_request = DSHOT600; dshot_frequency_request = DSHOT600;
} else if (tim_config == -2) {
dshot_frequency_request = DSHOT1200;
} else { } else {
_output_mask &= ~channels; // don't use for dshot _output_mask &= ~channels; // don't use for dshot
} }
@@ -824,7 +821,7 @@ On startup, the module tries to occupy all available pins for DShot output.
It skips all pins already in use (e.g. by a camera trigger module). It skips all pins already in use (e.g. by a camera trigger module).
It supports: It supports:
- DShot150, DShot300, DShot600, DShot1200 - DShot150, DShot300, DShot600
- telemetry via separate UART and publishing as esc_status message - telemetry via separate UART and publishing as esc_status message
- sending DShot commands via CLI - sending DShot commands via CLI
src/drivers/dshot/DShot.h
-2
View File
@@ -52,7 +52,6 @@ using namespace time_literals;
static constexpr unsigned int DSHOT150 = 150000u; static constexpr unsigned int DSHOT150 = 150000u;
static constexpr unsigned int DSHOT300 = 300000u; static constexpr unsigned int DSHOT300 = 300000u;
static constexpr unsigned int DSHOT600 = 600000u; static constexpr unsigned int DSHOT600 = 600000u;
static constexpr unsigned int DSHOT1200 = 1200000u;
static constexpr int DSHOT_DISARM_VALUE = 0; static constexpr int DSHOT_DISARM_VALUE = 0;
static constexpr int DSHOT_MIN_THROTTLE = 1; static constexpr int DSHOT_MIN_THROTTLE = 1;
@@ -107,7 +106,6 @@ private:
DShot150 = 150, DShot150 = 150,
DShot300 = 300, DShot300 = 300,
DShot600 = 600, DShot600 = 600,
DShot1200 = 1200,
}; };
struct Command { struct Command {
src/drivers/pwm_out/module.yaml
-1
View File
@@ -23,7 +23,6 @@ actuator_output:
-5: DShot150 -5: DShot150
-4: DShot300 -4: DShot300
-3: DShot600 -3: DShot600
-2: DShot1200
-1: OneShot -1: OneShot
50: PWM 50 Hz 50: PWM 50 Hz
100: PWM 100 Hz 100: PWM 100 Hz