2024-05-31

Application/os-app.c

@@ -12,6 +12,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include "mqtt-board.h"
+#include "relay-board.h"
 #include "data.h"
 uint32_t os_timer_count = 1;
 
@@ -38,7 +39,7 @@ static rt_timer_t locktimer;
 static void locktimerouter (void* parameter)
 {
 	// todo 关闭定时器
-	HAL_GPIO_WritePin (LOCK_GPIO_Port, LOCK_Pin, GPIO_PIN_RESET);
+	MX_Relay_Push(RELAYDoor,RELAY_DISC);
 }
 
 static void thread_entry (void *parameter)
@@ -68,6 +69,7 @@ static void thread_entry (void *parameter)
 	//gCommEvents =   rt_event_create ("gCommEvents", RT_IPC_FLAG_FIFO)  ;
 
 	locktimer = rt_timer_create ("locktimer", locktimerouter, RT_NULL, 1000, RT_TIMER_FLAG_ONE_SHOT); // 异常检测定时器
+	RtcThreadStart ();
 	SluiceThreadStart();  // 闸门控制线程
 	U4851ThreadStart();   // 4851采集线程
 	U4852ThreadStart();   // 4852采集线程
@@ -89,7 +91,7 @@ static void thread_entry (void *parameter)
 		if (RT_EOK == rt_event_recv (gCtrlEvents, EVENT_CTRL_SET_UNLOCK, RT_EVENT_FLAG_AND | RT_EVENT_FLAG_CLEAR, 2000, RT_NULL)) // 数据接受失败，上报异常状态
 		{
 			// todo: 打开继电器，开启定时器
-			HAL_GPIO_WritePin (LOCK_GPIO_Port, LOCK_Pin, GPIO_PIN_SET);
+			MX_Relay_Push(RELAYDoor,RELAY_CONN);
 			rt_timer_start (locktimer);
 		}
 	}

Application/os-app.h

@@ -64,10 +64,14 @@
 #define CFG_THREAD_PRIORITY         		13    // 优先级
 #define CFG_THREAD_TIMESLICE       			5
 
-// UI线程
+// 升级
 #define UPGRADE_THREAD_PRIORITY         		12    // 优先级
 #define UPGRADE_THREAD_TIMESLICE       			5
 
+// RTC
+#define RTC_THREAD_PRIORITY         		11    // 优先级
+#define RTC_THREAD_TIMESLICE       			5
+
 int ThreadNewOsApp (void);
 
 void SluiceThreadStart (void);
@@ -84,6 +88,7 @@ void CAT1ThreadStart (void);
 void ZS001ThreadStart (void);
 void MJEth1ThreadStart (void);
 void UpgradeThreadStart (void);
+void RtcThreadStart (void);
 
 #define EVENT_CTRL_SET_OPT_SLU	 	(1U<< 0) // 发送开度控制到提闸线程
 #define EVENT_CTRL_SET_STP_SLU	 	(1U<< 1) // 发送停止控制到提闸线程
@@ -118,6 +123,7 @@ void UpgradeThreadStart (void);
 #define EVENT_TRIG_COMM_RX      (1U << 6) // MQTT 接受到数据
 #define EVENT_TRIG_COMM_RST     (1U << 7) // MQTT 发送数据
 #define EVENT_TRIG_UPGRADE_RX   (1U << 8) // MQTT 接受到数据
+#define EVENT_TRIG_NETMODE_TX2  (1U << 9) // 通过网络模块向通道2发送数据
 
 
 #define MAIL_COMM_HEART    0
@@ -127,6 +133,7 @@ void UpgradeThreadStart (void);
 #define MAIL_COMM_UPACK    4 // 提闸的ACK
 #define MAIL_COMM_SLACK    5 // 其他的ACK
 #define MAIL_COMM_READPARA 6 // 读取参数
+#define MAIL_COMM_ACK	   7 // 读取参数
 
 #define MAIL_SLUICE_OPT    0
 #define MAIL_SLUICE_STP    1
@@ -134,10 +141,10 @@ void UpgradeThreadStart (void);
 #define MAIL_SLUICE_SDW    3
 
 
-#define MAIL_CT_OPT	0
-#define MAIL_CT_SUP	1
-#define MAIL_CT_SDW	2
-#define MAIL_CT_STP	3
+#define MAIL_CT_OPT	0   // 执行
+#define MAIL_CT_SUP	1   // 上升
+#define MAIL_CT_SDW	2   // 下降
+#define MAIL_CT_STP	3   // 停止
 
 #define MAIL_VIEW_LOGIN		1  // 登录成功 需要跳转页面
 #define MAIL_VIEW_FLUSH		2  // 刷新界面显示