diff --git a/Core/Inc/main.h b/Core/Inc/main.h
index f2a701b..fbf0a84 100644
--- a/Core/Inc/main.h
+++ b/Core/Inc/main.h
@@ -62,18 +62,20 @@ void MX_TOF_Init(void);
 #define RTC_N_PREDIV_S 10
 #define RTC_PREDIV_S ((1<<RTC_N_PREDIV_S)-1)
 #define RTC_PREDIV_A ((1<<(15-RTC_N_PREDIV_S))-1)
+
+#if	defined(STM32WL55xx)
 #define LED1_Pin GPIO_PIN_15
 #define LED1_GPIO_Port GPIOB
 #define LED2_Pin GPIO_PIN_9
 #define LED2_GPIO_Port GPIOB
 #define LED3_Pin GPIO_PIN_11
 #define LED3_GPIO_Port GPIOB
-
 #define BSP_BUTTON_EXTI_IRQn EXTI0_IRQn
 #define PROB2_Pin GPIO_PIN_13
 #define PROB2_GPIO_Port GPIOB
 #define PROB1_Pin GPIO_PIN_12
 #define PROB1_GPIO_Port GPIOB
+#endif
 
 #define BUT1_Pin GPIO_PIN_0
 #define BUT1_GPIO_Port GPIOA
@@ -83,9 +85,11 @@ void MX_TOF_Init(void);
 #define BUT2_GPIO_Port GPIOA
 #define BUT2_EXTI_IRQn EXTI1_IRQn
 
+#if	defined(STM32WL55xx)
 #define BUT3_Pin GPIO_PIN_6
 #define BUT3_GPIO_Port GPIOC
 #define BUT3_EXTI_IRQn EXTI9_5_IRQn
+#endif
 
 #define USARTx_RX_Pin GPIO_PIN_3
 #define USARTx_RX_GPIO_Port GPIOA
@@ -108,6 +112,7 @@ void MX_TOF_Init(void);
 
 /* USER CODE BEGIN Private defines */
 #if	defined(STM32WLE5xx) || defined(STM32WL55xx)
+/*    TOF_1                    */
 #define TOF_C_INT_Pin GPIO_PIN_10
 #define TOF_C_INT_GPIO_Port GPIOA
 #define TOF_C_INT_EXTI_IRQn EXTI15_10_IRQn
@@ -116,6 +121,7 @@ void MX_TOF_Init(void);
 #endif
 
 #if	defined(STM32WL55xx)
+/*    TOF_2                    */
 #define TOF_L_INT_Pin GPIO_PIN_7
 #define TOF_L_INT_GPIO_Port GPIOC
 #define TOF_L_INT_EXTI_IRQn EXTI9_5_IRQn
@@ -123,7 +129,17 @@ void MX_TOF_Init(void);
 #define TOF_L_XSHUT_GPIO_Port GPIOB
 #endif
 
+#if	defined(STM32WLE5xx)
+/*    TOF_2                    */
+#define TOF_L_INT_Pin GPIO_PIN_10
+#define TOF_L_INT_GPIO_Port GPIOA
+#define TOF_L_INT_EXTI_IRQn EXTI15_10_IRQn
+#define TOF_L_XSHUT_Pin GPIO_PIN_2
+#define TOF_L_XSHUT_GPIO_Port GPIOB
+#endif
+
 #if	defined(STM32WL55xx)
+/*    TOF_3                    */
 #define TOF_R_INT_Pin GPIO_PIN_10
 #define TOF_R_INT_GPIO_Port GPIOA
 #define TOF_R_INT_EXTI_IRQn EXTI15_10_IRQn
@@ -131,6 +147,16 @@ void MX_TOF_Init(void);
 #define TOF_R_XSHUT_GPIO_Port GPIOB
 #endif
 
+#if	defined(STM32WLE5xx)
+/*    TOF_3                    */
+#define TOF_R_INT_Pin GPIO_PIN_10
+#define TOF_R_INT_GPIO_Port GPIOA
+#define TOF_R_INT_EXTI_IRQn EXTI15_10_IRQn
+#define TOF_R_XSHUT_Pin GPIO_PIN_5
+#define TOF_R_XSHUT_GPIO_Port GPIOB
+#endif
+
+
 #define	STS_SERVICE_MASK_L0		(0)		// Service normal , no mask off
 #define	STS_SERVICE_MASK_L1		(1)		// service mask level 1, sensing data upload in silence mode, node appearance silence (no LED, No display, no sound, no vibration)
 #define	STS_SERVICE_MASK_L2		(2)		// service mask level 2, NO sensing data upload (event or periodicity)
diff --git a/Core/Inc/yunhorn_sts_prd_conf.h b/Core/Inc/yunhorn_sts_prd_conf.h
index 38f322f..83a3cd2 100644
--- a/Core/Inc/yunhorn_sts_prd_conf.h
+++ b/Core/Inc/yunhorn_sts_prd_conf.h
@@ -258,9 +258,11 @@
 #define	CFG_CMD_MODE_COLOR_LENGTH				(STS_MODE_COLOR_CMD_LEN)
 #endif
 
+#ifdef  USE_STM32WLE5
 #define	PRESENCE_SENSOR_SPI_HANDLE		hspi1
 #define PRESENCE_SENSOR_TIM_HANDLE		htim2
-#define PRESENCE_SENSOR_I2C_HANDLE 		hi2c1
+#define PRESENCE_SENSOR_I2C_HANDLE 		hi2c2
+#endif
 
 #ifdef	USE_OLED_SSD1306
 #define SSD1306_I2C_HANDLE	hi2c2
@@ -315,23 +317,10 @@
 
 #define	NVM_CFG_PARAMETER_SIZE			YUNHORN_STS_M7_NVM_CFG_SIZE
 #define	CFG_CMD_PARAMETER_SIZE			YUNHORN_STS_M7_CFG_CMD_SIZE
-#define MEMS_POWER_Pin							GPIO_PIN_4
-#define MEMS_POWER_GPIO_Port 				GPIOB
-
-#define MEMS_RESET_Pin							GPIO_PIN_4
-#define MEMS_RESET_GPIO_Port 				GPIOB
-
 #define MOTION_SENSOR_TIM_HANDLE		htim2
 #define MOTION_SENSOR_I2C_HANDLE 		hi2c1
 #endif /* YUNHORN_STS_M7_ENABLED */
 
-#ifdef	USE_OLED_SSD1306
-#define SSD1306_I2C_HANDLE	hi2c2
-#include "ssd1306.h"
-#include "ssd1306_tests.h"
-#endif
-
-
 
 #define    YUNHORN_STS_DUTY_CYCLE_INTERVAL_ENABLED
 
diff --git a/Core/Src/gpio.c b/Core/Src/gpio.c
index 41d33cc..d210751 100644
--- a/Core/Src/gpio.c
+++ b/Core/Src/gpio.c
@@ -52,14 +52,15 @@ void MX_GPIO_Init(void)
   __HAL_RCC_GPIOC_CLK_ENABLE();
 
   /*Configure GPIO pin Output Level */
+#if	defined(STM32WL55xx)
   HAL_GPIO_WritePin(GPIOB, LED1_Pin|LED2_Pin|PROB2_Pin|PROB1_Pin
                           |LED3_Pin, GPIO_PIN_RESET);
-
+#endif
   /*Configure GPIO pin Output Level */
 #if (defined(STS_USE_TOF_VL53L0X) || (defined(STS_USE_TOF_VL53L1X))||(defined(STM32WLE5xx)) || (defined(STM32WL55xx)))
   HAL_GPIO_WritePin(TOF_C_XSHUT_GPIO_Port, TOF_C_XSHUT_Pin, GPIO_PIN_SET);
 #endif
-
+#if	defined(STM32WL55xx)
   /*Configure GPIO pins : PBPin PBPin PBPin */
   GPIO_InitStruct.Pin = LED1_Pin|LED2_Pin|LED3_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
@@ -79,7 +80,7 @@ void MX_GPIO_Init(void)
   GPIO_InitStruct.Mode = GPIO_MODE_IT_FALLING;
   GPIO_InitStruct.Pull = GPIO_PULLUP;
   HAL_GPIO_Init(BUT3_GPIO_Port, &GPIO_InitStruct);
-
+#endif
   /*Configure GPIO pin : PtPin */
   GPIO_InitStruct.Pin = BUT2_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_IT_FALLING;
@@ -98,7 +99,7 @@ void MX_GPIO_Init(void)
   GPIO_InitStruct.Mode = GPIO_MODE_IT_FALLING;
   GPIO_InitStruct.Pull = GPIO_NOPULL;
   HAL_GPIO_Init(TOF_C_INT_GPIO_Port, &GPIO_InitStruct);
-#if	defined(STM32WL55xx)
+#if	defined(STM32WL55xx)||defined(STM32WLE5xx)
   /*Configure GPIO pins : TOF_L_INT_Pin */
   GPIO_InitStruct.Pin = TOF_L_INT_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_IT_FALLING;
@@ -116,8 +117,9 @@ void MX_GPIO_Init(void)
   GPIO_InitStruct.Pull = GPIO_PULLUP;
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
   HAL_GPIO_Init(TOF_C_XSHUT_GPIO_Port, &GPIO_InitStruct);
+
   /*Configure GPIO pins : TOF_L_XSHUT_Pin */
-#if	defined(STM32WL55xx)
+#if	defined(STM32WL55xx)||defined(STM32WLE5xx)
   GPIO_InitStruct.Pin = TOF_L_XSHUT_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
   GPIO_InitStruct.Pull = GPIO_PULLUP;
@@ -140,7 +142,7 @@ void MX_GPIO_Init(void)
 
   HAL_NVIC_SetPriority(TOF_C_INT_EXTI_IRQn, 0, 0);
   HAL_NVIC_EnableIRQ(TOF_C_INT_EXTI_IRQn);
-#if	defined(STM32WL55xx)
+#if	defined(STM32WL55xx)||defined(STM32WLE5xx)
   HAL_NVIC_SetPriority(TOF_L_INT_EXTI_IRQn, 0, 0);
   HAL_NVIC_EnableIRQ(TOF_L_INT_EXTI_IRQn);
   HAL_NVIC_SetPriority(TOF_R_INT_EXTI_IRQn, 0, 0);
diff --git a/Core/Src/main.c b/Core/Src/main.c
index 106e12a..e27099e 100644
--- a/Core/Src/main.c
+++ b/Core/Src/main.c
@@ -197,7 +197,9 @@ void Error_Handler(void)
   __disable_irq();
   while (1)
   {
+#if	defined(STM32WL55xx)
 	  HAL_GPIO_TogglePin(LED3_GPIO_Port, LED3_Pin); /* LED_RED */
+#endif
   }
   /* USER CODE END Error_Handler_Debug */
 }
diff --git a/Core/Src/stm32wlxx_it.c b/Core/Src/stm32wlxx_it.c
index 168f8de..088275e 100644
--- a/Core/Src/stm32wlxx_it.c
+++ b/Core/Src/stm32wlxx_it.c
@@ -371,7 +371,9 @@ void EXTI9_5_IRQHandler(void)
   /* USER CODE BEGIN EXTI9_5_IRQn 0 */
 
   /* USER CODE END EXTI9_5_IRQn 0 */
+#if	defined(STM32WL55xx)
   HAL_GPIO_EXTI_IRQHandler(BUT3_Pin);
+#endif
   /* USER CODE BEGIN EXTI9_5_IRQn 1 */
 
   /* USER CODE END EXTI9_5_IRQn 1 */
diff --git a/LoRaWAN/App/lora_app.c b/LoRaWAN/App/lora_app.c
index 93c1c57..cbc1988 100644
--- a/LoRaWAN/App/lora_app.c
+++ b/LoRaWAN/App/lora_app.c
@@ -645,8 +645,9 @@ void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin)
       UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaStopJoinEvent), CFG_SEQ_Prio_0);
 #endif
       break;
-    case  BUT3_Pin:
 #if defined(USE_STM32WL55)
+    case  BUT3_Pin:
+
       UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaStoreContextEvent), CFG_SEQ_Prio_0);
 #endif
       break;
@@ -676,7 +677,9 @@ static void OnRxData(LmHandlerAppData_t *appData, LmHandlerRxParams_t *params)
 
   if (params != NULL)
   {
+#if	defined(STM32WL55xx)
     HAL_GPIO_WritePin(LED1_GPIO_Port, LED1_Pin, GPIO_PIN_SET); /* LED_BLUE */
+#endif
 
     UTIL_TIMER_Start(&RxLedTimer);
 
@@ -722,12 +725,16 @@ static void OnRxData(LmHandlerAppData_t *appData, LmHandlerRxParams_t *params)
                 if (AppLedStateOn == RESET)
                 {
                   APP_LOG(TS_OFF, VLEVEL_H, "LED OFF\r\n");
+#if	defined(STM32WL55xx)
                   HAL_GPIO_WritePin(LED3_GPIO_Port, LED3_Pin, GPIO_PIN_RESET); /* LED_RED */
+#endif
                 }
                 else
                 {
                   APP_LOG(TS_OFF, VLEVEL_H, "LED ON\r\n");
+#if	defined(STM32WL55xx)
                   HAL_GPIO_WritePin(LED3_GPIO_Port, LED3_Pin, GPIO_PIN_SET); /* LED_RED */
+#endif
                 }
               }
               break;
@@ -825,7 +832,9 @@ static void SendTxData(void)
     if ((JoinLedTimer.IsRunning) && (LmHandlerJoinStatus() == LORAMAC_HANDLER_SET))
     {
       UTIL_TIMER_Stop(&JoinLedTimer);
+#if	defined(STM32WL55xx)
       HAL_GPIO_WritePin(LED3_GPIO_Port, LED3_Pin, GPIO_PIN_RESET); /* LED_RED */
+#endif
     }
 
     status = LmHandlerSend(&AppData, LmHandlerParams.IsTxConfirmed, false);
@@ -871,17 +880,23 @@ static void OnTxTimerEvent(void *context)
 /* USER CODE BEGIN PrFD_LedEvents */
 static void OnTxTimerLedEvent(void *context)
 {
+#if	defined(STM32WL55xx)
   HAL_GPIO_WritePin(LED2_GPIO_Port, LED2_Pin, GPIO_PIN_RESET); /* LED_GREEN */
+#endif
 }
 
 static void OnRxTimerLedEvent(void *context)
 {
+#if	defined(STM32WL55xx)
   HAL_GPIO_WritePin(LED1_GPIO_Port, LED1_Pin, GPIO_PIN_RESET); /* LED_BLUE */
+#endif
 }
 
 static void OnJoinTimerLedEvent(void *context)
 {
+#if	defined(STM32WL55xx)
   HAL_GPIO_TogglePin(LED3_GPIO_Port, LED3_Pin); /* LED_RED */
+#endif
 }
 
 /* USER CODE END PrFD_LedEvents */
@@ -894,7 +909,9 @@ static void OnTxData(LmHandlerTxParams_t *params)
     /* Process Tx event only if its a mcps response to prevent some internal events (mlme) */
     if (params->IsMcpsConfirm != 0)
     {
+#if	defined(STM32WL55xx)
       HAL_GPIO_WritePin(LED2_GPIO_Port, LED2_Pin, GPIO_PIN_SET); /* LED_GREEN */
+#endif
       UTIL_TIMER_Start(&TxLedTimer);
 
       APP_LOG(TS_OFF, VLEVEL_M, "\r\n###### ========== MCPS-Confirm =============\r\n");
@@ -923,7 +940,9 @@ static void OnJoinRequest(LmHandlerJoinParams_t *joinParams)
     if (joinParams->Status == LORAMAC_HANDLER_SUCCESS)
     {
       UTIL_TIMER_Stop(&JoinLedTimer);
+#if	defined(STM32WL55xx)
       HAL_GPIO_WritePin(LED3_GPIO_Port, LED3_Pin, GPIO_PIN_RESET); /* LED_RED */
+#endif
 
       APP_LOG(TS_OFF, VLEVEL_M, "\r\n###### = JOINED = ");
       if (joinParams->Mode == ACTIVATION_TYPE_ABP)
@@ -1074,9 +1093,11 @@ static void OnSystemReset(void)
 static void StopJoin(void)
 {
   /* USER CODE BEGIN StopJoin_1 */
+#if	defined(STM32WL55xx)
   HAL_GPIO_WritePin(LED1_GPIO_Port, LED1_Pin, GPIO_PIN_SET); /* LED_BLUE */
   HAL_GPIO_WritePin(LED2_GPIO_Port, LED2_Pin, GPIO_PIN_SET); /* LED_GREEN */
   HAL_GPIO_WritePin(LED3_GPIO_Port, LED3_Pin, GPIO_PIN_SET); /* LED_RED */
+#endif
   /* USER CODE END StopJoin_1 */
 
   UTIL_TIMER_Stop(&TxTimer);
@@ -1118,9 +1139,11 @@ static void OnStopJoinTimerEvent(void *context)
     UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaStopJoinEvent), CFG_SEQ_Prio_0);
   }
   /* USER CODE BEGIN OnStopJoinTimerEvent_Last */
+#if	defined(STM32WL55xx)
   HAL_GPIO_WritePin(LED1_GPIO_Port, LED1_Pin, GPIO_PIN_RESET); /* LED_BLUE */
   HAL_GPIO_WritePin(LED2_GPIO_Port, LED2_Pin, GPIO_PIN_RESET); /* LED_GREEN */
   HAL_GPIO_WritePin(LED3_GPIO_Port, LED3_Pin, GPIO_PIN_RESET); /* LED_RED */
+#endif
   /* USER CODE END OnStopJoinTimerEvent_Last */
 }
 
@@ -1887,7 +1910,9 @@ void STS_SENSOR_Upload_Message(uint8_t appDataPort, uint8_t appBufferSize, char
 	    if ((JoinLedTimer.IsRunning) && (LmHandlerJoinStatus() == LORAMAC_HANDLER_SET))
 	    {
 	      UTIL_TIMER_Stop(&JoinLedTimer);
+#if	defined(STM32WL55xx)
 	      HAL_GPIO_WritePin(LED3_GPIO_Port, LED3_Pin, GPIO_PIN_RESET); /* LED_RED */
+#endif
 	    }
 
 		status = LmHandlerSend(&AppData, LmHandlerParams.IsTxConfirmed, false);