Changeset - f2f8cb2bebfa
Parent rev.
Child rev.
[Not reviewed]
default
0 6 0
Ethan Zonca - 7 years ago 2019-09-02 13:57:33
ez@ethanzonca.com
1hz RTC interrupt and STOP mode works! Now idling at 0.8mA or so!
6 files changed with 44 insertions and 12 deletions:
drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_hal.h
1
drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal.c
6
inc/gpio.h
2
1
inc/rtc.h
1
src/main.c
24
10
src/rtc.c
10
1
0 comments (0 inline, 0 general)
drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_hal.h
➞
Show inline comments
 
@@ -522,12 +522,13 @@ HAL_StatusTypeDef HAL_InitTick (uint32_t
 
/** @addtogroup HAL_Exported_Functions_Group2
 
  * @{
 
  */
 
 
/* Peripheral Control functions  ************************************************/
 
void              HAL_IncTick(void);
 
void 			  HAL_IncTickBy(uint32_t increment); // emz
 
void              HAL_Delay(__IO uint32_t Delay);
 
uint32_t          HAL_GetTick(void);
 
void              HAL_SuspendTick(void);
 
void              HAL_ResumeTick(void);
 
uint32_t          HAL_GetHalVersion(void);
 
uint32_t          HAL_GetREVID(void);
drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal.c
➞
Show inline comments
 
@@ -285,12 +285,18 @@ HAL_StatusTypeDef HAL_DeInit(void)
 
  */
 
__weak void HAL_IncTick(void)
 
{
 
  uwTick++;
 
}
 
 
// emz
 
__weak void HAL_IncTickBy(uint32_t increment)
 
{
 
	uwTick += increment;
 
}
 
 
/**
 
  * @brief  Provides a tick value in millisecond.
 
  * @note   This function is declared as __weak  to be overwritten  in case of other
 
  *       implementations in user file.
 
  * @retval tick value
 
  */
inc/gpio.h
➞
Show inline comments
 
@@ -5,13 +5,14 @@
 
 
 
enum _blinkrate
 
{
 
    BLINK_FAST = 50,
 
    BLINK_MED = 250,
 
    BLINK_SLOW = 2000
 
    BLINK_SLOW = 2000,
 
	BLINK_DISABLE = 9999,
 
};
 
 
 
#define OSC_EN_Pin GPIO_PIN_1
 
#define OSC_EN_GPIO_Port GPIOF
 
#define OSC_NOTEN OSC_EN_GPIO_Port , OSC_EN_Pin
inc/rtc.h
➞
Show inline comments
 
@@ -2,10 +2,11 @@
 
#define __rtc_H
 
 
#include "stm32f0xx_hal.h"
 
 
 
void rtc_init(void);
 
RTC_TimeTypeDef* rtc_time(void);
 
RTC_HandleTypeDef* rtc_gethandle(void);
 
 
 
#endif /*__ rtc_H */
src/main.c
➞
Show inline comments
 
@@ -51,15 +51,15 @@ int main(void)
 
 
    uint32_t led_timer = HAL_GetTick();
 
 
    led_blink(4);
 
 
    uint16_t blink_rate = BLINK_FAST;
 
//    uint8_t state = SYSTEM_GPSACQ;
 
    uint8_t state = SYSTEM_GPSACQ;
 
//DEBUG:
 
    uint8_t state = SYSTEM_IDLE;
 
//    uint8_t state = SYSTEM_IDLE;
 
 
    uint32_t gps_polltimer = 0;
 
    uint32_t fix_acq_starttime = 0;
 
    uint32_t nextwspr_time = 0;
 
    uint8_t nextwspr_time_valid = 0;
 
    uint32_t last_wspr_tx_time = 0;
 
@@ -69,15 +69,16 @@ int main(void)
 
    // Transmit pilot tone to test TX on bootup
 
    HAL_Delay(1000);
 
    wspr_pilot_tone();
 
    adc_stop();
 
    HAL_Delay(1000);
 
 
    __DBGMCU_CLK_ENABLE() ; // (RCC->APB2ENR |= (RCC_APB2ENR_DBGMCUEN))
 
    HAL_EnableDBGStopMode();  //  SET_BIT(DBGMCU->CR, DBGMCU_CR_DBG_STOP);
 
//    __DBGMCU_CLK_ENABLE() ; // (RCC->APB2ENR |= (RCC_APB2ENR_DBGMCUEN))
 
//    HAL_EnableDBGStopMode();  //  SET_BIT(DBGMCU->CR, DBGMCU_CR_DBG_STOP);
 
 
    uint32_t idle_blink_last = 0;
 
 
    while (1)
 
    {
 
    	// TODO: Disable GPIO port clocking when not needed!
 
 
    	// Every 10 minutes, wake up and try to wspr
 
@@ -117,22 +118,35 @@ int main(void)
 
        switch(state)
 
        {
 
 
            // Idling: sleep and wait for RTC timeslot trigger
 
            case SYSTEM_IDLE:
 
            {
 
                blink_rate = BLINK_SLOW;
 
            	// Don't blink normally
 
                blink_rate = 9999; //BLINK_SLOW;
 
 
                // Actually sleep for real: disable systick and sleep until RTC interrupt
 
//                HAL_SuspendTick();
 
                // If we haven't blinked for a while, blink now
 
                if(HAL_GetTick() - idle_blink_last > 10 * 1000)
 
                {
 
                	HAL_GPIO_WritePin(LED_BLUE, 1);
 
                	HAL_Delay(20);
 
                	HAL_GPIO_WritePin(LED_BLUE, 0);
 
                	idle_blink_last = HAL_GetTick();
 
                }
 
 
                // Enter sleep mode: wait for interrupt
 
                //HAL_PWR_EnterSLEEPMode(0, PWR_SLEEPENTRY_WFI);
 
                __HAL_PWR_CLEAR_FLAG(PWR_FLAG_WU);
 
                HAL_SuspendTick();
 
 
        		HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);
 
 
        		// We probably stopped for a second
 
        		HAL_IncTickBy(1000); // maybe check the RTC before and after this, increment tick by the delta?
 
                HAL_ResumeTick();
 
 
                // We have woken up! Clear wakeup flag
 
        		__HAL_PWR_CLEAR_FLAG(PWR_FLAG_WU);
 
 
                // This is hopefully the only timer that needs to stay alive in idle mode
 
 //               last_wspr_tx_time += 0; // move this timer forward based on sleep length
 
 
@@ -186,13 +200,13 @@ int main(void)
 
                    fix_acq_starttime = 0;
 
                    last_wspr_tx_time = HAL_GetTick(); // repeat acq/tx cycle after big time delay
 
                	state = SYSTEM_IDLE;
 
                }
 
            } break;
 
 
 
 
            // Wait for wspr timeslot and start transmitting
 
            case SYSTEM_WSPRTX:
 
            {
 
            	blink_rate = BLINK_MED;
 
                // Wait for wspr countdown timer to expire and go to tx
 
//                if(timeout_expired)
 
@@ -238,19 +252,19 @@ int main(void)
 
 
            } break;
 
 
        }
 
 
		#ifndef LED_DISABLE
 
			if(HAL_GetTick() - led_timer > blink_rate)
 
			if((blink_rate != BLINK_DISABLE) && (HAL_GetTick() - led_timer > blink_rate))
 
			{
 
				ledpulse();
 
				led_timer = HAL_GetTick();
 
			}
 
 
			if(statled_ontime && HAL_GetTick() - statled_ontime > 10)
 
			if((blink_rate != BLINK_DISABLE) && (statled_ontime && HAL_GetTick() - statled_ontime > 10))
 
			{
 
				HAL_GPIO_WritePin(LED_BLUE, 0);
 
				statled_ontime = 0;
 
			}
 
		#endif
 
src/rtc.c
➞
Show inline comments
 
@@ -74,13 +74,13 @@ void rtc_init(void)
 
	sAlarm.AlarmTime.SubSeconds = 0x0;
 
	sAlarm.AlarmTime.DayLightSaving = RTC_DAYLIGHTSAVING_NONE;
 
	sAlarm.AlarmTime.StoreOperation = RTC_STOREOPERATION_RESET;
 
 
	// Alarm will trigger on the Xth second of every minute
 
	sAlarm.AlarmMask = RTC_ALARMMASK_ALL; // Trigger every second for now
 
	sAlarm.AlarmSubSecondMask = RTC_ALARMSUBSECONDMASK_ALL;
 
	sAlarm.AlarmSubSecondMask = RTC_ALARMSUBSECONDMASK_SS14; //RTC_ALARMSUBSECONDMASK_ALL;
 
	sAlarm.AlarmDateWeekDaySel = RTC_ALARMDATEWEEKDAYSEL_DATE;
 
	sAlarm.AlarmDateWeekDay = RTC_WEEKDAY_MONDAY;
 
	sAlarm.Alarm = RTC_ALARM_A;
 
	if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, RTC_FORMAT_BCD) != HAL_OK)
 
	{
 
		Error_Handler();
 
@@ -91,12 +91,21 @@ void rtc_init(void)
 
 
	HAL_RTC_WaitForSynchro(&hrtc);
 
 
 
}
 
 
RTC_TimeTypeDef time_last = {0};
 
 
RTC_TimeTypeDef* rtc_time(void)
 
{
 
	HAL_RTC_GetTime(&hrtc, &time_last, RTC_FORMAT_BCD);
 
	return &time_last;
 
}
 
 
 
void rtc_cal(void)
 
{
 
	// Do something with hrtc.Instance->CALR; // this has a plus and minus component, see refman
 
}
 
 
RTC_HandleTypeDef* rtc_gethandle(void)
0 comments (0 inline, 0 general)
Server instance: zserverv-626845 This site is powered by Kallithea, which is © 2010–2021 by various authors & licensed under GPLv3. – Support