Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-23 22:58:10 +08:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

pwm_out: check PWM_OUT_MAX_INSTANCES with conditional

Browse Source 
- PWM_OUT_MAX_INSTANCES is a constant (static constexpr) not available to the preprocessor
This commit is contained in:
Daniel Agar
2021-03-23 22:13:18 -04:00
committed by GitHub
parent 3983f0b833
commit b2faea7f43
2 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/pwm_out/CMakeLists.txt
-2
View File
@@ -34,8 +34,6 @@ px4_add_module(
MODULE drivers__pwm_out
MAIN pwm_out
COMPILE_FLAGS
-Wno-unused-but-set-variable # TODO
-Wno-unused-variable # TODO
SRCS
PWMOut.cpp
PWMOut.hpp
src/drivers/pwm_out/PWMOut.cpp
+10 -12
View File
@@ -1743,24 +1743,22 @@ int PWMOut::fmu_new_mode(PortMode new_mode)
return -1;
}
#if PWM_OUT_MAX_INSTANCES > 0
PWMOut *pwm0 = _objects[0].load(); // TODO: get_instance();
if (PWM_OUT_MAX_INSTANCES > 0) {
PWMOut *pwm0 = _objects[0].load(); // TODO: get_instance();
if (pwm0 && pwm_mode0 != pwm0->get_mode()) {
pwm0->request_mode(pwm_mode0);
if (pwm0 && pwm_mode0 != pwm0->get_mode()) {
pwm0->request_mode(pwm_mode0);
}
}
#endif
if (PWM_OUT_MAX_INSTANCES > 1) {
PWMOut *pwm1 = _objects[1].load(); // TODO: get_instance();
#if PWM_OUT_MAX_INSTANCES > 1
PWMOut *pwm1 = _objects[1].load(); // TODO: get_instance();
if (pwm1 && pwm_mode1 != pwm1->get_mode()) {
pwm1->request_mode(pwm_mode1);
if (pwm1 && pwm_mode1 != pwm1->get_mode()) {
pwm1->request_mode(pwm_mode1);
}
}
#endif
return OK;
}