Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-07 01:05:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merged in raiden00/nuttx (pull request #529)

Browse Source 
Master

* cosmetics

* stm32_hrtim: add helper macros

* smps: cosmetics

* stm32f33xxx_adc: injected channels support, fix some definitions, add interface to disable interrupts

* stm32f334-dsico: beginning of lower-half driver for SMPS (buck-boost onboard converter)

* nucleo-f334r8/highpri: missing ADC trigger configuration

Approved-by: Gregory Nutt <gnutt@nuttx.org>
This commit is contained in:
Mateusz Szafoni
2017-11-05 14:15:04 +00:00
committed by Gregory Nutt
parent 4d6c17246f
commit 2fc5237854
16 changed files with 1211 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/nuttx/power/smps.h
+3 -3
View File
@@ -121,15 +121,15 @@ struct smps_feedback_s
#ifdef CONFIG_SMPS_HAVE_OUTPUT_VOLTAGE
float v_out; /* Output Voltage */
#endif
#ifdef CONFIG_SMPS_HAVE_INPUT_CURRENT
float i_in; /* Input Current */
#endif
#ifdef CONFIG_SMPS_HAVE_INPUT_VOLTAGE
float v_in; /* Input Voltage */
#endif
#ifdef CONFIG_SMPS_HAVE_OUTPUT_CURRENT
float i_out; /* Output Current */
#endif
#ifdef CONFIG_SMPS_HAVE_INPUT_CURRENT
float i_in; /* Input Current */
#endif
#ifdef CONFIG_SMPS_HAVE_INPUT_POWER
float p_in; /* Input Power */
#endif