From cd517632ebe397dd4695c30ca6977e93dd731f2c Mon Sep 17 00:00:00 2001 From: YunHorn Technology Date: Fri, 24 May 2024 12:19:55 +0800 Subject: [PATCH] no good so far --- Core/Src/yunhorn_sts_process.c | 1 + LoRaWAN/App/lora_app.c | 11 ++++++++--- STM32CubeIDE/.cproject | 3 +++ STM32CubeIDE/.settings/language.settings.xml | 4 ++-- STM32CubeIDE/Release/makefile | 2 +- TOF/App/app_tof_vl53l0x_range.c | 6 +++--- 6 files changed, 18 insertions(+), 9 deletions(-) diff --git a/Core/Src/yunhorn_sts_process.c b/Core/Src/yunhorn_sts_process.c index 4e6f66d..8134663 100644 --- a/Core/Src/yunhorn_sts_process.c +++ b/Core/Src/yunhorn_sts_process.c @@ -302,6 +302,7 @@ void STS_YunhornSTSEventP3_Process(void) void STS_YunhornSTSEventP4_Process(void) { STS_SENSOR_Power_ON(0); + HAL_Delay(10); #ifdef LED_ONBOARD LED_ON; HAL_Delay(10); diff --git a/LoRaWAN/App/lora_app.c b/LoRaWAN/App/lora_app.c index 0e7f512..ea0fc22 100644 --- a/LoRaWAN/App/lora_app.c +++ b/LoRaWAN/App/lora_app.c @@ -638,8 +638,11 @@ void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin) #ifdef YUNHORN_STS_O5_ENABLED UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_YunhornSTSEventP1), CFG_SEQ_Prio_0); #endif - UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0); } +#ifdef STS_R1D + UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_YunhornSTSEventP4), CFG_SEQ_Prio_0); +#endif + UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0); #ifdef LED_ONBOARD LED_ON; HAL_Delay(20); @@ -786,7 +789,7 @@ static void SendTxData(void) LmHandlerErrorStatus_t status = LORAMAC_HANDLER_ERROR; uint8_t batteryLevel = GetBatteryLevel(); //uint16_t batteryLevelmV = SYS_GetBatteryLevel(); - sensor_t sensor_data; + //sensor_t sensor_data; #if defined(YUNHORN_STS_R0_ENABLED)||defined(YUNHORN_STS_R5_ENABLED) STS_R0_SensorDataTypeDef r0_data; #endif @@ -808,7 +811,7 @@ static void SendTxData(void) //UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_YunhornSTSEventP6), CFG_SEQ_Prio_0); #if defined(YUNHORN_STS_R0_ENABLED)||defined(YUNHORN_STS_R5_ENABLED) - UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_YunhornSTSEventP4), CFG_SEQ_Prio_0); + //UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_YunhornSTSEventP4), CFG_SEQ_Prio_0); STS_R0_SENSOR_Read(&r0_data); //r0_data.battery_mV = batteryLevelmV; @@ -916,6 +919,7 @@ static void OnTxTimerEvent(void *context) /* USER CODE END OnTxTimerEvent_1 */ //upload_message_timer =1U; + UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_YunhornSTSEventP4), CFG_SEQ_Prio_0); UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0); /*Wait for next tx slot*/ @@ -1015,6 +1019,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); } + UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_YunhornSTSEventP4), CFG_SEQ_Prio_0); UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0); /* USER CODE END OnJoinRequest_1 */ } diff --git a/STM32CubeIDE/.cproject b/STM32CubeIDE/.cproject index 18dc31b..14e3627 100644 --- a/STM32CubeIDE/.cproject +++ b/STM32CubeIDE/.cproject @@ -175,6 +175,7 @@ + diff --git a/STM32CubeIDE/.settings/language.settings.xml b/STM32CubeIDE/.settings/language.settings.xml index 801f38f..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/Release/makefile b/STM32CubeIDE/Release/makefile index e32150c..69e4e9b 100644 --- a/STM32CubeIDE/Release/makefile +++ b/STM32CubeIDE/Release/makefile @@ -77,7 +77,7 @@ 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 -z noexecstack --specs=nano.specs -mfloat-abi=soft -mthumb -Wl,--start-group -lc -lm -Wl,--end-group + 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 -z noexecstack -Wunused-but-set-variable -Wunused-variable --specs=nano.specs -mfloat-abi=soft -mthumb -Wl,--start-group -lc -lm -Wl,--end-group @echo 'Finished building target: $@' @echo ' ' diff --git a/TOF/App/app_tof_vl53l0x_range.c b/TOF/App/app_tof_vl53l0x_range.c index cba7348..5b33c30 100644 --- a/TOF/App/app_tof_vl53l0x_range.c +++ b/TOF/App/app_tof_vl53l0x_range.c @@ -135,7 +135,7 @@ int sts_tof_vl53l0x_DetectSensors(void) for (i=0; i < MAX_TOF_COUNT; i++) { XWL55_WLE5_53L0X_ResetId(i,0); - XWL55_WLE5_53L0X_SetIntrStateId(1,i); + //XWL55_WLE5_53L0X_SetIntrStateId(1,i); } /* detect all sensors (even on-board)*/ @@ -418,9 +418,9 @@ void STS_TOF_VL53L0X_Range_Process(void) // ########## 1) return status ==0, // ########## 2) and ranging status for valid ranging value !!!!!!!!!!!!!!!!! } - HAL_Delay(10); + HAL_Delay(30); } while ((RangingMeasurementData.RangeStatus != 0)&&(rep <10)); - //sts_tof_distance_data[i] = (RangingMeasurementData.RangeStatus!=0)?STS_MAX_L0_RANGE:VL53L0XDevs[i].LeakyRange; + sts_tof_distance_data[i] = (RangingMeasurementData.RangeStatus!=0)?STS_MAX_L0_RANGE:VL53L0XDevs[i].LeakyRange; } HAL_Delay(30);