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

Merged in raiden00/apps (pull request #134)

Browse Source 
examples/powerled: add arch initialization; examples/smps: fixes in some printf and in Kconfig

Approved-by: Gregory Nutt <gnutt@nuttx.org>
This commit is contained in:
Mateusz Szafoni 2018-04-07 12:45:35 +00:00 committed by Gregory Nutt
parent 0be2f16e3f
commit 4d38b98054
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/powerled/powerled_main.c
View File

@ -478,6 +478,12 @@ int powerled_main(int argc, char *argv[])
} }
#endif #endif
#ifndef CONFIG_NSH_BUILTIN_APPS
/* Perform architecture-specific initialization (if configured) */
(void)boardctl(BOARDIOC_INIT, 0);
#endif
/* Set LED current limit */ /* Set LED current limit */
powerled_limits.current = (((float)CONFIG_EXAMPLES_POWERLED_CURRENT_LIMIT)/1000.0); powerled_limits.current = (((float)CONFIG_EXAMPLES_POWERLED_CURRENT_LIMIT)/1000.0);

18
examples/smps/smps_main.c
View File

@ -366,31 +366,31 @@ errout:
static void feedback_print(FAR struct smps_feedback_s *fb) static void feedback_print(FAR struct smps_feedback_s *fb)
{ {
#ifdef CONFIG_SMPS_HAVE_INPUT_VOLTAGE #ifdef CONFIG_SMPS_HAVE_INPUT_VOLTAGE
printf("v_out: %0.3f\t", fb->v_out); printf("v_out: %.3f\t", fb->v_out);
#endif #endif
#ifdef CONFIG_SMPS_HAVE_OUTPUT_VOLTAGE #ifdef CONFIG_SMPS_HAVE_OUTPUT_VOLTAGE
printf("v_in: %0.3f\t", fb->v_in); printf("v_in: %.3f\t", fb->v_in);
#endif #endif
#ifdef CONFIG_SMPS_HAVE_OUTPUT_CURRENT #ifdef CONFIG_SMPS_HAVE_OUTPUT_CURRENT
printf("i_out: %0.3f\t", fb->i_out); printf("i_out: %.3f\t", fb->i_out);
#endif #endif
#ifdef CONFIG_SMPS_HAVE_INPUT_CURRENT #ifdef CONFIG_SMPS_HAVE_INPUT_CURRENT
printf("i_in: %0.3f\t", fb->i_in); printf("i_in: %.3f\t", fb->i_in);
#endif #endif
#ifdef CONFIG_SMPS_HAVE_OUTPUT_POWER #ifdef CONFIG_SMPS_HAVE_OUTPUT_POWER
printf("p_in: %0.3f\t", fb->p_in); printf("p_in: %.3f\t", fb->p_in);
#endif #endif
#ifdef CONFIG_SMPS_HAVE_INPUT_POWER #ifdef CONFIG_SMPS_HAVE_INPUT_POWER
printf("p_out: %0.3f\t", fb->p_out); printf("p_out: %.3f\t", fb->p_out);
#endif #endif
#ifdef CONFIG_SMPS_HAVE_EFFICIENCY #ifdef CONFIG_SMPS_HAVE_EFFICIENCY
printf("eff: %0.3f\t", fb->eff); printf("eff: %.3f\t", fb->eff);
#endif #endif
printf("\n"); printf("\n");
} }
void print_info(struct smps_limits_s *limits, struct smps_params_s *params, static void print_info(struct smps_limits_s *limits, struct smps_params_s *params,
uint8_t *mode, struct args_s *args) uint8_t *mode, struct args_s *args)
{ {
printf("-------------------------------------\n"); printf("-------------------------------------\n");
printf("Current SMPS settings:\n"); printf("Current SMPS settings:\n");