diff --git a/Core/Inc/main.h b/Core/Inc/main.h
index c24e068..7856c3e 100644
--- a/Core/Inc/main.h
+++ b/Core/Inc/main.h
@@ -149,15 +149,15 @@ void MX_TOF_Init(void);
 /*    TOF_1, U3      RIGHT CORNER, PB-5         */
 
 #if	defined(TOF_1)	//&& defined(STM32WLE5xx)
-#define TOF_C_INT_Pin 			GPIO_PIN_3		// 2024-04-08 WAS GPIO_PIN_5
+#define TOF_C_INT_Pin 			GPIO_PIN_5		// 2024-04-08 WAS GPIO_PIN_5
 #define TOF_C_INT_GPIO_Port 	GPIOB
-#define TOF_C_INT_EXTI_IRQn 	EXTI3_IRQn		// 2024-04-08 WAS EXTI9_5_IRQn
-#define TOF_C_XSHUT_Pin 		GPIO_PIN_5		// 2024-04-08 WAS GPIO_PIN_3
+#define TOF_C_INT_EXTI_IRQn 	EXTI9_5_IRQn		// 2024-04-08 WAS EXTI9_5_IRQn
+#define TOF_C_XSHUT_Pin 		GPIO_PIN_3		// 2024-04-08 WAS GPIO_PIN_3
 #define TOF_C_XSHUT_GPIO_Port 	GPIOB
 #endif
 // Common Shared Int Pin and Port for VL53L0X
 
-#define TOF_INT_EXTI_PIN		GPIO_PIN_3		//	2024-04-08 WAS GPIO_PIN_5		//TOF_C_INT_Pin
+#define TOF_INT_EXTI_PIN		GPIO_PIN_5		//	2024-04-08 WAS GPIO_PIN_5		//TOF_C_INT_Pin
 #define TOF_INT_EXTI_PORT		GPIOB			//TOF_C_INT_GPIO_Port
 
 /*    TOF_2,                     */
@@ -172,9 +172,9 @@ void MX_TOF_Init(void);
 
 /*    TOF_2, U4      LEFT   CORNER, PA-9       */
 #if	defined(TOF_2) && defined(STM32WLE5xx)
-#define TOF_L_INT_Pin 			GPIO_PIN_3		// 2024-04-08 WAS GPIO_PIN_5
+#define TOF_L_INT_Pin 			GPIO_PIN_5		// 2024-04-08 WAS GPIO_PIN_5
 #define TOF_L_INT_GPIO_Port 	GPIOB
-#define TOF_L_INT_EXTI_IRQn 	EXTI3_IRQn		// 2024-04-08 WAS EXTI9_5_IRQn
+#define TOF_L_INT_EXTI_IRQn 	EXTI9_5_IRQn		// 2024-04-08 WAS EXTI9_5_IRQn
 #define TOF_L_XSHUT_Pin 		GPIO_PIN_9
 #define TOF_L_XSHUT_GPIO_Port 	GPIOA
 #endif
diff --git a/Core/Src/stm32wlxx_it.c b/Core/Src/stm32wlxx_it.c
index bc049b4..3cf7d49 100644
--- a/Core/Src/stm32wlxx_it.c
+++ b/Core/Src/stm32wlxx_it.c
@@ -358,7 +358,7 @@ void DMA1_Channel7_IRQHandler(void)
   /* USER CODE END DMA1_Channel7_IRQn 1 */
 }
 #endif
-#if 1
+#if 0
 void EXTI3_IRQHandler(void)
 {
   /* USER CODE BEGIN EXTI3_IRQn 0 */
@@ -387,7 +387,7 @@ void EXTI4_IRQHandler(void)
   /* USER CODE END EXTI9_5_IRQn 1 */
 }
 #endif
-#if 0
+#if 1
 /**
   * @brief This function handles EXTI Lines [9:5] Interrupt.
   */
diff --git a/Core/Src/yunhorn_sts_process.c b/Core/Src/yunhorn_sts_process.c
index dce2733..31d5352 100644
--- a/Core/Src/yunhorn_sts_process.c
+++ b/Core/Src/yunhorn_sts_process.c
@@ -157,7 +157,7 @@ void STS_YunhornSTSEventRFAC_Process(void)
 		if ((rfac_timer >= STS_BURN_IN_RFAC) && (rfac_timer < (STS_BURN_IN_RFAC +3)))
 		{
 			APP_LOG(TS_OFF, VLEVEL_M, "\r\n -------------------RFAC Process\r\n");
-			STS_SENSOR_Upload_Message(LORAWAN_USER_APP_CTRL_REPLY_PORT, 4, "RFAC");
+			STS_SENSOR_Upload_Message(LORAWAN_USER_APP_CTRL_REPLY_PORT, 4, (uint8_t*)"RFAC");
 		}
 		if ((rfac_timer > (STS_BURN_IN_RFAC + 2)))
 		{
diff --git a/STM32CubeIDE/Release/STS_RR_R125.bin b/STM32CubeIDE/Release/STS_R1D_JP_RM2_2024_07_18.bin
similarity index 99%
rename from STM32CubeIDE/Release/STS_RR_R125.bin
rename to STM32CubeIDE/Release/STS_R1D_JP_RM2_2024_07_18.bin
index 9876c80..8cff64c 100644
Binary files a/STM32CubeIDE/Release/STS_RR_R125.bin and b/STM32CubeIDE/Release/STS_R1D_JP_RM2_2024_07_18.bin differ
diff --git a/STM32CubeIDE/Release/STS_RR_R125.hex b/STM32CubeIDE/Release/STS_RR_R125.hex
index 72aab7f..677facb 100644
--- a/STM32CubeIDE/Release/STS_RR_R125.hex
+++ b/STM32CubeIDE/Release/STS_RR_R125.hex
@@ -5,10 +5,10 @@
 :10003000BD27000800000000BF270008C1270008F6
 :100040004540000845400008C52700084540000815
 :10005000454000084540000845400008454000086C
-:1000600045400008E92700084540000845400008D1
+:10006000454000084540000845400008454000085C
 :100070004540000845400008D1270008DD2700085A
 :10008000454000084540000845400008454000083C
-:1000900000000000454000084540000845400008B9
+:100090000000000045400008E9270008454000082E
 :1000A000454000084540000845400008454000081C
 :1000B000454000084540000845400008454000080C
 :1000C00045400008454000084540000845400008FC
@@ -570,14 +570,14 @@
 :10237800DB6C03400193019B02B070472DE9F043E9
 :1023880087B000240120264E0594FFF7EBFF0220BA
 :10239800FFF7E8FFFFF7E6FF0120FFF7E3FF02275B
-:1023A80008224FF4041301A93046CDE90123012581
-:1023B8004FF020090394049705F0F4FA01A9304678
+:1023A80020224FF4041301A93046CDE90123012569
+:1023B8004FF008090394049705F0F4FA01A9304690
 :1023C8004FF40078CDE90195CDE9037405F0EAFAF8
 :1023D80001A94FF09040CDE90185CDE9037405F0DE
 :1023E800E1FA142301A93046CDE90135CDE903749A
 :1023F80005F0D8FA2A464946304605F0F9FB2A4640
-:1024080041464FF0904005F0F3FB22462146092053
-:1024180004F0DCFF092005F00BF807B0BDE8F083F5
+:1024080041464FF0904005F0F3FB22462146162046
+:1024180004F0DCFF162005F00BF807B0BDE8F083E8
 :10242800000400481248134A08B540F61463C0E98E
 :10243800002300230122C0E90232C0E90433C0E9C5
 :102448000633036205F050FD08B100F0EBF80848C8
@@ -638,7 +638,7 @@
 :1027B800FEE770477047704770470000014806F011
 :1027C80069BD00BF580A0020014804F09DBF00BF42
 :1027D800A4090020014804F097BF00BF4409002065
-:1027E800082005F013BA0000014806F087BB00BFB7
+:1027E800202005F013BA0000014806F087BB00BF9F
 :1027F800580A0020014806F076BF00BFBC0A002036
 :102808002DE9F04389B080460020109E0790894644
 :1028180015461F46FDF704FDF0B9104CCDE90090B0
@@ -828,7 +828,7 @@
 :103398000400FA0538B504460D4607484FF40061A5
 :1033A800FEF7C6FF30B92A4621460348BDE8384033
 :1033B800FEF7C4BE38BD00BF00F003087047704771
-:1033C80070477047082802BF014B01221A707047E6
+:1033C80070477047202802BF014B01221A707047CE
 :1033D800600E002070B505460C46164607F056FAF2
 :1033E8000346002835D000241B480FF0DDFF1B4B97
 :1033F80019481B689C42214638BF194610F05CF8F2
@@ -1053,7 +1053,7 @@
 :1041A8000744446103F0A0FE06B070BD0004004857
 :1041B8000C0E002000580040FFF750BF10B1012836
 :1041C80009D0704701394A424A414FF090404FF4B4
-:1041D800007103F00DBD4B1E5A4202485A4120217E
+:1041D800007103F00DBD4B1E5A4202485A41082196
 :1041E800F7E700BF00040048FFF7E6BF00F016B984
 :1041F800054B1A6802805A689B684381034B028109
 :1042080001221A70704700BF640E0020E30D0020E1