diff --git a/Core/Inc/main.h b/Core/Inc/main.h
index 7290862..4f7e013 100644
--- a/Core/Inc/main.h
+++ b/Core/Inc/main.h
@@ -99,6 +99,33 @@ void MX_TOF_Init(void);
#define BUT2_GPIO_Port GPIOA
#define BUT2_EXTI_IRQn EXTI1_IRQn
+#ifdef STS_O5 // STS_O5_JP 2024-04-10
+/* --------------------------------------------------*/
+/* | HALL-1 (PA-0) VCC-GPIO-PB3 | */
+/* | | */
+/* | HALL-2 (PA-10) VCC-GPIO-PB-4 | */
+/* | | */
+/* | | */
+/* |------------------------------------------------ */
+
+#define HALL1_OUT_Pin GPIO_PIN_0
+#define HALL1_OUT_GPIO_Port GPIOA
+#define HALL1_OUT_EXTI_IRQn EXTI0_IRQn
+
+#define HALL1_VCC_Pin GPIO_PIN_3
+#define HALL1_VCC_GPIO_Port GPIOB
+
+#define HALL2_OUT_Pin GPIO_PIN_10
+#define HALL2_OUT_GPIO_Port GPIOA
+#define HALL2_OUT_EXTI_IRQn EXTI15_10_IRQn
+
+#define HALL2_VCC_Pin GPIO_PIN_4
+#define HALL2_VCC_GPIO_Port GPIOB
+
+#define HALL1_STATE HAL_GPIO_Read(HALL1_OUT_GPIO_Port, HALL1_OUT_Pin)
+#define HALL2_STATE HAL_GPIO_Read(HALL2_OUT_GPIO_Port, HALL1_OUT_Pin)
+#endif
+
#if defined(STM32WL55xx)
#define BUT3_Pin GPIO_PIN_6
#define BUT3_GPIO_Port GPIOC
@@ -131,50 +158,46 @@ void MX_TOF_Init(void);
/* USER CODE BEGIN Private defines */
-
/* -------------------- | -------------------- */
-/* | | | */
+/* | | | */
/* | TOF-2 | TOF-1 | */
/* -------------------- | ------------------ | */
-/* U4, PA-9 | U3, PB-3 | */
+/* U4, PA-9 | U3, PB-5 | */
+/* TOF_1, U3 RIGHT CORNER, PB-5 */
-/* TOF_1, U3 RIGHT CORNER, PB-3 */
-
-#if defined(TOF_1)&& defined(STM32WLE5xx)
-#define TOF_C_INT_Pin GPIO_PIN_5
-#define TOF_C_INT_GPIO_Port GPIOB
-#define TOF_C_INT_EXTI_IRQn EXTI9_5_IRQn
-#define TOF_C_XSHUT_Pin GPIO_PIN_3
-#define TOF_C_XSHUT_GPIO_Port GPIOB
+#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_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_XSHUT_GPIO_Port GPIOB
#endif
// Common Shared Int Pin and Port for VL53L0X
-#define TOF_INT_EXTI_PIN GPIO_PIN_5 //TOF_C_INT_Pin
-#define TOF_INT_EXTI_PORT GPIOB //TOF_C_INT_GPIO_Port
+#define TOF_INT_EXTI_PIN GPIO_PIN_3 // 2024-04-08 WAS GPIO_PIN_5 //TOF_C_INT_Pin
+#define TOF_INT_EXTI_PORT GPIOB // TOF_C_INT_GPIO_Port
/* TOF_2, */
-#if defined(TOF_2) && defined(STM32WL55xx)
-#define TOF_L_INT_Pin GPIO_PIN_7
-#define TOF_L_INT_GPIO_Port GPIOC
-#define TOF_L_INT_EXTI_IRQn EXTI9_5_IRQn
-#define TOF_L_XSHUT_Pin GPIO_PIN_10
-#define TOF_L_XSHUT_GPIO_Port GPIOB
+#if defined(TOF_2) && defined(STM32WL55xx)
+#define TOF_L_INT_Pin GPIO_PIN_7
+#define TOF_L_INT_GPIO_Port GPIOC
+#define TOF_L_INT_EXTI_IRQn EXTI9_5_IRQn
+#define TOF_L_XSHUT_Pin GPIO_PIN_10
+#define TOF_L_XSHUT_GPIO_Port GPIOB
#endif
-
/* TOF_2, U4 LEFT CORNER, PA-9 */
-#if defined(TOF_1) && defined(STM32WLE5xx)
-#define TOF_L_INT_Pin GPIO_PIN_5
+#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_GPIO_Port GPIOB
-#define TOF_L_INT_EXTI_IRQn EXTI9_5_IRQn
+#define TOF_L_INT_EXTI_IRQn EXTI3_IRQn // 2024-04-08 WAS EXTI9_5_IRQn
#define TOF_L_XSHUT_Pin GPIO_PIN_9
#define TOF_L_XSHUT_GPIO_Port GPIOA
#endif
-
/* TOF_3 */
-#if defined(STM32WL55xx)&& defined(TOF_3)
+#if defined(STM32WL55xx) && defined(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
@@ -182,35 +205,34 @@ void MX_TOF_Init(void);
#define TOF_R_XSHUT_GPIO_Port GPIOB
#endif
-
/* TOF_3 */
-#if defined(STM32WLE5xx)&& defined(TOF_3)
-#define TOF_R_INT_Pin GPIO_PIN_5
+#if defined(STM32WLE5xx) && defined(TOF_3)
+#define TOF_R_INT_Pin GPIO_PIN_3 // 2024-04-08 WAS GPIO_PIN_5
#define TOF_R_INT_GPIO_Port GPIOB
-#define TOF_R_INT_EXTI_IRQn EXTI9_5_IRQn
+#define TOF_R_INT_EXTI_IRQn EXTI3_IRQn // 2024-04-08 WAS EXTI9_5_IRQn
#define TOF_R_XSHUT_Pin GPIO_PIN_10
#define TOF_R_XSHUT_GPIO_Port GPIOA
#endif
#if defined(SOAP_LEVEL_SENSOR)
/* IF_SOAP_IN, MEMS_IF_3, PA10 */
-#define SOAP_STATUS_Pin GPIO_PIN_10
-#define SOAP_STATUS_GPIO_Port GPIOA
+#define SOAP_STATUS_Pin GPIO_PIN_10
+#define SOAP_STATUS_GPIO_Port GPIOA
/* IF_SENSOR_ON_OFF, MEMS_IF_1, PB3 */
-#define SOAP_SWITCH_Pin GPIO_PIN_3
-#define SOAP_SWITCH_GPIO_Port GPIOB
+#define SOAP_SWITCH_Pin GPIO_PIN_5 // 2024-04-08 WAS GPIO_PIN_3
+#define SOAP_SWITCH_GPIO_Port GPIOB
-#define SOAP_DATA HAL_GPIO_ReadPin(SOAP_STATUS_GPIO_Port,SOAP_STATUS_Pin)
+#define SOAP_DATA HAL_GPIO_ReadPin(SOAP_STATUS_GPIO_Port, SOAP_STATUS_Pin)
#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)
#define STS_SERVICE_MASK_L3 (3) // service mask level 3, NO responsing to cloud control command, or config change/responding, EXCEPT STS_SERVICE_MASK_ON_OFF cmd
-//#define STS_SERVICE_MASK_L4 (1<<4) // service mask level 4, level 3 + node states heart-beat(predefined long periodicity off), EXCEPT STS_SERVICE_MASK_ON_OFF cmd
+ // #define STS_SERVICE_MASK_L4 (1<<4) // service mask level 4, level 3 + node states heart-beat(predefined long periodicity off), EXCEPT STS_SERVICE_MASK_ON_OFF cmd
-/* USER CODE END Private defines */
+ /* USER CODE END Private defines */
#ifdef __cplusplus
}
diff --git a/Core/Src/gpio.c b/Core/Src/gpio.c
index 94dcfd2..0c2a40f 100644
--- a/Core/Src/gpio.c
+++ b/Core/Src/gpio.c
@@ -54,12 +54,13 @@ void MX_GPIO_Init(void)
GPIO_InitStruct.Pin = GPIO_PIN_All;
GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
GPIO_InitStruct.Pull = GPIO_NOPULL;
+ GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
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_GPIOA_CLK_DISABLE();
+ //__HAL_RCC_GPIOB_CLK_DISABLE();
__HAL_RCC_GPIOC_CLK_DISABLE();
/*Configure GPIO pin Output Level */
@@ -92,22 +93,52 @@ void MX_GPIO_Init(void)
GPIO_InitStruct.Pull = GPIO_PULLUP;
HAL_GPIO_Init(BUT3_GPIO_Port, &GPIO_InitStruct);
#endif
-#if 0
+
+#ifdef STS_O5
+ /*Configure GPIO pin : PtPin */
+ GPIO_InitStruct.Pin = HALL1_OUT_Pin;
+ GPIO_InitStruct.Mode = GPIO_MODE_IT_RISING_FALLING;
+ GPIO_InitStruct.Pull = GPIO_NOPULL;
+ GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
+ HAL_GPIO_Init(HALL1_OUT_GPIO_Port, &GPIO_InitStruct);
+
+ /*Configure GPIO pin : PtPin */
+ GPIO_InitStruct.Pin = HALL2_OUT_Pin;
+ GPIO_InitStruct.Mode = GPIO_MODE_IT_RISING_FALLING;
+ GPIO_InitStruct.Pull = GPIO_NOPULL;
+ GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
+ HAL_GPIO_Init(HALL2_OUT_GPIO_Port, &GPIO_InitStruct);
+
+
+ GPIO_InitStruct.Pin = HALL1_VCC_Pin;
+ GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
+ GPIO_InitStruct.Pull = GPIO_NOPULL;
+ GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
+ HAL_GPIO_Init(HALL1_VCC_GPIO_Port, &GPIO_InitStruct);
+
+ GPIO_InitStruct.Pin = HALL2_VCC_Pin;
+ GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
+ GPIO_InitStruct.Pull = GPIO_NOPULL;
+ GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
+ HAL_GPIO_Init(HALL2_VCC_GPIO_Port, &GPIO_InitStruct);
+
+#else
+
/*Configure GPIO pin : PtPin */
GPIO_InitStruct.Pin = BUT2_Pin;
GPIO_InitStruct.Mode = GPIO_MODE_IT_FALLING;
GPIO_InitStruct.Pull = GPIO_PULLUP;
+ GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
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_PULLDOWN;
+ GPIO_InitStruct.Pull = GPIO_PULLUP;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
HAL_GPIO_Init(BUT1_GPIO_Port, &GPIO_InitStruct);
- //__HAL_RCC_GPIOA_CLK_DISABLE();
+#endif
__HAL_RCC_GPIOB_CLK_ENABLE();
GPIO_InitStruct.Pin = MEMS_POWER_Pin;
GPIO_InitStruct.Mode = GPIO_MODE_IT_RISING_FALLING;
@@ -197,13 +228,23 @@ HAL_GPIO_Init(SOAP_SWITCH_GPIO_Port, &GPIO_InitStruct);
#endif
+#ifdef STS_O5
+ /* EXTI interrupt init*/
+ HAL_NVIC_SetPriority(HALL1_OUT_EXTI_IRQn, 4, 0);
+ HAL_NVIC_EnableIRQ(HALL1_OUT_EXTI_IRQn);
+
+ HAL_NVIC_SetPriority(HALL2_OUT_EXTI_IRQn, 4, 0);
+ HAL_NVIC_EnableIRQ(HALL2_OUT_EXTI_IRQn);
+
+#else
/* 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);
diff --git a/Core/Src/stm32wlxx_it.c b/Core/Src/stm32wlxx_it.c
index b4c3d47..920ed85 100644
--- a/Core/Src/stm32wlxx_it.c
+++ b/Core/Src/stm32wlxx_it.c
@@ -243,14 +243,17 @@ void EXTI0_IRQHandler(void)
/* USER CODE BEGIN EXTI0_IRQn 0 */
/* USER CODE END EXTI0_IRQn 0 */
- //HAL_EXTI_IRQHandler(&H_EXTI_0);
+#ifdef STS_O5
+ HAL_GPIO_EXTI_IRQHandler(HALL1_OUT_Pin);
+#else
HAL_GPIO_EXTI_IRQHandler(BUT1_Pin);
+#endif
/* USER CODE BEGIN EXTI0_IRQn 1 */
/* USER CODE END EXTI0_IRQn 1 */
}
-#if 0
+
/**
* @brief This function handles EXTI Line 1 Interrupt.
*/
@@ -259,12 +262,15 @@ void EXTI1_IRQHandler(void)
/* USER CODE BEGIN EXTI1_IRQn 0 */
/* USER CODE END EXTI1_IRQn 0 */
+#ifdef STS_O5
+#else
HAL_GPIO_EXTI_IRQHandler(BUT2_Pin);
+#endif
/* USER CODE BEGIN EXTI1_IRQn 1 */
/* USER CODE END EXTI1_IRQn 1 */
}
-#endif
+
#if 0
/**
@@ -385,7 +391,7 @@ void EXTI9_5_IRQHandler(void)
/* USER CODE END EXTI9_5_IRQn 1 */
}
-
+#endif
/**
* @brief This function handles EXTI Lines [9:5] Interrupt.
*/
@@ -394,7 +400,9 @@ void EXTI15_10_IRQHandler(void)
/* USER CODE BEGIN EXTI15_10_IRQn 0 */
/* USER CODE END EXTI15_10_IRQn 0 */
-#if defined(STM32WL55xx)
+#ifdef STS_O5
+ HAL_GPIO_EXTI_IRQHandler(HALL2_OUT_Pin);
+#else
HAL_GPIO_EXTI_IRQHandler(TOF_INT_EXTI_PIN);
#endif
/* USER CODE BEGIN EXTI15_10_IRQn 1 */
@@ -402,7 +410,7 @@ void EXTI15_10_IRQHandler(void)
/* USER CODE END EXTI15_10_IRQn 1 */
}
-#endif
+
/**
* @brief This function handles USART2 Interrupt.
diff --git a/LoRaWAN/App/lora_app.c b/LoRaWAN/App/lora_app.c
index 2ac2ce4..be7d1b8 100644
--- a/LoRaWAN/App/lora_app.c
+++ b/LoRaWAN/App/lora_app.c
@@ -629,25 +629,30 @@ void LoRaWAN_Init(void)
void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin)
{
+ uint8_t pinstate = 0;
switch (GPIO_Pin)
{
- case BUT1_Pin:
-
-#ifdef YUNHORN_STS_O5_ENABLED
+#ifdef STS_O5
+ case HALL1_OUT_Pin:
+ pinstate = HAL_GPIO_ReadPin(HALL1_OUT_GPIO_Port, HALL1_OUT_Pin);
+ APP_LOG(TS_OFF, VLEVEL_M, "## HALL 1 DETECTED: %2d \r\n", pinstate);
UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0);
+ break;
+ case HALL2_OUT_Pin:
+ pinstate = HAL_GPIO_ReadPin(HALL2_OUT_GPIO_Port, HALL2_OUT_Pin);
+ APP_LOG(TS_OFF, VLEVEL_M, "## HALL 2 DETECTED: %2d \r\n", pinstate);
+ UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0);
+ break;
+#else
+ case BUT1_Pin:
+ UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0);
if (EventType == TX_ON_EVENT)
{
UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0);
} else
{
-#ifdef LED_ONBOARD
- LED_ON;
- HAL_Delay(20);
- LED_OFF;
-#endif
}
-#endif
break;
case BUT2_Pin:
@@ -669,7 +674,7 @@ void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin)
// APP_LOG(TS_OFF,VLEVEL_L, "##################################### TOF_EVENT DETECTED \r\n");
break;
#endif
-
+#endif
default:
break;
}
diff --git a/STM32CubeIDE/.cproject b/STM32CubeIDE/.cproject
index 8f92345..155436f 100644
--- a/STM32CubeIDE/.cproject
+++ b/STM32CubeIDE/.cproject
@@ -182,7 +182,7 @@
-
diff --git a/STM32CubeIDE/Release/Application/User/Core/stm32wlxx_it.cyclo b/STM32CubeIDE/Release/Application/User/Core/stm32wlxx_it.cyclo
index 2343999..a2416f4 100644
--- a/STM32CubeIDE/Release/Application/User/Core/stm32wlxx_it.cyclo
+++ b/STM32CubeIDE/Release/Application/User/Core/stm32wlxx_it.cyclo
@@ -9,7 +9,9 @@ D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/C
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/Core/Src/stm32wlxx_it.c:207:6:SysTick_Handler 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/Core/Src/stm32wlxx_it.c:227:6:TAMP_STAMP_LSECSS_SSRU_IRQHandler 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/Core/Src/stm32wlxx_it.c:241:6:EXTI0_IRQHandler 1
-D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/Core/Src/stm32wlxx_it.c:343:6:DMA1_Channel7_IRQHandler 1
-D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/Core/Src/stm32wlxx_it.c:410:6:USART2_IRQHandler 1
-D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/Core/Src/stm32wlxx_it.c:424:6:RTC_Alarm_IRQHandler 1
-D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/Core/Src/stm32wlxx_it.c:438:6:SUBGHZ_Radio_IRQHandler 1
+D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/Core/Src/stm32wlxx_it.c:260:6:EXTI1_IRQHandler 1
+D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/Core/Src/stm32wlxx_it.c:349:6:DMA1_Channel7_IRQHandler 1
+D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/Core/Src/stm32wlxx_it.c:398:6:EXTI15_10_IRQHandler 1
+D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/Core/Src/stm32wlxx_it.c:418:6:USART2_IRQHandler 1
+D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/Core/Src/stm32wlxx_it.c:432:6:RTC_Alarm_IRQHandler 1
+D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/Core/Src/stm32wlxx_it.c:446:6:SUBGHZ_Radio_IRQHandler 1
diff --git a/STM32CubeIDE/Release/Application/User/LoRaWAN/App/lora_app.cyclo b/STM32CubeIDE/Release/Application/User/LoRaWAN/App/lora_app.cyclo
index 108af6e..93747b8 100644
--- a/STM32CubeIDE/Release/Application/User/LoRaWAN/App/lora_app.cyclo
+++ b/STM32CubeIDE/Release/Application/User/LoRaWAN/App/lora_app.cyclo
@@ -1,35 +1,35 @@
-D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1032:13:OnBeaconStatusChange 1
-D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1074:13:OnClassChange 1
-D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1115:13:OnTxFrameCtrlChanged 1
-D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1126:13:OnPingSlotPeriodicityChanged 1
-D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:923:13:OnTxTimerEvent 1
-D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1081:13:OnMacProcessNotify 1
-D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:993:13:OnJoinRequest 3
-D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1093:13:OnTxPeriodicityChanged 1
-D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1297:13:OnYunhornSTSHeartBeatPeriodicityChanged 2
-D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1263:13:OnRestoreContextRequest 1
-D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1151:13:StopJoin 2
-D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1208:13:StoreContext 1
-D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:789:13:SendTxData 9
-D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:962:13:OnTxData 3
-D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1447:13:OnYunhornSTSHeartBeatTimerEvent 5
-D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1190:13:OnStopJoinTimerEvent 2
-D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1137:13:OnSystemReset 3
-D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1248:13:OnStoreContextRequest 2
-D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:953:13:OnJoinTimerLedEvent 1
-D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1230:13:OnNvmDataChange 1
-D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:939:13:OnTxTimerLedEvent 1
-D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:946:13:OnRxTimerLedEvent 1
-D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1067:13:OnSysTimeUpdate 1
+D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1037:13:OnBeaconStatusChange 1
+D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1079:13:OnClassChange 1
+D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1120:13:OnTxFrameCtrlChanged 1
+D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1131:13:OnPingSlotPeriodicityChanged 1
+D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:928:13:OnTxTimerEvent 1
+D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1086:13:OnMacProcessNotify 1
+D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:998:13:OnJoinRequest 3
+D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1098:13:OnTxPeriodicityChanged 1
+D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1302:13:OnYunhornSTSHeartBeatPeriodicityChanged 2
+D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1268:13:OnRestoreContextRequest 1
+D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1156:13:StopJoin 2
+D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1213:13:StoreContext 1
+D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:794:13:SendTxData 9
+D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:967:13:OnTxData 3
+D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1452:13:OnYunhornSTSHeartBeatTimerEvent 5
+D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1195:13:OnStopJoinTimerEvent 2
+D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1142:13:OnSystemReset 3
+D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1253:13:OnStoreContextRequest 2
+D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:958:13:OnJoinTimerLedEvent 1
+D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1235:13:OnNvmDataChange 1
+D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:944:13:OnTxTimerLedEvent 1
+D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:951:13:OnRxTimerLedEvent 1
+D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1072:13:OnSysTimeUpdate 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:630:6:HAL_GPIO_EXTI_Callback 3
-D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1953:6:STS_SENSOR_Upload_Message 6
-D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1940:6:STS_SENSOR_Upload_Config_Invalid_Message 2
-D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:2001:6:OnStoreSTSCFGContextRequest 4
-D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:2049:6:OnRestoreSTSCFGContextRequest 1
-D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:2112:6:OnRestoreSTSCFGContextProcess 8
-D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:2061:6:STS_REBOOT_CONFIG_Init 6
+D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1958:6:STS_SENSOR_Upload_Message 6
+D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1945:6:STS_SENSOR_Upload_Config_Invalid_Message 2
+D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:2006:6:OnStoreSTSCFGContextRequest 4
+D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:2054:6:OnRestoreSTSCFGContextRequest 1
+D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:2117:6:OnRestoreSTSCFGContextProcess 8
+D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:2066:6:STS_REBOOT_CONFIG_Init 6
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:481:6:LoRaWAN_Init 2
-D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:2180:6:STS_SENSOR_Distance_Test_Process 1
-D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:2197:6:STS_SENSOR_Function_Test_Process 1
-D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1463:6:USER_APP_AUTO_RESPONDER_Parse 45
-D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:686:13:OnRxData 15
+D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:2185:6:STS_SENSOR_Distance_Test_Process 1
+D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:2202:6:STS_SENSOR_Function_Test_Process 1
+D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1468:6:USER_APP_AUTO_RESPONDER_Parse 45
+D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:691:13:OnRxData 15
diff --git a/STM32CubeIDE/Release/STS_RR_R125.bin b/STM32CubeIDE/Release/STS_RR_R125.bin
index e847a0f..62892ca 100644
Binary files a/STM32CubeIDE/Release/STS_RR_R125.bin and b/STM32CubeIDE/Release/STS_RR_R125.bin differ
diff --git a/STM32CubeIDE/Release/STS_RR_R125.list b/STM32CubeIDE/Release/STS_RR_R125.list
index 5dc7517..e1ead86 100644
--- a/STM32CubeIDE/Release/STS_RR_R125.list
+++ b/STM32CubeIDE/Release/STS_RR_R125.list
@@ -5,27 +5,27 @@ Sections:
Idx Name Size VMA LMA File off Algn
0 .isr_vector 00000138 08000000 08000000 00001000 2**0
CONTENTS, ALLOC, LOAD, READONLY, DATA
- 1 .text 00010ac0 08000138 08000138 00001138 2**3
+ 1 .text 00010ad0 08000138 08000138 00001138 2**3
CONTENTS, ALLOC, LOAD, READONLY, CODE
- 2 .rodata 00000b50 08010bf8 08010bf8 00011bf8 2**2
+ 2 .rodata 00000b50 08010c08 08010c08 00011c08 2**2
CONTENTS, ALLOC, LOAD, READONLY, DATA
- 3 .USER_embedded_Keys 000000d8 08011748 08011748 00012748 2**2
+ 3 .USER_embedded_Keys 000000d8 08011758 08011758 00012758 2**2
CONTENTS, ALLOC, LOAD, READONLY, DATA
- 4 .ARM.extab 00000000 08011820 08011820 0001314c 2**0
+ 4 .ARM.extab 00000000 08011830 08011830 0001314c 2**0
CONTENTS
- 5 .ARM 00000008 08011820 08011820 00012820 2**2
+ 5 .ARM 00000008 08011830 08011830 00012830 2**2
CONTENTS, ALLOC, LOAD, READONLY, DATA
- 6 .preinit_array 00000000 08011828 08011828 0001314c 2**0
+ 6 .preinit_array 00000000 08011838 08011838 0001314c 2**0
CONTENTS, ALLOC, LOAD, DATA
- 7 .init_array 00000004 08011828 08011828 00012828 2**2
+ 7 .init_array 00000004 08011838 08011838 00012838 2**2
CONTENTS, ALLOC, LOAD, READONLY, DATA
- 8 .fini_array 00000004 0801182c 0801182c 0001282c 2**2
+ 8 .fini_array 00000004 0801183c 0801183c 0001283c 2**2
CONTENTS, ALLOC, LOAD, READONLY, DATA
- 9 .data 0000014c 20000000 08011830 00013000 2**2
+ 9 .data 0000014c 20000000 08011840 00013000 2**2
CONTENTS, ALLOC, LOAD, DATA
- 10 .bss 000021dc 2000014c 0801197c 0001314c 2**2
+ 10 .bss 000021dc 2000014c 0801198c 0001314c 2**2
ALLOC
- 11 ._user_heap_stack 00000a00 20002328 0801197c 00013328 2**0
+ 11 ._user_heap_stack 00000a00 20002328 0801198c 00013328 2**0
ALLOC
12 .ARM.attributes 0000002e 00000000 00000000 0001314c 2**0
CONTENTS, READONLY
@@ -52,7 +52,7 @@ Disassembly of section .text:
800014e: bd10 pop {r4, pc}
8000150: 2000014c .word 0x2000014c
8000154: 00000000 .word 0x00000000
- 8000158: 08010be0 .word 0x08010be0
+ 8000158: 08010bf0 .word 0x08010bf0
0800015c :
800015c: b508 push {r3, lr}
@@ -64,7 +64,7 @@ Disassembly of section .text:
800016a: bd08 pop {r3, pc}
800016c: 00000000 .word 0x00000000
8000170: 20000150 .word 0x20000150
- 8000174: 08010be0 .word 0x08010be0
+ 8000174: 08010bf0 .word 0x08010bf0
08000178 :
8000178: 2114 movs r1, #20
@@ -812,7 +812,7 @@ Disassembly of section .text:
8000900: b001 add sp, #4
8000902: bd00 pop {pc}
8000904: 217c movs r1, #124 @ 0x7c
- 8000906: f010 f8d3 bl 8010ab0 <__aeabi_memclr>
+ 8000906: f010 f8dd bl 8010ac4 <__aeabi_memclr>
800090a: f44f 3000 mov.w r0, #131072 @ 0x20000
800090e: b001 add sp, #4
8000910: bd00 pop {pc}
@@ -1014,7 +1014,7 @@ Disassembly of section .text:
8000aec: bf0e itee eq
8000aee: 4c03 ldreq r4, [pc, #12] @ (8000afc )
8000af0: f44f 71c0 movne.w r1, #384 @ 0x180
- 8000af4: f00f ffdc blne 8010ab0 <__aeabi_memclr>
+ 8000af4: f00f ffe6 blne 8010ac4 <__aeabi_memclr>
8000af8: 4620 mov r0, r4
8000afa: bd10 pop {r4, pc}
8000afc: 00030002 .word 0x00030002
@@ -1214,7 +1214,7 @@ Disassembly of section .text:
8000cf2: e8bd 87f0 ldmia.w sp!, {r4, r5, r6, r7, r8, r9, sl, pc}
8000cf6: bf00 nop
8000cf8: 00030002 .word 0x00030002
- 8000cfc: 08010c78 .word 0x08010c78
+ 8000cfc: 08010c88 .word 0x08010c88
8000d00: 20000168 .word 0x20000168
8000d04: 08000f24 .word 0x08000f24
8000d08: d74ebead .word 0xd74ebead
@@ -1255,7 +1255,7 @@ Disassembly of section .text:
8000d5a: 4617 mov r7, r2
8000d5c: 2140 movs r1, #64 @ 0x40
8000d5e: a801 add r0, sp, #4
- 8000d60: f00f fea6 bl 8010ab0 <__aeabi_memclr>
+ 8000d60: f00f feb0 bl 8010ac4 <__aeabi_memclr>
8000d64: 7a29 ldrb r1, [r5, #8]
8000d66: 07c8 lsls r0, r1, #31
8000d68: d504 bpl.n 8000d74
@@ -1336,12 +1336,12 @@ Disassembly of section .text:
8000e2e: 4616 mov r6, r2
8000e30: 2140 movs r1, #64 @ 0x40
8000e32: a815 add r0, sp, #84 @ 0x54
- 8000e34: f00f fe3c bl 8010ab0 <__aeabi_memclr>
+ 8000e34: f00f fe46 bl 8010ac4 <__aeabi_memclr>
8000e38: 2200 movs r2, #0
8000e3a: 9204 str r2, [sp, #16]
8000e3c: 2140 movs r1, #64 @ 0x40
8000e3e: a805 add r0, sp, #20
- 8000e40: f00f fe36 bl 8010ab0 <__aeabi_memclr>
+ 8000e40: f00f fe40 bl 8010ac4 <__aeabi_memclr>
8000e44: 7a38 ldrb r0, [r7, #8]
8000e46: 07c1 lsls r1, r0, #31
8000e48: d55e bpl.n 8000f08
@@ -1424,7 +1424,7 @@ Disassembly of section .text:
8000f0a: b026 add sp, #152 @ 0x98
8000f0c: e8bd 81f0 ldmia.w sp!, {r4, r5, r6, r7, r8, pc}
8000f10: 00030001 .word 0x00030001
- 8000f14: 08010c80 .word 0x08010c80
+ 8000f14: 08010c90 .word 0x08010c90
8000f18: 00036e93 .word 0x00036e93
8000f1c: 0003c726 .word 0x0003c726
8000f20: 00030002 .word 0x00030002
@@ -1462,7 +1462,7 @@ Disassembly of section .text:
08000f78 :
8000f78: 2220 movs r2, #32
8000f7a: 305c adds r0, #92 @ 0x5c
- 8000f7c: f00f bd96 b.w 8010aac <__aeabi_memcpy>
+ 8000f7c: f00f bda0 b.w 8010ac0 <__aeabi_memcpy>
08000f80 :
8000f80: b5f0 push {r4, r5, r6, r7, lr}
@@ -1566,14 +1566,14 @@ Disassembly of section .text:
8001054: 464a mov r2, r9
8001056: 4631 mov r1, r6
8001058: 18f8 adds r0, r7, r3
- 800105a: f00f fd27 bl 8010aac <__aeabi_memcpy>
+ 800105a: f00f fd31 bl 8010ac0 <__aeabi_memcpy>
800105e: 6822 ldr r2, [r4, #0]
8001060: 6813 ldr r3, [r2, #0]
8001062: 4639 mov r1, r7
8001064: e00f b.n 8001086
8001066: 4642 mov r2, r8
8001068: 4638 mov r0, r7
- 800106a: f00f fd1f bl 8010aac <__aeabi_memcpy>
+ 800106a: f00f fd29 bl 8010ac0 <__aeabi_memcpy>
800106e: 6823 ldr r3, [r4, #0]
8001070: 681a ldr r2, [r3, #0]
8001072: 4639 mov r1, r7
@@ -1598,7 +1598,7 @@ Disassembly of section .text:
800109e: 1a2a subs r2, r5, r0
80010a0: 1831 adds r1, r6, r0
80010a2: 18f8 adds r0, r7, r3
- 80010a4: f00f fd02 bl 8010aac <__aeabi_memcpy>
+ 80010a4: f00f fd0c bl 8010ac0 <__aeabi_memcpy>
80010a8: f44f 3000 mov.w r0, #131072 @ 0x20000
80010ac: e8bd 83f2 ldmia.w sp!, {r1, r4, r5, r6, r7, r8, r9, pc}
80010b0: 00020004 .word 0x00020004
@@ -1739,7 +1739,7 @@ Disassembly of section .text:
80011f2: d003 beq.n 80011fc
80011f4: 4651 mov r1, sl
80011f6: 4620 mov r0, r4
- 80011f8: f00f fc5a bl 8010ab0 <__aeabi_memclr>
+ 80011f8: f00f fc64 bl 8010ac4 <__aeabi_memclr>
80011fc: 682a ldr r2, [r5, #0]
80011fe: 9e06 ldr r6, [sp, #24]
8001200: 9f05 ldr r7, [sp, #20]
@@ -1763,7 +1763,7 @@ Disassembly of section .text:
8001226: f44f 3000 mov.w r0, #131072 @ 0x20000
800122a: b007 add sp, #28
800122c: e8bd 8ff0 ldmia.w sp!, {r4, r5, r6, r7, r8, r9, sl, fp, pc}
- 8001230: 08010c78 .word 0x08010c78
+ 8001230: 08010c88 .word 0x08010c88
8001234: 08001254 .word 0x08001254
8001238: 20000168 .word 0x20000168
800123c: 9310c55f .word 0x9310c55f
@@ -2897,7 +2897,7 @@ Disassembly of section .text:
8001e38: 6382 str r2, [r0, #56] @ 0x38
8001e3a: f880 303c strb.w r3, [r0, #60] @ 0x3c
8001e3e: 64c3 str r3, [r0, #76] @ 0x4c
- 8001e40: f002 f8a4 bl 8003f8c
+ 8001e40: f002 f8ae bl 8003fa0
8001e44: b118 cbz r0, 8001e4e
8001e46: e8bd 4008 ldmia.w sp!, {r3, lr}
8001e4a: f000 bac9 b.w 80023e0
@@ -2945,30 +2945,30 @@ Disassembly of section .text:
8001ea8: 9403 str r4, [sp, #12]
8001eaa: f7ff ffa9 bl 8001e00
8001eae: 4814 ldr r0, [pc, #80] @ (8001f00 )
- 8001eb0: f002 fc00 bl 80046b4
+ 8001eb0: f002 fc0a bl 80046c8
8001eb4: b108 cbz r0, 8001eba
8001eb6: f000 fa93 bl 80023e0
8001eba: 4811 ldr r0, [pc, #68] @ (8001f00 )
8001ebc: 9403 str r4, [sp, #12]
8001ebe: a901 add r1, sp, #4
8001ec0: e9cd 5401 strd r5, r4, [sp, #4]
- 8001ec4: f002 f9c0 bl 8004248
+ 8001ec4: f002 f9ca bl 800425c
8001ec8: b108 cbz r0, 8001ece
8001eca: f000 fa89 bl 80023e0
8001ece: 480c ldr r0, [pc, #48] @ (8001f00 )
- 8001ed0: f002 fb1a bl 8004508
+ 8001ed0: f002 fb24 bl 800451c
8001ed4: b108 cbz r0, 8001eda
8001ed6: f000 fa83 bl 80023e0
8001eda: f04f 31ff mov.w r1, #4294967295
8001ede: 4808 ldr r0, [pc, #32] @ (8001f00 )
- 8001ee0: f002 f954 bl 800418c
+ 8001ee0: f002 f95e bl 80041a0
8001ee4: 4806 ldr r0, [pc, #24] @ (8001f00 )
- 8001ee6: f002 fbc7 bl 8004678
+ 8001ee6: f002 fbd1 bl 800468c
8001eea: 4805 ldr r0, [pc, #20] @ (8001f00 )
- 8001eec: f002 f9a8 bl 8004240
+ 8001eec: f002 f9b2 bl 8004254
8001ef0: 4604 mov r4, r0
8001ef2: 4803 ldr r0, [pc, #12] @ (8001f00 )
- 8001ef4: f002 fb6a bl 80045cc
+ 8001ef4: f002 fb74 bl 80045e0
8001ef8: 4620 mov r0, r4
8001efa: b005 add sp, #20
8001efc: bd30 pop {r4, r5, pc}
@@ -3087,21 +3087,21 @@ Disassembly of section .text:
8002016: 2200 movs r2, #0
8002018: 4611 mov r1, r2
800201a: 200b movs r0, #11
- 800201c: f002 fbe8 bl 80047f0
+ 800201c: f002 fbf2 bl 8004804
8002020: 200b movs r0, #11
- 8002022: f002 fc17 bl 8004854
+ 8002022: f002 fc21 bl 8004868
8002026: 2200 movs r2, #0
8002028: 2011 movs r0, #17
800202a: 4611 mov r1, r2
- 800202c: f002 fbe0 bl 80047f0
+ 800202c: f002 fbea bl 8004804
8002030: e8bd 4008 ldmia.w sp!, {r3, lr}
8002034: 2011 movs r0, #17
- 8002036: f002 bc0d b.w 8004854
+ 8002036: f002 bc17 b.w 8004868
...
0800203c :
800203c: b508 push {r3, lr}
- 800203e: f002 fe5b bl 8004cf8
+ 800203e: f002 fe65 bl 8004d0c
8002042: b110 cbz r0, 800204a
8002044: f06f 0004 mvn.w r0, #4
8002048: bd08 pop {r3, pc}
@@ -3111,7 +3111,7 @@ Disassembly of section .text:
8002052: 619a str r2, [r3, #24]
8002054: f24c 32fa movw r2, #50170 @ 0xc3fa
8002058: 611a str r2, [r3, #16]
- 800205a: f002 fe5f bl 8004d1c
+ 800205a: f002 fe69 bl 8004d30
800205e: 2800 cmp r0, #0
8002060: d0f2 beq.n 8002048
8002062: e7ef b.n 8002044
@@ -3128,7 +3128,7 @@ Disassembly of section .text:
8002076: f7ff ffe1 bl 800203c
800207a: 4604 mov r4, r0
800207c: bb70 cbnz r0, 80020dc
- 800207e: f002 fe3b bl 8004cf8
+ 800207e: f002 fe45 bl 8004d0c
8002082: bb88 cbnz r0, 80020e8
8002084: 481a ldr r0, [pc, #104] @ (80020f0 )
8002086: 4a1b ldr r2, [pc, #108] @ (80020f4 )
@@ -3153,13 +3153,13 @@ Disassembly of section .text:
80020c2: 4669 mov r1, sp
80020c4: a801 add r0, sp, #4
80020c6: 9303 str r3, [sp, #12]
- 80020c8: f002 fea8 bl 8004e1c
+ 80020c8: f002 feb2 bl 8004e30
80020cc: b120 cbz r0, 80020d8
80020ce: 2802 cmp r0, #2
80020d0: bf14 ite ne
80020d2: f06f 0401 mvnne.w r4, #1
80020d6: 2401 moveq r4, #1
- 80020d8: f002 fe20 bl 8004d1c
+ 80020d8: f002 fe2a bl 8004d30
80020dc: 4620 mov r0, r4
80020de: b005 add sp, #20
80020e0: bdf0 pop {r4, r5, r6, r7, pc}
@@ -3202,7 +3202,7 @@ Disassembly of section .text:
8002142: f7ff ff7b bl 800203c
8002146: 4604 mov r4, r0
8002148: bb90 cbnz r0, 80021b0
- 800214a: f002 fdd5 bl 8004cf8
+ 800214a: f002 fddf bl 8004d0c
800214e: 2800 cmp r0, #0
8002150: f040 80a8 bne.w 80022a4
8002154: f8d9 15e0 ldr.w r1, [r9, #1504] @ 0x5e0
@@ -3235,7 +3235,7 @@ Disassembly of section .text:
80021a6: 9b03 ldr r3, [sp, #12]
80021a8: 459a cmp sl, r3
80021aa: d305 bcc.n 80021b8
- 80021ac: f002 fdb6 bl 8004d1c
+ 80021ac: f002 fdc0 bl 8004d30
80021b0: 4620 mov r0, r4
80021b2: b009 add sp, #36 @ 0x24
80021b4: e8bd 8ff0 ldmia.w sp!, {r4, r5, r6, r7, r8, r9, sl, fp, pc}
@@ -3279,14 +3279,14 @@ Disassembly of section .text:
800221c: b127 cbz r7, 8002228
800221e: f44f 6200 mov.w r2, #2048 @ 0x800
8002222: 4639 mov r1, r7
- 8002224: f00d ffda bl 80101dc
+ 8002224: f00d ffe4 bl 80101f0
8002228: f8df 9088 ldr.w r9, [pc, #136] @ 80022b4
800222c: 9900 ldr r1, [sp, #0]
800222e: f8d9 3000 ldr.w r3, [r9]
8002232: f3cb 000a ubfx r0, fp, #0, #11
8002236: 4418 add r0, r3
8002238: b2aa uxth r2, r5
- 800223a: f00d ffcf bl 80101dc
+ 800223a: f00d ffd9 bl 80101f0
800223e: f44f 6100 mov.w r1, #2048 @ 0x800
8002242: 4638 mov r0, r7
8002244: f7ff ff10 bl 8002068
@@ -3303,7 +3303,7 @@ Disassembly of section .text:
8002260: 9302 str r3, [sp, #8]
8002262: 2001 movs r0, #1
8002264: e9d3 2300 ldrd r2, r3, [r3]
- 8002268: f002 fd92 bl 8004d90
+ 8002268: f002 fd9c bl 8004da4
800226c: b988 cbnz r0, 8002292
800226e: 9907 ldr r1, [sp, #28]
8002270: 9b01 ldr r3, [sp, #4]
@@ -3346,7 +3346,7 @@ Disassembly of section .text:
80022d4: d805 bhi.n 80022e2
80022d6: b138 cbz r0, 80022e8
80022d8: b292 uxth r2, r2
- 80022da: f00d ff7f bl 80101dc
+ 80022da: f00d ff89 bl 80101f0
80022de: 2000 movs r0, #0
80022e0: bd70 pop {r4, r5, r6, pc}
80022e2: f04f 30ff mov.w r0, #4294967295
@@ -3383,12 +3383,12 @@ Disassembly of section .text:
8002330: 2248 movs r2, #72 @ 0x48
8002332: 2100 movs r1, #0
8002334: a808 add r0, sp, #32
- 8002336: f00e fb8d bl 8010a54
+ 8002336: f00e fb97 bl 8010a68
800233a: 2218 movs r2, #24
800233c: 2100 movs r1, #0
800233e: a802 add r0, sp, #8
- 8002340: f00e fb88 bl 8010a54
- 8002344: f002 fef0 bl 8005128
+ 8002340: f00e fb92 bl 8010a68
+ 8002344: f002 fefa bl 800513c
8002348: f04f 42b0 mov.w r2, #1476395008 @ 0x58000000
800234c: 2001 movs r0, #1
800234e: f8d2 3090 ldr.w r3, [r2, #144] @ 0x90
@@ -3411,7 +3411,7 @@ Disassembly of section .text:
8002384: 22b0 movs r2, #176 @ 0xb0
8002386: a808 add r0, sp, #32
8002388: e9cd 2312 strd r2, r3, [sp, #72] @ 0x48
- 800238c: f003 f8a6 bl 80054dc
+ 800238c: f003 f8b0 bl 80054f0
8002390: b108 cbz r0, 8002396
8002392: b672 cpsid i
8002394: e7fe b.n 8002394
@@ -3421,7 +3421,7 @@ Disassembly of section .text:
80023a0: e9cd 0006 strd r0, r0, [sp, #24]
80023a4: 2102 movs r1, #2
80023a6: a802 add r0, sp, #8
- 80023a8: f003 fb32 bl 8005a10
+ 80023a8: f003 fb3c bl 8005a24
80023ac: b108 cbz r0, 80023b2
80023ae: b672 cpsid i
80023b0: e7fe b.n 80023b0
@@ -3430,17 +3430,17 @@ Disassembly of section .text:
080023b8 :
80023b8: b508 push {r3, lr}
- 80023ba: f001 fd95 bl 8003ee8
+ 80023ba: f001 fd9f bl 8003efc
80023be: f7ff ffb5 bl 800232c
80023c2: 2101 movs r1, #1
80023c4: 2000 movs r0, #0
- 80023c6: f001 fd27 bl 8003e18
+ 80023c6: f001 fd31 bl 8003e2c
80023ca: 2101 movs r1, #1
80023cc: 2000 movs r0, #0
- 80023ce: f002 fefd bl 80051cc
- 80023d2: f002 ff33 bl 800523c
- 80023d6: f000 fd87 bl 8002ee8
- 80023da: f000 fd8c bl 8002ef6
+ 80023ce: f002 ff07 bl 80051e0
+ 80023d2: f002 ff3d bl 8005250
+ 80023d6: f000 fd8b bl 8002ef0
+ 80023da: f000 fd90 bl 8002efe
80023de: e7fc b.n 80023da
080023e0 :
@@ -3453,7 +3453,7 @@ Disassembly of section .text:
80023e8: 222c movs r2, #44 @ 0x2c
80023ea: 2100 movs r1, #0
80023ec: a801 add r0, sp, #4
- 80023ee: f00e fb31 bl 8010a54
+ 80023ee: f00e fb3b bl 8010a68
80023f2: 4817 ldr r0, [pc, #92] @ (8002450 )
80023f4: 4b17 ldr r3, [pc, #92] @ (8002454 )
80023f6: 6003 str r3, [r0, #0]
@@ -3466,11 +3466,11 @@ Disassembly of section .text:
800240a: 6183 str r3, [r0, #24]
800240c: f44f 7380 mov.w r3, #256 @ 0x100
8002410: 6243 str r3, [r0, #36] @ 0x24
- 8002412: f003 fda3 bl 8005f5c
+ 8002412: f003 fdad bl 8005f70
8002416: b108 cbz r0, 800241c
8002418: f7ff ffe2 bl 80023e0
800241c: 480c ldr r0, [pc, #48] @ (8002450 )
- 800241e: f003 fec9 bl 80061b4
+ 800241e: f003 fed3 bl 80061c8
8002422: b108 cbz r0, 8002428
8002424: f7ff ffdc bl 80023e0
8002428: f04f 5300 mov.w r3, #536870912 @ 0x20000000
@@ -3483,7 +3483,7 @@ Disassembly of section .text:
800243a: 9202 str r2, [sp, #8]
800243c: 9206 str r2, [sp, #24]
800243e: 930b str r3, [sp, #44] @ 0x2c
- 8002440: f003 fdec bl 800601c
+ 8002440: f003 fdf6 bl 8006030
8002444: b108 cbz r0, 800244a
8002446: f7ff ffcb bl 80023e0
800244a: b00d add sp, #52 @ 0x34
@@ -3498,7 +3498,7 @@ Disassembly of section .text:
800245e: 2238 movs r2, #56 @ 0x38
8002460: 2100 movs r1, #0
8002462: a802 add r0, sp, #8
- 8002464: f00e faf6 bl 8010a54
+ 8002464: f00e fb00 bl 8010a68
8002468: 6822 ldr r2, [r4, #0]
800246a: 4b19 ldr r3, [pc, #100] @ (80024d0 )
800246c: 429a cmp r2, r3
@@ -3508,7 +3508,7 @@ Disassembly of section .text:
8002476: a802 add r0, sp, #8
8002478: f44f 7380 mov.w r3, #256 @ 0x100
800247c: 930f str r3, [sp, #60] @ 0x3c
- 800247e: f003 fbeb bl 8005c58
+ 800247e: f003 fbf5 bl 8005c6c
8002482: b108 cbz r0, 8002488
8002484: f7ff ffac bl 80023e0
8002488: f04f 43b0 mov.w r3, #1476395008 @ 0x58000000
@@ -3525,15 +3525,15 @@ Disassembly of section .text:
80024aa: 4611 mov r1, r2
80024ac: 9301 str r3, [sp, #4]
80024ae: 9b01 ldr r3, [sp, #4]
- 80024b0: f002 f99e bl 80047f0
+ 80024b0: f002 f9a8 bl 8004804
80024b4: 2002 movs r0, #2
- 80024b6: f002 f9cd bl 8004854
+ 80024b6: f002 f9d7 bl 8004868
80024ba: 2200 movs r2, #0
80024bc: 202a movs r0, #42 @ 0x2a
80024be: 4611 mov r1, r2
- 80024c0: f002 f996 bl 80047f0
+ 80024c0: f002 f9a0 bl 8004804
80024c4: 202a movs r0, #42 @ 0x2a
- 80024c6: f002 f9c5 bl 8004854
+ 80024c6: f002 f9cf bl 8004868
80024ca: b010 add sp, #64 @ 0x40
80024cc: bd10 pop {r4, pc}
80024ce: bf00 nop
@@ -3541,20 +3541,20 @@ Disassembly of section .text:
080024d4 :
80024d4: b508 push {r3, lr}
- 80024d6: f001 fd1d bl 8003f14
+ 80024d6: f001 fd27 bl 8003f28
80024da: 2021 movs r0, #33 @ 0x21
- 80024dc: f002 fe2c bl 8005138
+ 80024dc: f002 fe36 bl 800514c
80024e0: 4b03 ldr r3, [pc, #12] @ (80024f0 )
80024e2: 2201 movs r2, #1
80024e4: 619a str r2, [r3, #24]
80024e6: e8bd 4008 ldmia.w sp!, {r3, lr}
- 80024ea: f002 be55 b.w 8005198
+ 80024ea: f002 be5f b.w 80051ac
80024ee: bf00 nop
80024f0: 58000400 .word 0x58000400
080024f4 :
80024f4: b508 push {r3, lr}
- 80024f6: f001 fd14 bl 8003f22
+ 80024f6: f001 fd1e bl 8003f36
80024fa: 4b04 ldr r3, [pc, #16] @ (800250c )
80024fc: f8d3 2088 ldr.w r2, [r3, #136] @ 0x88
8002500: 05d2 lsls r2, r2, #23
@@ -3565,25 +3565,25 @@ Disassembly of section .text:
800250c: 58000400 .word 0x58000400
08002510 :
- 8002510: f001 bd07 b.w 8003f22
+ 8002510: f001 bd11 b.w 8003f36
08002514 :
8002514: b510 push {r4, lr}
- 8002516: f001 fcfd bl 8003f14
+ 8002516: f001 fd07 bl 8003f28
800251a: 4b0b ldr r3, [pc, #44] @ (8002548 )
800251c: 480b ldr r0, [pc, #44] @ (800254c )
800251e: 2401 movs r4, #1
8002520: f8c3 4088 str.w r4, [r3, #136] @ 0x88
- 8002524: f004 f992 bl 800684c
+ 8002524: f004 f99c bl 8006860
8002528: 4809 ldr r0, [pc, #36] @ (8002550 )
800252a: f64f 71ff movw r1, #65535 @ 0xffff
- 800252e: f002 fd6f bl 8005010
+ 800252e: f002 fd79 bl 8005024
8002532: 4808 ldr r0, [pc, #32] @ (8002554 )
8002534: f64f 71ff movw r1, #65535 @ 0xffff
- 8002538: f002 fd6a bl 8005010
+ 8002538: f002 fd74 bl 8005024
800253c: 4620 mov r0, r4
800253e: e8bd 4010 ldmia.w sp!, {r4, lr}
- 8002542: f002 beab b.w 800529c
+ 8002542: f002 beb5 b.w 80052b0
8002546: bf00 nop
8002548: 58000400 .word 0x58000400
800254c: 200002b0 .word 0x200002b0
@@ -3592,14 +3592,14 @@ Disassembly of section .text:
08002558 :
8002558: b508 push {r3, lr}
- 800255a: f001 fcdb bl 8003f14
+ 800255a: f001 fce5 bl 8003f28
800255e: e8bd 4008 ldmia.w sp!, {r3, lr}
8002562: 2101 movs r1, #1
8002564: 2000 movs r0, #0
- 8002566: f002 bdf7 b.w 8005158
+ 8002566: f002 be01 b.w 800516c
0800256a :
- 800256a: f001 bcda b.w 8003f22
+ 800256a: f001 bce4 b.w 8003f36
0800256e :
800256e: 4770 bx lr
@@ -3634,23413 +3634,23419 @@ Disassembly of section .text:
08002584 :
8002584: 4801 ldr r0, [pc, #4] @ (800258c )
- 8002586: f003 be3b b.w 8006200
+ 8002586: f003 be45 b.w 8006214
800258a: bf00 nop
800258c: 200001d4 .word 0x200001d4
08002590 :
8002590: 2001 movs r0, #1
- 8002592: f002 bdbd b.w 8005110
- ...
+ 8002592: f002 bdc7 b.w 8005124
+
+08002596 :
+ 8002596: 4770 bx lr
08002598 :
8002598: 4801 ldr r0, [pc, #4] @ (80025a0 )
- 800259a: f002 bb31 b.w 8004c00
+ 800259a: f002 bb3b b.w 8004c14
800259e: bf00 nop
80025a0: 20000250 .word 0x20000250
-080025a4 :
- 80025a4: 4801 ldr r0, [pc, #4] @ (80025ac )
- 80025a6: f004 ba0d b.w 80069c4
- 80025aa: bf00 nop
- 80025ac: 200002b0 .word 0x200002b0
+080025a4 :
+ 80025a4: f44f 6080 mov.w r0, #1024 @ 0x400
+ 80025a8: f002 bdbc b.w 8005124
-080025b0 :
- 80025b0: 4801 ldr r0, [pc, #4] @ (80025b8 )
- 80025b2: f003 bc59 b.w 8005e68
- 80025b6: bf00 nop
- 80025b8: 200001d4 .word 0x200001d4
+080025ac :
+ 80025ac: 4801 ldr r0, [pc, #4] @ (80025b4 )
+ 80025ae: f004 ba13 b.w 80069d8
+ 80025b2: bf00 nop
+ 80025b4: 200002b0 .word 0x200002b0
-080025bc :
- 80025bc: 4801 ldr r0, [pc, #4] @ (80025c4 )
- 80025be: f004 b848 b.w 8006652
- 80025c2: bf00 nop
- 80025c4: 20000238 .word 0x20000238
+080025b8 :
+ 80025b8: 4801 ldr r0, [pc, #4] @ (80025c0 )
+ 80025ba: f003 bc5f b.w 8005e7c
+ 80025be: bf00 nop
+ 80025c0: 200001d4 .word 0x200001d4
-080025c8 :
- 80025c8: e92d 43f0 stmdb sp!, {r4, r5, r6, r7, r8, r9, lr}
- 80025cc: b089 sub sp, #36 @ 0x24
- 80025ce: 4680 mov r8, r0
- 80025d0: 2000 movs r0, #0
- 80025d2: 9e10 ldr r6, [sp, #64] @ 0x40
- 80025d4: 9007 str r0, [sp, #28]
- 80025d6: 4689 mov r9, r1
- 80025d8: 4615 mov r5, r2
- 80025da: 461f mov r7, r3
- 80025dc: f7fd fe24 bl 8000228
- 80025e0: b9f0 cbnz r0, 8002620
- 80025e2: 4c10 ldr r4, [pc, #64] @ (8002624 )
- 80025e4: e9cd 9000 strd r9, r0, [sp]
- 80025e8: e9cd 0402 strd r0, r4, [sp, #8]
- 80025ec: ab07 add r3, sp, #28
- 80025ee: 480e ldr r0, [pc, #56] @ (8002628 )
- 80025f0: 9305 str r3, [sp, #20]
- 80025f2: 2314 movs r3, #20
- 80025f4: 9304 str r3, [sp, #16]
- 80025f6: 463a mov r2, r7
- 80025f8: 4643 mov r3, r8
- 80025fa: 4629 mov r1, r5
- 80025fc: 6800 ldr r0, [r0, #0]
- 80025fe: f7fd fedd bl 80003bc
- 8002602: 4623 mov r3, r4
- 8002604: 4632 mov r2, r6
- 8002606: f104 0114 add.w r1, r4, #20
- 800260a: f853 4b04 ldr.w r4, [r3], #4
- 800260e: f842 4b04 str.w r4, [r2], #4
- 8002612: 428b cmp r3, r1
- 8002614: d1f9 bne.n 800260a
- 8002616: 9b07 ldr r3, [sp, #28]
- 8002618: 7533 strb r3, [r6, #20]
- 800261a: b009 add sp, #36 @ 0x24
- 800261c: e8bd 83f0 ldmia.w sp!, {r4, r5, r6, r7, r8, r9, pc}
- 8002620: 2001 movs r0, #1
- 8002622: e7fa b.n 800261a
- 8002624: 20000222 .word 0x20000222
- 8002628: 08010c74 .word 0x08010c74
+080025c4 :
+ 80025c4: 4801 ldr r0, [pc, #4] @ (80025cc )
+ 80025c6: f004 b84e b.w 8006666
+ 80025ca: bf00 nop
+ 80025cc: 20000238 .word 0x20000238
-0800262c :
- 800262c: b51f push {r0, r1, r2, r3, r4, lr}
- 800262e: 4c0e ldr r4, [pc, #56] @ (8002668 )
- 8002630: 2300 movs r3, #0
- 8002632: 223c movs r2, #60 @ 0x3c
- 8002634: a802 add r0, sp, #8
- 8002636: e9cd 3302 strd r3, r3, [sp, #8]
- 800263a: 7562 strb r2, [r4, #21]
- 800263c: 7523 strb r3, [r4, #20]
- 800263e: f000 f8bd bl 80027bc
- 8002642: 2304 movs r3, #4
- 8002644: aa03 add r2, sp, #12
- 8002646: 9400 str r4, [sp, #0]
- 8002648: 2112 movs r1, #18
- 800264a: 4808 ldr r0, [pc, #32] @ (800266c )
- 800264c: f7ff ffbc bl 80025c8
- 8002650: 4907 ldr r1, [pc, #28] @ (8002670 )
- 8002652: 2214 movs r2, #20
- 8002654: 4620 mov r0, r4
- 8002656: f00e f9ed bl 8010a34
- 800265a: fab0 f380 clz r3, r0
- 800265e: 095b lsrs r3, r3, #5
- 8002660: 7563 strb r3, [r4, #21]
- 8002662: b004 add sp, #16
- 8002664: bd10 pop {r4, pc}
- 8002666: bf00 nop
- 8002668: 2000020c .word 0x2000020c
- 800266c: 08010c9c .word 0x08010c9c
- 8002670: 20000561 .word 0x20000561
+080025d0 :
+ 80025d0: e92d 43f0 stmdb sp!, {r4, r5, r6, r7, r8, r9, lr}
+ 80025d4: b089 sub sp, #36 @ 0x24
+ 80025d6: 4680 mov r8, r0
+ 80025d8: 2000 movs r0, #0
+ 80025da: 9e10 ldr r6, [sp, #64] @ 0x40
+ 80025dc: 9007 str r0, [sp, #28]
+ 80025de: 4689 mov r9, r1
+ 80025e0: 4615 mov r5, r2
+ 80025e2: 461f mov r7, r3
+ 80025e4: f7fd fe20 bl 8000228
+ 80025e8: b9f0 cbnz r0, 8002628
+ 80025ea: 4c10 ldr r4, [pc, #64] @ (800262c )
+ 80025ec: e9cd 9000 strd r9, r0, [sp]
+ 80025f0: e9cd 0402 strd r0, r4, [sp, #8]
+ 80025f4: ab07 add r3, sp, #28
+ 80025f6: 480e ldr r0, [pc, #56] @ (8002630 )
+ 80025f8: 9305 str r3, [sp, #20]
+ 80025fa: 2314 movs r3, #20
+ 80025fc: 9304 str r3, [sp, #16]
+ 80025fe: 463a mov r2, r7
+ 8002600: 4643 mov r3, r8
+ 8002602: 4629 mov r1, r5
+ 8002604: 6800 ldr r0, [r0, #0]
+ 8002606: f7fd fed9 bl 80003bc
+ 800260a: 4623 mov r3, r4
+ 800260c: 4632 mov r2, r6
+ 800260e: f104 0114 add.w r1, r4, #20
+ 8002612: f853 4b04 ldr.w r4, [r3], #4
+ 8002616: f842 4b04 str.w r4, [r2], #4
+ 800261a: 428b cmp r3, r1
+ 800261c: d1f9 bne.n 8002612
+ 800261e: 9b07 ldr r3, [sp, #28]
+ 8002620: 7533 strb r3, [r6, #20]
+ 8002622: b009 add sp, #36 @ 0x24
+ 8002624: e8bd 83f0 ldmia.w sp!, {r4, r5, r6, r7, r8, r9, pc}
+ 8002628: 2001 movs r0, #1
+ 800262a: e7fa b.n 8002622
+ 800262c: 20000222 .word 0x20000222
+ 8002630: 08010c84 .word 0x08010c84
-08002674 :
- 8002674: 4805 ldr r0, [pc, #20] @ (800268c )
- 8002676: b508 push {r3, lr}
- 8002678: 2308 movs r3, #8
- 800267a: 6003 str r3, [r0, #0]
- 800267c: f003 fe06 bl 800628c
- 8002680: b118 cbz r0, 800268a
- 8002682: e8bd 4008 ldmia.w sp!, {r3, lr}
- 8002686: f7ff beab b.w 80023e0
- 800268a: bd08 pop {r3, pc}
- 800268c: 20000238 .word 0x20000238
+08002634 :
+ 8002634: b51f push {r0, r1, r2, r3, r4, lr}
+ 8002636: 4c0e ldr r4, [pc, #56] @ (8002670