diff --git a/Core/Src/gpio.c b/Core/Src/gpio.c index 3e14778..9fc72b8 100644 --- a/Core/Src/gpio.c +++ b/Core/Src/gpio.c @@ -83,8 +83,13 @@ void MX_GPIO_Init(void) #endif /*Configure GPIO pin : PtPin */ GPIO_InitStruct.Pin = BUT2_Pin; +#ifdef TOF_2 + GPIO_InitStruct.Mode = GPIO_MODE_ANALOG; + GPIO_InitStruct.Pull = GPIO_NOPULL; +#else GPIO_InitStruct.Mode = GPIO_MODE_IT_FALLING; GPIO_InitStruct.Pull = GPIO_PULLUP; +#endif HAL_GPIO_Init(BUT2_GPIO_Port, &GPIO_InitStruct); /*Configure GPIO pin : PtPin */ diff --git a/Core/Src/main.c b/Core/Src/main.c index 80a8531..bbadc1e 100644 --- a/Core/Src/main.c +++ b/Core/Src/main.c @@ -26,6 +26,7 @@ #include "i2c.h" #include "dma.h" #include "usart.h" +#include "usart_if.h" #include "sys_app.h" /* Private includes ----------------------------------------------------------*/ /* USER CODE BEGIN Includes */ @@ -115,7 +116,7 @@ int main(void) MX_LoRaWAN_Init(); /* USER CODE BEGIN 2 */ - + vcom_DeInit(); //HAL_Delay(3000); diff --git a/Core/Src/stm32_lpm_if.c b/Core/Src/stm32_lpm_if.c index bfa47d5..6684cd4 100644 --- a/Core/Src/stm32_lpm_if.c +++ b/Core/Src/stm32_lpm_if.c @@ -80,15 +80,28 @@ const struct UTIL_LPM_Driver_s UTIL_PowerDriver = void PWR_EnterOffMode(void) { - /* USER CODE BEGIN EnterOffMode_1 */ +#if 0 + LED_OFF; + HAL_UART_DeInit(&huart2); + HAL_PWR_DisableWakeUpPin(PWR_WAKEUP_PIN1);//禁用所有使用的唤醒源:PWR_WAKEUP_PIN1 connected to PA.00 + __HAL_PWR_CLEAR_FLAG(PWR_FLAG_WU);//清除所有相关的唤醒标志 + HAL_PWR_EnableWakeUpPin(PWR_WAKEUP_PIN1);//启用连接到PA.00的WakeUp Pin + HAL_PWR_EnterSTANDBYMode();//进入待机模式 + /* USER CODE BEGIN EnterOffMode_1 */ + HAL_PWR_EnterSTANDBYMode(); /* USER CODE END EnterOffMode_1 */ +#endif } void PWR_ExitOffMode(void) { /* USER CODE BEGIN ExitOffMode_1 */ - +#if 0 + __HAL_PWR_CLEAR_FLAG(PWR_FLAG_SB); + LED_ON; + HAL_Delay(200); +#endif /* USER CODE END ExitOffMode_1 */ } @@ -123,7 +136,7 @@ void PWR_ExitStopMode(void) SRAM ctrls, DMAx, DMAMux, AES, RNG, HSEM */ /* Resume not retained USARTx and DMA */ - vcom_Resume(); + //vcom_Resume(); /* USER CODE BEGIN ExitStopMode_2 */ MX_GPIO_Init(); MX_DMA_Init(); diff --git a/Core/Src/sys_app.c b/Core/Src/sys_app.c index 00070a6..afd0327 100644 --- a/Core/Src/sys_app.c +++ b/Core/Src/sys_app.c @@ -122,7 +122,7 @@ void SystemApp_Init(void) /*Init low power manager*/ UTIL_LPM_Init(); /* Disable Stand-by mode */ - UTIL_LPM_SetOffMode((1 << CFG_LPM_APPLI_Id), UTIL_LPM_ENABLE); + UTIL_LPM_SetOffMode((1 << CFG_LPM_APPLI_Id), UTIL_LPM_DISABLE); #if defined (LOW_POWER_DISABLE) && (LOW_POWER_DISABLE == 1) /* Disable Stop Mode */ diff --git a/Core/Src/usart.c b/Core/Src/usart.c index f0e4467..f1dcfe9 100644 --- a/Core/Src/usart.c +++ b/Core/Src/usart.c @@ -104,13 +104,21 @@ void HAL_UART_MspInit(UART_HandleTypeDef* uartHandle) PA3 ------> USART2_RX PA2 ------> USART2_TX */ - GPIO_InitStruct.Pin = USARTx_RX_Pin|USARTx_TX_Pin; + GPIO_InitStruct.Pin = USARTx_TX_Pin; GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; GPIO_InitStruct.Pull = GPIO_NOPULL; GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH; GPIO_InitStruct.Alternate = GPIO_AF7_USART2; HAL_GPIO_Init(GPIOA, &GPIO_InitStruct); + GPIO_InitStruct.Pin = USARTx_RX_Pin; + GPIO_InitStruct.Mode = GPIO_MODE_ANALOG; + GPIO_InitStruct.Pull = GPIO_NOPULL; + //GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH; + //GPIO_InitStruct.Alternate = GPIO_AF7_USART2; + HAL_GPIO_Init(GPIOA, &GPIO_InitStruct); + + /* USART2 DMA Init */ /* USART2_TX Init */ hdma_usart2_tx.Instance = DMA1_Channel7; diff --git a/LoRaWAN/App/lora_app.c b/LoRaWAN/App/lora_app.c index 863239b..b3416cd 100644 --- a/LoRaWAN/App/lora_app.c +++ b/LoRaWAN/App/lora_app.c @@ -68,7 +68,7 @@ volatile sts_cfg_nvm_t sts_cfg_nvm = { sts_mtmcode2, sts_version, sts_hardware_ver, - 0x05, //Regular TxPeriodicity interval + 0x01, //Regular TxPeriodicity interval 'M', //unit of Regular TxPeriodicity interval 0x3C, //Heart-beat interval or Sampling interval 'M', //unit of Heart-beat interval or Sampling interval