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

remove unused code

This commit is contained in:
Yunhorn 2023-12-28 11:10:17 +08:00
parent f8fe7a445f
commit 62cccb2ccf
6 changed files with 102 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Core/Inc/yunhorn_sts_prd_conf.h
View File

@ -298,6 +298,9 @@
#define sts_version 1U
#define sts_senddataport (YUNHORN_STS_M1A_LORA_APP_DATA_PORT)
#define sts_sendhtbtport (YUNHORN_STS_M1A_LORA_APP_HTBT_PORT)
#define CFG_CMD_TMG_SIZE 6U
#endif
#define sts_appctrlport (YUNHORN_STS_USER_APP_CTRL_PORT)

7
Core/Inc/yunhorn_sts_sensors.h
View File

@ -47,7 +47,12 @@ enum cfg_cmd_order{
CFG_CMD3, // # Z {H, S, C} M {0,1,2,3,4]
CFG_CMD4, // #
CFG_CMD5, // 'S','M','H'
CFG_CMD6
CFG_CMD6,
CFG_CMD7,
CFG_CMD8,
CFG_CMD9,
CFG_CMD10,
CFG_CMD11
};
enum p_cmd_order{
P_CMD=0, //'P' //P_MTM_CODE, // #1

74
LoRaWAN/App/lora_app.c
View File

@ -60,7 +60,11 @@ extern volatile int sts_tof_distance_data[MAX_TOF_COUNT];
volatile uint32_t SamplingPeriodicity = 1000; //unit ms
volatile uint32_t HeartBeatPeriodicity = 120000; //unit ms
volatile uint8_t STS_LoRa_WAN_Joined = 0;
#ifdef STS_TMG
extern volatile uint8_t waterTempThreshold;
extern volatile uint8_t normalPeopleTemp;
extern volatile uint8_t normalWaterTemp;
#endif
volatile uint8_t heart_beat_timer =0;
char outbuf[128]="";
volatile uint8_t upload_message_timer =0;
@ -1809,6 +1813,7 @@ void USER_APP_AUTO_RESPONDER_Parse(char *tlv_buf, size_t tlv_buf_size)
uint8_t j=0;
if (mems_ver == sts_version)
{ // Firmware version or Variation of MEMS/component
#ifdef YUNHORN_STS_O6_ENABLED
if (tlv_buf_size >= CFG_CMD_TOF_SIMPLE_SIZE)
{
//Validation check
@ -1849,7 +1854,74 @@ void USER_APP_AUTO_RESPONDER_Parse(char *tlv_buf, size_t tlv_buf_size)
OnStoreSTSCFGContextRequest();
}
#endif
#ifdef STS_TMG
/* YUNHORN TODO XXXXXX
P # # A # #
+--------------- HW VER
+------------- SW VER
+ ---------- TYPE OF PARAMETER
'W': Water threshold
'A': Average Temperature
'H': Human Body Temperature
+ -------- MSB OF PARAMETER
+ ------ LSB OF PARAMTER
*/
if (tlv_buf_size >= CFG_CMD_TMG_SIZE)
{
//Validation check
invalid_flag = 0;
if (tlv_buf[CFG_CMD4] == 'W') {
if ((tlv_buf[CFG_CMD5]>='0')&&(tlv_buf[CFG_CMD6]<='9')&&(tlv_buf[CFG_CMD5]>='0')&&(tlv_buf[CFG_CMD5]<='9')) {
//volatile uint8_t waterTempThreshold=15, normalWaterTemp=25;
waterTempThreshold = (tlv_buf[CFG_CMD5]-0x30)*10+(tlv_buf[CFG_CMD6]-0x30);
} else {
invalid_flag = 1;
}
}
for (j =0; j < CFG_CMD_TMG_SIZE; j++)
{
sts_cfg_nvm.p[j] = (uint8_t)((tlv_buf[CFG_CMD4+j] - 0x30)&0xff);
APP_LOG(TS_OFF,VLEVEL_H,"\r\n tlv_buf %d = %02x cfg->p[%d]=%02x \r\n",
j,tlv_buf[CFG_CMD4+j], j, sts_cfg_nvm.p[j]);
}
//STS_PRESENCE_SENSOR_NVM_CFG_SIMPLE();
STS_SENSOR_NVM_CFG_SIMPLE();
i=0; // Step 1: Prepare status update message
outbuf[i++] = (char) 'P';
outbuf[i++] = sts_mtmcode1;
outbuf[i++] = sts_mtmcode2;
outbuf[i++] = sts_version;
outbuf[i++] = sts_hardware_ver;
for (j=0; j < CFG_CMD_TMG_SIZE; j++)
{
outbuf[i++] = (uint8_t)(sts_cfg_nvm.p[j]+0x30)&0xff;
}
APP_LOG(TS_OFF, VLEVEL_H, "###### RSS Simple CFG=%s\r\n",*outbuf);
// Step 2: Save valid config to NVM
sts_cfg_nvm.mtmcode1 = sts_mtmcode1;
sts_cfg_nvm.mtmcode2 = sts_mtmcode2;
sts_cfg_nvm.version = sts_version;
sts_cfg_nvm.hardware_ver = sts_hardware_ver;
sts_cfg_nvm.work_mode = sts_work_mode;
sts_cfg_nvm.sts_service_mask = sts_service_mask;
sts_cfg_nvm.length = CFG_CMD_TMG_SIZE;
OnStoreSTSCFGContextRequest();
}
#endif
// Invalid parameters
// Step 1/2: Prepare status update message
if (invalid_flag == 1)

10
STM32CubeIDE/.project
View File

@ -522,16 +522,6 @@
<type>1</type>
<locationURI>copy_PARENT/mlx90640/mlx90640_lcd_display.c</locationURI>
</link>
<link>
<name>Application/User/MLX90640/mlx90640_user.c</name>
<type>1</type>
<locationURI>copy_PARENT/mlx90640/mlx90640_user.c</locationURI>
</link>
<link>
<name>Application/User/MLX90640/st7789.c</name>
<type>1</type>
<locationURI>copy_PARENT/mlx90640/st7789.c</locationURI>
</link>
<link>
<name>Application/User/MLX90640/stm32_hx8347d_lcd.c</name>
<type>1</type>

2
STM32CubeIDE/Release/objects.list
View File

@ -31,8 +31,6 @@
"./Application/User/MLX90640/MLX90640_I2C_Driver.o"
"./Application/User/MLX90640/hx8347d.o"
"./Application/User/MLX90640/mlx90640_lcd_display.o"
"./Application/User/MLX90640/mlx90640_user.o"
"./Application/User/MLX90640/st7789.o"
"./Application/User/MLX90640/stm32_hx8347d_lcd.o"
"./Application/User/Startup/startup_stm32wl55jcix.o"
"./Application/User/TOF/App/X-WL55_WLE5_53L0X.o"

37
mlx90640/mlx90640_lcd_display.c
View File

@ -21,7 +21,7 @@ paramsMLX90640 mlx90640;
static uint16_t eeMLX90640[832];
int status;
volatile uint8_t draw_legend_once=0, normalPeopleTemp=32, blackOutTag=0;
volatile uint8_t waterTempThreshold=18, normalWaterTemp=25;
volatile uint8_t waterTempThreshold=15, normalWaterTemp=25;
volatile uint8_t detectCycle=0, v_water_cnt=0,h_water_cnt=0, spot_cnt=0;
// start with some initial colors
volatile float minTemp = -20.0f;
@ -30,7 +30,7 @@ volatile float centerTemp=0.0f;
volatile float averageTemp=0.0f;
volatile uint16_t waterSpillCount=0;
extern volatile uint8_t sensor_data_ready;
char tempBuffer[128];
char tempBuffer[256];
// variables for interpolated colors
uint8_t red, green, blue;
@ -249,7 +249,7 @@ static void drawPicture(void)
v_1++;
}
}
for (y=12; y<ROW-1; y++) {
for (y=12; y<ROW; y++) {
if ((1 == v_cnt[y]) && (0 == v_cnt[y-1])) {
v_2++;
}
@ -308,9 +308,12 @@ void blackOutFilter(void)
*/
// ignore edge of FOV
waterSpillCount =0;
for (y=1; y<ROW-1; y++)
detectCycle = 0;
do
{
for (y=1; y<ROW; y++)
{
for (x=1; x<COL-1; x++)
for (x=1; x<COL; x++)
{
temp1 = (float)tempValues[(x) + (y*COL)];
temph1 = (float)tempValues[(x) + (y-1)*COL];
@ -342,15 +345,11 @@ void blackOutFilter(void)
}
}
if (detectCycle ++ > 20)
{
detectCycle = 0;
detectCycle ++;
memset((void *)zoneMask,0,sizeof(zoneMask));
memset((void *)edgeMask, 0, sizeof(edgeMask));
memset((void *)upMask, 0, sizeof(upMask));
}
} while (detectCycle <30);
waterSpillCount /=30;
}
@ -359,7 +358,7 @@ void STS_M1A_SENSOR_Read(STS_M1A_SensorDataTypeDef *m1a_data)
{
m1a_data->waterSpillCount = waterSpillCount;
m1a_data->spillage_level = (uint8_t)((int)waterSpillCount*99/((ROW-2)*(COL-2)))&0xff; // (24-4) * (32 -4) minus edge dots
m1a_data->spillage_level = (uint8_t)(waterSpillCount*99/80); //((ROW-2)*(COL-2))); // (24-4) * (32 -4) minus edge dots
m1a_data->averageTemp = averageTemp;
m1a_data->centerTemp = centerTemp;
m1a_data->minTemp = minTemp;
@ -388,8 +387,8 @@ void STS_M1A_SENSOR_Read(STS_M1A_SensorDataTypeDef *m1a_data)
memset(tempBuffer,0,sizeof(tempBuffer));
sprintf(tempBuffer,(char *)"Read Sensor Spot CNT=%4d V_cnt=%2d H_cnt=%2d Spillage Level =%2d average=%2.2fC center=%2.2fC min=%2.2fC max=%2.2fC \r\n",
m1a_data->waterSpillCount, v_water_cnt, h_water_cnt, m1a_data->spillage_level, (float)averageTemp, (float)centerTemp, (float)minTemp, (float)maxTemp);
sprintf(tempBuffer,(char *)"\r\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## averageTemp=%2.2f C centerTemp=%2.2f C MinTemp=%2.2f C maxTemp=%2.2f C \r\n",
m1a_data->waterSpillCount, v_water_cnt, h_water_cnt, (float)(m1a_data->spillage_level), (float)averageTemp, (float)centerTemp, (float)minTemp, (float)maxTemp);
APP_LOG(TS_OFF, VLEVEL_L,(char *)tempBuffer);
@ -408,6 +407,10 @@ void STS_M1A_SENSOR_Read(STS_M1A_SensorDataTypeDef *m1a_data)
void mlx90640_display_process(void)
{
memset((void *)zoneMask, 0,sizeof(zoneMask));
memset((void *)edgeMask, 0, sizeof(edgeMask));
memset((void *)upMask, 0, sizeof(upMask));
readTempValues();
setTempScale();
blackOutFilter();
@ -430,7 +433,7 @@ void mlx90640_display_process(void)
//BSP_LCD_DisplayOff();
}
#endif
APP_LOG(TS_OFF, VLEVEL_L, "Water Spill Detected Level = %d of 768 \r\n", waterSpillCount);
APP_LOG(TS_OFF, VLEVEL_L, "Water Spill Detected Level = %d of 600 \r\n", waterSpillCount);
}
uint8_t mlx90640_bringup_test(void)
@ -477,7 +480,7 @@ static void bubbleSort(uint8_t arr[], uint8_t len, uint8_t order[])
{
uint8_t i, j, temp, t1;
for (j=0; j < len ; j++) {
order[j] = 1+j;
order[j] = j;
}
for (i = 0; i < len - 1; i++) {
for (j = 0; j < len - i - 1; j++) {