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

add blackOutTag logic to eliminate higher temp impact such as human body

This commit is contained in:
Yunhorn 2024-01-05 17:34:33 +08:00
parent 2c1b731cb9
commit 4d1ce540dd
1 changed files with 6 additions and 6 deletions

12
mlx90640/mlx90640_lcd_display.c
View File

@ -383,7 +383,7 @@ void blackOutFilter(void)
void STS_M1A_SENSOR_Read(STS_M1A_SensorDataTypeDef *m1a_data)
{
m1a_data->waterSpillCount = waterSpillCount;
m1a_data->waterSpillCount = blackOutTag==0?waterSpillCount:0;
m1a_data->spillage_level = (uint8_t)(waterSpillCount*99/560.0); //((ROW-2)*(COL-2))); // (24-4) * (32 -4) minus edge dots
m1a_data->averageTemp = averageTemp;
m1a_data->averageTempInner = averageTempInner;
@ -392,11 +392,11 @@ void STS_M1A_SENSOR_Read(STS_M1A_SensorDataTypeDef *m1a_data)
m1a_data->maxTemp = maxTemp;
m1a_data->v_water_cnt = v_water_cnt;
m1a_data->h_water_cnt = h_water_cnt;
m1a_data->spot_cnt = spot_cnt; //max(v_water_cnt, h_water_cnt);
m1a_data->spot_cnt = blackOutTag ==0? spot_cnt:0; //max(v_water_cnt, h_water_cnt);
//memcpy((void *)m1a_data->waterSpillMatrix,(const void *) zoneMask,sizeof(zoneMask));
uint8_t i=0;
if (spot_cnt != 0) {
if ((spot_cnt != 0) && (blackOutTag == 0)) {
//bubbleSort((uint8_t*)upMask, (ROW/3)*(COL/3), (uint8_t*)order);
bubbleSort((void *)upMask, 80, (void *)order);
@ -417,12 +417,12 @@ void STS_M1A_SENSOR_Read(STS_M1A_SensorDataTypeDef *m1a_data)
memset(tempBuffer,0x0,sizeof(tempBuffer));
sprintf(tempBuffer,(char *)"\r\n## Blackout ==== %u ######\r\n\n##Read Sensor Spot CNT=%4d (areas) \r\n## V_cnt=%2d (lane) H_cnt=%2d (lane) \r\n## Spillage Level =%2.2f%% \r\n## averageTempInner=%2.2f C averageTemp=%2.2f C centerTemp=%2.2f C MinTemp=%2.2f C maxTemp=%2.2f C \r\n ######## Gap_Average= %2.2f Gap_Inner = %2.2f \r\n",
blackOutTag, m1a_data->waterSpillCount, v_water_cnt, h_water_cnt, (float)(m1a_data->spillage_level), (float)averageTempInner, (float)averageTemp, (float)centerTemp, (float)minTemp, (float)maxTemp, (float)(averageTemp - minTemp),(float)(averageTempInner - minTemp));
sprintf(tempBuffer,(char *)"\r\n## Blackout=%u ######\n##Read Sensor Spot CNT=%4d (areas) \r\n## V_cnt=%2d (lane) H_cnt=%2d (lane) \r\n## Spillage Level =%02.2f%% \r\n## averageTempInner=%02.2f C averageTemp=%02.2f C centerTemp=%.2f C MinTemp=%02.2f C maxTemp=%02.2f C \r\n ######## Gap_Average= %02.2f Gap_Inner = %02.2f \r\n",
(uint8_t)blackOutTag, (uint8_t)m1a_data->waterSpillCount, (uint8_t)v_water_cnt, (uint8_t)h_water_cnt, (float)(m1a_data->spillage_level), (float)averageTempInner, (float)averageTemp, (float)centerTemp, (float)minTemp, (float)maxTemp, (float)(averageTemp - minTemp),(float)(averageTempInner - minTemp));
APP_LOG(TS_OFF, VLEVEL_H,(char *)tempBuffer);
if (m1a_data->spot_cnt !=0 )
if ((m1a_data->spot_cnt !=0 ) && (blackOutTag == 0))
{
for (uint8_t i=0; i< 4; i++) {
memset(tempBuffer,0x0,sizeof(tempBuffer));