yemai/bizhang_-obav
1
0
Fork 0
mirror of https://gitee.com/xiaohuolufeihua/bizhang_-obav.git synced 2026-05-22 01:12:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

io_timer_init.h: avoid using timer_channel, as imxrt does not have it

Browse Source
This commit is contained in:
Beat Küng
2020-01-31 10:41:09 +01:00
committed by David Sidrane
parent ef36d70cb4
commit 6b1ee7bbe2
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
platforms/nuttx/src/px4/common/include/px4_platform/io_timer_init.h
View File

@@ -61,7 +61,7 @@ static inline constexpr io_timers_channel_mapping_t initIOTimerChannelMapping(co
uint32_t channel_count = 0;
for (uint32_t channel = 0; channel < MAX_TIMER_IO_CHANNELS; ++channel) {
if (timer_io_channels_conf[channel].timer_channel == 0) {
if (timer_io_channels_conf[channel].gpio_in == 0 && timer_io_channels_conf[channel].gpio_out == 0) {
break;
}
@@ -88,7 +88,8 @@ static inline constexpr io_timers_channel_mapping_t initIOTimerChannelMapping(co
// validate that the number of configured channels matches DIRECT_PWM_OUTPUT_CHANNELS
uint32_t num_channels = 0;
while (num_channels < MAX_TIMER_IO_CHANNELS && timer_io_channels_conf[num_channels].timer_channel != 0) {
while (num_channels < MAX_TIMER_IO_CHANNELS &&
(timer_io_channels_conf[num_channels].gpio_in != 0 || timer_io_channels_conf[num_channels].gpio_out != 0)) {
++num_channels;
}