other changes

Core/Inc/yunhorn_sts_prd_conf.h

@@ -32,7 +32,7 @@
 /* 
  * MCU CORE SELECTION
  */
-#define  			STS_USE_STM32WLE5					1U						//STM32WLE5CCUX
+//#define  			STS_USE_STM32WLE5					1U						//STM32WLE5CCUX
 //#define  			USE_STM32WL55					1U							//STM32WL55JC1X
 
 /*
@@ -40,19 +40,17 @@
  */
 //#define 				USE_OLED_SSD1306
 //#define					USE_TOF_VL53L1X
+
+#ifdef STS_R1D
+#define				YUNHORN_STS_R1_ENABLED	1U
 #define				STS_USE_TOF_VL53L0X		1U
-#define				YUNHORN_STS_R1_ENABLED
+#endif
 
+/* ########################## Product Selection ##############################
+ * @brief This is the list of Yunhorn STS products to be used in ALL product config
+ */
 
- // TOF VL53LX number
+/*   YUNHORN SMARTOILETS OCCUPANCY PRODUCTS 									*/
-//#define					USE_MEMS_ADXL345
-//#define						USE_ACCONEER_A111
-/* ########################## Product Selection ############################## */
-/**
-  * @brief This is the list of Yunhorn STS products to be used in ALL product config
-  */
-
-/**   YUNHORN SMARTOILETS OCCUPANCY PRODUCTS 									**/
 /*#define YUNHORN_STS_O1_ENABLED		*/
 /*#define YUNHORN_STS_O2_ENABLED		*/
 /*#define YUNHORN_STS_O3_ENABLED		*/
@@ -64,9 +62,9 @@
 /*#define YUNHORN_STS_O9_ENABLED		*/
 /*#define YUNHORN_STS_O10_ENABLED		*/
 
- /*#define YUNHORN_STS_O6_ENABLED		*/
+/*#define YUNHORN_STS_O6_ENABLED		*/
 
-/**   YUNHORN SMARTOILETS ENVIRONMENT PRODUCTS  							**/
+/*   YUNHORN SMARTOILETS ENVIRONMENT PRODUCTS  							*/
 /*#define YUNHORN_STS_E1_ENABLED		*/
 /*#define YUNHORN_STS_E2_ENABLED		*/
 /*#define YUNHORN_STS_E3_ENABLED		*/
@@ -75,7 +73,7 @@
 /*#define YUNHORN_STS_E6_ENABLED		*/
 
 
-/**   YUNHORN SMARTOILETS PEOPLE COUNTING PRODUCTS						**/
+/*   YUNHORN SMARTOILETS PEOPLE COUNTING PRODUCTS						*/
 /*#define YUNHORN_STS_P1_ENABLED		*/
 /*#define YUNHORN_STS_P2_ENABLED		*/
 /*#define YUNHORN_STS_P3_ENABLED		*/
@@ -83,19 +81,15 @@
 /*#define YUNHORN_STS_P5_ENABLED		*/
 /*#define YUNHORN_STS_P6_ENABLED		*/
 
-/**   YUNHORN SMARTOILETS CLEANSING RESOUCES LEVEL PRODUCTS		**/
+/*   YUNHORN SMARTOILETS CLEANSING RESOUCES LEVEL PRODUCTS		*/
+//#define YUNHORN_STS_R0_ENABLED
 //#define YUNHORN_STS_R0_ENABLED
-#define YUNHORN_STS_R0_ENABLED
 //#define YUNHORN_STS_R2_ENABLED
-/*#define YUNHORN_STS_R3_ENABLED		*/
+//#define YUNHORN_STS_R3_ENABLED
-/*#define YUNHORN_STS_R4_ENABLED		*/
+//#define YUNHORN_STS_R4_ENABLED
-
-/*#define YUNHORN_STS_R6_ENABLED		*/
-/*#define YUNHORN_STS_R7_ENABLED		*/
-/*#define YUNHORN_STS_R8_ENABLED		*/
 
 
-/**   YUNHORN SMARTOILETS MECHNICAL REACTURAL PRODUCTS				**/
+/*   YUNHORN SMARTOILETS MECHNICAL REACTURAL PRODUCTS				*/
 /*#define YUNHORN_STS_M1_ENABLED		*/
 /*#define YUNHORN_STS_M2_ENABLED		*/
 /*#define YUNHORN_STS_M3_ENABLED		*/
@@ -107,9 +101,9 @@
 
 /*#define YUNHORN_STS_M8_ENABLED		*/
 /*#define YUNHORN_STS_M9_ENABLED		*/
-//#define YUNHORN_STS_M10_ENABLED
+/*#define YUNHORN_STS_M10_ENABLED		*/
 
-/**   YUNHORN SMARTOILETS DIPLAY AND SMART PANEL PRODUCTS			**/
+/*   YUNHORN SMARTOILETS DIPLAY AND SMART PANEL PRODUCTS			*/
 /*#define YUNHORN_STS_D1_ENABLED		*/
 /*#define YUNHORN_STS_D2_ENABLED		*/
 /*#define YUNHORN_STS_D3_ENABLED		*/
@@ -270,7 +264,7 @@
 #define sts_appctrlport							(YUNHORN_STS_USER_APP_CTRL_PORT)
 #define sts_appctrl_reply_port					(YUNHORN_STS_USER_APP_CTRL_REPLY_PORT)
 
-#ifdef STS_O5
+#ifdef	STS_O5
 #define YUNHORN_STS_O5_ENABLED						1U
 #define sts_mtmcode1								0U
 #define sts_mtmcode2								5U

Core/Src/gpio.c

@@ -59,7 +59,7 @@ void MX_GPIO_Init(void)
   HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
   //__HAL_RCC_GPIOA_CLK_DISABLE();
   //__HAL_RCC_GPIOB_CLK_DISABLE();
-  __HAL_RCC_GPIOC_CLK_DISABLE();
+  //__HAL_RCC_GPIOC_CLK_DISABLE();
 
   /*Configure GPIO pin Output Level */
 #if	defined(STM32WL55xx)
@@ -104,7 +104,7 @@ void MX_GPIO_Init(void)
 
   /*Configure GPIO pin : PtPin */
   GPIO_InitStruct.Pin = BUT1_Pin;
-  GPIO_InitStruct.Mode = GPIO_MODE_IT_RISING_FALLING;
+  GPIO_InitStruct.Mode = GPIO_MODE_IT_FALLING;
   GPIO_InitStruct.Pull = GPIO_PULLUP;
   HAL_GPIO_Init(BUT1_GPIO_Port, &GPIO_InitStruct);
 

Core/Src/stm32_lpm_if.c

@@ -106,6 +106,7 @@ void PWR_ExitOffMode(void)
   /* USER CODE BEGIN ExitOffMode_1 */
 #if 1
 	HAL_ResumeTick();
+	  __HAL_PWR_CLEAR_FLAG(PWR_FLAG_SB);
 	//HAL_GPIO_WritePin(GPIOB, GPIO_PIN_2, GPIO_PIN_SET); /* LED ON */
 	return;
 #endif

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();

LoRaWAN/App/lora_app.c

@@ -634,7 +634,7 @@ void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin)
   {
     case  BUT1_Pin:
 
-#ifdef 	YUNHORN_STS_O5_ENABLED
+#ifdef	YUNHORN_STS_O5_ENABLED
         UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_YunhornSTSEventP1), CFG_SEQ_Prio_0);
         UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0);
 #else

STM32CubeIDE/.project

@@ -557,9 +557,5 @@
 			<name>copy_PARENT1</name>
 			<value>file:/D:/ONEDRIVE/STM32WLV13</value>
 		</variable>
-		<variable>
-			<name>copy_PARENT12</name>
-			<value>$%7Bcopy_PARENT1%7D/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125</value>
-		</variable>
 	</variableList>
 </projectDescription>