diff --git a/Core/Inc/i2c.h b/Core/Inc/i2c.h
index c9e44ba..1cd94f5 100644
--- a/Core/Inc/i2c.h
+++ b/Core/Inc/i2c.h
@@ -33,37 +33,6 @@ extern "C" {
 
 
 /* USER CODE BEGIN Private defines */
-/**I2C1 GPIO Configuration for STM32WL55xx
-PB6     ------> I2C1_SCL
-PB7     ------> I2C1_SDA
-*/
-
-#if defined(STM32WL55xx)
-#define MEMS_ENABLE_Pin GPIO_PIN_5
-#define MEMS_ENABLE_GPIO_Port GPIOB
-#define MEMS_SENSOR_INTERRUPT_Pin GPIO_PIN_8
-#define MEMS_SENSOR_INTERRUPT_GPIO_Port GPIOA
-#define MEMS_SENSOR_INTERRUPT_EXTI_IRQn EXTI9_5_IRQn
-#endif
-
-/**I2C2 GPIO Configuration STM32WLE5xx
-PA12     ------> I2C2_SCL
-PA11     ------> I2C2_SDA
-*/
-#if	defined(STM32WLE5xx)|| defined(STM32WL55xx)
-extern I2C_HandleTypeDef hi2c2;
-#define MEMS_I2C_HANDLE			hi2c2
-#define MEMS_I2C_SCL_Pin 		GPIO_PIN_12
-#define MEMS_I2C_SCL_GPIO_Port 	GPIOA
-#define MEMS_I2C_SDA_Pin 		GPIO_PIN_11
-#define MEMS_I2C_SDA_GPIO_Port 	GPIOA
-
-#define MEMS_SENSOR_INTERRUPT_Pin 			GPIO_PIN_8
-#define MEMS_SENSOR_INTERRUPT_GPIO_Port 	GPIOA
-#define MEMS_SENSOR_INTERRUPT_EXTI_IRQn 	EXTI9_5_IRQn
-#define MEMS_ENABLE_Pin 		GPIO_PIN_5
-#define MEMS_ENABLE_GPIO_Port 	GPIOB
-#endif
 
 /* USER CODE END Private defines */
 
diff --git a/Core/Inc/main.h b/Core/Inc/main.h
index d269bbf..7820023 100644
--- a/Core/Inc/main.h
+++ b/Core/Inc/main.h
@@ -119,6 +119,13 @@ void Error_Handler(void);
 #define W25Q_CS_GPIO_Port GPIOA
 
 #if defined(USE_IPS_LCD_ST7789)
+
+#define MEMS_SPI_SCK_Pin 		GPIO_PIN_3
+#define MEMS_SPI_SCK_GPIO_Port 	GPIOB
+#define MEMS_SPI_MOSI_Pin 		GPIO_PIN_5
+#define MEMS_SPI_MOSI_GPIO_Port GPIOB
+
+
 #define LCD_RST_Pin GPIO_PIN_4
 #define LCD_RST_GPIO_Port GPIOA
 #define LCD_DC_Pin GPIO_PIN_5
@@ -128,6 +135,39 @@ void Error_Handler(void);
 #define LCD_BL_Pin GPIO_PIN_7
 #define LCD_BL_GPIO_Port GPIOA
 #endif
+
+/**I2C1 GPIO Configuration for STM32WL55xx
+PB6     ------> I2C1_SCL
+PB7     ------> I2C1_SDA
+*/
+
+#if defined(STM32WL55xx)
+#define MEMS_ENABLE_Pin GPIO_PIN_5
+#define MEMS_ENABLE_GPIO_Port GPIOB
+#define MEMS_SENSOR_INTERRUPT_Pin GPIO_PIN_8
+#define MEMS_SENSOR_INTERRUPT_GPIO_Port GPIOA
+#define MEMS_SENSOR_INTERRUPT_EXTI_IRQn EXTI9_5_IRQn
+#endif
+
+/**I2C2 GPIO Configuration STM32WLE5xx
+PA12     ------> I2C2_SCL
+PA11     ------> I2C2_SDA
+*/
+#if	defined(STM32WLE5xx)|| defined(STM32WL55xx)
+extern I2C_HandleTypeDef hi2c2;
+#define MEMS_I2C_HANDLE			hi2c2
+#define MEMS_I2C_SCL_Pin 		GPIO_PIN_12
+#define MEMS_I2C_SCL_GPIO_Port 	GPIOA
+#define MEMS_I2C_SDA_Pin 		GPIO_PIN_11
+#define MEMS_I2C_SDA_GPIO_Port 	GPIOA
+
+#define MEMS_SENSOR_INTERRUPT_Pin 			GPIO_PIN_8
+#define MEMS_SENSOR_INTERRUPT_GPIO_Port 	GPIOA
+#define MEMS_SENSOR_INTERRUPT_EXTI_IRQn 	EXTI9_5_IRQn
+#define MEMS_ENABLE_Pin 		GPIO_PIN_5
+#define MEMS_ENABLE_GPIO_Port 	GPIOB
+#endif
+
 /* USER CODE END Private defines */
 
 #ifdef __cplusplus
diff --git a/Core/Inc/spi.h b/Core/Inc/spi.h
index f16c41d..02235a0 100644
--- a/Core/Inc/spi.h
+++ b/Core/Inc/spi.h
@@ -29,37 +29,6 @@ extern "C" {
 #include "main.h"
 
 /* USER CODE BEGIN Includes */
-/*
-#if 0
-#if	defined(STM32WLE5xx)||defined(STM32WL55xx)
-#define MEMS_SPI_SCK_Pin 		GPIO_PIN_5							//GPIO_PIN_3
-#define MEMS_SPI_SCK_GPIO_Port 	GPIOA								//GPIOB
-#define MEMS_SPI_MISO_Pin 		GPIO_PIN_6							//GPIO_PIN_11
-#define MEMS_SPI_MISO_GPIO_Port GPIOA								//GPIOA
-#define MEMS_SPI_MOSI_Pin 		GPIO_PIN_7							//GPIO_PIN_12
-#define MEMS_SPI_MOSI_GPIO_Port GPIOA								//GPIOA
-#define MEMS_CS_N_Pin 			GPIO_PIN_4							//GPIO_PIN_15
-#define MEMS_CS_N_GPIO_Port 	GPIOA								//GPIOA
-#define MEMS_SENSOR_INTERRUPT_Pin 			GPIO_PIN_8
-#define MEMS_SENSOR_INTERRUPT_GPIO_Port 	GPIOA
-#define MEMS_SENSOR_INTERRUPT_EXTI_IRQn 	EXTI9_5_IRQn
-#define MEMS_ENABLE_Pin 		GPIO_PIN_5
-#define MEMS_ENABLE_GPIO_Port 	GPIOB
-#endif
-#endif
-*/
-// For SPI LCD display, master transmit only
-//#if	defined(USE_IPS_LCD_ST7789)
-#define MEMS_SPI_SCK_Pin 		GPIO_PIN_3
-#define MEMS_SPI_SCK_GPIO_Port 	GPIOB
-#define MEMS_SPI_MOSI_Pin 		GPIO_PIN_5
-#define MEMS_SPI_MOSI_GPIO_Port GPIOB
-//#define MEMS_SENSOR_INTERRUPT_Pin 			GPIO_PIN_8
-//#define MEMS_SENSOR_INTERRUPT_GPIO_Port 	GPIOA
-//#define MEMS_SENSOR_INTERRUPT_EXTI_IRQn 	EXTI9_5_IRQn
-//#define MEMS_ENABLE_Pin 		GPIO_PIN_5
-//#define MEMS_ENABLE_GPIO_Port 	GPIOB
-//#endif
 
 /* USER CODE END Includes */