sundp
/
WLE5CC_NODE_STS
1
0
Fork 1
Code Issues Pull Requests 2 Packages Projects Releases Wiki Activity

L8 #77

Open
sundp wants to merge 3 commits from L8 into master
pull from: L8
merge into: sundp:master
Conversation 0 Commits 3 Files Changed 7 +39 -9
4 changed files with 39 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d85b8e385f - Show all commits

1
LoRaWAN/App/lora_app.c
View File

@ -1405,6 +1405,7 @@ static void OnJoinRequest(LmHandlerJoinParams_t *joinParams)
LmHandlerParams.IsTxConfirmed = true;
LmHandlerErrorStatus_t status = LmHandlerSend(&AppData, LmHandlerParams.IsTxConfirmed, false);
if (status ==LORAMAC_HANDLER_SUCCESS ) LmHandlerParams.IsTxConfirmed = false;
STS_SENSOR_Distance_Test_Process();
}
else
{

BIN
STM32CubeIDE/Release/WLE5CC_NODE_STS.bin
View File

Binary file not shown.

BIN
STM32CubeIDE/Release/WLE5CC_NODE_STS.elf
View File

Binary file not shown.

47
STS/TOF/App/app_tof.c
View File

@ -182,8 +182,9 @@ void STS_LMZ_Ambient_Height_Scan_Process(void)
{
#if 1
uint8_t i=0;
uint8_t i=0, j=0;
uint32_t range_distance =0;
uint32_t bg_distance[64]={0x0};
for (i=0; i<64; i++)
{
@ -198,8 +199,11 @@ void STS_LMZ_Ambient_Height_Scan_Process(void)
// printf("sts sensor install height = %4d \r\n", (int)sts_sensor_install_height);
sts_high_threshold = sts_sensor_install_height;
sts_low_threshold = sts_sensor_install_height-1400;
//sts_high_threshold = sts_sensor_install_height;
//sts_low_threshold = sts_sensor_install_height-1400;
sts_high_threshold = 5000;
sts_low_threshold = 1000;
//APP_LOG(TS_OFF, VLEVEL_M, "\r\nReconfig ----> Threshold High=%d mm, Low=%d mm \r\n", sts_high_threshold, sts_low_threshold);
STS_TOF_L8_Reconfig();
@ -211,7 +215,10 @@ void STS_LMZ_Ambient_Height_Scan_Process(void)
printf("VL53L8A1_RANGING_SENSOR_Start failed\n");
while (1);
}
uint8_t idx[64]={0};
for (j=0; j<10; j++)
{
if (ToF_EventDetected != 0)
{
ToF_EventDetected = 0;
@ -219,8 +226,28 @@ void STS_LMZ_Ambient_Height_Scan_Process(void)
if (status != BSP_ERROR_NONE)
{
APP_LOG(TS_OFF, VLEVEL_M, "\r\n x \r\n");
} else
{
for (i=0; i<64; i++)
{
if (i%8==0) APP_LOG(TS_OFF, VLEVEL_L, "\r\n[cm]|");
if ((Result.ZoneResult[i].NumberOfTargets > 0))
{
bg_distance[i] += (uint32_t)Result.ZoneResult[i].Distance[0];
idx[i] ++;
APP_LOG(TS_OFF, VLEVEL_L, "|%3d ", Result.ZoneResult[i].Distance[0]/10);
} else APP_LOG(TS_OFF, VLEVEL_L, "|%3d ", 0);
}
}
}
HAL_Delay(400);
}
for (i=0;i<64;i++)
bg_distance[i] /= idx[i];
//STS_TOF_L8_Process();
@ -231,9 +258,10 @@ void STS_LMZ_Ambient_Height_Scan_Process(void)
{
/* Print distance and status */
if (i%8==0) APP_LOG(TS_OFF, VLEVEL_L, "\r\n[cm]|");
if ((Result.ZoneResult[i].NumberOfTargets > 0))
// if ((Result.ZoneResult[i].NumberOfTargets > 0))
{
range_distance = (uint32_t)Result.ZoneResult[i].Distance[0];
// range_distance = (uint32_t)Result.ZoneResult[i].Distance[0];
range_distance = (uint32_t)bg_distance[i];
fhmos_bg.h2cm[i] = abs(sts_sensor_install_height - range_distance)/20; // in 2 cm
@ -251,10 +279,11 @@ void STS_LMZ_Ambient_Height_Scan_Process(void)
APP_LOG(TS_OFF, VLEVEL_L, "|%3d ", fhmos_bg.h2cm[i]*2);
}
else {
fhmos_bg.h2cm[i] = 0;
APP_LOG(TS_OFF, VLEVEL_L, "|%3d ", fhmos_bg.h2cm[i]);
}
//else {
// fhmos_bg.h2cm[i] = 0;
//APP_LOG(TS_OFF, VLEVEL_L, "|%3d ", fhmos_bg.h2cm[i]);
//}
}
APP_LOG(TS_OFF, VLEVEL_L, "\r\n Thresholds: Headlevel=%4d cm, Gesture Mask off=%d cm, Min body height=%d cm\r\n",