From a27bbf7e09de31420b0b623078bc21f4f52eecd0 Mon Sep 17 00:00:00 2001 From: YunHorn Technology Date: Thu, 29 Jun 2023 13:12:12 +0800 Subject: [PATCH] reformat --- Core/Src/yunhorn_sts_presence_sensor.c | 3 +-- LoRaWAN/App/lora_app.c | 13 +++++-------- STM32CubeIDE/.settings/language.settings.xml | 4 ++-- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/Core/Src/yunhorn_sts_presence_sensor.c b/Core/Src/yunhorn_sts_presence_sensor.c index efbedeb..c136f2f 100644 --- a/Core/Src/yunhorn_sts_presence_sensor.c +++ b/Core/Src/yunhorn_sts_presence_sensor.c @@ -45,7 +45,7 @@ volatile float sts_distance_rss_distance; extern volatile float sts_presence_rss_distance, sts_presence_rss_score; volatile uint8_t sts_rss_config_updated_flag = 0; extern volatile uint8_t mems_int1_detected, link_wakeup, link_sleep; -volatile uint32_t event_start_time, event_stop_time, sensor_data_ready; +volatile uint32_t event_start_time, event_stop_time; extern volatile STS_OO_RSS_SensorTuneDataTypeDef sts_presence_rss_config; extern volatile sts_cfg_nvm_t sts_cfg_nvm; extern volatile uint8_t sts_fall_detection_acc_threshold, sts_fall_detection_depth_threshold, sts_occupancy_overtime_threshold; @@ -120,7 +120,6 @@ void STS_YunhornSTSEventRFAC_Process(void) if ((rfac_timer >= STS_BURN_IN_RFAC) && (rfac_timer < (STS_BURN_IN_RFAC +3))) { APP_LOG(TS_OFF, VLEVEL_H, "\r\n -------------------RFAC Process\r\n"); - //STS_SENSOR_Upload_Message(LORAWAN_USER_APP_CTRL_REPLY_PORT, 4, "RFAC"); STS_SENSOR_Upload_Message(YUNHORN_STS_O6_USER_APP_CTRL_REPLY_PORT, 4, "RFAC"); } if ((rfac_timer > (STS_BURN_IN_RFAC + 2))) diff --git a/LoRaWAN/App/lora_app.c b/LoRaWAN/App/lora_app.c index 6544683..d6be62c 100644 --- a/LoRaWAN/App/lora_app.c +++ b/LoRaWAN/App/lora_app.c @@ -60,7 +60,7 @@ volatile uint32_t SamplingPeriodicity = 1000; //unit ms volatile uint32_t HeartBeatPeriodicity = 120000; //unit ms volatile uint8_t STS_LoRa_WAN_Joined = 0; volatile uint8_t mems_int1_detected = 0; -volatile uint8_t periodicity_level=0; + volatile uint8_t heart_beat_timer =0; char outbuf[128]=""; volatile sts_cfg_nvm_t sts_cfg_nvm = { @@ -323,13 +323,11 @@ static void OnJoinTimerLedEvent(void *context); static void OnYunhornSTSOORSSWakeUpTimerEvent(void *context); /** - * @brief Yunhorn STS Sampling Check timer callback function - * @param context ptr of STS Sampling Check context + * @brief Yunhorn STS AC Code handle Process + * @param void */ - -//static void OnYunhornSTSSamplingCheckTimerEvent(void *context); - static void STS_YUNHORN_RFAC_HANDLE_PROCESS(void); + /* USER CODE END PFP */ /* Private variables ---------------------------------------------------------*/ @@ -2132,7 +2130,7 @@ void OnRestoreSTSCFGContextRequest(uint8_t *cfg_in_nvm) void STS_REBOOT_CONFIG_Init(void) { /* USER CODE BEGIN OnRestoreContextRequest_1 */ - uint8_t nvm_stored_value[YUNHORN_STS_MAX_NVM_CFG_SIZE]=""; + uint8_t nvm_stored_value[YUNHORN_STS_MAX_NVM_CFG_SIZE]={0x0}; /* USER CODE END OnRestoreContextRequest_1 */ UTIL_MEM_cpy_8(nvm_stored_value, (void *)STS_CONFIG_NVM_BASE_ADDRESS, YUNHORN_STS_MAX_NVM_CFG_SIZE); @@ -2229,7 +2227,6 @@ void OnRestoreSTSCFGContextProcess(void) { STS_PRESENCE_SENSOR_Init(); STS_PRESENCE_SENSOR_RSS_Init(); - } #endif diff --git a/STM32CubeIDE/.settings/language.settings.xml b/STM32CubeIDE/.settings/language.settings.xml index 6d8b782..4686da5 100644 --- a/STM32CubeIDE/.settings/language.settings.xml +++ b/STM32CubeIDE/.settings/language.settings.xml @@ -5,7 +5,7 @@ - + @@ -16,7 +16,7 @@ - +