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

workable

This commit is contained in:
Yunhorn 2025-05-16 18:33:18 +08:00
parent ef276c57f9
commit 6fb2656e32
6 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LoRaWAN/App/lora_app.c
View File

@ -672,7 +672,7 @@ void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin)
{ {
case BUT1_Pin: case BUT1_Pin:
/* Note: when "EventType == TX_ON_TIMER" this GPIO is not initialized */ /* Note: when "EventType == TX_ON_TIMER" this GPIO is not initialized */
HAL_Delay(250); HAL_Delay(100);
__HAL_GPIO_EXTI_CLEAR_IT(GPIO_Pin); __HAL_GPIO_EXTI_CLEAR_IT(GPIO_Pin);
//__HAL_GPIO_EXTI_CLEAR_IT(GPIO_Pin); //__HAL_GPIO_EXTI_CLEAR_IT(GPIO_Pin);
sts_hall1_read = HALL1_STATE; sts_hall1_read = HALL1_STATE;

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

@ -231,7 +231,7 @@ volatile uint8_t sts_water_leakage_changed_flag=0;
volatile uint8_t sts_reed_hall_1_result=STS_Status_Door_Open, sts_reed_hall_2_result=STS_Status_SOS_Release; volatile uint8_t sts_reed_hall_1_result=STS_Status_Door_Open, sts_reed_hall_2_result=STS_Status_SOS_Release;
volatile uint8_t sts_reed_hall_3_result, sts_reed_hall_4_result; volatile uint8_t sts_reed_hall_3_result, sts_reed_hall_4_result;
volatile uint8_t sts_fhmos_result=STS_FHMOS_FALL_STATE_NO_OCCUPY; volatile uint8_t sts_fhmos_result=STS_FHMOS_FALL_STATE_NO_OCCUPY;
volatile uint8_t sts_fhmos_bitmap_pending=0; volatile uint8_t sts_fhmos_bitmap_pending=FHMOS_BITMAP_BLANK;
#endif #endif
@ -559,7 +559,7 @@ void STS_YunhornSTSEventP5_Process(void)
} }
#if 1 #if 1
if (sts_fhmos_bitmap_pending == 1) if (sts_fhmos_bitmap_pending == FHMOS_BITMAP_GENERATED)
{ {
APP_LOG(TS_OFF, VLEVEL_M, "\r\n Upload Fall Gesture Type 2 \r\n"); APP_LOG(TS_OFF, VLEVEL_M, "\r\n Upload Fall Gesture Type 2 \r\n");
STS_FHMOS_sensor_upload_map(0x02); STS_FHMOS_sensor_upload_map(0x02);
@ -2040,7 +2040,7 @@ void STS_FHMOS_sensor_upload_map(uint8_t map_index)
APP_LOG(TS_OFF, VLEVEL_M, "\r\n Bitmap uploading, size=%02x\r\n", i); APP_LOG(TS_OFF, VLEVEL_M, "\r\n Bitmap uploading, size=%02x\r\n", i);
STS_SENSOR_Upload_Message(YUNHORN_STS_L8_LORA_APP_DATA_PORT, i, (uint8_t *)tstbuf); STS_SENSOR_Upload_Message(YUNHORN_STS_L8_LORA_APP_DATA_PORT, i, (uint8_t *)tstbuf);
sts_fhmos_bitmap_pending = 2; sts_fhmos_bitmap_pending = FHMOS_BITMAP_FINISHED; // 2;
APP_LOG(TS_OFF, VLEVEL_M, "\r\n +++++++++++++++++++++++ \r\nBitmap Pending uploaded\r\n"); APP_LOG(TS_OFF, VLEVEL_M, "\r\n +++++++++++++++++++++++ \r\nBitmap Pending uploaded\r\n");
} }
#endif #endif
@ -2544,7 +2544,7 @@ void YunhornSTSDurationCheckTimer(void)
over_threshold |= 1<<6; over_threshold |= 1<<6;
// upload state confirm message // upload state confirm message
if (sts_fhmos_bitmap_pending == 0) if (sts_fhmos_bitmap_pending == FHMOS_BITMAP_BLANK)
{ {
//APP_LOG(TS_OFF, VLEVEL_M, "\r\nGenerate Fall Gesture Map\r\n"); //APP_LOG(TS_OFF, VLEVEL_M, "\r\nGenerate Fall Gesture Map\r\n");
UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0); UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0);
@ -2596,7 +2596,7 @@ void YunhornSTSDurationCheckTimer(void)
if (STS_Status_Door_Close == sts_hall1_read) if (STS_Status_Door_Close == sts_hall1_read)
fhmos_data.state_fall = STS_FHMOS_FALL_STATE_NORMAL; // 2025 04 18 fhmos_data.state_fall = STS_FHMOS_FALL_STATE_NORMAL; // 2025 04 18
fhmos_data.state_fall_released = 1; fhmos_data.state_fall_released = 1;
sts_fhmos_bitmap_pending = 0; sts_fhmos_bitmap_pending = FHMOS_BITMAP_BLANK;
over_threshold &= ~0x40; over_threshold &= ~0x40;
over_threshold &= ~0x80; over_threshold &= ~0x80;

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

@ -425,7 +425,7 @@ void sts_generate_fall_gesture_map(void)
printf("%02X\r\n",fhmos_gesture_bitmap[i]); printf("%02X\r\n",fhmos_gesture_bitmap[i]);
#endif #endif
sts_fhmos_bitmap_pending = 1; sts_fhmos_bitmap_pending = FHMOS_BITMAP_GENERATED;
APP_LOG(TS_OFF, VLEVEL_L, "\r\n Fall Gesture bitmap Generated\r\n"); APP_LOG(TS_OFF, VLEVEL_L, "\r\n Fall Gesture bitmap Generated\r\n");
} }
uint16_t MX_TOF_Ranging_Process(void) uint16_t MX_TOF_Ranging_Process(void)
@ -716,7 +716,7 @@ static void print_result(RANGING_SENSOR_Result_t *Result)
} else if ((head_distance_from_ceiling < (factor2_head_level_from_floor - 150))) // TODO XXX 50mm gap to avoid flapping back and forth } else if ((head_distance_from_ceiling < (factor2_head_level_from_floor - 150))) // TODO XXX 50mm gap to avoid flapping back and forth
{ {
sts_head_level_low = 0; sts_head_level_low = 0;
sts_fhmos_bitmap_pending = 0; sts_fhmos_bitmap_pending = FHMOS_BITMAP_BLANK;
to_confirm = 0; to_confirm = 0;
} }

5
STS/TOF/App/app_tof.h
View File

@ -55,6 +55,11 @@ typedef enum {
STS_TOF_VL53L7X STS_TOF_VL53L7X
} vl53lx_model; } vl53lx_model;
typedef enum {
FHMOS_BITMAP_BLANK=0,
FHMOS_BITMAP_GENERATED,
FHMOS_BITMAP_FINISHED
} fhmos_bitmap_state;
#ifdef __cplusplus #ifdef __cplusplus
} }