dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

PM update 

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4941 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
patacongo 2012-07-14 19:38:14 +00:00
parent 4ea9aa3ff1
commit 1faee63c00
4 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nuttx/ChangeLog
View File

@ -2981,6 +2981,9 @@
* configs/lpc4330-xplorer/up_nsh.c: Add support for a basic SPIFI block * configs/lpc4330-xplorer/up_nsh.c: Add support for a basic SPIFI block
driver for use by NSH. Does not work! Crashes on first SPIFI write. driver for use by NSH. Does not work! Crashes on first SPIFI write.
* configs/lpc4330-xplorer/*/defconfig: Calibrate delay loops (this is
based on the current "slow" 72MHz M4 clock and will need to be
re-calibrated when this is increased).
* configs/stm3220g-eval/include/board.h and configs/stm3240g-eval/include/board.h: * configs/stm3220g-eval/include/board.h and configs/stm3240g-eval/include/board.h:
The SDIOCLK frequency in the F2 and F4 derives for PLL48CLK and not HCLK The SDIOCLK frequency in the F2 and F4 derives for PLL48CLK and not HCLK
so that the SDIOCLK input frequency should always be 48MHz. so that the SDIOCLK input frequency should always be 48MHz.

1
nuttx/configs/stm3210e-eval/pm/defconfig
View File

@ -488,7 +488,6 @@ CONFIG_PM_BUTTONS_NAME4="DOWN"
CONFIG_PM_BUTTONS_NAME5="LEFT" CONFIG_PM_BUTTONS_NAME5="LEFT"
CONFIG_PM_BUTTONS_NAME6="RIGHT" CONFIG_PM_BUTTONS_NAME6="RIGHT"
CONFIG_PM_BUTTONS_NAME7="UP" CONFIG_PM_BUTTONS_NAME7="UP"
CONFIG_PM_BUTTONS=1
# #
# Settings for NXFLAT # Settings for NXFLAT

21
nuttx/configs/stm3210e-eval/src/up_lcd.c
View File

@ -1169,6 +1169,7 @@ static void stm3210e_pm_notify(struct pm_callback_s *cb , enum pm_state_e pmstat
{ {
duty--; duty--;
} }
putreg16((uint16_t)duty, STM32_TIM1_CCR1); putreg16((uint16_t)duty, STM32_TIM1_CCR1);
#endif #endif
} }
@ -1176,17 +1177,31 @@ static void stm3210e_pm_notify(struct pm_callback_s *cb , enum pm_state_e pmstat
case(PM_IDLE): case(PM_IDLE):
{ {
/* Entering IDLE mode - Turn display off */ /* Entering IDLE mode - Reduce LCD light */
#ifdef CONFIG_LCD_PWM #ifdef CONFIG_LCD_PWM
putreg16(0, STM32_TIM1_CCR1); frac = (g_lcddev.power << 16) / CONFIG_LCD_MAXPOWER;
duty = (g_lcddev.reload * frac) >> 16;
if (duty > 0)
{
duty--;
}
/* Reduce the LCD light to 50% of the MAXPOWER */
duty >>= 1;
putreg16((uint16_t)duty, STM32_TIM1_CCR1);
#endif #endif
} }
break; break;
case(PM_STANDBY): case(PM_STANDBY):
{ {
/* Entering STANDBY mode - Logic for PM_STANDBY goes here */ /* Entering STANDBY mode - Turn display off */
#ifdef CONFIG_LCD_PWM
putreg16(0, STM32_TIM1_CCR1);
#endif
} }
break; break;

2
nuttx/configs/stm3210e-eval/src/up_pm.c
View File

@ -93,7 +93,7 @@ void up_pminitialize(void)
pm_initialize(); pm_initialize();
#ifdef CONFIG_PM_BUTTONS #if defined(CONFIG_IDLE_CUSTOM) && defined(CONFIG_PM_BUTTONS)
/* Initialize the buttons to wake up the system from low power modes */ /* Initialize the buttons to wake up the system from low power modes */
up_pmbuttons(); up_pmbuttons();