From 8039c946db6093b185a3963ef30615aa6f4fc29e Mon Sep 17 00:00:00 2001 From: YunHorn Technology Date: Mon, 3 Jul 2023 13:34:34 +0800 Subject: [PATCH] remove useless sts command auto response process --- .gitignore | 1 + Core/Src/sts_lamp_bar.c | 2 +- Core/Src/yunhorn_sts_presence_sensor.c | 2 +- LoRaWAN/App/lora_app.c | 58 +------------------- STM32CubeIDE/.settings/language.settings.xml | 4 +- 5 files changed, 6 insertions(+), 61 deletions(-) diff --git a/.gitignore b/.gitignore index 222383a..5a295b6 100644 --- a/.gitignore +++ b/.gitignore @@ -84,4 +84,5 @@ Module.symvers Mkfile.old dkms.conf *.cyclo +*.settings.* diff --git a/Core/Src/sts_lamp_bar.c b/Core/Src/sts_lamp_bar.c index d811a06..d17a762 100644 --- a/Core/Src/sts_lamp_bar.c +++ b/Core/Src/sts_lamp_bar.c @@ -192,7 +192,7 @@ void STS_YunhornSTSEventP3_Process(void) } /* - * STS P4 Process, STS_CAP_Sensor_Detection Process + * STS SOAP Level detection Process, STS_CAP_Sensor_Detection Process * STS_CAP_SWITCH(ON) Boost Voltage to 5V, then hold for 1000 ms * HAL_Delay(1000) (ms) * STS_CAP_Read_Data() Read STS_CAP_DATA state diff --git a/Core/Src/yunhorn_sts_presence_sensor.c b/Core/Src/yunhorn_sts_presence_sensor.c index c136f2f..eaedba4 100644 --- a/Core/Src/yunhorn_sts_presence_sensor.c +++ b/Core/Src/yunhorn_sts_presence_sensor.c @@ -38,7 +38,7 @@ //#include "yunhorn_sts_rss_sensor.h" extern volatile uint8_t sts_ac_code[20]; volatile uint32_t rfac_timer; - +extern volatile uint8_t sensor_data_ready; volatile STS_OO_SensorStatusDataTypeDef sts_o6_sensorData; volatile STS_PRESENCE_SENSOR_Event_Status_t sts_o6_event_status; volatile float sts_distance_rss_distance; diff --git a/LoRaWAN/App/lora_app.c b/LoRaWAN/App/lora_app.c index d6be62c..0de4d11 100644 --- a/LoRaWAN/App/lora_app.c +++ b/LoRaWAN/App/lora_app.c @@ -116,7 +116,7 @@ volatile sts_cfg_nvm_t sts_cfg_nvm = { }; #ifdef YUNHORN_STS_O6_ENABLED -extern volatile uint8_t sensor_data_ready; +volatile uint8_t sensor_data_ready; extern volatile STS_OO_SensorStatusDataTypeDef sts_o6_sensorData; extern volatile float sts_distance_rss_distance; volatile uint8_t sts_presence_fall_detection; @@ -2004,62 +2004,6 @@ void STS_SENSOR_Upload_Message(uint8_t appDataPort, uint8_t appBufferSize, char } } - -void STS_SENSOR_Auto_Responder_Process(uint8_t tlv_ver,uint8_t tlv_type, uint8_t tlv_length, uint8_t *tlv_content) -{ - uint8_t sensor_mems_type=(tlv_content[0]-0x30); //sensor_mems_type defined in sts_sensors.h - -#ifdef YUNHORN_STS_M7_ENABLED - uint8_t fm_version = FirmwareVersion; //MajorVer+MinorVer+SubMinorVer; - -#endif - - switch (sensor_mems_type) - { -#ifdef YUNHORN_STS_M7_ENABLED - case sts_mtmcode2: - //TODO - break; -#endif -#ifdef YUNHORN_STS_R0_ENABLED - case STS_CTRL_CMD_MEMS_TUNE_TOF_VL53L0X: - - break; -#endif -#ifdef YUNHORN_STS_P1_ENABLED - case STS_CTRL_CMD_MEMS_TUNE_FMCW_TI68X: - - break; -#endif -#ifdef YUNHORN_STS_OO_ENABLED - case STS_CTRL_CMD_MEMS_TUNE_PCR_A12X: - - break; - - case STS_CTRL_CMD_PRESENCE_SETTING: - - break; -#endif -#ifdef YUNHORN_STS_M3_ENABLED - case STS_CTRL_CMD_MEMS_TUNE_DIGITAL_RELAY: - - break; -#endif -#ifdef YUNHORN_STS_M5_ENABLED - case STS_CTRL_CMD_MEMS_TUNE_FAN_CONTROL: - - break; -#endif - default: - - break; - - } -} - - - - void OnStoreSTSCFGContextRequest(void) { /* USER CODE BEGIN OnStoreContextRequest_1 */ diff --git a/STM32CubeIDE/.settings/language.settings.xml b/STM32CubeIDE/.settings/language.settings.xml index 4686da5..2d055d2 100644 --- a/STM32CubeIDE/.settings/language.settings.xml +++ b/STM32CubeIDE/.settings/language.settings.xml @@ -5,7 +5,7 @@ - + @@ -16,7 +16,7 @@ - +