Merge branch 'STS_O5_JP' of http://gitea.yunhorn.com/sundp/STS_RR_R125 into STS_O5_JP

reduce to 2uA open door, 99uA closed door
2024-04-07 12:44:31 +08:00 · 2024-03-18 17:46:41 +08:00
10 changed files with 106 additions and 17 deletions
--- a/Core/Inc/sys_conf.h
+++ b/Core/Inc/sys_conf.h
@ -47,7 +47,11 @@ extern "C" {
 /**
  * @brief  Verbose level for all trace logs
  */
+<<<<<<< HEAD
+#define VERBOSE_LEVEL                        VLEVEL_OFF
+=======
 #define VERBOSE_LEVEL                        VLEVEL_H
+>>>>>>> 994ee75876f51d9662a2372f255d101ec95c9358

 /**
  * @brief Enable trace logs
--- a/Core/Src/gpio.c
+++ b/Core/Src/gpio.c
@ -51,6 +51,21 @@ void MX_GPIO_Init(void)
  __HAL_RCC_GPIOB_CLK_ENABLE();
  __HAL_RCC_GPIOC_CLK_ENABLE();

+  //PME OFF
+  HAL_GPIO_WritePin(GPIOB, GPIO_PIN_4,RESET);
+
+  GPIO_InitStruct.Pin = GPIO_PIN_All;
+  GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
+  GPIO_InitStruct.Pull = GPIO_NOPULL;
+
+  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
+  HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
+
+  __HAL_RCC_GPIOA_CLK_DISABLE();
+  __HAL_RCC_GPIOB_CLK_DISABLE();
+  __HAL_RCC_GPIOC_CLK_DISABLE();
+
  /*Configure GPIO pin Output Level */
 #if	defined(STM32WL55xx)
  HAL_GPIO_WritePin(GPIOB, LED1_Pin|LED2_Pin|PROB2_Pin|PROB1_Pin
@ -81,13 +96,15 @@ void MX_GPIO_Init(void)
  GPIO_InitStruct.Pull = GPIO_PULLUP;
  HAL_GPIO_Init(BUT3_GPIO_Port, &GPIO_InitStruct);
 #endif
+#if 0
  /*Configure GPIO pin : PtPin */
  GPIO_InitStruct.Pin = BUT2_Pin;
  GPIO_InitStruct.Mode = GPIO_MODE_IT_FALLING;
  GPIO_InitStruct.Pull = GPIO_PULLUP;
  HAL_GPIO_Init(BUT2_GPIO_Port, &GPIO_InitStruct);
-
+#endif
  /*Configure GPIO pin : PtPin */
+  __HAL_RCC_GPIOA_CLK_ENABLE();
  GPIO_InitStruct.Pin = BUT1_Pin;
  GPIO_InitStruct.Mode = GPIO_MODE_IT_RISING_FALLING;
  GPIO_InitStruct.Pull = GPIO_PULLUP;
@ -142,14 +159,14 @@ void MX_GPIO_Init(void)
  HAL_GPIO_Init(TOF_R_XSHUT_GPIO_Port, &GPIO_InitStruct);
 #endif

-
+#if 0
 /*Configure GPIO pins : PBPin PBPin PBPin */
  GPIO_InitStruct.Pin = LED1_Pin;
  GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
  GPIO_InitStruct.Pull = GPIO_NOPULL;
  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
  HAL_GPIO_Init(LED1_GPIO_Port, &GPIO_InitStruct);
-
+#endif

 #if defined(SOAP_LEVEL_SENSOR)
 /* ==============   SOAP LEVEL DETECTION ========================= */
@ -176,9 +193,10 @@ HAL_GPIO_Init(SOAP_SWITCH_GPIO_Port, &GPIO_InitStruct);
  /* EXTI interrupt init*/
  HAL_NVIC_SetPriority(EXTI0_IRQn, 0, 0);
  HAL_NVIC_EnableIRQ(EXTI0_IRQn);
-
+#if 0
  HAL_NVIC_SetPriority(EXTI1_IRQn, 0, 0);
  HAL_NVIC_EnableIRQ(EXTI1_IRQn);
+#endif
 #if	defined(TOF_1)
  HAL_NVIC_SetPriority(TOF_C_INT_EXTI_IRQn, 0, 0);
  HAL_NVIC_EnableIRQ(TOF_C_INT_EXTI_IRQn);
--- a/Core/Src/main.c
+++ b/Core/Src/main.c
@ -118,10 +118,14 @@ int main(void)
    /* Clear Standby flag */
    __HAL_PWR_CLEAR_FLAG(PWR_FLAG_SB);

+<<<<<<< HEAD
+  //MX_I2C2_Init();
+=======
  } else {
 	  MX_LoRaWAN_Init();
 	  LED_ON;
  }
+>>>>>>> 994ee75876f51d9662a2372f255d101ec95c9358

  HAL_Delay(1000);
  LED_OFF;
@ -138,6 +142,12 @@ int main(void)
 #endif
  /* USER CODE BEGIN 2 */

+<<<<<<< HEAD
+  //HAL_Delay(3000);
+
+
+=======
+>>>>>>> 994ee75876f51d9662a2372f255d101ec95c9358
  /* USER CODE END 2 */

  /* Infinite loop */
--- a/Core/Src/stm32_lpm_if.c
+++ b/Core/Src/stm32_lpm_if.c
@ -81,6 +81,11 @@ const struct UTIL_LPM_Driver_s UTIL_PowerDriver =
 void PWR_EnterOffMode(void)
 {
  /* USER CODE BEGIN EnterOffMode_1 */
+<<<<<<< HEAD
+	HAL_SuspendTick();
+	HAL_GPIO_DeInit(GPIOB,GPIO_PIN_All);
+	HAL_GPIO_DeInit(GPIOC,GPIO_PIN_All);
+=======
 	  HAL_SuspendTick();
 	  /* Enable WakeUp Pin PWR_WAKEUP_PIN1 connected to PA0 */
 	  HAL_PWR_EnableWakeUpPin(PWR_WAKEUP_PIN1_LOW);
@ -90,6 +95,7 @@ void PWR_EnterOffMode(void)
 	  __HAL_PWR_CLEAR_FLAG(PWR_FLAG_WU);
 	  /* Enter the Standby mode */
 	  HAL_PWR_EnterSTANDBYMode();
+>>>>>>> 994ee75876f51d9662a2372f255d101ec95c9358
  /* USER CODE END EnterOffMode_1 */
 }

@ -109,7 +115,10 @@ void PWR_EnterStopMode(void)
  HAL_SuspendTick();
  /* Clear Status Flag before entering STOP/STANDBY Mode */
  LL_PWR_ClearFlag_C1STOP_C1STB();
-
+  //HAL_GPIO_DeInit(GPIOA,GPIO_PIN_All);
+  HAL_UART_DeInit(&huart2);
+  HAL_GPIO_DeInit(GPIOB,GPIO_PIN_All);
+  HAL_GPIO_DeInit(GPIOC,GPIO_PIN_All);
  /* USER CODE BEGIN EnterStopMode_2 */

  /* USER CODE END EnterStopMode_2 */
@ -132,10 +141,15 @@ 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 */
+<<<<<<< HEAD
+  //MX_GPIO_Init();
+  //MX_DMA_Init();
+=======
  MX_GPIO_Init();
  MX_DMA_Init();
+>>>>>>> 994ee75876f51d9662a2372f255d101ec95c9358
  //MX_I2C2_Init();

  /* USER CODE END ExitStopMode_2 */
--- a/Core/Src/stm32wlxx_it.c
+++ b/Core/Src/stm32wlxx_it.c
@ -62,8 +62,8 @@ extern RTC_HandleTypeDef hrtc;
 extern SUBGHZ_HandleTypeDef hsubghz;
 extern UART_HandleTypeDef huart2;

-extern DMA_HandleTypeDef hdma_i2c2_rx;
-extern DMA_HandleTypeDef hdma_i2c2_tx;
+//extern DMA_HandleTypeDef hdma_i2c2_rx;
+//extern DMA_HandleTypeDef hdma_i2c2_tx;

 //extern DMA_HandleTypeDef hdma_spi1_rx;
 //extern DMA_HandleTypeDef hdma_spi1_tx;
@ -76,9 +76,14 @@ extern DMA_HandleTypeDef hdma_i2c2_tx;
 //extern TIM_HandleTypeDef htim2;
 //extern TIM_HandleTypeDef htim16;
 extern DMA_HandleTypeDef hdma_usart2_tx;
+<<<<<<< HEAD
+//extern DMA_HandleTypeDef hdma_usart2_rx;
+
+=======
 #if 0
 extern DMA_HandleTypeDef hdma_usart2_rx;
 #endif
+>>>>>>> 994ee75876f51d9662a2372f255d101ec95c9358

 /* USER CODE BEGIN EV */

@ -249,7 +254,7 @@ void EXTI0_IRQHandler(void)

  /* USER CODE END EXTI0_IRQn 1 */
 }
-
+#if 0
 /**
  * @brief This function handles EXTI Line 1 Interrupt.
  */
@ -263,8 +268,9 @@ void EXTI1_IRQHandler(void)

  /* USER CODE END EXTI1_IRQn 1 */
 }
+#endif

-
+#if 0
 /**
  * @brief This function handles DMA1 Channel 2 Interrupt.
  */
@ -315,12 +321,14 @@ void DMA1_Channel5_IRQHandler(void)
  /* USER CODE BEGIN DMA1_Channel5_IRQn 0 */

  /* USER CODE END DMA1_Channel5_IRQn 0 */
-  HAL_DMA_IRQHandler(&hdma_usart2_tx);
+  HAL_DMA_IRQHandler(&hdma_i2c2_tx);
  /* USER CODE BEGIN DMA1_Channel5_IRQn 1 */

  /* USER CODE END DMA1_Channel5_IRQn 1 */
 }
+#endif

+#if 0
 /**
  * @brief This function handles DMA1 Channel 6 Interrupt.
  */
@ -336,6 +344,7 @@ void DMA1_Channel6_IRQHandler(void)

  /* USER CODE END DMA1_Channel6_IRQn 1 */
 }
+#endif

 /**
  * @brief This function handles DMA1 Channel 7 Interrupt.
@ -350,7 +359,7 @@ void DMA1_Channel7_IRQHandler(void)

  /* USER CODE END DMA1_Channel7_IRQn 1 */
 }
-
+#if 0
 /**
  * @brief This function handles EXTI Lines [4] Interrupt.
  */
@ -364,8 +373,9 @@ void EXTI4_IRQHandler(void)

  /* USER CODE END EXTI9_5_IRQn 1 */
 }
+#endif

-
+#if 0
 /**
  * @brief This function handles EXTI Lines [9:5] Interrupt.
  */
@ -401,7 +411,7 @@ void EXTI15_10_IRQHandler(void)

  /* USER CODE END EXTI15_10_IRQn 1 */
 }
-
+#endif


 /**
--- a/Core/Src/sys_app.c
+++ b/Core/Src/sys_app.c
@ -101,7 +101,7 @@ void SystemApp_Init(void)
  UTIL_TIMER_Init();
  SYS_TimerInitialisedFlag = 1;
  /* Initializes the SW probes pins and the monitor RF pins via Alternate Function */
-  DBG_Init();
+  //DBG_Init();

  /*Initialize the terminal */
  UTIL_ADV_TRACE_Init();
--- a/Core/Src/usart.c
+++ b/Core/Src/usart.c
@ -28,9 +28,14 @@

 UART_HandleTypeDef huart2;
 DMA_HandleTypeDef hdma_usart2_tx;
+<<<<<<< HEAD
+//DMA_HandleTypeDef hdma_usart2_rx;
+
+=======
 #if 0
 DMA_HandleTypeDef hdma_usart2_rx;
 #endif
+>>>>>>> 994ee75876f51d9662a2372f255d101ec95c9358
 /* USART2 init function */

 void MX_USART2_UART_Init(void)
@ -62,10 +67,12 @@ void MX_USART2_UART_Init(void)
  {
    Error_Handler();
  }
+#if 0
  if (HAL_UARTEx_SetRxFifoThreshold(&huart2, UART_RXFIFO_THRESHOLD_1_8) != HAL_OK)
  {
    Error_Handler();
  }
+#endif
  if (HAL_UARTEx_EnableFifoMode(&huart2) != HAL_OK)
  {
    Error_Handler();
@ -104,13 +111,19 @@ 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_HIGH;
+    HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
    /* USART2 DMA Init */
    /* USART2_TX Init */
    hdma_usart2_tx.Instance = DMA1_Channel7;
@ -134,7 +147,7 @@ void HAL_UART_MspInit(UART_HandleTypeDef* uartHandle)
    }
 #endif
    __HAL_LINKDMA(uartHandle,hdmatx,hdma_usart2_tx);
-
+#if 0
    /* USART2_RX Init */
 #if 0
     hdma_usart2_rx.Instance = DMA1_Channel6;
--- a/LoRaWAN/App/lora_app.c
+++ b/LoRaWAN/App/lora_app.c
@ -636,6 +636,15 @@ void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin)
  {
    case  BUT1_Pin:

+<<<<<<< HEAD
+#ifdef 	YUNHORN_STS_O5_ENABLED
+      if (EventType == TX_ON_EVENT)
+      {
+        UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0);
+      }
+
+#endif
+=======
 #ifdef STS_O5
    	LED_ON;
    	uint8_t pinstate = (STS_Reed_Hall_State== 0)?1:0;
@ -655,7 +664,9 @@ void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin)
      }
 #endif
      LED_OFF;
+>>>>>>> 994ee75876f51d9662a2372f255d101ec95c9358
      break;
+
    case  BUT2_Pin:
 #if defined(STS_USE_STM32WLE5)
      UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaStopJoinEvent), CFG_SEQ_Prio_0);
--- a/STM32CubeIDE/.cproject
+++ b/STM32CubeIDE/.cproject
@ -40,6 +40,7 @@
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.2089215826" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="YUNHORN_STS_RANDOM"/>
 									<listOptionValue builtIn="false" value="CORE_CM4"/>
+									<listOptionValue builtIn="false" value="YUNHORN_STS_RANDOM"/>
 									<listOptionValue builtIn="false" value="STS_O5"/>
 									<listOptionValue builtIn="false" value="STM32WLE5xx"/>
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
--- a/STM32CubeIDE/.settings/language.settings.xml
+++ b/STM32CubeIDE/.settings/language.settings.xml
@ -5,7 +5,11 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
+<<<<<<< HEAD
+			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1553454923168292746" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+=======
 			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1252328505282345581" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+>>>>>>> 994ee75876f51d9662a2372f255d101ec95c9358
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
@ -16,7 +20,11 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
+<<<<<<< HEAD
+			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1553454923168292746" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+=======
 			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1252328505282345581" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+>>>>>>> 994ee75876f51d9662a2372f255d101ec95c9358
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
Author	SHA1	Message	Date
Yunhorn	3d3fddc9b1	Merge branch 'STS_O5_JP' of http://gitea.yunhorn.com/sundp/STS_RR_R125 into STS_O5_JP	2024-04-07 12:44:31 +08:00
Yunhorn	f808794d2b	reduce to 2uA open door, 99uA closed door	2024-03-18 17:46:41 +08:00