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

minor changes

This commit is contained in:
Yunhorn 2024-12-11 13:07:08 +08:00
parent 8b67118d04
commit a1b5959f3a
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LoRaWAN/App/lora_app.c
View File

@ -1196,7 +1196,7 @@ static void SendTxData(void)
if ((fhmos_data.state_fall ==3)||(fhmos_data.state_occupancy ==3)||(fhmos_data.state_human_movement ==3))
{
AppData.Buffer[i++] = 10;
AppData.Buffer[i++] = 0x03; // payload type, 0x01= regular payload
AppData.Buffer[i++] = 0x04; // payload type, 0x01= regular payload
AppData.Buffer[i++] = fhmos_data.state_fall;
AppData.Buffer[i++] = fhmos_data.state_human_movement;
AppData.Buffer[i++] = fhmos_data.state_occupancy;

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.

10
STS/Core/Src/yunhorn_sts_process.c
View File

@ -1994,10 +1994,10 @@ void STS_FHMOS_sensor_upload_map(uint8_t map_index)
sts_fhmos_bitmap_pending = 2;
} else if (map_index == 0x01)
} else if (map_index == 0x03)
{
tstbuf[i++] = (uint8_t) (9)&0xff; //length of following data
tstbuf[i++] = (uint8_t) 0x01; // payload type 0x02=Gesture map
tstbuf[i++] = (uint8_t) 0x03; // payload type 0x02=Gesture map
// MASK OFF background mask bitmap
tstbuf[i++] = (uint8_t) (sts_mask_bitmap[0]);
tstbuf[i++] = (uint8_t) (sts_mask_bitmap[1]);
@ -2088,7 +2088,7 @@ void STS_SENSOR_Function_Test_Process(void)
#if (defined(STS_P2)||defined(STS_T6))||defined(L8)
STS_SENSOR_MEMS_Get_ID(&sensor_id);
printf("\r\n Sensor id =%04x \r\n", sensor_id);
APP_LOG(TS_OFF, VLEVEL_M, "\r\n Sensor id =%04x \r\n", sensor_id);
#if defined(L8)
if (((sensor_id & 0xff)!= 0x0C) && (((sensor_id >>8) & 0xFF)!=0xF0)) // no VL53L8X found
{
@ -3146,7 +3146,7 @@ void STS_Combined_Status_Processing(void)
if ((sts_hall1_read == STS_Status_Door_Open) && (sts_hall2_read == STS_Status_SOS_Release))
{
sts_status_color = STS_VACANT_COLOR;
printf("\r\n ********* --1--- combined process Vacant color = 0x%02x \r\n", sts_status_color);
APP_LOG(TS_OFF, VLEVEL_M, "\r\n ********* --1--- combined process Vacant color = 0x%02x \r\n", sts_status_color);
//} else if ((sts_reed_hall_1_result == STS_Status_Door_Close )|| (sts_reed_hall_2_result == STS_Status_SOS_Pushdown ))
//|| (sts_fhmos_result != STS_FHMOS_FALL_STATE_NO_OCCUPY))
@ -3182,7 +3182,7 @@ void STS_Combined_Status_Processing(void)
#endif
//printf("\r\n ********* combined process finished status color = %d \r\n", sts_status_color);
sts_lamp_bar_color = sts_status_color;
printf("\r\n COMBINED: sts-lamp_bar-color =0x%02x \r\n", sts_lamp_bar_color);
APP_LOG(TS_OFF, VLEVEL_M, "\r\n COMBINED: sts-lamp_bar-color =0x%02x \r\n", sts_lamp_bar_color);
}