diff --git a/Core/Src/stm32wlxx_it.c b/Core/Src/stm32wlxx_it.c index b904524..6654108 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 -----------------------------------------------------------*/ diff --git a/Core/Src/yunhorn_sts_process.c b/Core/Src/yunhorn_sts_process.c index e6a2216..0756211 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" diff --git a/LoRaWAN/App/lora_app.c b/LoRaWAN/App/lora_app.c index bf2eb5a..eb824ce 100644 --- a/LoRaWAN/App/lora_app.c +++ b/LoRaWAN/App/lora_app.c @@ -44,7 +44,7 @@ #include "yunhorn_sts_sensors.h" #include "yunhorn_sts_prd_conf.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 ---------------------------------------------------------*/ @@ -57,7 +57,7 @@ volatile uint8_t sts_work_mode =0; 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[3]; volatile uint32_t SamplingPeriodicity = 1000; //unit ms volatile uint32_t HeartBeatPeriodicity = 120000; //unit ms volatile uint8_t STS_LoRa_WAN_Joined = 0; @@ -2100,8 +2100,9 @@ void STS_SENSOR_Function_Test_Process(void) { char tstbuf[128] =""; uint8_t i=0; uint8_t count = 0; +#ifndef SOAP_LEVEL_SENSOR uint8_t mems_Dev_ID[2] = {0x0,0x0}; - +#endif tstbuf[i++] = (uint8_t) 'S'; tstbuf[i++] = (uint8_t) sts_mtmcode1; tstbuf[i++] = (uint8_t) sts_mtmcode2;