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

RM2_1 #2

Merged
sundp merged 208 commits from RM2_1 into master 2024-09-13 09:16:14 +08:00
Conversation 0 Commits 208 Files Changed 112 +17 -20
2 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 079734e74c - Show all commits

8
Core/Src/yunhorn_sts_process.c
View File

@ -102,7 +102,7 @@ extern uint8_t luminance_level;
extern volatile uint8_t sts_status_color; extern volatile uint8_t sts_status_color;
extern volatile uint8_t sts_lamp_bar_color; //puColor extern volatile uint8_t sts_lamp_bar_color; //puColor
extern volatile uint8_t sts_cloud_netcolor; //netColor extern volatile uint8_t sts_cloud_netcolor; //netColor
extern volatile bool p2_work_finished;
volatile uint8_t sts_tof_result_changed_flag = 0; volatile uint8_t sts_tof_result_changed_flag = 0;
volatile uint8_t sts_rss_result_changed_flag = 0; volatile uint8_t sts_rss_result_changed_flag = 0;
@ -245,7 +245,7 @@ extern volatile uint32_t wcnt;
*/ */
void STS_YunhornSTSEventP2_Process(void) void STS_YunhornSTSEventP2_Process(void)
{ {
p2_work_finished=false;
//STS_Lamp_Bar_Refresh(); //TODO XXX eliminate refresh every second.... try //STS_Lamp_Bar_Refresh(); //TODO XXX eliminate refresh every second.... try
if ((sts_work_mode >= STS_RSS_MODE) && (sts_work_mode <= STS_TOF_RSS_MODE)) if ((sts_work_mode >= STS_RSS_MODE) && (sts_work_mode <= STS_TOF_RSS_MODE))
{ {
@ -265,7 +265,7 @@ void STS_YunhornSTSEventP2_Process(void)
STS_Combined_Status_Processing(); STS_Combined_Status_Processing();
} }
p2_work_finished=true;
} }
void STS_Reed_Hall_Presence_Detection(void) void STS_Reed_Hall_Presence_Detection(void)
@ -634,7 +634,7 @@ void STS_Combined_Status_Processing(void)
#ifdef STS_M1 #ifdef STS_M1
sts_water_leakage_changed_flag=0; sts_water_leakage_changed_flag=0;
#endif #endif
//sensor_data_ready = 1; sensor_data_ready = 1;
//STS_PRESENCE_SENSOR_Prepare_Send_Data(); //STS_PRESENCE_SENSOR_Prepare_Send_Data();
} }
#endif #endif

29
LoRaWAN/App/lora_app.c
View File

@ -686,7 +686,7 @@ void LoRaWAN_Init(void)
#if defined(STS_O7)||defined(STS_O6) #if defined(STS_O7)||defined(STS_O6)
UTIL_TIMER_Create(&YunhornSTSRSSWakeUpTimer, UTIL_TIMER_Create(&YunhornSTSRSSWakeUpTimer,
YUNHORN_STS_RSS_WAKEUP_CHECK_TIME, YUNHORN_STS_RSS_WAKEUP_CHECK_TIME,
UTIL_TIMER_PERIODIC, OnYunhornSTSOORSSWakeUpTimerEvent, NULL); UTIL_TIMER_ONESHOT, OnYunhornSTSOORSSWakeUpTimerEvent, NULL);
UTIL_TIMER_Start(&YunhornSTSRSSWakeUpTimer); UTIL_TIMER_Start(&YunhornSTSRSSWakeUpTimer);
UTIL_TIMER_Create(&YunhornSTSHeartBeatTimer, UTIL_TIMER_Create(&YunhornSTSHeartBeatTimer,
@ -1296,7 +1296,8 @@ static void OnYunhornSTSDurationCheckTimerEvent(void *context)
if (over_threshold == TRUE) { if (over_threshold == TRUE) {
sensor_data_ready = 1; sensor_data_ready = 1;
sts_lamp_bar_color = sts_lamp_bar_flashing_color; sts_status_color = STS_RED_DARK;
sts_lamp_bar_color = STS_RED_DARK; //sts_lamp_bar_flashing_color;
SendTxData(); SendTxData();
over_threshold = FALSE; over_threshold = FALSE;
} }
@ -1630,23 +1631,19 @@ static void OnRestoreContextRequest(void *nvm, uint32_t nvm_size)
*/ */
static void OnYunhornSTSOORSSWakeUpTimerEvent(void *context) static void OnYunhornSTSOORSSWakeUpTimerEvent(void *context)
{ {
if (p2_work_finished) UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_YunhornSTSEventP2), CFG_SEQ_Prio_0);
//APP_LOG(TS_OFF,VLEVEL_L,"\r\n RSS result changed flag=%d \r\n", sts_rss_result_changed_flag);
if ((STS_LoRa_WAN_Joined != 0)&&(sts_rss_result_changed_flag==1))
{ {
sts_rss_result_changed_flag = 0;
UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_YunhornSTSEventP2), CFG_SEQ_Prio_0); UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0);
//APP_LOG(TS_OFF,VLEVEL_L,"\r\n RSS result changed flag=%d \r\n", sts_rss_result_changed_flag); //if ((last_sts_rss_result ==STS_RESULT_NO_MOTION)&& (sts_rss_result==STS_RESULT_MOTION))
if ((STS_LoRa_WAN_Joined != 0)&&(sts_rss_result_changed_flag==1)) {
{ //OnSensor3StateChanged();
sts_rss_result_changed_flag = 0; }
UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0);
//if ((last_sts_rss_result ==STS_RESULT_NO_MOTION)&& (sts_rss_result==STS_RESULT_MOTION))
{
//OnSensor3StateChanged();
}
}
} }
//UTIL_TIMER_Start(&YunhornSTSRSSWakeUpTimer); UTIL_TIMER_Start(&YunhornSTSRSSWakeUpTimer);
} }