Standby

Author: kevinkessler

Inc/main.h

@@ -55,6 +55,8 @@
 #define RST_GPIO_Port GPIOA
 #define BUSY_Pin GPIO_PIN_4
 #define BUSY_GPIO_Port GPIOA
+#define EPD_POWER_Pin GPIO_PIN_6
+#define EPD_POWER_GPIO_Port GPIOA
 
 /* ########################## Assert Selection ############################## */
 /**

Makefile

@@ -1,5 +1,5 @@
 ##########################################################################################################################
-# File automatically-generated by tool: [projectgenerator] version: [2.27.0] date: [Fri Apr 13 21:38:53 EDT 2018] 
+# File automatically-generated by tool: [projectgenerator] version: [2.27.0] date: [Sun Apr 15 22:21:16 EDT 2018] 
 ##########################################################################################################################
 
 # ------------------------------------------------
@@ -22,7 +22,7 @@ TARGET = TemperatureHumidityEPD
 # debug build?
 DEBUG = 1
 # optimization
-OPT = -O2
+OPT = -Og
 
 
 #######################################

Src/edpcontroller.c

@@ -101,6 +101,7 @@ static uint8_t getBatteryIndex(uint8_t value) {
 
 void displayData(int16_t temperature, int16_t humidity, uint8_t battery) {
 
+HAL_GPIO_WritePin(EPD_POWER_GPIO_Port, EPD_POWER_Pin, GPIO_PIN_RESET);
 EPD_Init(&epd);
 
 Paint paint_black;
@@ -143,9 +144,9 @@ void displayData(int16_t temperature, int16_t humidity, uint8_t battery) {
 
 
 EPD_DisplayRefresh(&epd);
-//	SlowClock();
 EPD_WaitUntilIdle(&epd);
 EPD_Sleep(&epd);
+HAL_GPIO_WritePin(EPD_POWER_GPIO_Port, EPD_POWER_Pin, GPIO_PIN_SET);
 
 }
 
@@ -172,12 +173,28 @@ int Display_init() {
 return 0;
 }
 
+void enterStandby()
+{
+GPIO_InitTypeDef GPIO_InitStruct;
+
+GPIO_InitStruct.Pin = SPI_CS_Pin|DC_Pin|RST_Pin|BUSY_Pin|EPD_POWER_Pin;
+GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
+GPIO_InitStruct.Pull = GPIO_NOPULL;
+GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
+HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+HAL_RTCEx_DeactivateWakeUpTimer(&hrtc);
+__HAL_PWR_CLEAR_FLAG(PWR_FLAG_WU);
+HAL_RTCEx_SetWakeUpTimer_IT(&hrtc, 20, RTC_WAKEUPCLOCK_CK_SPRE_16BITS);
+
+HAL_PWR_EnterSTANDBYMode();
+}
+
 void pollSensors(){
 
 uint8_t hum_data[2];
 uint8_t temp_data[2];
 
-
 HAL_I2C_Mem_Read(&hi2c1, 0x80, 0xe5, 1, hum_data, 2, 1000);
 HAL_I2C_Mem_Read(&hi2c1, 0x80, 0xe0, 1, temp_data, 2, 1000);
 
@@ -193,8 +210,7 @@ void pollSensors(){
 uint8_t volt_idx = getBatteryIndex(v_perc);
 
 displayData(temp, hum, volt_idx);
-HAL_Delay(10000);
-
+enterStandby();
 
 
 }

Src/main.c

@@ -110,20 +110,19 @@ int main(void)
  MX_ADC_Init();
 
  /* USER CODE BEGIN 2 */
+
  Display_init();
  HAL_ADC_Start(&hadc);
  /* USER CODE END 2 */
 
  /* Infinite loop */
  /* USER CODE BEGIN WHILE */
- while (1)
- {
- pollSensors();
+
+ pollSensors();
  /* USER CODE END WHILE */
 
  /* USER CODE BEGIN 3 */
 
- }
  /* USER CODE END 3 */
 
 }
@@ -143,10 +142,11 @@ void SystemClock_Config(void)
 
  /**Initializes the CPU, AHB and APB busses clocks 
  */
- RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI|RCC_OSCILLATORTYPE_LSI;
- RCC_OscInitStruct.HSIState = RCC_HSI_ON;
- RCC_OscInitStruct.HSICalibrationValue = 16;
+ RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSI|RCC_OSCILLATORTYPE_MSI;
  RCC_OscInitStruct.LSIState = RCC_LSI_ON;
+ RCC_OscInitStruct.MSIState = RCC_MSI_ON;
+ RCC_OscInitStruct.MSICalibrationValue = 0;
+ RCC_OscInitStruct.MSIClockRange = RCC_MSIRANGE_5;
  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE;
  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
  {
@@ -157,7 +157,7 @@ void SystemClock_Config(void)
  */
  RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK
  |RCC_CLOCKTYPE_PCLK1|RCC_CLOCKTYPE_PCLK2;
- RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_HSI;
+ RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_MSI;
  RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1;
  RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
@@ -233,7 +233,7 @@ static void MX_I2C1_Init(void)
 {
 
  hi2c1.Instance = I2C1;
- hi2c1.Init.Timing = 0x00303D5B;
+ hi2c1.Init.Timing = 0x00000708;
  hi2c1.Init.OwnAddress1 = 0;
  hi2c1.Init.AddressingMode = I2C_ADDRESSINGMODE_7BIT;
  hi2c1.Init.DualAddressMode = I2C_DUALADDRESS_DISABLE;
@@ -311,7 +311,7 @@ static void MX_RTC_Init(void)
  }
  /**Enable the WakeUp 
  */
- if (HAL_RTCEx_SetWakeUpTimer_IT(&hrtc, 46250, RTC_WAKEUPCLOCK_RTCCLK_DIV16) != HAL_OK)
+ if (HAL_RTCEx_SetWakeUpTimer_IT(&hrtc, 60, RTC_WAKEUPCLOCK_CK_SPRE_16BITS) != HAL_OK)
  {
  _Error_Handler(__FILE__, __LINE__);
  }
@@ -380,16 +380,16 @@ static void MX_GPIO_Init(void)
  __HAL_RCC_GPIOB_CLK_ENABLE();
 
  /*Configure GPIO pin Output Level */
- HAL_GPIO_WritePin(GPIOA, SPI_CS_Pin|DC_Pin|RST_Pin, GPIO_PIN_RESET);
+ HAL_GPIO_WritePin(GPIOA, SPI_CS_Pin|DC_Pin|RST_Pin|EPD_POWER_Pin, GPIO_PIN_RESET);
 
  /*Configure GPIO pins : PC14 PC15 */
  GPIO_InitStruct.Pin = GPIO_PIN_14|GPIO_PIN_15;
  GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
  GPIO_InitStruct.Pull = GPIO_NOPULL;
  HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
 
- /*Configure GPIO pins : PA0 PA6 */
- GPIO_InitStruct.Pin = GPIO_PIN_0|GPIO_PIN_6;
+ /*Configure GPIO pin : PA0 */
+ GPIO_InitStruct.Pin = GPIO_PIN_0;
  GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
  GPIO_InitStruct.Pull = GPIO_NOPULL;
  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
@@ -407,6 +407,13 @@ static void MX_GPIO_Init(void)
  GPIO_InitStruct.Pull = GPIO_NOPULL;
  HAL_GPIO_Init(BUSY_GPIO_Port, &GPIO_InitStruct);
 
+ /*Configure GPIO pin : EPD_POWER_Pin */
+ GPIO_InitStruct.Pin = EPD_POWER_Pin;
+ GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_OD;
+ GPIO_InitStruct.Pull = GPIO_NOPULL;
+ GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
+ HAL_GPIO_Init(EPD_POWER_GPIO_Port, &GPIO_InitStruct);
+
  /*Configure GPIO pin : PB1 */
  GPIO_InitStruct.Pin = GPIO_PIN_1;
  GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;

TemperatureHumidityEPD.ioc

@@ -22,7 +22,7 @@ Dma.Request1=I2C1_TX
 Dma.RequestsNb=2
 File.Version=6
 I2C1.IPParameters=Timing
-I2C1.Timing=0x00303D5B
+I2C1.Timing=0x00000708
 KeepUserPlacement=false
 Mcu.Family=STM32L0
 Mcu.IP0=ADC
@@ -38,20 +38,21 @@ Mcu.Name=STM32L031F(4-6)Px
 Mcu.Package=TSSOP20
 Mcu.Pin0=PA1
 Mcu.Pin1=PA2
-Mcu.Pin10=VP_ADC_Vref_Input
-Mcu.Pin11=VP_RTC_VS_RTC_Activate
-Mcu.Pin12=VP_RTC_VS_RTC_Calendar
-Mcu.Pin13=VP_RTC_VS_RTC_WakeUp_intern
-Mcu.Pin14=VP_SYS_VS_Systick
+Mcu.Pin10=PA14
+Mcu.Pin11=VP_ADC_Vref_Input
+Mcu.Pin12=VP_RTC_VS_RTC_Activate
+Mcu.Pin13=VP_RTC_VS_RTC_Calendar
+Mcu.Pin14=VP_RTC_VS_RTC_WakeUp_intern
+Mcu.Pin15=VP_SYS_VS_Systick
 Mcu.Pin2=PA3
 Mcu.Pin3=PA4
 Mcu.Pin4=PA5
-Mcu.Pin5=PA7
-Mcu.Pin6=PA9
-Mcu.Pin7=PA10
-Mcu.Pin8=PA13
-Mcu.Pin9=PA14
-Mcu.PinsNb=15
+Mcu.Pin5=PA6
+Mcu.Pin6=PA7
+Mcu.Pin7=PA9
+Mcu.Pin8=PA10
+Mcu.Pin9=PA13
+Mcu.PinsNb=16
 Mcu.ThirdPartyNb=0
 Mcu.UserConstants=
 Mcu.UserName=STM32L031F6Px
@@ -91,6 +92,11 @@ PA5.GPIOParameters=GPIO_Speed
 PA5.GPIO_Speed=GPIO_SPEED_FREQ_MEDIUM
 PA5.Mode=Simplex_Bidirectional_Master
 PA5.Signal=SPI1_SCK
+PA6.GPIOParameters=GPIO_Label,GPIO_ModeDefaultOutputPP
+PA6.GPIO_Label=EPD_POWER
+PA6.GPIO_ModeDefaultOutputPP=GPIO_MODE_OUTPUT_OD
+PA6.Locked=true
+PA6.Signal=GPIO_Output
 PA7.GPIOParameters=GPIO_Speed
 PA7.GPIO_Speed=GPIO_SPEED_FREQ_MEDIUM
 PA7.Mode=Simplex_Bidirectional_Master
@@ -133,42 +139,42 @@ ProjectManager.ToolChainLocation=
 ProjectManager.UnderRoot=false
 ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL-true,2-MX_DMA_Init-DMA-false-HAL-true,3-SystemClock_Config-RCC-false-HAL-true,4-MX_RTC_Init-RTC-false-HAL-true,5-MX_I2C1_Init-I2C1-false-HAL-true,6-MX_SPI1_Init-SPI1-false-HAL-true,7-MX_ADC_Init-ADC-false-HAL-true
 RCC.ADCFreq_Value=16000000
-RCC.AHBFreq_Value=16000000
-RCC.APB1Freq_Value=16000000
-RCC.APB1TimFreq_Value=16000000
-RCC.APB2Freq_Value=16000000
-RCC.APB2TimFreq_Value=16000000
-RCC.FCLKCortexFreq_Value=16000000
+RCC.AHBFreq_Value=2097000
+RCC.APB1Freq_Value=2097000
+RCC.APB1TimFreq_Value=2097000
+RCC.APB2Freq_Value=2097000
+RCC.APB2TimFreq_Value=2097000
+RCC.FCLKCortexFreq_Value=2097000
 RCC.FamilyName=M
-RCC.HCLKFreq_Value=16000000
+RCC.HCLKFreq_Value=2097000
 RCC.HSE_VALUE=8000000
 RCC.HSI16_VALUE=16000000
 RCC.HSI_VALUE=16000000
-RCC.I2C1Freq_Value=16000000
-RCC.IPParameters=ADCFreq_Value,AHBFreq_Value,APB1Freq_Value,APB1TimFreq_Value,APB2Freq_Value,APB2TimFreq_Value,FCLKCortexFreq_Value,FamilyName,HCLKFreq_Value,HSE_VALUE,HSI16_VALUE,HSI_VALUE,I2C1Freq_Value,LPTIMFreq_Value,LPUARTFreq_Value,LSE_VALUE,LSI_VALUE,MCOPinFreq_Value,MSI_VALUE,PLLCLKFreq_Value,PLLMUL,PWRFreq_Value,RTCFreq_Value,RTCHSEDivFreq_Value,SYSCLKFreq_VALUE,SYSCLKSource,TIMFreq_Value,TimerFreq_Value,USART2Freq_Value,VCOInputFreq_Value,VCOOutputFreq_Value,WatchDogFreq_Value
-RCC.LPTIMFreq_Value=16000000
-RCC.LPUARTFreq_Value=16000000
+RCC.I2C1Freq_Value=2097000
+RCC.IPParameters=ADCFreq_Value,AHBFreq_Value,APB1Freq_Value,APB1TimFreq_Value,APB2Freq_Value,APB2TimFreq_Value,FCLKCortexFreq_Value,FamilyName,HCLKFreq_Value,HSE_VALUE,HSI16_VALUE,HSI_VALUE,I2C1Freq_Value,LPTIMFreq_Value,LPUARTFreq_Value,LSE_VALUE,LSI_VALUE,MCOPinFreq_Value,MSI_VALUE,PLLCLKFreq_Value,PLLMUL,PWRFreq_Value,RTCFreq_Value,RTCHSEDivFreq_Value,SYSCLKFreq_VALUE,TIMFreq_Value,TimerFreq_Value,USART2Freq_Value,VCOInputFreq_Value,VCOOutputFreq_Value,WatchDogFreq_Value
+RCC.LPTIMFreq_Value=2097000
+RCC.LPUARTFreq_Value=2097000
 RCC.LSE_VALUE=32768
 RCC.LSI_VALUE=37000
-RCC.MCOPinFreq_Value=16000000
+RCC.MCOPinFreq_Value=2097000
 RCC.MSI_VALUE=2097000
 RCC.PLLCLKFreq_Value=32000000
 RCC.PLLMUL=RCC_PLLMUL_4
-RCC.PWRFreq_Value=16000000
+RCC.PWRFreq_Value=2097000
 RCC.RTCFreq_Value=37000
 RCC.RTCHSEDivFreq_Value=4000000
-RCC.SYSCLKFreq_VALUE=16000000
-RCC.SYSCLKSource=RCC_SYSCLKSOURCE_HSI
-RCC.TIMFreq_Value=16000000
-RCC.TimerFreq_Value=16000000
-RCC.USART2Freq_Value=16000000
+RCC.SYSCLKFreq_VALUE=2097000
+RCC.TIMFreq_Value=2097000
+RCC.TimerFreq_Value=2097000
+RCC.USART2Freq_Value=2097000
 RCC.VCOInputFreq_Value=16000000
 RCC.VCOOutputFreq_Value=64000000
 RCC.WatchDogFreq_Value=37000
-RTC.IPParameters=WakeUpCounter-WakeUp
-RTC.WakeUpCounter-WakeUp=46250
+RTC.IPParameters=WakeUpCounter-WakeUp,WakeUpClock-WakeUp
+RTC.WakeUpClock-WakeUp=RTC_WAKEUPCLOCK_CK_SPRE_16BITS
+RTC.WakeUpCounter-WakeUp=60
 SPI1.BaudRatePrescaler=SPI_BAUDRATEPRESCALER_2
-SPI1.CalculateBaudRate=8.0 MBits/s
+SPI1.CalculateBaudRate=1.0485 MBits/s
 SPI1.Direction=SPI_DIRECTION_1LINE
 SPI1.IPParameters=VirtualType,Mode,Direction,CalculateBaudRate,BaudRatePrescaler
 SPI1.Mode=SPI_MODE_MASTER