chenzongxiong/Leakage-Control
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update：main V0.005.0、hmi V1.4

Browse Source 
main
1、MODBUS_TCP增加3个port口，总计4个port口供主机读取数据；
2、修复历史报警记录靠前条数不是最新的报警信息BUG;
3、修复MODBUS_TCP写寄存器时解析数据的异常BUG;

hmi
1、MODBUS_TCP设置界面增加3个port口，总计4个port口进行设置；
This commit is contained in:
guanyejian
2026-06-05 17:48:48 +08:00
parent 786b29bb85
commit 118727b491
15 changed files with 3980 additions and 5461 deletions
Download Patch File Download Diff File Expand all files Collapse all files
leakage_system/usr/app/app.c
+4 -4
View File
@@ -23,7 +23,7 @@
#include "gui_tjc_hmi.h"
const char *HwVersion = "V2.0";
char SwVersion[24] = "V0.004.0";
char SwVersion[24] = "V0.005.0";
void task_idle(void);
void task_10ms(void);
void task_50ms(void);
@@ -60,7 +60,7 @@ void app_init(void)
Wdg.Init();
/*flash*/
w25q32.init();
Wdg.Feed();
// HAL_Delay(5000);
/*串口初始化*/
@@ -69,10 +69,10 @@ void app_init(void)
com_uart3.init(&com_uart3);
com_uart4.init(&com_uart4);
com_uart6.init(&com_uart6);
Wdg.Feed();
/*网口*/
W5500.Init();
Wdg.Feed();
/*屏幕通讯*/
tjc_hmi.init();
leakage_system/usr/app/app_leakage.c
+150 -155
View File
@@ -16,129 +16,124 @@ static void app_leakage_init(void);
/*历史报警缓冲区*/
uint8_t sector_buf[2][W25Q32_SECTOR_SIZE];
app_leakage_t leakage =
{
.region_num = 0,
.sub_device_num = 0,
.init = app_leakage_init,
.task = app_leakage_task,
.class_update = app_leakage_region_classify,
app_leakage_t leakage =
{
.region_num = 0,
.sub_device_num = 0,
.init = app_leakage_init,
.task = app_leakage_task,
.class_update = app_leakage_region_classify,
};
app_leakage_t *p_leakage = &leakage;
app_hitory_t history =
{
.read_history = history_read_record,
.clean_history = history_clear_all,
.init_history = history_init
};
{
.read_history = history_read_record,
.clean_history = history_clear_all,
.init_history = history_init};
static void app_leakage_init(void)
{
// for(int i = 0; i < APP_LEAKAGE_SUB_DEVICE_NUM; i++)
// {
// memset(leakage.sub_device_data[i].ch_data, 0,
// sizeof(leakage.sub_device_data[i].ch_data));
// }
app_leakage_region_classify();
// for(int i = 0; i < APP_LEAKAGE_SUB_DEVICE_NUM; i++)
// {
// memset(leakage.sub_device_data[i].ch_data, 0,
// sizeof(leakage.sub_device_data[i].ch_data));
// }
app_leakage_region_classify();
}
/*区域分类，将同一区域名的设备划分到一起*/
void app_leakage_region_classify(void)
{
u16 i,j;
u16 i, j;
u8 add_region_flag;
/*数量及相关数据清零*/
p_leakage->region_num = 0;
p_leakage->sub_device_num = 0;
memset(p_leakage->region_data,0,sizeof(p_leakage->region_data));
memset(p_leakage->region_data, 0, sizeof(p_leakage->region_data));
/*遍历子系统*/
for(i=0;i<APP_LEAKAGE_SUB_DEVICE_NUM;i++)
for (i = 0; i < APP_LEAKAGE_SUB_DEVICE_NUM; i++)
{
add_region_flag = 1; /*添加新区域*/
add_region_flag = 1; /*添加新区域*/
/*设备使能*/
if(ENABLE == p_leakage->sub_device_data[i].flash_data.state)
if (ENABLE == p_leakage->sub_device_data[i].flash_data.state)
{
p_leakage->sub_device_num++;/*子系统总数量++*/
p_leakage->sub_device_num++; /*子系统总数量++*/
/********************************************区域划分******************************************************/
/*遍历区域*/
for(j=0;j<APP_LEAKAGE_SUB_DEVICE_NUM;j++)
/*遍历区域*/
for (j = 0; j < APP_LEAKAGE_SUB_DEVICE_NUM; j++)
{
if(0 == memcmp(p_leakage->region_data[j].name,p_leakage->sub_device_data[i].flash_data.region_name, APP_LEAKAGE_STRING_NANE_LEN))/*名称相同*/
if (0 == memcmp(p_leakage->region_data[j].name, p_leakage->sub_device_data[i].flash_data.region_name, APP_LEAKAGE_STRING_NANE_LEN)) /*名称相同*/
{
/*添加子设备*/
p_leakage->region_data[j].sub_device_index[p_leakage->region_data[j].sub_device_num] = i;/*绑定子设备索引*/
p_leakage->region_data[j].sub_device_num++; /*区域中子系统数据++*/
add_region_flag = 0;/*不添加新区域*/
p_leakage->region_data[j].sub_device_index[p_leakage->region_data[j].sub_device_num] = i; /*绑定子设备索引*/
p_leakage->region_data[j].sub_device_num++; /*区域中子系统数据++*/
add_region_flag = 0; /*不添加新区域*/
break;
}
}
/*没有找到相同名称*/
if(add_region_flag)/*添加新区域*/
if (add_region_flag) /*添加新区域*/
{
/*复制名称*/
memcpy(p_leakage->region_data[p_leakage->region_num].name,
memcpy(p_leakage->region_data[p_leakage->region_num].name,
p_leakage->sub_device_data[i].flash_data.region_name,
APP_LEAKAGE_STRING_NANE_LEN);
// 第一个设备索引为0
p_leakage->region_data[p_leakage->region_num].sub_device_index[0] = i;
p_leakage->region_data[p_leakage->region_num].sub_device_num = 1;
p_leakage->region_num++;
}
}
}
}
}
/*控制 声 光 继电器 报警*/
static void app_leakage_alarm_contorl(void)
{
if(0 != p_leakage->alarm_state)
if (0 != p_leakage->alarm_state)
{
buzzer.set.on();
relay.set(BSP_RELAY_CH_ERROR_STATE,USR_ON);
relay.set(BSP_RELAY_CH_ERROR_STATE, USR_ON);
}
else
{
buzzer.set.off();
relay.set(BSP_RELAY_CH_ERROR_STATE,USR_OFF);
relay.set(BSP_RELAY_CH_ERROR_STATE, USR_OFF);
}
/*漏液状态*/
if(p_leakage->alarm_state & APP_LEAKAGE_SUB_DEVICE_STATE_LEAKAGE)
if (p_leakage->alarm_state & APP_LEAKAGE_SUB_DEVICE_STATE_LEAKAGE)
{
relay.set(BSP_RELAY_CH_LEAKAGE,USR_ON);
relay.set(BSP_RELAY_CH_LEAKAGE, USR_ON);
}
else
{
relay.set(BSP_RELAY_CH_LEAKAGE,USR_OFF);
relay.set(BSP_RELAY_CH_LEAKAGE, USR_OFF);
}
/*断带状态*/
if(p_leakage->alarm_state & APP_LEAKAGE_SUB_DEVICE_STATE_OPEN)
if (p_leakage->alarm_state & APP_LEAKAGE_SUB_DEVICE_STATE_OPEN)
{
relay.set(BSP_RELAY_CH_OPEN,USR_ON);
relay.set(BSP_RELAY_CH_OPEN, USR_ON);
}
else
{
relay.set(BSP_RELAY_CH_OPEN,USR_OFF);
relay.set(BSP_RELAY_CH_OPEN, USR_OFF);
}
/*通讯超时*/
if(p_leakage->alarm_state & APP_LEAKAGE_SUB_DEVICE_STATE_TIME_OUT)
if (p_leakage->alarm_state & APP_LEAKAGE_SUB_DEVICE_STATE_TIME_OUT)
{
relay.set(BSP_RELAY_CH_COMMINCAION,USR_ON);
}
relay.set(BSP_RELAY_CH_COMMINCAION, USR_ON);
}
else
{
relay.set(BSP_RELAY_CH_COMMINCAION,USR_OFF);
relay.set(BSP_RELAY_CH_COMMINCAION, USR_OFF);
}
}
/*异常状态设备数量统计*/
void app_leakage_task(void)
{
@@ -146,7 +141,7 @@ void app_leakage_task(void)
u16 i, j, k, sub_device_index;
/* 初始化区域异常统计 */
for(i = 0; i < p_leakage->region_num; i++)
for (i = 0; i < p_leakage->region_num; i++)
{
p_leakage->region_data[i].leakage_num = 0;
p_leakage->region_data[i].open_num = 0;
@@ -154,52 +149,50 @@ void app_leakage_task(void)
}
p_leakage->alarm_state = 0;
/* 检测状态变化并统计异常数量 */
for(i = 0; i < p_leakage->region_num; i++)
for (i = 0; i < p_leakage->region_num; i++)
{
for(j = 0; j < p_leakage->region_data[i].sub_device_num; j++)
for (j = 0; j < p_leakage->region_data[i].sub_device_num; j++)
{
sub_device_index = p_leakage->region_data[i].sub_device_index[j];
/* 检查设备是否启用 */
if(p_leakage->sub_device_data[sub_device_index].flash_data.state != ENABLE)
if (p_leakage->sub_device_data[sub_device_index].flash_data.state != ENABLE)
{
continue;
}
/* 检查设备是否屏蔽 */
if(p_leakage->sub_device_data[sub_device_index].shield != UNBLOCKED)
if (p_leakage->sub_device_data[sub_device_index].shield != UNBLOCKED)
{
continue;
}
/*历史报警存储*/
for(k = 0; k < APP_LEAKAGE_SUB_DEVICE_USE_CH_NUM; k++)
for (k = 0; k < APP_LEAKAGE_SUB_DEVICE_USE_CH_NUM; k++)
{
u16 current_state = p_leakage->sub_device_data[sub_device_index].ch_data[k].state;
u16 prev_state = prev_ch_state[sub_device_index][k];
u16 leak_distance = p_leakage->sub_device_data[sub_device_index].ch_data[k].distance;
/* 检测状态变化并记录历史报警 */
if((current_state & APP_LEAKAGE_SUB_DEVICE_STATE_LEAKAGE) &&
!(prev_state & APP_LEAKAGE_SUB_DEVICE_STATE_LEAKAGE))
if ((current_state & APP_LEAKAGE_SUB_DEVICE_STATE_LEAKAGE) &&
!(prev_state & APP_LEAKAGE_SUB_DEVICE_STATE_LEAKAGE))
{
/* 漏液报警开始 - 记录历史报警 */
history_add_alarm_record(i, sub_device_index, k, APP_LEAKAGE_SUB_DEVICE_STATE_LEAKAGE, leak_distance);
}
if((current_state & APP_LEAKAGE_SUB_DEVICE_STATE_OPEN) &&
!(prev_state & APP_LEAKAGE_SUB_DEVICE_STATE_OPEN))
if ((current_state & APP_LEAKAGE_SUB_DEVICE_STATE_OPEN) &&
!(prev_state & APP_LEAKAGE_SUB_DEVICE_STATE_OPEN))
{
/* 断带报警开始 - 记录历史报警 */
history_add_alarm_record(i, sub_device_index, k, APP_LEAKAGE_SUB_DEVICE_STATE_OPEN, 0);
}
if((current_state & APP_LEAKAGE_SUB_DEVICE_STATE_TIME_OUT) &&
!(prev_state & APP_LEAKAGE_SUB_DEVICE_STATE_TIME_OUT))
if ((current_state & APP_LEAKAGE_SUB_DEVICE_STATE_TIME_OUT) &&
!(prev_state & APP_LEAKAGE_SUB_DEVICE_STATE_TIME_OUT))
{
if( k > 0 && (p_leakage->sub_device_data[sub_device_index].ch_data[0].state & APP_LEAKAGE_SUB_DEVICE_STATE_TIME_OUT))
if (k > 0 && (p_leakage->sub_device_data[sub_device_index].ch_data[0].state & APP_LEAKAGE_SUB_DEVICE_STATE_TIME_OUT))
{
/*第一个通道超时，剩余通道不存储超时报警*/
}
@@ -209,34 +202,33 @@ void app_leakage_task(void)
history_add_alarm_record(i, sub_device_index, k, APP_LEAKAGE_SUB_DEVICE_STATE_TIME_OUT, 0);
}
}
/* 更新历史状态 */
prev_ch_state[sub_device_index][k] = current_state;
}
/* 统计区域异常设备数量 - 按设备统计 */
for(k = 0; k < APP_LEAKAGE_SUB_DEVICE_USE_CH_NUM; k++)
for (k = 0; k < APP_LEAKAGE_SUB_DEVICE_USE_CH_NUM; k++)
{
u16 current_state = p_leakage->sub_device_data[sub_device_index].ch_data[k].state;
if(current_state & APP_LEAKAGE_SUB_DEVICE_STATE_TIME_OUT)
if (current_state & APP_LEAKAGE_SUB_DEVICE_STATE_TIME_OUT)
{
p_leakage->region_data[i].time_out_num++;
p_leakage->alarm_state |= APP_LEAKAGE_SUB_DEVICE_STATE_TIME_OUT;
break;
}
else if(current_state & APP_LEAKAGE_SUB_DEVICE_STATE_OPEN)
else if (current_state & APP_LEAKAGE_SUB_DEVICE_STATE_OPEN)
{
p_leakage->region_data[i].open_num++;
p_leakage->alarm_state |= APP_LEAKAGE_SUB_DEVICE_STATE_OPEN;
p_leakage->region_data[i].open_num++;
p_leakage->alarm_state |= APP_LEAKAGE_SUB_DEVICE_STATE_OPEN;
}
else if(current_state & APP_LEAKAGE_SUB_DEVICE_STATE_LEAKAGE)
else if (current_state & APP_LEAKAGE_SUB_DEVICE_STATE_LEAKAGE)
{
p_leakage->region_data[i].leakage_num++;
p_leakage->alarm_state |= APP_LEAKAGE_SUB_DEVICE_STATE_LEAKAGE;
}
}
}
}
/*报警控制 声光报警*/
@@ -246,29 +238,28 @@ void app_leakage_task(void)
/* 获取当前时间 */
static void get_current_time(u8 *time_buffer)
{
/* 年: 2字节 (例如: 2024 -> 0x07 0xE8) */
uint16_t year = 2000 + DS1302.Time.Year; /* RTC年份通常从2000开始 */
time_buffer[0] = (year >> 8) & 0xFF; /* 高字节 */
time_buffer[1] = year & 0xFF; /* 低字节 */
time_buffer[2] = DS1302.Time.Month; /* 月 */
time_buffer[3] = DS1302.Time.Day; /* 日 */
time_buffer[4] = DS1302.Time.Hour; /* 时 */
time_buffer[5] = DS1302.Time.Minute; /* 分 */
time_buffer[6] = DS1302.Time.Second; /* 秒 */
/* 年: 2字节 (例如: 2024 -> 0x07 0xE8) */
uint16_t year = 2000 + DS1302.Time.Year; /* RTC年份通常从2000开始 */
time_buffer[0] = (year >> 8) & 0xFF; /* 高字节 */
time_buffer[1] = year & 0xFF; /* 低字节 */
time_buffer[2] = DS1302.Time.Month; /* 月 */
time_buffer[3] = DS1302.Time.Day; /* 日 */
time_buffer[4] = DS1302.Time.Hour; /* 时 */
time_buffer[5] = DS1302.Time.Minute; /* 分 */
time_buffer[6] = DS1302.Time.Second; /* 秒 */
}
/* 从Flash读取历史报警元数据 */
static void history_read_metadata(void)
{
app_leakage_history_metadata_t temp_metadata;
w25q32.read(W25Q32_HISTORY_ALARM_METADATA_ADDR,
(uint8_t*)&temp_metadata,
w25q32.read(W25Q32_HISTORY_ALARM_METADATA_ADDR,
(uint8_t *)&temp_metadata,
sizeof(app_leakage_history_metadata_t));
if(temp_metadata.total_records <= temp_metadata.max_records &&
temp_metadata.write_index < temp_metadata.max_records)
if (temp_metadata.total_records <= temp_metadata.max_records &&
temp_metadata.write_index < temp_metadata.max_records)
{
/* 数据有效，复制到全局变量 */
memcpy(&leakage.history_metadata, &temp_metadata, sizeof(app_leakage_history_metadata_t));
@@ -278,9 +269,9 @@ static void history_read_metadata(void)
/* 数据无效，初始化 */
memset(&leakage.history_metadata, 0, sizeof(app_leakage_history_metadata_t));
leakage.history_metadata.max_records = MAX_HISTORY_ALARM_RECORDS;
/* 保存到Flash */
history_save_metadata();
history_save_metadata();
}
}
@@ -289,17 +280,17 @@ static void history_save_metadata(void)
{
/* 擦除元数据扇区 */
w25q32_sector_erase(W25Q32_HISTORY_ALARM_METADATA_ADDR);
/* 写入元数据 */
w25q32.write(W25Q32_HISTORY_ALARM_METADATA_ADDR,
(uint8_t*)&leakage.history_metadata,
sizeof(app_leakage_history_metadata_t));
w25q32.write(W25Q32_HISTORY_ALARM_METADATA_ADDR,
(uint8_t *)&leakage.history_metadata,
sizeof(app_leakage_history_metadata_t));
}
/* 计算记录在Flash中的地址 */
static uint32_t history_calc_record_addr(u32 record_index)
{
return W25Q32_HISTORY_ALARM_DATA_ADDR +
return W25Q32_HISTORY_ALARM_DATA_ADDR +
(record_index * HISTORY_ALARM_RECORD_SIZE);
}
@@ -307,7 +298,7 @@ static uint32_t history_calc_record_addr(u32 record_index)
static uint32_t history_calc_sector_addr(u32 record_index)
{
uint32_t record_addr = history_calc_record_addr(record_index);
return record_addr & ~(W25Q32_SECTOR_SIZE - 1); /* 4K对齐 */
return record_addr & ~(W25Q32_SECTOR_SIZE - 1); /* 4K对齐 */
}
/* 添加历史报警记录 */
@@ -315,76 +306,84 @@ void history_add_alarm_record(u8 region_idx, u8 device_idx, u8 channel, u16 alar
{
app_leakage_history_alarm_t new_alarm;
uint32_t write_addr;
/* 填充报警记录 */
memset(&new_alarm, 0, sizeof(app_leakage_history_alarm_t));
/* 区域名 */
if (region_idx < leakage.region_num) {
memcpy(new_alarm.region_name, leakage.region_data[region_idx].name,
if (region_idx < leakage.region_num)
{
memcpy(new_alarm.region_name, leakage.region_data[region_idx].name,
APP_LEAKAGE_STRING_NANE_LEN);
}
/* 设备ID和名称 */
if (device_idx < APP_LEAKAGE_SUB_DEVICE_NUM) {
if (device_idx < APP_LEAKAGE_SUB_DEVICE_NUM)
{
new_alarm.device_id = leakage.sub_device_data[device_idx].flash_data.modbus_id;
memcpy(new_alarm.device_name, leakage.sub_device_data[device_idx].flash_data.device_name,
APP_LEAKAGE_STRING_NANE_LEN);
}
/* 报警类型、通道和漏液距离 */
new_alarm.alarm_type = alarm_type;
new_alarm.channel = channel;
new_alarm.leak_distance = leak_distance;
/* 开始时间 */
get_current_time(new_alarm.start_time);
/* 计算写入地址 */
write_addr = history_calc_record_addr(leakage.history_metadata.write_index);
/* 计算该记录可能跨越的扇区范围（最多2个扇区） */
uint32_t start_sector = write_addr & ~(W25Q32_SECTOR_SIZE - 1);
uint32_t end_addr = write_addr + HISTORY_ALARM_RECORD_SIZE - 1;
uint32_t end_sector = end_addr & ~(W25Q32_SECTOR_SIZE - 1);
uint32_t num_sectors = (end_sector - start_sector) / W25Q32_SECTOR_SIZE + 1;
/* 缓冲区：最多两个扇区，每个扇区4KB */
uint32_t sectors[2] = {start_sector, (num_sectors > 1) ? end_sector : 0};
/* 1. 读取所有涉及的扇区到RAM */
for (uint32_t i = 0; i < num_sectors; i++) {
for (uint32_t i = 0; i < num_sectors; i++)
{
w25q32.read(sectors[i], sector_buf[i], W25Q32_SECTOR_SIZE);
}
/* 2. 擦除这些扇区 */
for (uint32_t i = 0; i < num_sectors; i++) {
for (uint32_t i = 0; i < num_sectors; i++)
{
w25q32_sector_erase(sectors[i]);
}
/* 3. 在RAM中更新新记录的内容 */
uint32_t offset_in_start = write_addr - start_sector;
uint32_t first_part_len = (num_sectors == 1) ? HISTORY_ALARM_RECORD_SIZE : (W25Q32_SECTOR_SIZE - offset_in_start);
memcpy(sector_buf[0] + offset_in_start, &new_alarm, first_part_len);
if (num_sectors > 1) {
if (num_sectors > 1)
{
uint32_t second_part_len = HISTORY_ALARM_RECORD_SIZE - first_part_len;
memcpy(sector_buf[1], (uint8_t*)&new_alarm + first_part_len, second_part_len);
memcpy(sector_buf[1], (uint8_t *)&new_alarm + first_part_len, second_part_len);
}
/* 4. 将修改后的缓冲区写回Flash */
for (uint32_t i = 0; i < num_sectors; i++) {
for (uint32_t i = 0; i < num_sectors; i++)
{
w25q32.write(sectors[i], sector_buf[i], W25Q32_SECTOR_SIZE);
}
/* 5. 更新元数据（环形队列） */
leakage.history_metadata.write_index++;
if (leakage.history_metadata.write_index >= leakage.history_metadata.max_records) {
if (leakage.history_metadata.write_index >= leakage.history_metadata.max_records)
{
leakage.history_metadata.write_index = 0;
}
if (leakage.history_metadata.total_records < leakage.history_metadata.max_records) {
if (leakage.history_metadata.total_records < leakage.history_metadata.max_records)
{
leakage.history_metadata.total_records++;
}
/* 保存元数据到Flash */
history_save_metadata();
}
@@ -392,31 +391,28 @@ void history_add_alarm_record(u8 region_idx, u8 device_idx, u8 channel, u16 alar
/* 读取历史报警记录 */
static u8 history_read_record(u32 record_index, app_leakage_history_alarm_t *record)
{
if(record_index >= leakage.history_metadata.total_records)
if (record_index >= leakage.history_metadata.total_records)
{
return 0; /* 记录索引无效 */
return 0; /* 记录索引无效 */
}
/* 计算实际存储索引（考虑循环队列） */
uint32_t actual_index;
if(leakage.history_metadata.total_records == leakage.history_metadata.max_records) {
// 环形已满，write_index 指向最旧记录
actual_index = (leakage.history_metadata.write_index - 1 - record_index
+ leakage.history_metadata.max_records) % leakage.history_metadata.max_records;
} else {
// 未满，顺序存储，索引 0 最早，索引 total_records-1 最新
actual_index = leakage.history_metadata.total_records - 1 - record_index;
}
if(actual_index == 125)
if (leakage.history_metadata.total_records == leakage.history_metadata.max_records)
{
actual_index =125;
/* 缓冲区已满，计算相对索引 */
actual_index = (leakage.history_metadata.write_index + record_index) %
leakage.history_metadata.max_records;
}
else
{
/* 缓冲区未满，直接读取 */
actual_index = record_index;
}
uint32_t read_addr = history_calc_record_addr(actual_index);
w25q32.read(read_addr, (uint8_t*)record, HISTORY_ALARM_RECORD_SIZE);
uint32_t read_addr = history_calc_record_addr(actual_index);
w25q32.read(read_addr, (uint8_t *)record, HISTORY_ALARM_RECORD_SIZE);
return 1;
}
@@ -426,19 +422,18 @@ static void history_clear_all(void)
/* 重置元数据 */
memset(&leakage.history_metadata, 0, sizeof(app_leakage_history_metadata_t));
leakage.history_metadata.max_records = MAX_HISTORY_ALARM_RECORDS;
/* 保存元数据 */
history_save_metadata();
/* 擦除所有数据扇区（可选） */
for(uint32_t i = 0; i < HISTORY_ALARM_SECTORS_NEEDED; i++)
for (uint32_t i = 0; i < HISTORY_ALARM_SECTORS_NEEDED; i++)
{
uint32_t sector_addr = W25Q32_HISTORY_ALARM_DATA_ADDR + i * W25Q32_SECTOR_SIZE;
w25q32_sector_erase(sector_addr);
}
}
/* 初始化历史报警模块 */
static void history_init(void)
{
leakage_system/usr/app/app_leakage.h
+4 -1
View File
@@ -2,6 +2,7 @@
#define _APP_LEAKAGE_H_
#include "main.h"
#include "bsp_W5500.h"
#define ENABLE (1)
#define DISABLE (0)
@@ -24,6 +25,8 @@ void app_leakage_region_classify(void);
void history_add_alarm_record(u8 region_idx, u8 device_idx, u8 channel, u16 alarm_type, u16 leak_distance);
#define NETWORK_PORT_NUM BSP_W5500_PORT_NUM
/*子设备存储的参数*/
typedef struct
{
@@ -66,7 +69,7 @@ typedef struct {
u8 ip[4];
u8 mask[4];
u8 gateway[4];
u16 port;
u16 port[NETWORK_PORT_NUM];
}network_config_t;
/* 历史报警记录结构 */
leakage_system/usr/bsp/bsp_W5500.c
+20 -2
View File
@@ -33,7 +33,7 @@ bsp_W5500_t W5500 =
{
.Gateway_IP = {192,168,100,1}, /*网关IP地址*/
.Sub_Mask = {255,255,255,0}, /*子网掩码*/
.Phy_Addr = {0x0c,0x29,0xab,0x7c,0x00,0x01}, /*物理地址(MAC)*/
.Phy_Addr = {0x0c,0x29,0xab,0x7c,0x00,0x01}, /*物理地址(MAC) 根据单片机UID生成随机的MAC*/
.IP_Addr = {192,168,100,201}, /*本机IP地址*/
.Interrupt_Process = bsp_W5500_Interrupt_Process,
@@ -49,6 +49,24 @@ bsp_W5500_t W5500 =
.ConfigData.Port = {0x01,0xF6},
.Run_Mode = BSP_W5500_PORT_RUN_MODE_TCP_SERVER,
},
.W5500_Class[1] =
{
.SocketPort = 1, /*使用端口1*/
.ConfigData.Port = {0x01,0xF7},
.Run_Mode = BSP_W5500_PORT_RUN_MODE_TCP_SERVER,
},
.W5500_Class[2] =
{
.SocketPort = 2, /*使用端口2*/
.ConfigData.Port = {0x01,0xF8},
.Run_Mode = BSP_W5500_PORT_RUN_MODE_TCP_SERVER,
},
.W5500_Class[3] =
{
.SocketPort = 3, /*使用端口3*/
.ConfigData.Port = {0x01,0xF9},
.Run_Mode = BSP_W5500_PORT_RUN_MODE_TCP_SERVER,
},
};
bsp_W5500_t *pW5500 = &W5500;
@@ -822,7 +840,7 @@ static void bsp_W5500_Task(void)
if ((pW5500->W5500_Class[i].TR_Data_State & BSP_W5500_PORT_DATA_RECEIVE) == BSP_W5500_PORT_DATA_RECEIVE) // 如果Socket0接收到数据
{
pW5500->W5500_Class[i].TR_Data_State &= ~BSP_W5500_PORT_DATA_RECEIVE;
u16 Len = Read_SOCK_Data_Buffer(0, pW5500->W5500_Class[i].Rx_Buffer);
u16 Len = Read_SOCK_Data_Buffer(i, pW5500->W5500_Class[i].Rx_Buffer);
// Write_SOCK_Data_Buffer(&pW5500->W5500_Class[i], pW5500->W5500_Class[i].Rx_Buffer, Len);
// printf("RX");
// Debug_UartSend(pW5500->W5500_Class[i].Rx_Buffer, Len);
leakage_system/usr/bsp/bsp_W5500.h
+1 -1
View File
@@ -215,7 +215,7 @@
#define W5500_INT_PORT W5500_INT_GPIO_Port
typedef u8 SOCKET; // 自定义端口号数据类型
#define BSP_W5500_PORT_NUM 1
#define BSP_W5500_PORT_NUM 4
#define BSP_W5500_TX_DATA_LEN 2048
#define BSP_W5500_RX_DATA_LEN 2048
leakage_system/usr/bsp/bsp_w25q.c
+7 -2
View File
@@ -98,6 +98,7 @@ static void gui_tjc_hmi_read_device_info_from_w25q(void)
static void gui_tjc_hmi_read_network_config_from_w25q(void)
{
u16 i;
network_config_t config;
w25q32.read(W25Q32_NETWORK_CONFIG_ADDR, (uint8_t*)&config, sizeof(config));
@@ -106,8 +107,12 @@ static void gui_tjc_hmi_read_network_config_from_w25q(void)
memcpy(W5500.IP_Addr, config.ip, 4);
memcpy(W5500.Sub_Mask, config.mask, 4);
memcpy(W5500.Gateway_IP, config.gateway, 4);
W5500.W5500_Class[0].ConfigData.Port[0] = (config.port >> 8) & 0xFF;
W5500.W5500_Class[0].ConfigData.Port[1] = config.port & 0xFF;
for(i=0;i<NETWORK_PORT_NUM;i++)
{
W5500.W5500_Class[i].ConfigData.Port[0] = (config.port[i] >> 8) & 0xFF;
W5500.W5500_Class[i].ConfigData.Port[1] = config.port[i] & 0xFF;
}
}
}
leakage_system/usr/gui/gui_tjc_hmi.c
+1921 -1822
View File
File diff suppressed because it is too large Load Diff
leakage_system/usr/protocol/proto_modbus_tcp_slave_ex.c
+16 -14
View File
@@ -48,7 +48,12 @@ static void proto_modbus_communication_data_send(u8 *p_data, u16 len)
static void proto_modbus_init(void)
{
W5500.W5500_Class[0].Rx_DataAnalysis = proto_modbus_communication_data_analysis;
u16 i;
for(i=0;i<BSP_W5500_PORT_NUM;i++)
{
W5500.W5500_Class[i].Rx_DataAnalysis = proto_modbus_communication_data_analysis;
}
}
static void proto_modbus_task(void)
{
@@ -134,8 +139,8 @@ static void proto_modbus_communication_data_analysis(u8 *pData, u16 len,void *ot
case 0x06:
{
modbus_analysis_data.write_data_addr[0] = pData[10];
modbus_analysis_data.write_data_addr[1] = pData[11];
modbus_analysis_data.write_data_addr = &pData[send_buff_index_offset + 4];
TempAddr = modbus_analysis_data.start_addr;
TempData = (modbus_analysis_data.write_data_addr[0] << 8) | modbus_analysis_data.write_data_addr[1];
error_code = proto_modbus_data_write(TempAddr, TempData);
@@ -155,11 +160,8 @@ static void proto_modbus_communication_data_analysis(u8 *pData, u16 len,void *ot
case 0x10:
{
u8 byte_count = pData[12]; // 字节数
// 将数据复制到 write_data_addr
for (u8 i = 0; i < byte_count; i++) {
modbus_analysis_data.write_data_addr[i] = pData[13 + i];
}
modbus_analysis_data.write_data_addr = &pData[send_buff_index_offset + 7];
TempAddr = modbus_analysis_data.start_addr;
for (inx = 0; inx < modbus_analysis_data.reg_number; inx++)
{
@@ -173,12 +175,12 @@ static void proto_modbus_communication_data_analysis(u8 *pData, u16 len,void *ot
}
}
send_struct.len = send_buff_index_offset + 6;
send_struct.send_buffer[send_buff_index_offset + send_buff_index_offset + 0] = modbus_analysis_data.id;
send_struct.send_buffer[send_buff_index_offset + send_buff_index_offset + 1] = modbus_analysis_data.func;
send_struct.send_buffer[send_buff_index_offset + send_buff_index_offset + 2] = modbus_analysis_data.start_addr >> 8;
send_struct.send_buffer[send_buff_index_offset + send_buff_index_offset + 3] = modbus_analysis_data.start_addr & 0xff;
send_struct.send_buffer[send_buff_index_offset + send_buff_index_offset + 4] = modbus_analysis_data.reg_number >> 8;
send_struct.send_buffer[send_buff_index_offset + send_buff_index_offset + 5] = modbus_analysis_data.reg_number & 0xff;
send_struct.send_buffer[send_buff_index_offset + 0] = modbus_analysis_data.id;
send_struct.send_buffer[send_buff_index_offset + 1] = modbus_analysis_data.func;
send_struct.send_buffer[send_buff_index_offset + 2] = modbus_analysis_data.start_addr >> 8;
send_struct.send_buffer[send_buff_index_offset + 3] = modbus_analysis_data.start_addr & 0xff;
send_struct.send_buffer[send_buff_index_offset + 4] = modbus_analysis_data.reg_number >> 8;
send_struct.send_buffer[send_buff_index_offset + 5] = modbus_analysis_data.reg_number & 0xff;
}
break;
default: