|
@@ -40,6 +40,8 @@
|
|
|
static char msg_pool[256];
|
|
static char msg_pool[256];
|
|
|
|
|
|
|
|
static char rx_buffer[HMI_UART_RXBUFFER_SIZE + 1];
|
|
static char rx_buffer[HMI_UART_RXBUFFER_SIZE + 1];
|
|
|
|
|
+
|
|
|
|
|
+void list_mem(void);
|
|
|
/**/
|
|
/**/
|
|
|
Device_Status_typedef device_status;
|
|
Device_Status_typedef device_status;
|
|
|
|
|
|
|
@@ -61,7 +63,7 @@ rt_device_t serial; /*串口设备句柄*/
|
|
|
static struct rt_messagequeue rx_mq;//接收数据消息队列
|
|
static struct rt_messagequeue rx_mq;//接收数据消息队列
|
|
|
static void HMI_Decode(char *cmd,uint8_t cmd_len);
|
|
static void HMI_Decode(char *cmd,uint8_t cmd_len);
|
|
|
static rt_err_t uart_input(rt_device_t dev, rt_size_t size);
|
|
static rt_err_t uart_input(rt_device_t dev, rt_size_t size);
|
|
|
-void HMI_uart4_init(void)
|
|
|
|
|
|
|
+static int HMI_uart4_init(void)
|
|
|
{
|
|
{
|
|
|
serial = rt_device_find(UART_NAME);
|
|
serial = rt_device_find(UART_NAME);
|
|
|
/*修改串口配置参数*/
|
|
/*修改串口配置参数*/
|
|
@@ -76,7 +78,7 @@ void HMI_uart4_init(void)
|
|
|
//rt_device_open(serial, RT_DEVICE_FLAG_INT_RX);
|
|
//rt_device_open(serial, RT_DEVICE_FLAG_INT_RX);
|
|
|
/* 以 DMA 接收及轮询发送模式打开串口设备 */
|
|
/* 以 DMA 接收及轮询发送模式打开串口设备 */
|
|
|
rt_device_open(serial, RT_DEVICE_FLAG_DMA_RX);
|
|
rt_device_open(serial, RT_DEVICE_FLAG_DMA_RX);
|
|
|
-
|
|
|
|
|
|
|
+ return RT_EOK;
|
|
|
}
|
|
}
|
|
|
/*串口屏写数据*/
|
|
/*串口屏写数据*/
|
|
|
void HMI_WRITE(char *fmt, ...)
|
|
void HMI_WRITE(char *fmt, ...)
|
|
@@ -116,6 +118,7 @@ static rt_err_t uart_input(rt_device_t dev, rt_size_t size)
|
|
|
/*入口函数*/
|
|
/*入口函数*/
|
|
|
static void Hmi_thread_entry(void *parameter)
|
|
static void Hmi_thread_entry(void *parameter)
|
|
|
{
|
|
{
|
|
|
|
|
+
|
|
|
struct rx_msg msg;
|
|
struct rx_msg msg;
|
|
|
rt_err_t result;
|
|
rt_err_t result;
|
|
|
rt_uint32_t rx_length;
|
|
rt_uint32_t rx_length;
|
|
@@ -574,7 +577,7 @@ static void Ctr_Mortor_entry(void* parameter)
|
|
|
{
|
|
{
|
|
|
device_status.clear_status = 0;
|
|
device_status.clear_status = 0;
|
|
|
if(ctr_clear(650)==0)
|
|
if(ctr_clear(650)==0)
|
|
|
- ctr_TG_Clear(200);
|
|
|
|
|
|
|
+ ctr_TG_Clear(250);
|
|
|
}
|
|
}
|
|
|
rt_thread_delay(100);
|
|
rt_thread_delay(100);
|
|
|
//rt_kprintf("action num is:%d%d%d",num_up_open,num_up_close,num_down_open,num_down_close,num_clear);
|
|
//rt_kprintf("action num is:%d%d%d",num_up_open,num_up_close,num_down_open,num_down_close,num_clear);
|
|
@@ -584,7 +587,6 @@ static void Ctr_Mortor_entry(void* parameter)
|
|
|
int Hmi_Fresh(void)
|
|
int Hmi_Fresh(void)
|
|
|
{
|
|
{
|
|
|
//初始化串口4
|
|
//初始化串口4
|
|
|
- HMI_uart4_init();
|
|
|
|
|
rt_err_t ret = RT_EOK;
|
|
rt_err_t ret = RT_EOK;
|
|
|
/* 初始化消息队列 */
|
|
/* 初始化消息队列 */
|
|
|
rt_mq_init(&rx_mq, "rx_mq",
|
|
rt_mq_init(&rx_mq, "rx_mq",
|
|
@@ -636,12 +638,10 @@ void Check_ParamConfig(void)
|
|
|
device_status.rebootcnt++;
|
|
device_status.rebootcnt++;
|
|
|
ef_set_env_blob("reboot_time", &device_status.rebootcnt, sizeof(device_status.rebootcnt));
|
|
ef_set_env_blob("reboot_time", &device_status.rebootcnt, sizeof(device_status.rebootcnt));
|
|
|
rt_kprintf("REBOOT_TIME:%d-%d-%d\n",device_status.rebootcnt,device_status.iSave,device_status.update_flag);
|
|
rt_kprintf("REBOOT_TIME:%d-%d-%d\n",device_status.rebootcnt,device_status.iSave,device_status.update_flag);
|
|
|
- HMI_WRITE("hardcheck.flash.txt=\"READ FLASH OK\"");
|
|
|
|
|
- HMI_WRITE("hardcheck.p8.pic=%d",70);
|
|
|
|
|
|
|
+
|
|
|
}
|
|
}
|
|
|
else {
|
|
else {
|
|
|
- HMI_WRITE("hardcheck.flash.txt=\"ERR\"");
|
|
|
|
|
- HMI_WRITE("hardcheck.p8.pic=%d",72);
|
|
|
|
|
|
|
+ LOG_E("easyflash init ERRPR!!!\n");
|
|
|
}
|
|
}
|
|
|
//保存默认屏幕配置
|
|
//保存默认屏幕配置
|
|
|
if(device_status.iSave!=FLASH_FLAG)
|
|
if(device_status.iSave!=FLASH_FLAG)
|
|
@@ -790,17 +790,13 @@ void Check_ParamConfig(void)
|
|
|
rt_kprintf("数据上传间隔:%d\n",device_status.dattim);
|
|
rt_kprintf("数据上传间隔:%d\n",device_status.dattim);
|
|
|
}
|
|
}
|
|
|
rt_kprintf("当前时间:%04d-%02d-%02d %02d:%02d:%02d\n",tm.tm_year+1900,tm.tm_mon+1,tm.tm_mday,tm.tm_hour,tm.tm_min,tm.tm_sec);
|
|
rt_kprintf("当前时间:%04d-%02d-%02d %02d:%02d:%02d\n",tm.tm_year+1900,tm.tm_mon+1,tm.tm_mday,tm.tm_hour,tm.tm_min,tm.tm_sec);
|
|
|
- HMI_WRITE("hardcheck.tip_rtc.txt=%04d-%02d-%02d %02d:%02d:%02d",tm.tm_year+1900,tm.tm_mon+1,tm.tm_mday,tm.tm_hour,tm.tm_min,tm.tm_sec);
|
|
|
|
|
- HMI_WRITE("hardcheck.p0.pic=%d",70);
|
|
|
|
|
//RTC时间判断,如果当前年份小于2020,提示需要设置时间,切换为光控
|
|
//RTC时间判断,如果当前年份小于2020,提示需要设置时间,切换为光控
|
|
|
- if(tm.tm_year+1900<2020)
|
|
|
|
|
|
|
+ if(tm.tm_year+1900<2021)
|
|
|
{
|
|
{
|
|
|
device_status.timeSwitch = 0;
|
|
device_status.timeSwitch = 0;
|
|
|
//保存光控变量
|
|
//保存光控变量
|
|
|
ef_set_env_blob("timeSwitch", &device_status.timeSwitch, sizeof(device_status.timeSwitch));
|
|
ef_set_env_blob("timeSwitch", &device_status.timeSwitch, sizeof(device_status.timeSwitch));
|
|
|
LOG_E("Time not set:%04d-%02d-%02d %02d:%02d:%02d\n",tm.tm_year+1900,tm.tm_mon+1,tm.tm_mday,tm.tm_hour,tm.tm_min,tm.tm_sec);
|
|
LOG_E("Time not set:%04d-%02d-%02d %02d:%02d:%02d\n",tm.tm_year+1900,tm.tm_mon+1,tm.tm_mday,tm.tm_hour,tm.tm_min,tm.tm_sec);
|
|
|
- HMI_WRITE("hardcheck.tip_rtc.txt=%04d-%02d-%02d %02d:%02d:%02d",tm.tm_year+1900,tm.tm_mon+1,tm.tm_mday,tm.tm_hour,tm.tm_min,tm.tm_sec);
|
|
|
|
|
- HMI_WRITE("hardcheck.p0.pic=%d",71);
|
|
|
|
|
set_date(2020, 1, 1);
|
|
set_date(2020, 1, 1);
|
|
|
set_time(0, 0, 0);
|
|
set_time(0, 0, 0);
|
|
|
}
|
|
}
|
|
@@ -971,5 +967,5 @@ void Debug_log_OFF(void)
|
|
|
}
|
|
}
|
|
|
MSH_CMD_EXPORT(Debug_log_ON,Debug_log_ON);
|
|
MSH_CMD_EXPORT(Debug_log_ON,Debug_log_ON);
|
|
|
MSH_CMD_EXPORT(Debug_log_OFF,Debug_log_OFF);
|
|
MSH_CMD_EXPORT(Debug_log_OFF,Debug_log_OFF);
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
|
|
+//
|
|
|
|
|
+INIT_BOARD_EXPORT(HMI_uart4_init);
|