diff --git a/Core/Inc/main.h b/Core/Inc/main.h
index 38f24dd..d3074a5 100644
--- a/Core/Inc/main.h
+++ b/Core/Inc/main.h
@@ -109,12 +109,39 @@ void MX_TOF_Init(void);
#define USARTx_TX_Pin GPIO_PIN_2
#define USARTx_TX_GPIO_Port GPIOA
+#ifdef STS_O5 // STS_O5 GPIO PORT PIN DEFINATION
+/* --------------------------------------------------*/
+/* | HALL-2 (PA-10) VCC-GPIO-PB-4 | */
+/* | | */
+/* | HALL-1 (PA-0) VCC-GPIO-PB3 | */
+/* | | */
+/* |------------------------------------------------ */
+#define HALL1_Pin GPIO_PIN_0
+#define HALL1_GPIO_Port GPIOA
+#define HALL1_EXTI_IRQn EXTI0_IRQn
+
+#define HALL2_Pin GPIO_PIN_10
+#define HALL2_GPIO_Port GPIOA
+#define HALL2_EXTI_IRQn EXTI15_10_IRQn
+#define HALL1_STATE HAL_GPIO_ReadPin(HALL1_GPIO_Port, HALL1_Pin)
+#define HALL2_STATE HAL_GPIO_ReadPin(HALL2_GPIO_Port, HALL2_Pin)
+
+#define HALL1_VCC_Pin GPIO_PIN_3
+#define HALL1_VCC_GPIO_Port GPIOB
+#define HALL2_VCC_Pin GPIO_PIN_4
+#define HALL2_VCC_GPIO_Port GPIOB
+#endif // STS_O5 GPIO PORT PIN DEFINATION
+
#define MEMS_POWER_Pin GPIO_PIN_4 // PMU_ENABLE
#define MEMS_POWER_GPIO_Port GPIOB // PMU_ENABLE
#define MEMS_RESET_Pin GPIO_PIN_4
#define MEMS_RESET_GPIO_Port GPIOB
+#define PME_ON HAL_GPIO_WritePin(MEMS_RESET_GPIO_Port, MEMS_POWER_Pin, GPIO_PIN_SET )
+#define PME_OFF HAL_GPIO_WritePin(MEMS_RESET_GPIO_Port, MEMS_POWER_Pin, GPIO_PIN_RESET )
+
+
#define TOF250_I2C_ADDR (0x52<<1)
#if defined(STM32WLE5xx) || defined(STM32WL55xx)
diff --git a/Core/Inc/sys_conf.h b/Core/Inc/sys_conf.h
index a963a2e..4941614 100644
--- a/Core/Inc/sys_conf.h
+++ b/Core/Inc/sys_conf.h
@@ -47,12 +47,12 @@ extern "C" {
/**
* @brief Verbose level for all trace logs
*/
-#define VERBOSE_LEVEL VLEVEL_H
+#define VERBOSE_LEVEL VLEVEL_OFF
/**
* @brief Enable trace logs
*/
-#define APP_LOG_ENABLED 1
+#define APP_LOG_ENABLED 0
/**
* @brief Activate monitoring (probes) of some internal RF signals for debug purpose
@@ -75,7 +75,7 @@ extern "C" {
* @brief Enable/Disable MCU Debugger pins (dbg serial wires)
* @note by HW serial wires are ON by default, need to put them OFF to save power
*/
-#define DEBUGGER_ENABLED 1
+#define DEBUGGER_ENABLED 0
/**
* @brief Disable Low Power mode
diff --git a/Core/Src/dma.c b/Core/Src/dma.c
index c34a3c2..00edbfe 100644
--- a/Core/Src/dma.c
+++ b/Core/Src/dma.c
@@ -44,9 +44,9 @@ void MX_DMA_Init(void)
/* DMA controller clock enable */
__HAL_RCC_DMAMUX1_CLK_ENABLE();
__HAL_RCC_DMA1_CLK_ENABLE();
- __HAL_RCC_DMA2_CLK_ENABLE();
- /* DMA interrupt init */
+ /* DMA interrupt init */
+#if 0
// **** TIM1_CH2 WS2812B @ PA-9
HAL_NVIC_SetPriority(DMA1_Channel1_IRQn, 0, 0);
HAL_NVIC_EnableIRQ(DMA1_Channel1_IRQn);
@@ -70,7 +70,7 @@ void MX_DMA_Init(void)
// **** I2C2
// **** USART2
-#if 0
+
/* DMA1_Channel6_IRQn interrupt configuration */
HAL_NVIC_SetPriority(DMA1_Channel6_IRQn, 0, 0);
HAL_NVIC_EnableIRQ(DMA1_Channel6_IRQn);
@@ -80,10 +80,6 @@ void MX_DMA_Init(void)
HAL_NVIC_EnableIRQ(DMA1_Channel7_IRQn);
// **** USART2
- /* DMA2_Channel1_IRQn interrupt configuration */
- HAL_NVIC_SetPriority(DMA2_Channel1_IRQn, 0, 0);
- HAL_NVIC_EnableIRQ(DMA2_Channel1_IRQn);
-
}
diff --git a/Core/Src/gpio.c b/Core/Src/gpio.c
index 0a34d92..c42c0e2 100644
--- a/Core/Src/gpio.c
+++ b/Core/Src/gpio.c
@@ -51,6 +51,21 @@ void MX_GPIO_Init(void)
__HAL_RCC_GPIOB_CLK_ENABLE();
__HAL_RCC_GPIOC_CLK_ENABLE();
+ GPIO_InitStruct.Pin = 0xFC;
+ GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
+ GPIO_InitStruct.Pull = GPIO_NOPULL;
+ HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+ GPIO_InitStruct.Pin = 0xFF;
+ HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
+ HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
+
+ HAL_GPIO_WritePin(MEMS_POWER_GPIO_Port, MEMS_POWER_Pin, GPIO_PIN_RESET);
+
+ __HAL_RCC_GPIOB_CLK_DISABLE();
+ __HAL_RCC_GPIOC_CLK_DISABLE();
+
+
/*Configure GPIO pin Output Level */
#if defined(STM32WL55xx)
HAL_GPIO_WritePin(GPIOB, LED1_Pin|LED2_Pin|PROB2_Pin|PROB1_Pin
@@ -82,13 +97,14 @@ void MX_GPIO_Init(void)
HAL_GPIO_Init(BUT3_GPIO_Port, &GPIO_InitStruct);
#endif
/*Configure GPIO pin : PtPin */
+#if 0
GPIO_InitStruct.Pin = BUT2_Pin;
GPIO_InitStruct.Mode = GPIO_MODE_IT_FALLING;
GPIO_InitStruct.Pull = GPIO_PULLUP;
HAL_GPIO_Init(BUT2_GPIO_Port, &GPIO_InitStruct);
-
+#endif
/*Configure GPIO pin : PtPin */
- GPIO_InitStruct.Pin = BUT1_Pin;
+ GPIO_InitStruct.Pin = HALL1_Pin|HALL2_Pin;
GPIO_InitStruct.Mode = GPIO_MODE_IT_RISING_FALLING;
GPIO_InitStruct.Pull = GPIO_PULLUP;
HAL_GPIO_Init(BUT1_GPIO_Port, &GPIO_InitStruct);
@@ -142,14 +158,14 @@ void MX_GPIO_Init(void)
HAL_GPIO_Init(TOF_R_XSHUT_GPIO_Port, &GPIO_InitStruct);
#endif
-
+#if 0
/*Configure GPIO pins : PBPin PBPin PBPin */
GPIO_InitStruct.Pin = LED1_Pin;
GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
GPIO_InitStruct.Pull = GPIO_NOPULL;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
HAL_GPIO_Init(LED1_GPIO_Port, &GPIO_InitStruct);
-
+#endif
#if defined(SOAP_LEVEL_SENSOR)
/* ============== SOAP LEVEL DETECTION ========================= */
@@ -174,11 +190,16 @@ HAL_GPIO_Init(SOAP_SWITCH_GPIO_Port, &GPIO_InitStruct);
/* EXTI interrupt init*/
- HAL_NVIC_SetPriority(EXTI0_IRQn, 0, 0);
+ HAL_NVIC_SetPriority(EXTI0_IRQn, 10, 0);
HAL_NVIC_EnableIRQ(EXTI0_IRQn);
- HAL_NVIC_SetPriority(EXTI1_IRQn, 0, 0);
+#if 0
+ HAL_NVIC_SetPriority(EXTI1_IRQn, 10, 0);
HAL_NVIC_EnableIRQ(EXTI1_IRQn);
+#endif
+ HAL_NVIC_SetPriority(EXTI15_10_IRQn, 10, 0);
+ HAL_NVIC_EnableIRQ(EXTI15_10_IRQn);
+
#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/main.c b/Core/Src/main.c
index 5d2552a..032e5d5 100644
--- a/Core/Src/main.c
+++ b/Core/Src/main.c
@@ -111,31 +111,10 @@ int main(void)
/* Initialize all configured peripherals */
MX_GPIO_Init();
- MX_DMA_Init();
- WkupPin1_Config();
- if (__HAL_PWR_GET_FLAG(PWR_FLAG_SB) != RESET)
- {
- /* Clear Standby flag */
- __HAL_PWR_CLEAR_FLAG(PWR_FLAG_SB);
+ HAL_GPIO_WritePin(MEMS_POWER_GPIO_Port, MEMS_POWER_Pin, GPIO_PIN_RESET);
- } else {
- MX_LoRaWAN_Init();
- LED_ON;
- }
+ MX_LoRaWAN_Init();
- HAL_Delay(1000);
- LED_OFF;
- //MX_LoRaWAN_Process();
-#if 0
- /* Enable WakeUp Pin PWR_WAKEUP_PIN1 connected to PA0 */
- HAL_PWR_EnableWakeUpPin(PWR_WAKEUP_PIN1_LOW);
-
- /* Clear all related wakeup flags*/
- __HAL_PWR_CLEAR_FLAG(PWR_FLAG_WUF1);
-
- /* Enter the Standby mode */
- HAL_PWR_EnterSTANDBYMode();
-#endif
/* USER CODE BEGIN 2 */
/* USER CODE END 2 */
@@ -146,9 +125,9 @@ int main(void)
while (1)
{
/* USER CODE END WHILE */
-//LED_ON;
+
MX_LoRaWAN_Process();
-//LED_OFF;
+
/* USER CODE BEGIN 3 */
}
/* USER CODE END 3 */
diff --git a/Core/Src/stm32_lpm_if.c b/Core/Src/stm32_lpm_if.c
index fe52561..6cd7d94 100644
--- a/Core/Src/stm32_lpm_if.c
+++ b/Core/Src/stm32_lpm_if.c
@@ -81,30 +81,23 @@ const struct UTIL_LPM_Driver_s UTIL_PowerDriver =
void PWR_EnterOffMode(void)
{
/* USER CODE BEGIN EnterOffMode_1 */
- HAL_SuspendTick();
- /* Enable WakeUp Pin PWR_WAKEUP_PIN1 connected to PA0 */
- HAL_PWR_EnableWakeUpPin(PWR_WAKEUP_PIN1_LOW);
- /* Clear all related wakeup flags*/
- __HAL_PWR_CLEAR_FLAG(PWR_FLAG_WUF1);
- __HAL_PWR_CLEAR_FLAG(PWR_FLAG_WU);
- /* Enter the Standby mode */
- HAL_PWR_EnterSTANDBYMode();
/* USER CODE END EnterOffMode_1 */
}
void PWR_ExitOffMode(void)
{
/* USER CODE BEGIN ExitOffMode_1 */
- HAL_ResumeTick();
- __HAL_PWR_CLEAR_FLAG(PWR_FLAG_SB);
+
/* USER CODE END ExitOffMode_1 */
}
void PWR_EnterStopMode(void)
{
/* USER CODE BEGIN EnterStopMode_1 */
-
+ HAL_GPIO_WritePin(GPIOA, 0xFFFC, GPIO_PIN_RESET);
+ HAL_GPIO_WritePin(GPIOB, GPIO_PIN_All, GPIO_PIN_RESET);
+ HAL_GPIO_WritePin(GPIOC, GPIO_PIN_All, GPIO_PIN_RESET);
/* USER CODE END EnterStopMode_1 */
HAL_SuspendTick();
/* Clear Status Flag before entering STOP/STANDBY Mode */
@@ -135,7 +128,7 @@ void PWR_ExitStopMode(void)
vcom_Resume();
/* USER CODE BEGIN ExitStopMode_2 */
MX_GPIO_Init();
- MX_DMA_Init();
+ //MX_DMA_Init();
//MX_I2C2_Init();
/* USER CODE END ExitStopMode_2 */
diff --git a/Core/Src/stm32wlxx_it.c b/Core/Src/stm32wlxx_it.c
index 3bb6950..0365756 100644
--- a/Core/Src/stm32wlxx_it.c
+++ b/Core/Src/stm32wlxx_it.c
@@ -24,7 +24,7 @@
#include "stm32wlxx_it.h"
/* Private includes ----------------------------------------------------------*/
/* USER CODE BEGIN Includes */
-#include "app_tof_pin_conf.h"
+//#include "app_tof_pin_conf.h"
/* USER CODE END Includes */
/* Private typedef -----------------------------------------------------------*/
@@ -65,16 +65,6 @@ extern UART_HandleTypeDef huart2;
extern DMA_HandleTypeDef hdma_i2c2_rx;
extern DMA_HandleTypeDef hdma_i2c2_tx;
-//extern DMA_HandleTypeDef hdma_spi1_rx;
-//extern DMA_HandleTypeDef hdma_spi1_tx;
-//extern SPI_HandleTypeDef hspi1;
-
-
-//extern DMA_HandleTypeDef hdma_tim1_up;
-//extern DMA_HandleTypeDef hdma_tim2_up;
-//extern TIM_HandleTypeDef htim1;
-//extern TIM_HandleTypeDef htim2;
-//extern TIM_HandleTypeDef htim16;
extern DMA_HandleTypeDef hdma_usart2_tx;
#if 0
extern DMA_HandleTypeDef hdma_usart2_rx;
@@ -244,12 +234,12 @@ void EXTI0_IRQHandler(void)
/* USER CODE END EXTI0_IRQn 0 */
//HAL_EXTI_IRQHandler(&H_EXTI_0);
- HAL_GPIO_EXTI_IRQHandler(BUT1_Pin);
+ HAL_GPIO_EXTI_IRQHandler(HALL1_Pin);
/* USER CODE BEGIN EXTI0_IRQn 1 */
/* USER CODE END EXTI0_IRQn 1 */
}
-
+#if 0
/**
* @brief This function handles EXTI Line 1 Interrupt.
*/
@@ -263,8 +253,8 @@ void EXTI1_IRQHandler(void)
/* USER CODE END EXTI1_IRQn 1 */
}
-
-
+#endif
+#if 0
/**
* @brief This function handles DMA1 Channel 2 Interrupt.
*/
@@ -301,7 +291,7 @@ void DMA1_Channel4_IRQHandler(void)
/* USER CODE BEGIN DMA1_Channel4_IRQn 0 */
/* USER CODE END DMA1_Channel4_IRQn 0 */
- HAL_DMA_IRQHandler(&hdma_i2c2_rx);
+ //HAL_DMA_IRQHandler(&hdma_i2c2_rx);
/* USER CODE BEGIN DMA1_Channel4_IRQn 1 */
/* USER CODE END DMA1_Channel4_IRQn 1 */
@@ -315,7 +305,7 @@ void DMA1_Channel5_IRQHandler(void)
/* USER CODE BEGIN DMA1_Channel5_IRQn 0 */
/* USER CODE END DMA1_Channel5_IRQn 0 */
- HAL_DMA_IRQHandler(&hdma_usart2_tx);
+ //HAL_DMA_IRQHandler(&hdma_usart2_tx);
/* USER CODE BEGIN DMA1_Channel5_IRQn 1 */
/* USER CODE END DMA1_Channel5_IRQn 1 */
@@ -336,7 +326,7 @@ void DMA1_Channel6_IRQHandler(void)
/* USER CODE END DMA1_Channel6_IRQn 1 */
}
-
+#endif
/**
* @brief This function handles DMA1 Channel 7 Interrupt.
*/
@@ -350,7 +340,7 @@ void DMA1_Channel7_IRQHandler(void)
/* USER CODE END DMA1_Channel7_IRQn 1 */
}
-
+#if 0
/**
* @brief This function handles EXTI Lines [4] Interrupt.
*/
@@ -364,8 +354,9 @@ void EXTI4_IRQHandler(void)
/* USER CODE END EXTI9_5_IRQn 1 */
}
+#endif
-
+#if 0
/**
* @brief This function handles EXTI Lines [9:5] Interrupt.
*/
@@ -379,12 +370,13 @@ void EXTI9_5_IRQHandler(void)
#endif
#if defined(STM32WLE5xx)
//HAL_GPIO_EXTI_IRQHandler(TOF_INT_EXTI_PIN);
- HAL_GPIO_EXTI_IRQHandler(TOF_INT_EXTI_PIN);
+ //HAL_GPIO_EXTI_IRQHandler(TOF_INT_EXTI_PIN);
#endif
/* USER CODE BEGIN EXTI9_5_IRQn 1 */
/* USER CODE END EXTI9_5_IRQn 1 */
}
+#endif
/**
* @brief This function handles EXTI Lines [9:5] Interrupt.
@@ -397,6 +389,7 @@ void EXTI15_10_IRQHandler(void)
#if defined(STM32WL55xx)
HAL_GPIO_EXTI_IRQHandler(TOF_INT_EXTI_PIN);
#endif
+ HAL_GPIO_EXTI_IRQHandler(HALL2_Pin);
/* USER CODE BEGIN EXTI15_10_IRQn 1 */
/* USER CODE END EXTI15_10_IRQn 1 */
diff --git a/Core/Src/sys_app.c b/Core/Src/sys_app.c
index 5e06fea..300f7f8 100644
--- a/Core/Src/sys_app.c
+++ b/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();
diff --git a/Core/Src/usart.c b/Core/Src/usart.c
index f0e4467..d8f944d 100644
--- a/Core/Src/usart.c
+++ b/Core/Src/usart.c
@@ -104,13 +104,18 @@ void HAL_UART_MspInit(UART_HandleTypeDef* uartHandle)
PA3 ------> USART2_RX
PA2 ------> USART2_TX
*/
- GPIO_InitStruct.Pin = USARTx_RX_Pin|USARTx_TX_Pin;
+ GPIO_InitStruct.Pin = USARTx_TX_Pin;
GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
GPIO_InitStruct.Pull = GPIO_NOPULL;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
GPIO_InitStruct.Alternate = GPIO_AF7_USART2;
HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+ GPIO_InitStruct.Pin = USARTx_RX_Pin;
+ GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
+ GPIO_InitStruct.Pull = GPIO_NOPULL;
+ HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
/* USART2 DMA Init */
/* USART2_TX Init */
hdma_usart2_tx.Instance = DMA1_Channel7;
diff --git a/Core/Src/yunhorn_sts_process.c b/Core/Src/yunhorn_sts_process.c
index 02e104d..a970d0f 100644
--- a/Core/Src/yunhorn_sts_process.c
+++ b/Core/Src/yunhorn_sts_process.c
@@ -29,7 +29,7 @@
#include "adc_if.h"
#include "gpio.h"
#include "LmHandler.h"
-#include "app_tof.h"
+//#include "app_tof.h"
#include "lora_app.h"
#include "yunhorn_sts_prd_conf.h"
#include "yunhorn_sts_sensors.h"
@@ -45,7 +45,7 @@ volatile uint8_t sts_reed_hall_result, last_sts_reed_hall_result,sts_reed_hall_c
volatile uint32_t event_start_time, event_stop_time;
volatile uint8_t sts_soap_level_state;
-
+extern volatile uint8_t hall1_pin_read,hall2_pin_read;
extern volatile uint8_t sts_work_mode, sts_service_mask;
volatile uint8_t sts_reed_hall_ext_int = 0;
volatile uint8_t sts_occupancy_status;
@@ -576,6 +576,7 @@ void STS_SENSOR_NVM_CFG_SIMPLE(void)
}
+
#if defined(YUNHORN_STS_O5_ENABLED)
void STS_O5_SENSOR_Read(STS_OO_SensorDataTypeDef *oo_data)
{
@@ -583,8 +584,8 @@ void STS_O5_SENSOR_Read(STS_OO_SensorDataTypeDef *oo_data)
sts_reed_hall_result = (STS_Reed_Hall_State==0)?1:0;
- oo_data->state_sensor1_on_off = sts_reed_hall_result;
-
+ oo_data->state_sensor1_on_off = hall1_pin_read;
+ oo_data->state_sensor2_on_off = hall2_pin_read;
sensor_data_ready = 1;
}
diff --git a/LoRaWAN/App/lora_app.c b/LoRaWAN/App/lora_app.c
index fd2a5f0..4ca87a1 100644
--- a/LoRaWAN/App/lora_app.c
+++ b/LoRaWAN/App/lora_app.c
@@ -38,11 +38,11 @@
/* USER CODE BEGIN Includes */
#include "yunhorn_sts_prd_conf.h"
-#include "app_tof_pin_conf.h"
-#include "app_tof.h"
+//#include "app_tof_pin_conf.h"
+//#include "app_tof.h"
#include "yunhorn_sts_sensors.h"
#include "sts_cmox_hmac_sha.h"
-#include "X-WL55_WLE5_53L0X.h"
+//#include "X-WL55_WLE5_53L0X.h"
/* USER CODE END Includes */
/* External variables ---------------------------------------------------------*/
@@ -52,10 +52,11 @@ extern volatile uint32_t rfac_timer;
volatile uint8_t sts_ac_code[YUNHORN_STS_AC_CODE_SIZE]={0x0};
extern hmac_result_t hmac_result;
volatile uint8_t sts_work_mode =0;
+volatile uint8_t hall1_pin_read=STS_Status_Door_Open,hall2_pin_read=STS_Status_Door_Open;
volatile uint8_t sensor_data_ready=0;
extern volatile uint8_t sts_soap_level_state;
extern volatile uint8_t ToF_EventDetected;
-extern volatile int sts_tof_distance_data[MAX_TOF_COUNT];
+//extern volatile int sts_tof_distance_data[MAX_TOF_COUNT];
volatile uint32_t SamplingPeriodicity = 1000; //unit ms
volatile uint32_t HeartBeatPeriodicity = 120000; //unit ms
volatile uint8_t STS_LoRa_WAN_Joined = 0;
@@ -634,28 +635,30 @@ void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin)
{
switch (GPIO_Pin)
{
+#ifdef STS_O5
+ case HALL1_Pin:
+ hall1_pin_read = HALL1_STATE;
+ UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0);
+
+ break;
+
+ case HALL2_Pin:
+
+ hall2_pin_read = HALL2_STATE;
+ UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0);
+
+ break;
+
+#else
case BUT1_Pin:
-
-#ifdef STS_O5
- LED_ON;
- uint8_t pinstate = (STS_Reed_Hall_State== 0)?1:0;
- APP_LOG(TS_OFF, VLEVEL_H, "## BUTTON-1 DETECTED: %2d \r\n", pinstate);
-
- //UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0);
+ //UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0);
if (EventType == TX_ON_EVENT)
{
-
-//#ifdef LED_ONBOARD
- LED_ON;
- HAL_Delay(20);
- LED_OFF;
-//#endif
UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0);
}
-#endif
- LED_OFF;
break;
+#endif
case BUT2_Pin:
#if defined(STS_USE_STM32WLE5)
UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaStopJoinEvent), CFG_SEQ_Prio_0);
@@ -665,8 +668,8 @@ void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin)
case BUT3_Pin:
UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaStoreContextEvent), CFG_SEQ_Prio_0);
-#endif
break;
+#endif
#if (defined(STS_USE_TOF_VL53L1X) ||defined(STS_USE_TOF_VL53L0X))
case TOF_INT_EXTI_PIN:
ToF_EventDetected = 1;
@@ -866,8 +869,9 @@ static void SendTxData(void)
AppData.Buffer[i++] = (uint8_t)(r0_data.distance1_mm)&0xff; //#06
#elif defined(STS_O5)
- AppData.Buffer[i++] = (uint8_t)(0x01)&0xff; // length of the following bytes
+ AppData.Buffer[i++] = (uint8_t)(0x02)&0xff; // length of the following bytes
AppData.Buffer[i++] = (uint8_t)(oo_data.state_sensor1_on_off)&0xff;
+ AppData.Buffer[i++] = (uint8_t)(oo_data.state_sensor2_on_off)&0xff;
#elif defined(YUNHORN_STS_R0_ENABLED)
AppData.Buffer[i++] = (uint8_t)(r0_data.distance_mm >>8)&0xff; //#05
@@ -927,7 +931,7 @@ static void OnTxTimerEvent(void *context)
/* USER CODE BEGIN OnTxTimerEvent_1 */
/* USER CODE END OnTxTimerEvent_1 */
- //upload_message_timer =1U;
+
UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0);
/*Wait for next tx slot*/
@@ -1027,6 +1031,7 @@ static void OnJoinRequest(LmHandlerJoinParams_t *joinParams)
APP_LOG(TS_OFF, VLEVEL_M, "###### U/L FRAME:JOIN | DR:%d | PWR:%d\r\n", joinParams->Datarate, joinParams->TxPower);
}
+ heart_beat_timer =1;
UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0);
/* USER CODE END OnJoinRequest_1 */
}
@@ -2200,7 +2205,7 @@ void STS_SENSOR_Function_Test_Process(void)
{
char tstbuf[128] =""; uint8_t i=0;
uint8_t count = 0;
- uint8_t mems_Dev_ID[2] = "";
+ //uint8_t mems_Dev_ID[2] = "";
tstbuf[i++] = (uint8_t) 'S';
tstbuf[i++] = (uint8_t) sts_mtmcode1;
@@ -2210,7 +2215,7 @@ void STS_SENSOR_Function_Test_Process(void)
tstbuf[i++] = (uint8_t) (99*((GetBatteryLevel()/254)&0xff));
- count = STS_SENSOR_MEMS_Get_ID(mems_Dev_ID);
+ //count = STS_SENSOR_MEMS_Get_ID(mems_Dev_ID);
// if ((mems_Dev_ID[0]==0X0) && (mems_Dev_ID[1]==0x0))
if (count ==0)
diff --git a/STM32CubeIDE/.settings/language.settings.xml b/STM32CubeIDE/.settings/language.settings.xml
index 2e71df2..7418597 100644
--- a/STM32CubeIDE/.settings/language.settings.xml
+++ b/STM32CubeIDE/.settings/language.settings.xml
@@ -5,7 +5,7 @@
-
+
@@ -16,7 +16,7 @@
-
+
diff --git a/STM32CubeIDE/.settings/stm32cubeide.project.prefs b/STM32CubeIDE/.settings/stm32cubeide.project.prefs
index f14dc4b..ea98395 100644
--- a/STM32CubeIDE/.settings/stm32cubeide.project.prefs
+++ b/STM32CubeIDE/.settings/stm32cubeide.project.prefs
@@ -1,3 +1,4 @@
-8DF89ED150041C4CBC7CB9A9CAA90856=1E8F1D9EDF5EB0F4ACFD485842648E9C
-DC22A860405A8BF2F2C095E5B6529F12=EAC6FC6468FD9889D03DF8A29B68CCA9
+2F62501ED4689FB349E356AB974DBE57=0886257CDC7421405ED752F51B92C86D
+8DF89ED150041C4CBC7CB9A9CAA90856=0886257CDC7421405ED752F51B92C86D
+DC22A860405A8BF2F2C095E5B6529F12=74CD6EB106FB50B767E4FE71225C7638
eclipse.preferences.version=1
diff --git a/STM32CubeIDE/Release/Application/User/Core/subdir.mk b/STM32CubeIDE/Release/Application/User/Core/subdir.mk
index 886955d..c4cd037 100644
--- a/STM32CubeIDE/Release/Application/User/Core/subdir.mk
+++ b/STM32CubeIDE/Release/Application/User/Core/subdir.mk
@@ -1,9 +1,9 @@
################################################################################
-# 自动生成的文件。不要编辑！
-# Toolchain: GNU Tools for STM32 (11.3.rel1)
+# Automatically-generated file. Do not edit!
+# Toolchain: GNU Tools for STM32 (12.3.rel1)
################################################################################
-# 将这些工具调用的输入和输出添加到构建变量
+# Add inputs and outputs from these tool invocations to the build variables
C_SRCS += \
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/Core/Src/adc.c \
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/Core/Src/adc_if.c \
@@ -80,7 +80,7 @@ C_DEPS += \
./Application/User/Core/yunhorn_sts_process.d
-# 每个子目录必须为构建它所贡献的源提供规则
+# Each subdirectory must supply rules for building sources it contributes
Application/User/Core/adc.o: D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/Core/Src/adc.c Application/User/Core/subdir.mk
arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -DCORE_CM4 -DYUNHORN_STS_RANDOM -DSTS_O5 -DSTM32WLE5xx -DUSE_HAL_DRIVER -c -I../../Core/Inc -I../../vl53l0x -I../../TOF/App -I../../TOF/Target -I../../LoRaWAN/App -I../../LoRaWAN/Target -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy -I../../../../../../../Utilities/trace/adv_trace -I../../../../../../../Utilities/misc -I../../../../../../../Utilities/sequencer -I../../../../../../../Utilities/timer -I../../../../../../../Utilities/lpm/tiny_lpm -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages -I../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy -I../../../../../../../Middlewares/ST/STM32_Cryptographic/include -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver -I../../../../../../../Drivers/CMSIS/Include -I../../../../../../../Drivers/BSP/STM32WLxx_Nucleo -Os -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfloat-abi=soft -mthumb -o "$@"
Application/User/Core/adc_if.o: D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/Core/Src/adc_if.c Application/User/Core/subdir.mk
diff --git a/STM32CubeIDE/Release/Application/User/LoRaWAN/App/subdir.mk b/STM32CubeIDE/Release/Application/User/LoRaWAN/App/subdir.mk
index 45547a5..030507c 100644
--- a/STM32CubeIDE/Release/Application/User/LoRaWAN/App/subdir.mk
+++ b/STM32CubeIDE/Release/Application/User/LoRaWAN/App/subdir.mk
@@ -1,9 +1,9 @@
################################################################################
-# 自动生成的文件。不要编辑！
-# Toolchain: GNU Tools for STM32 (11.3.rel1)
+# Automatically-generated file. Do not edit!
+# Toolchain: GNU Tools for STM32 (12.3.rel1)
################################################################################
-# 将这些工具调用的输入和输出添加到构建变量
+# Add inputs and outputs from these tool invocations to the build variables
C_SRCS += \
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/CayenneLpp.c \
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/app_lorawan.c \
@@ -23,7 +23,7 @@ C_DEPS += \
./Application/User/LoRaWAN/App/lora_info.d
-# 每个子目录必须为构建它所贡献的源提供规则
+# Each subdirectory must supply rules for building sources it contributes
Application/User/LoRaWAN/App/CayenneLpp.o: D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/CayenneLpp.c Application/User/LoRaWAN/App/subdir.mk
arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -DCORE_CM4 -DYUNHORN_STS_RANDOM -DSTS_O5 -DSTM32WLE5xx -DUSE_HAL_DRIVER -c -I../../Core/Inc -I../../vl53l0x -I../../TOF/App -I../../TOF/Target -I../../LoRaWAN/App -I../../LoRaWAN/Target -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy -I../../../../../../../Utilities/trace/adv_trace -I../../../../../../../Utilities/misc -I../../../../../../../Utilities/sequencer -I../../../../../../../Utilities/timer -I../../../../../../../Utilities/lpm/tiny_lpm -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages -I../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy -I../../../../../../../Middlewares/ST/STM32_Cryptographic/include -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver -I../../../../../../../Drivers/CMSIS/Include -I../../../../../../../Drivers/BSP/STM32WLxx_Nucleo -Os -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfloat-abi=soft -mthumb -o "$@"
Application/User/LoRaWAN/App/app_lorawan.o: D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/app_lorawan.c Application/User/LoRaWAN/App/subdir.mk
diff --git a/STM32CubeIDE/Release/Application/User/LoRaWAN/Target/subdir.mk b/STM32CubeIDE/Release/Application/User/LoRaWAN/Target/subdir.mk
index d274185..08db4a3 100644
--- a/STM32CubeIDE/Release/Application/User/LoRaWAN/Target/subdir.mk
+++ b/STM32CubeIDE/Release/Application/User/LoRaWAN/Target/subdir.mk
@@ -1,9 +1,9 @@
################################################################################
-# 自动生成的文件。不要编辑！
-# Toolchain: GNU Tools for STM32 (11.3.rel1)
+# Automatically-generated file. Do not edit!
+# Toolchain: GNU Tools for STM32 (12.3.rel1)
################################################################################
-# 将这些工具调用的输入和输出添加到构建变量
+# Add inputs and outputs from these tool invocations to the build variables
C_SRCS += \
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/Target/radio_board_if.c
@@ -14,7 +14,7 @@ C_DEPS += \
./Application/User/LoRaWAN/Target/radio_board_if.d
-# 每个子目录必须为构建它所贡献的源提供规则
+# Each subdirectory must supply rules for building sources it contributes
Application/User/LoRaWAN/Target/radio_board_if.o: D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/Target/radio_board_if.c Application/User/LoRaWAN/Target/subdir.mk
arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -DCORE_CM4 -DYUNHORN_STS_RANDOM -DSTS_O5 -DSTM32WLE5xx -DUSE_HAL_DRIVER -c -I../../Core/Inc -I../../vl53l0x -I../../TOF/App -I../../TOF/Target -I../../LoRaWAN/App -I../../LoRaWAN/Target -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy -I../../../../../../../Utilities/trace/adv_trace -I../../../../../../../Utilities/misc -I../../../../../../../Utilities/sequencer -I../../../../../../../Utilities/timer -I../../../../../../../Utilities/lpm/tiny_lpm -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages -I../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy -I../../../../../../../Middlewares/ST/STM32_Cryptographic/include -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver -I../../../../../../../Drivers/CMSIS/Include -I../../../../../../../Drivers/BSP/STM32WLxx_Nucleo -Os -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfloat-abi=soft -mthumb -o "$@"
diff --git a/STM32CubeIDE/Release/Application/User/Startup/subdir.mk b/STM32CubeIDE/Release/Application/User/Startup/subdir.mk
index 5e14a3f..140938e 100644
--- a/STM32CubeIDE/Release/Application/User/Startup/subdir.mk
+++ b/STM32CubeIDE/Release/Application/User/Startup/subdir.mk
@@ -1,9 +1,9 @@
################################################################################
-# 自动生成的文件。不要编辑！
-# Toolchain: GNU Tools for STM32 (11.3.rel1)
+# Automatically-generated file. Do not edit!
+# Toolchain: GNU Tools for STM32 (12.3.rel1)
################################################################################
-# 将这些工具调用的输入和输出添加到构建变量
+# Add inputs and outputs from these tool invocations to the build variables
S_SRCS += \
../Application/User/Startup/startup_stm32wle5ccux.s
@@ -14,7 +14,7 @@ S_DEPS += \
./Application/User/Startup/startup_stm32wle5ccux.d
-# 每个子目录必须为构建它所贡献的源提供规则
+# Each subdirectory must supply rules for building sources it contributes
Application/User/Startup/%.o: ../Application/User/Startup/%.s Application/User/Startup/subdir.mk
arm-none-eabi-gcc -mcpu=cortex-m4 -c -x assembler-with-cpp -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfloat-abi=soft -mthumb -o "$@" "$<"
diff --git a/STM32CubeIDE/Release/Application/User/TOF/App/subdir.mk b/STM32CubeIDE/Release/Application/User/TOF/App/subdir.mk
index 1690253..38040d0 100644
--- a/STM32CubeIDE/Release/Application/User/TOF/App/subdir.mk
+++ b/STM32CubeIDE/Release/Application/User/TOF/App/subdir.mk
@@ -1,9 +1,9 @@
################################################################################
-# 自动生成的文件。不要编辑！
-# Toolchain: GNU Tools for STM32 (11.3.rel1)
+# Automatically-generated file. Do not edit!
+# Toolchain: GNU Tools for STM32 (12.3.rel1)
################################################################################
-# 将这些工具调用的输入和输出添加到构建变量
+# Add inputs and outputs from these tool invocations to the build variables
C_SRCS += \
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/TOF/App/X-WL55_WLE5_53L0X.c \
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/TOF/App/app_tof.c \
@@ -20,7 +20,7 @@ C_DEPS += \
./Application/User/TOF/App/app_tof_vl53l0x_range.d
-# 每个子目录必须为构建它所贡献的源提供规则
+# Each subdirectory must supply rules for building sources it contributes
Application/User/TOF/App/X-WL55_WLE5_53L0X.o: D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/TOF/App/X-WL55_WLE5_53L0X.c Application/User/TOF/App/subdir.mk
arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -DCORE_CM4 -DYUNHORN_STS_RANDOM -DSTS_O5 -DSTM32WLE5xx -DUSE_HAL_DRIVER -c -I../../Core/Inc -I../../vl53l0x -I../../TOF/App -I../../TOF/Target -I../../LoRaWAN/App -I../../LoRaWAN/Target -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy -I../../../../../../../Utilities/trace/adv_trace -I../../../../../../../Utilities/misc -I../../../../../../../Utilities/sequencer -I../../../../../../../Utilities/timer -I../../../../../../../Utilities/lpm/tiny_lpm -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages -I../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy -I../../../../../../../Middlewares/ST/STM32_Cryptographic/include -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver -I../../../../../../../Drivers/CMSIS/Include -I../../../../../../../Drivers/BSP/STM32WLxx_Nucleo -Os -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfloat-abi=soft -mthumb -o "$@"
Application/User/TOF/App/app_tof.o: D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/TOF/App/app_tof.c Application/User/TOF/App/subdir.mk
diff --git a/STM32CubeIDE/Release/Application/User/TOF/Target/subdir.mk b/STM32CubeIDE/Release/Application/User/TOF/Target/subdir.mk
index e3d814a..c8c2d8c 100644
--- a/STM32CubeIDE/Release/Application/User/TOF/Target/subdir.mk
+++ b/STM32CubeIDE/Release/Application/User/TOF/Target/subdir.mk
@@ -1,9 +1,9 @@
################################################################################
-# 自动生成的文件。不要编辑！
-# Toolchain: GNU Tools for STM32 (11.3.rel1)
+# Automatically-generated file. Do not edit!
+# Toolchain: GNU Tools for STM32 (12.3.rel1)
################################################################################
-# 将这些工具调用的输入和输出添加到构建变量
+# Add inputs and outputs from these tool invocations to the build variables
C_SRCS += \
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/TOF/Target/app_tof_pin_conf.c
@@ -14,7 +14,7 @@ C_DEPS += \
./Application/User/TOF/Target/app_tof_pin_conf.d
-# 每个子目录必须为构建它所贡献的源提供规则
+# Each subdirectory must supply rules for building sources it contributes
Application/User/TOF/Target/app_tof_pin_conf.o: D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/TOF/Target/app_tof_pin_conf.c Application/User/TOF/Target/subdir.mk
arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -DCORE_CM4 -DYUNHORN_STS_RANDOM -DSTS_O5 -DSTM32WLE5xx -DUSE_HAL_DRIVER -c -I../../Core/Inc -I../../vl53l0x -I../../TOF/App -I../../TOF/Target -I../../LoRaWAN/App -I../../LoRaWAN/Target -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy -I../../../../../../../Utilities/trace/adv_trace -I../../../../../../../Utilities/misc -I../../../../../../../Utilities/sequencer -I../../../../../../../Utilities/timer -I../../../../../../../Utilities/lpm/tiny_lpm -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages -I../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy -I../../../../../../../Middlewares/ST/STM32_Cryptographic/include -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver -I../../../../../../../Drivers/CMSIS/Include -I../../../../../../../Drivers/BSP/STM32WLxx_Nucleo -Os -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfloat-abi=soft -mthumb -o "$@"
diff --git a/STM32CubeIDE/Release/Application/User/TOF/vl53l0x/subdir.mk b/STM32CubeIDE/Release/Application/User/TOF/vl53l0x/subdir.mk
index 3d123d9..15fc205 100644
--- a/STM32CubeIDE/Release/Application/User/TOF/vl53l0x/subdir.mk
+++ b/STM32CubeIDE/Release/Application/User/TOF/vl53l0x/subdir.mk
@@ -1,9 +1,9 @@
################################################################################
-# 自动生成的文件。不要编辑！
-# Toolchain: GNU Tools for STM32 (11.3.rel1)
+# Automatically-generated file. Do not edit!
+# Toolchain: GNU Tools for STM32 (12.3.rel1)
################################################################################
-# 将这些工具调用的输入和输出添加到构建变量
+# Add inputs and outputs from these tool invocations to the build variables
C_SRCS += \
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/vl53l0x/vl53l0x_api.c \
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/vl53l0x/vl53l0x_api_calibration.c \
@@ -32,7 +32,7 @@ C_DEPS += \
./Application/User/TOF/vl53l0x/vl53l0x_platform_log.d
-# 每个子目录必须为构建它所贡献的源提供规则
+# Each subdirectory must supply rules for building sources it contributes
Application/User/TOF/vl53l0x/vl53l0x_api.o: D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/vl53l0x/vl53l0x_api.c Application/User/TOF/vl53l0x/subdir.mk
arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -DCORE_CM4 -DYUNHORN_STS_RANDOM -DSTS_O5 -DSTM32WLE5xx -DUSE_HAL_DRIVER -c -I../../Core/Inc -I../../vl53l0x -I../../TOF/App -I../../TOF/Target -I../../LoRaWAN/App -I../../LoRaWAN/Target -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy -I../../../../../../../Utilities/trace/adv_trace -I../../../../../../../Utilities/misc -I../../../../../../../Utilities/sequencer -I../../../../../../../Utilities/timer -I../../../../../../../Utilities/lpm/tiny_lpm -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages -I../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy -I../../../../../../../Middlewares/ST/STM32_Cryptographic/include -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver -I../../../../../../../Drivers/CMSIS/Include -I../../../../../../../Drivers/BSP/STM32WLxx_Nucleo -Os -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfloat-abi=soft -mthumb -o "$@"
Application/User/TOF/vl53l0x/vl53l0x_api_calibration.o: D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/vl53l0x/vl53l0x_api_calibration.c Application/User/TOF/vl53l0x/subdir.mk
diff --git a/STM32CubeIDE/Release/Drivers/BSP/STM32WLxx_Nucleo/subdir.mk b/STM32CubeIDE/Release/Drivers/BSP/STM32WLxx_Nucleo/subdir.mk
index b2eed25..bfb7eca 100644
--- a/STM32CubeIDE/Release/Drivers/BSP/STM32WLxx_Nucleo/subdir.mk
+++ b/STM32CubeIDE/Release/Drivers/BSP/STM32WLxx_Nucleo/subdir.mk
@@ -1,9 +1,9 @@
################################################################################
-# 自动生成的文件。不要编辑！
-# Toolchain: GNU Tools for STM32 (11.3.rel1)
+# Automatically-generated file. Do not edit!
+# Toolchain: GNU Tools for STM32 (12.3.rel1)
################################################################################
-# 将这些工具调用的输入和输出添加到构建变量
+# Add inputs and outputs from these tool invocations to the build variables
C_SRCS += \
D:/ONEDRIVE/STM32WLV13/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c \
D:/ONEDRIVE/STM32WLV13/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c
@@ -17,7 +17,7 @@ C_DEPS += \
./Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.d
-# 每个子目录必须为构建它所贡献的源提供规则
+# Each subdirectory must supply rules for building sources it contributes
Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.o: D:/ONEDRIVE/STM32WLV13/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c Drivers/BSP/STM32WLxx_Nucleo/subdir.mk
arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -DCORE_CM4 -DYUNHORN_STS_RANDOM -DSTS_O5 -DSTM32WLE5xx -DUSE_HAL_DRIVER -c -I../../Core/Inc -I../../vl53l0x -I../../TOF/App -I../../TOF/Target -I../../LoRaWAN/App -I../../LoRaWAN/Target -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy -I../../../../../../../Utilities/trace/adv_trace -I../../../../../../../Utilities/misc -I../../../../../../../Utilities/sequencer -I../../../../../../../Utilities/timer -I../../../../../../../Utilities/lpm/tiny_lpm -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages -I../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy -I../../../../../../../Middlewares/ST/STM32_Cryptographic/include -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver -I../../../../../../../Drivers/CMSIS/Include -I../../../../../../../Drivers/BSP/STM32WLxx_Nucleo -Os -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfloat-abi=soft -mthumb -o "$@"
Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.o: D:/ONEDRIVE/STM32WLV13/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c Drivers/BSP/STM32WLxx_Nucleo/subdir.mk
diff --git a/STM32CubeIDE/Release/Drivers/CMSIS/subdir.mk b/STM32CubeIDE/Release/Drivers/CMSIS/subdir.mk
index 932210f..33f880e 100644
--- a/STM32CubeIDE/Release/Drivers/CMSIS/subdir.mk
+++ b/STM32CubeIDE/Release/Drivers/CMSIS/subdir.mk
@@ -1,9 +1,9 @@
################################################################################
-# 自动生成的文件。不要编辑！
-# Toolchain: GNU Tools for STM32 (11.3.rel1)
+# Automatically-generated file. Do not edit!
+# Toolchain: GNU Tools for STM32 (12.3.rel1)
################################################################################
-# 将这些工具调用的输入和输出添加到构建变量
+# Add inputs and outputs from these tool invocations to the build variables
C_SRCS += \
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/Core/Src/system_stm32wlxx.c
@@ -14,7 +14,7 @@ C_DEPS += \
./Drivers/CMSIS/system_stm32wlxx.d
-# 每个子目录必须为构建它所贡献的源提供规则
+# Each subdirectory must supply rules for building sources it contributes
Drivers/CMSIS/system_stm32wlxx.o: D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/Core/Src/system_stm32wlxx.c Drivers/CMSIS/subdir.mk
arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -DCORE_CM4 -DYUNHORN_STS_RANDOM -DSTS_O5 -DSTM32WLE5xx -DUSE_HAL_DRIVER -c -I../../Core/Inc -I../../vl53l0x -I../../TOF/App -I../../TOF/Target -I../../LoRaWAN/App -I../../LoRaWAN/Target -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy -I../../../../../../../Utilities/trace/adv_trace -I../../../../../../../Utilities/misc -I../../../../../../../Utilities/sequencer -I../../../../../../../Utilities/timer -I../../../../../../../Utilities/lpm/tiny_lpm -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages -I../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy -I../../../../../../../Middlewares/ST/STM32_Cryptographic/include -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver -I../../../../../../../Drivers/CMSIS/Include -I../../../../../../../Drivers/BSP/STM32WLxx_Nucleo -Os -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfloat-abi=soft -mthumb -o "$@"
diff --git a/STM32CubeIDE/Release/Drivers/STM32WLxx_HAL_Driver/subdir.mk b/STM32CubeIDE/Release/Drivers/STM32WLxx_HAL_Driver/subdir.mk
index 51d8aa5..d67d875 100644
--- a/STM32CubeIDE/Release/Drivers/STM32WLxx_HAL_Driver/subdir.mk
+++ b/STM32CubeIDE/Release/Drivers/STM32WLxx_HAL_Driver/subdir.mk
@@ -1,9 +1,9 @@
################################################################################
-# 自动生成的文件。不要编辑！
-# Toolchain: GNU Tools for STM32 (11.3.rel1)
+# Automatically-generated file. Do not edit!
+# Toolchain: GNU Tools for STM32 (12.3.rel1)
################################################################################
-# 将这些工具调用的输入和输出添加到构建变量
+# Add inputs and outputs from these tool invocations to the build variables
C_SRCS += \
D:/ONEDRIVE/STM32WLV13/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c \
D:/ONEDRIVE/STM32WLV13/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c \
@@ -83,7 +83,7 @@ C_DEPS += \
./Drivers/STM32WLxx_HAL_Driver/stm32wlxx_ll_adc.d
-# 每个子目录必须为构建它所贡献的源提供规则
+# Each subdirectory must supply rules for building sources it contributes
Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.o: D:/ONEDRIVE/STM32WLV13/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c Drivers/STM32WLxx_HAL_Driver/subdir.mk
arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -DCORE_CM4 -DYUNHORN_STS_RANDOM -DSTS_O5 -DSTM32WLE5xx -DUSE_HAL_DRIVER -c -I../../Core/Inc -I../../vl53l0x -I../../TOF/App -I../../TOF/Target -I../../LoRaWAN/App -I../../LoRaWAN/Target -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy -I../../../../../../../Utilities/trace/adv_trace -I../../../../../../../Utilities/misc -I../../../../../../../Utilities/sequencer -I../../../../../../../Utilities/timer -I../../../../../../../Utilities/lpm/tiny_lpm -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages -I../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy -I../../../../../../../Middlewares/ST/STM32_Cryptographic/include -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver -I../../../../../../../Drivers/CMSIS/Include -I../../../../../../../Drivers/BSP/STM32WLxx_Nucleo -Os -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfloat-abi=soft -mthumb -o "$@"
Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_adc.o: D:/ONEDRIVE/STM32WLV13/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c Drivers/STM32WLxx_HAL_Driver/subdir.mk
diff --git a/STM32CubeIDE/Release/Middlewares/LoRaWAN/subdir.mk b/STM32CubeIDE/Release/Middlewares/LoRaWAN/subdir.mk
index 2a131ed..dec50bc 100644
--- a/STM32CubeIDE/Release/Middlewares/LoRaWAN/subdir.mk
+++ b/STM32CubeIDE/Release/Middlewares/LoRaWAN/subdir.mk
@@ -1,9 +1,9 @@
################################################################################
-# 自动生成的文件。不要编辑！
-# Toolchain: GNU Tools for STM32 (11.3.rel1)
+# Automatically-generated file. Do not edit!
+# Toolchain: GNU Tools for STM32 (12.3.rel1)
################################################################################
-# 将这些工具调用的输入和输出添加到构建变量
+# Add inputs and outputs from these tool invocations to the build variables
C_SRCS += \
D:/ONEDRIVE/STM32WLV13/Middlewares/Third_Party/LoRaWAN/LmHandler/LmHandler.c \
D:/ONEDRIVE/STM32WLV13/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpCompliance.c \
@@ -110,7 +110,7 @@ C_DEPS += \
./Middlewares/LoRaWAN/utilities.d
-# 每个子目录必须为构建它所贡献的源提供规则
+# Each subdirectory must supply rules for building sources it contributes
Middlewares/LoRaWAN/LmHandler.o: D:/ONEDRIVE/STM32WLV13/Middlewares/Third_Party/LoRaWAN/LmHandler/LmHandler.c Middlewares/LoRaWAN/subdir.mk
arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -DCORE_CM4 -DYUNHORN_STS_RANDOM -DSTS_O5 -DSTM32WLE5xx -DUSE_HAL_DRIVER -c -I../../Core/Inc -I../../vl53l0x -I../../TOF/App -I../../TOF/Target -I../../LoRaWAN/App -I../../LoRaWAN/Target -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy -I../../../../../../../Utilities/trace/adv_trace -I../../../../../../../Utilities/misc -I../../../../../../../Utilities/sequencer -I../../../../../../../Utilities/timer -I../../../../../../../Utilities/lpm/tiny_lpm -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages -I../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy -I../../../../../../../Middlewares/ST/STM32_Cryptographic/include -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver -I../../../../../../../Drivers/CMSIS/Include -I../../../../../../../Drivers/BSP/STM32WLxx_Nucleo -Os -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfloat-abi=soft -mthumb -o "$@"
Middlewares/LoRaWAN/LmhpCompliance.o: D:/ONEDRIVE/STM32WLV13/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpCompliance.c Middlewares/LoRaWAN/subdir.mk
diff --git a/STM32CubeIDE/Release/Middlewares/SubGHz_Phy/subdir.mk b/STM32CubeIDE/Release/Middlewares/SubGHz_Phy/subdir.mk
index e5e7333..307c45f 100644
--- a/STM32CubeIDE/Release/Middlewares/SubGHz_Phy/subdir.mk
+++ b/STM32CubeIDE/Release/Middlewares/SubGHz_Phy/subdir.mk
@@ -1,9 +1,9 @@
################################################################################
-# 自动生成的文件。不要编辑！
-# Toolchain: GNU Tools for STM32 (11.3.rel1)
+# Automatically-generated file. Do not edit!
+# Toolchain: GNU Tools for STM32 (12.3.rel1)
################################################################################
-# 将这些工具调用的输入和输出添加到构建变量
+# Add inputs and outputs from these tool invocations to the build variables
C_SRCS += \
D:/ONEDRIVE/STM32WLV13/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c \
D:/ONEDRIVE/STM32WLV13/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c \
@@ -20,7 +20,7 @@ C_DEPS += \
./Middlewares/SubGHz_Phy/radio_fw.d
-# 每个子目录必须为构建它所贡献的源提供规则
+# Each subdirectory must supply rules for building sources it contributes
Middlewares/SubGHz_Phy/radio.o: D:/ONEDRIVE/STM32WLV13/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c Middlewares/SubGHz_Phy/subdir.mk
arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -DCORE_CM4 -DYUNHORN_STS_RANDOM -DSTS_O5 -DSTM32WLE5xx -DUSE_HAL_DRIVER -c -I../../Core/Inc -I../../vl53l0x -I../../TOF/App -I../../TOF/Target -I../../LoRaWAN/App -I../../LoRaWAN/Target -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy -I../../../../../../../Utilities/trace/adv_trace -I../../../../../../../Utilities/misc -I../../../../../../../Utilities/sequencer -I../../../../../../../Utilities/timer -I../../../../../../../Utilities/lpm/tiny_lpm -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages -I../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy -I../../../../../../../Middlewares/ST/STM32_Cryptographic/include -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver -I../../../../../../../Drivers/CMSIS/Include -I../../../../../../../Drivers/BSP/STM32WLxx_Nucleo -Os -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfloat-abi=soft -mthumb -o "$@"
Middlewares/SubGHz_Phy/radio_driver.o: D:/ONEDRIVE/STM32WLV13/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c Middlewares/SubGHz_Phy/subdir.mk
diff --git a/STM32CubeIDE/Release/Utilities/subdir.mk b/STM32CubeIDE/Release/Utilities/subdir.mk
index 60b078b..ff4b6d9 100644
--- a/STM32CubeIDE/Release/Utilities/subdir.mk
+++ b/STM32CubeIDE/Release/Utilities/subdir.mk
@@ -1,9 +1,9 @@
################################################################################
-# 自动生成的文件。不要编辑！
-# Toolchain: GNU Tools for STM32 (11.3.rel1)
+# Automatically-generated file. Do not edit!
+# Toolchain: GNU Tools for STM32 (12.3.rel1)
################################################################################
-# 将这些工具调用的输入和输出添加到构建变量
+# Add inputs and outputs from these tool invocations to the build variables
C_SRCS += \
D:/ONEDRIVE/STM32WLV13/Utilities/trace/adv_trace/stm32_adv_trace.c \
D:/ONEDRIVE/STM32WLV13/Utilities/lpm/tiny_lpm/stm32_lpm.c \
@@ -35,7 +35,7 @@ C_DEPS += \
./Utilities/stm32_tiny_vsnprintf.d
-# 每个子目录必须为构建它所贡献的源提供规则
+# Each subdirectory must supply rules for building sources it contributes
Utilities/stm32_adv_trace.o: D:/ONEDRIVE/STM32WLV13/Utilities/trace/adv_trace/stm32_adv_trace.c Utilities/subdir.mk
arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -DCORE_CM4 -DYUNHORN_STS_RANDOM -DSTS_O5 -DSTM32WLE5xx -DUSE_HAL_DRIVER -c -I../../Core/Inc -I../../vl53l0x -I../../TOF/App -I../../TOF/Target -I../../LoRaWAN/App -I../../LoRaWAN/Target -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy -I../../../../../../../Utilities/trace/adv_trace -I../../../../../../../Utilities/misc -I../../../../../../../Utilities/sequencer -I../../../../../../../Utilities/timer -I../../../../../../../Utilities/lpm/tiny_lpm -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages -I../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy -I../../../../../../../Middlewares/ST/STM32_Cryptographic/include -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver -I../../../../../../../Drivers/CMSIS/Include -I../../../../../../../Drivers/BSP/STM32WLxx_Nucleo -Os -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfloat-abi=soft -mthumb -o "$@"
Utilities/stm32_lpm.o: D:/ONEDRIVE/STM32WLV13/Utilities/lpm/tiny_lpm/stm32_lpm.c Utilities/subdir.mk
diff --git a/STM32CubeIDE/Release/makefile b/STM32CubeIDE/Release/makefile
index 93505c4..576fe9b 100644
--- a/STM32CubeIDE/Release/makefile
+++ b/STM32CubeIDE/Release/makefile
@@ -1,13 +1,13 @@
################################################################################
-# 自动生成的文件。不要编辑！
-# Toolchain: GNU Tools for STM32 (11.3.rel1)
+# Automatically-generated file. Do not edit!
+# Toolchain: GNU Tools for STM32 (12.3.rel1)
################################################################################
-include ../makefile.init
RM := rm -rf
-# 此处定义了参与生成的所有源
+# All of the sources participating in the build are defined here
-include sources.mk
-include Utilities/subdir.mk
-include Middlewares/SubGHz_Phy/subdir.mk
@@ -49,7 +49,7 @@ BUILD_ARTIFACT_EXTENSION := elf
BUILD_ARTIFACT_PREFIX :=
BUILD_ARTIFACT := $(BUILD_ARTIFACT_PREFIX)$(BUILD_ARTIFACT_NAME)$(if $(BUILD_ARTIFACT_EXTENSION),.$(BUILD_ARTIFACT_EXTENSION),)
-# 将这些工具调用的输入和输出添加到构建变量
+# Add inputs and outputs from these tool invocations to the build variables
EXECUTABLES += \
STS_RR_R125.elf \
@@ -69,39 +69,39 @@ OBJCOPY_BIN += \
STS_RR_R125.bin \
-# 所有目标
+# All Target
all: main-build
-# 主构建目标
+# Main-build Target
main-build: STS_RR_R125.elf secondary-outputs
-# 工具调用
+# Tool invocations
STS_RR_R125.elf STS_RR_R125.map: $(OBJS) $(USER_OBJS) D:\ONEDRIVE\STM32WLV13\Projects\NUCLEO-WL55JC\Applications\LoRaWAN\STS_RR_R125\STM32CubeIDE\STM32WLE5CCUX_FLASH.ld makefile objects.list $(OPTIONAL_TOOL_DEPS)
arm-none-eabi-gcc -o "STS_RR_R125.elf" @"objects.list" $(USER_OBJS) $(LIBS) -mcpu=cortex-m4 -T"D:\ONEDRIVE\STM32WLV13\Projects\NUCLEO-WL55JC\Applications\LoRaWAN\STS_RR_R125\STM32CubeIDE\STM32WLE5CCUX_FLASH.ld" --specs=nosys.specs -Wl,-Map="STS_RR_R125.map" -Wl,--gc-sections -static -L../../../../../../../Middlewares/ST/STM32_Cryptographic/lib --specs=nano.specs -mfloat-abi=soft -mthumb -Wl,--start-group -lc -lm -Wl,--end-group
- @echo '已结束构建目标： $@'
+ @echo 'Finished building target: $@'
@echo ' '
default.size.stdout: $(EXECUTABLES) makefile objects.list $(OPTIONAL_TOOL_DEPS)
arm-none-eabi-size $(EXECUTABLES)
- @echo '已结束构建： $@'
+ @echo 'Finished building: $@'
@echo ' '
STS_RR_R125.list: $(EXECUTABLES) makefile objects.list $(OPTIONAL_TOOL_DEPS)
arm-none-eabi-objdump -h -S $(EXECUTABLES) > "STS_RR_R125.list"
- @echo '已结束构建： $@'
+ @echo 'Finished building: $@'
@echo ' '
STS_RR_R125.hex: $(EXECUTABLES) makefile objects.list $(OPTIONAL_TOOL_DEPS)
arm-none-eabi-objcopy -O ihex $(EXECUTABLES) "STS_RR_R125.hex"
- @echo '已结束构建： $@'
+ @echo 'Finished building: $@'
@echo ' '
STS_RR_R125.bin: $(EXECUTABLES) makefile objects.list $(OPTIONAL_TOOL_DEPS)
arm-none-eabi-objcopy -O binary $(EXECUTABLES) "STS_RR_R125.bin"
- @echo '已结束构建： $@'
+ @echo 'Finished building: $@'
@echo ' '
-# 其他目标
+# Other Targets
clean:
-$(RM) STS_RR_R125.bin STS_RR_R125.elf STS_RR_R125.hex STS_RR_R125.list STS_RR_R125.map default.size.stdout
-@echo ' '
diff --git a/STM32CubeIDE/Release/objects.mk b/STM32CubeIDE/Release/objects.mk
index 582a77f..a5103de 100644
--- a/STM32CubeIDE/Release/objects.mk
+++ b/STM32CubeIDE/Release/objects.mk
@@ -1,6 +1,6 @@
################################################################################
-# 自动生成的文件。不要编辑！
-# Toolchain: GNU Tools for STM32 (11.3.rel1)
+# Automatically-generated file. Do not edit!
+# Toolchain: GNU Tools for STM32 (12.3.rel1)
################################################################################
USER_OBJS :=
diff --git a/STM32CubeIDE/Release/sources.mk b/STM32CubeIDE/Release/sources.mk
index a805fc3..8cc1ed4 100644
--- a/STM32CubeIDE/Release/sources.mk
+++ b/STM32CubeIDE/Release/sources.mk
@@ -1,6 +1,6 @@
################################################################################
-# 自动生成的文件。不要编辑！
-# Toolchain: GNU Tools for STM32 (11.3.rel1)
+# Automatically-generated file. Do not edit!
+# Toolchain: GNU Tools for STM32 (12.3.rel1)
################################################################################
ELF_SRCS :=
@@ -22,7 +22,7 @@ S_UPPER_DEPS :=
C_DEPS :=
OBJCOPY_BIN :=
-# 此处必须描述包含源文件的每个子目录
+# Every subdirectory with source files must be described here
SUBDIRS := \
Application/User/Core \
Application/User/LoRaWAN/App \
diff --git a/STM32CubeIDE/STM32WLE5CCUX_FLASH.ld b/STM32CubeIDE/STM32WLE5CCUX_FLASH.ld
index 40b4342..f2fc693 100644
--- a/STM32CubeIDE/STM32WLE5CCUX_FLASH.ld
+++ b/STM32CubeIDE/STM32WLE5CCUX_FLASH.ld
@@ -86,13 +86,13 @@ SECTIONS
. = ALIGN(4);
} >FLASH
- .ARM.extab : {
+ .ARM.extab (READONLY) : {
. = ALIGN(4);
*(.ARM.extab* .gnu.linkonce.armextab.*)
. = ALIGN(4);
} >FLASH
- .ARM : {
+ .ARM (READONLY): {
. = ALIGN(4);
__exidx_start = .;
*(.ARM.exidx*)
@@ -100,7 +100,7 @@ SECTIONS
. = ALIGN(4);
} >FLASH
- .preinit_array :
+ .preinit_array (READONLY) :
{
. = ALIGN(4);
PROVIDE_HIDDEN (__preinit_array_start = .);
@@ -109,7 +109,7 @@ SECTIONS
. = ALIGN(4);
} >FLASH
- .init_array :
+ .init_array (READONLY):
{
. = ALIGN(4);
PROVIDE_HIDDEN (__init_array_start = .);
@@ -119,7 +119,7 @@ SECTIONS
. = ALIGN(4);
} >FLASH
- .fini_array :
+ .fini_array (READONLY):
{
. = ALIGN(4);
PROVIDE_HIDDEN (__fini_array_start = .);
diff --git a/readme.txt b/readme.txt
index a9cb44e..48b4fff 100644
--- a/readme.txt
+++ b/readme.txt
@@ -41,5 +41,7 @@ Pre-defines
Jumbo Roll, Tissue Paper, Waste Bin sensor
-
+
+ change log
+ 2024-05-30 new start
******************************************************************************