sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

increase number of supported PWM channels from 4 to 6

Browse Source 
commit d8199fe460e432584125e73a4d9cceabd9baec74 changed Kconfig, but it
looks like pwm_main.c should have been changed too. This adds support
for the 5th and 6th channels to the code, and adds an error if more than
6 channels are configured.
This commit is contained in:
Norman Rasmussen 2021-12-28 03:04:12 -08:00 committed by Xiang Xiao
parent ec93611307
commit 75c1e43334
1 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
examples/pwm/pwm_main.c
View File

@ -65,6 +65,26 @@
# error "Channel numbers must be unique" # error "Channel numbers must be unique"
# endif # endif
# endif # endif
# if CONFIG_PWM_NCHANNELS > 4
# if CONFIG_EXAMPLES_PWM_CHANNEL1 == CONFIG_EXAMPLES_PWM_CHANNEL5 || \
CONFIG_EXAMPLES_PWM_CHANNEL2 == CONFIG_EXAMPLES_PWM_CHANNEL5 || \
CONFIG_EXAMPLES_PWM_CHANNEL3 == CONFIG_EXAMPLES_PWM_CHANNEL5 || \
CONFIG_EXAMPLES_PWM_CHANNEL4 == CONFIG_EXAMPLES_PWM_CHANNEL5
# error "Channel numbers must be unique"
# endif
# endif
# if CONFIG_PWM_NCHANNELS > 5
# if CONFIG_EXAMPLES_PWM_CHANNEL1 == CONFIG_EXAMPLES_PWM_CHANNEL6 || \
CONFIG_EXAMPLES_PWM_CHANNEL2 == CONFIG_EXAMPLES_PWM_CHANNEL6 || \
CONFIG_EXAMPLES_PWM_CHANNEL3 == CONFIG_EXAMPLES_PWM_CHANNEL6 || \
CONFIG_EXAMPLES_PWM_CHANNEL4 == CONFIG_EXAMPLES_PWM_CHANNEL6 || \
CONFIG_EXAMPLES_PWM_CHANNEL5 == CONFIG_EXAMPLES_PWM_CHANNEL6
# error "Channel numbers must be unique"
# endif
# endif
# if CONFIG_PWM_NCHANNELS > 6
# error "Too many PWM channels"
# endif
#endif #endif
/**************************************************************************** /****************************************************************************
@ -142,6 +162,12 @@ static void pwm_help(FAR struct pwm_state_s *pwm)
#endif #endif
#if CONFIG_PWM_NCHANNELS > 3 #if CONFIG_PWM_NCHANNELS > 3
CONFIG_EXAMPLES_PWM_CHANNEL4, CONFIG_EXAMPLES_PWM_CHANNEL4,
#endif
#if CONFIG_PWM_NCHANNELS > 4
CONFIG_EXAMPLES_PWM_CHANNEL5,
#endif
#if CONFIG_PWM_NCHANNELS > 5
CONFIG_EXAMPLES_PWM_CHANNEL6,
#endif #endif
}; };
@ -156,6 +182,12 @@ static void pwm_help(FAR struct pwm_state_s *pwm)
#endif #endif
#if CONFIG_PWM_NCHANNELS > 3 #if CONFIG_PWM_NCHANNELS > 3
CONFIG_EXAMPLES_PWM_DUTYPCT4, CONFIG_EXAMPLES_PWM_DUTYPCT4,
#endif
#if CONFIG_PWM_NCHANNELS > 4
CONFIG_EXAMPLES_PWM_DUTYPCT5,
#endif
#if CONFIG_PWM_NCHANNELS > 5
CONFIG_EXAMPLES_PWM_DUTYPCT6,
#endif #endif
}; };
@ -298,7 +330,7 @@ static void parse_args(FAR struct pwm_state_s *pwm, int argc,
#ifdef CONFIG_PWM_MULTICHAN #ifdef CONFIG_PWM_MULTICHAN
case 'c': case 'c':
nargs = arg_decimal(&argv[index], &value); nargs = arg_decimal(&argv[index], &value);
if (value < 1 || value > 4) if (value < 1 || value > CONFIG_PWM_NCHANNELS)
{ {
printf("Channel out of range: %ld\n", value); printf("Channel out of range: %ld\n", value);
exit(1); exit(1);
@ -426,6 +458,14 @@ int main(int argc, FAR char *argv[])
g_pwmstate.channels[3] = CONFIG_EXAMPLES_PWM_CHANNEL4; g_pwmstate.channels[3] = CONFIG_EXAMPLES_PWM_CHANNEL4;
g_pwmstate.duties[3] = CONFIG_EXAMPLES_PWM_DUTYPCT4; g_pwmstate.duties[3] = CONFIG_EXAMPLES_PWM_DUTYPCT4;
#endif #endif
#if CONFIG_PWM_NCHANNELS > 4
g_pwmstate.channels[4] = CONFIG_EXAMPLES_PWM_CHANNEL5;
g_pwmstate.duties[4] = CONFIG_EXAMPLES_PWM_DUTYPCT5;
#endif
#if CONFIG_PWM_NCHANNELS > 5
g_pwmstate.channels[5] = CONFIG_EXAMPLES_PWM_CHANNEL6;
g_pwmstate.duties[5] = CONFIG_EXAMPLES_PWM_DUTYPCT6;
#endif
#else #else
g_pwmstate.duty = CONFIG_EXAMPLES_PWM_DUTYPCT; g_pwmstate.duty = CONFIG_EXAMPLES_PWM_DUTYPCT;
#endif #endif