From 4a80ce22a153e0171b2554706e1d1972aa60cc06 Mon Sep 17 00:00:00 2001 From: YunHorn Technology Date: Thu, 11 Jul 2024 19:57:43 +0800 Subject: [PATCH] ==== remove Kalmanfilter, fix typo error --- Core/Src/sts_weight_scale.c | 8 ++++---- LoRaWAN/App/lora_app.c | 2 +- STM32CubeIDE/Release/WL55JC_AS923.bin | Bin 255448 -> 255448 bytes 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Core/Src/sts_weight_scale.c b/Core/Src/sts_weight_scale.c index dbc84a0..a23d155 100644 --- a/Core/Src/sts_weight_scale.c +++ b/Core/Src/sts_weight_scale.c @@ -30,7 +30,7 @@ void sts_weight_scale_init(void) { HX711_Init(); Get_GrossWeight(); - HAL_Delay(500); + HAL_Delay(10); Get_GrossWeight(); } @@ -149,7 +149,7 @@ void Get_GrossWeight(void) { gross_weight = HX711_Read(); gross_weight = KalmanFilter(gross_weight); - APP_LOG(TS_OFF, VLEVEL_M, "\r\n ##### Gross Weight =%d <<<<<< \r\n",gross_weight); + //APP_LOG(TS_OFF, VLEVEL_M, "\r\n ##### Gross Weight =%d <<<<<< \r\n",gross_weight); } //**************************************************** @@ -168,8 +168,8 @@ void Get_NetWeight(void) //因为不同的传感器特性曲线不一样,因此,每一个传感器需要矫正这里的GapValue这个除数。 //当发现测试出来的重量偏大时,增加该数值。 - net_weight = KalmanFilter(net_weight); - APP_LOG(TS_OFF, VLEVEL_M, "\r\n ##### Net Weight =%d \r\n", net_weight);//如果测试出来的重量偏小时,减小改数值。 + //net_weight = KalmanFilter(net_weight); + //APP_LOG(TS_OFF, VLEVEL_M, "\r\n ##### Net Weight =%d \r\n", net_weight);//如果测试出来的重量偏小时,减小改数值。 } } diff --git a/LoRaWAN/App/lora_app.c b/LoRaWAN/App/lora_app.c index 0d4e937..db60ce0 100644 --- a/LoRaWAN/App/lora_app.c +++ b/LoRaWAN/App/lora_app.c @@ -579,7 +579,7 @@ static void SendTxData(void) EnvSensors_Read(&sensor_data); #ifdef STS_WS sts_weight_scale(&sts_sensor_data); - APP_LOG(TS_ON, VLEVEL_M, "Weigt Scale : %d\r\n", sts_sensor_data.weight_scale_value); + APP_LOG(TS_ON, VLEVEL_M, "Weight Scale : %d\r\n", sts_sensor_data.weight_scale_value); #endif APP_LOG(TS_ON, VLEVEL_M, "VDDA: %d\r\n", batteryLevel); diff --git a/STM32CubeIDE/Release/WL55JC_AS923.bin b/STM32CubeIDE/Release/WL55JC_AS923.bin index fff68f089a5293f3fffeaedacb07764134cbed56..e015525c7c4fdd0ab045d6a56bec7e4ce653a93d 100644 GIT binary patch delta 4048 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 delta 4111 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