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

V0.005.0

Browse Source
This commit is contained in:
guanyejian
2026-04-23 17:20:51 +08:00
parent 4c4cfa76b4
commit c185b3d8b9
77 changed files with 13811 additions and 24616 deletions
Download Patch File Download Diff File Expand all files Collapse all files
leakage_system/usr/protocol/proto_modbus_master_leakage.c
+35 -19
View File
@@ -10,7 +10,9 @@
#include "proto_print.h"
#include "proto_modbus_lib.h"
#define PROTO_LEAKAGE_READ_DATA_NUM (14) /*读取一个设备寄存器数量*/
#define PROTO_LEAKAGE_2CH_READ_DATA_NUM (8)
#define PROTO_LEAKAGE_4CH_READ_DATA_NUM (14)
#define PROTO_LEAKAGE_READ_DATA_NUM (PROTO_LEAKAGE_2CH_READ_DATA_NUM) /*读取一个设备寄存器数量*/
#define PROTO_LEAKAGE_GET_CURR_DATA_START_ADDR (0x0000)
static void proto_leakage_init(proto_leakage_t *p_leakage);
@@ -107,7 +109,7 @@ static void proto_leakage_switch(proto_leakage_t *p_leakage)
static void proto_leakage_tx_curr_data_get(proto_leakage_t *p_leakage)
{
u16 addr = PROTO_LEAKAGE_GET_CURR_DATA_START_ADDR;
u8 len = 14;
u8 len = PROTO_LEAKAGE_READ_DATA_NUM;
u8 id = p_leakage->sensor[p_leakage->sensor_index].comm.id;
modbus_lib_data_read(id,addr,len,p_leakage->uart_send);
}
@@ -128,10 +130,6 @@ static void proto_leakage_tx_task(proto_leakage_t *p_leakage)
if((++p_sensor->comm.tx_time_out_count) > 10)/*连续读取10次 通讯超时*/
{
p_sensor->comm.sensor_state_code |= (PROTO_LEAKAGE_STATE_CODE_TIME_OUT);
/*清除数据*/
//memset(&gas_data[p_sensor->sensor_index],0,sizeof(gas_data_t));
}
}
@@ -154,9 +152,10 @@ static void proto_leakage_tx_task(proto_leakage_t *p_leakage)
/*通讯超时*/
if(p_sensor->comm.sensor_state_code & (PROTO_LEAKAGE_STATE_CODE_TIME_OUT))
{
for(i=0;i<APP_LEAKAGE_SUB_DEVICE_CH_NUM;i++)
for(i=0;i<APP_LEAKAGE_SUB_DEVICE_CH_NUM;i++) /*清除相关数据*/
{
leakage.sub_device_data[p_sensor->comm.leakage_data_index].ch_data[i].state |= APP_LEAKAGE_SUB_DEVICE_STATE_TIME_OUT;
leakage.sub_device_data[p_sensor->comm.leakage_data_index].ch_data[i].state = APP_LEAKAGE_SUB_DEVICE_STATE_TIME_OUT;
leakage.sub_device_data[p_sensor->comm.leakage_data_index].ch_data[i].distance = 0;
}
}
else
@@ -186,8 +185,8 @@ static void proto_leakage_rx_task(u8 *p_data,u16 len,void *other_data)
u8 modbus_id,cmd;
u16 check_crc16,modbus_crc16;
u16 *p_u16_temp;
u16 i,ch;
u8 *p_rx_valid,temp_value;
u16 i,ch,temp_value;
u8 *p_rx_valid;
proto_sensor_class_t *p_sensor;
proto_leakage_t *p_leakage = NULL;
@@ -251,20 +250,36 @@ static void proto_leakage_rx_task(u8 *p_data,u16 len,void *other_data)
{
/*计算当前设备索引*/
u8 sensor_index = p_sensor->comm.leakage_data_index;
// u16 ch_addr_offset[4] = {0,4,8,11}; /*漏液待数据地址偏移*/
u8 sub_device_ch;
u16 ch_addr_offset[4] = {0,8,16,22}; /*漏液待数据地址偏移*/
u16 temp;
/*子漏液控制器为几通道*/
if(PROTO_LEAKAGE_4CH_READ_DATA_NUM == PROTO_LEAKAGE_READ_DATA_NUM)
{
sub_device_ch = APP_LEAKAGE_SUB_DEVICE_CH_NUM;
}
else if(PROTO_LEAKAGE_2CH_READ_DATA_NUM == PROTO_LEAKAGE_READ_DATA_NUM)
{
sub_device_ch = 2;
}
else
{
sub_device_ch = APP_LEAKAGE_SUB_DEVICE_CH_NUM;
}
if(sensor_index >= APP_LEAKAGE_SUB_DEVICE_NUM)
{
break;
}
/*通道数据重置*/
for(ch = 0;ch < APP_LEAKAGE_SUB_DEVICE_CH_NUM;ch++)
for(ch = 0;ch < sub_device_ch;ch++)
{
leakage.sub_device_data[sensor_index].ch_data[ch].state = 0;
leakage.sub_device_data[sensor_index].ch_data[ch].state = 0;
leakage.sub_device_data[sensor_index].ch_data[ch].state = 0;
leakage.sub_device_data[sensor_index].ch_data[ch].distance = 0;
}
/* 心跳包：0x0003*/
@@ -276,26 +291,27 @@ static void proto_leakage_rx_task(u8 *p_data,u16 len,void *other_data)
leakage.sub_device_data[sensor_index].test_mode = temp_value & 0xFF;
/*漏液数据*/
for(i=0;i<4;i++)
for(i=0;i<sub_device_ch;i++)
{
ch = i;
temp = ch_addr_offset[i];
/*漏液*/
temp_value = (p_rx_valid[temp + 0] << 8) | p_rx_valid[temp + 1];
if(temp_value == 1)
{
leakage.sub_device_data[sensor_index].ch_data[ch].state |=
APP_LEAKAGE_SUB_DEVICE_STATE_LEAKAGE;
}
/*断带*/
temp_value = (p_rx_valid[temp + 2] << 8) | p_rx_valid[temp + 3];
if(temp_value == 1)
{
leakage.sub_device_data[sensor_index].ch_data[ch].state |=
APP_LEAKAGE_SUB_DEVICE_STATE_OPEN;
}
/*漏液距离*/
temp_value = (p_rx_valid[temp + 4] << 8) | p_rx_valid[temp + 5];
leakage.sub_device_data[sensor_index].ch_data[ch].distance = temp_value *0.01;
leakage.sub_device_data[sensor_index].ch_data[ch].distance = temp_value;
}
}break;
}
leakage_system/usr/protocol/proto_modbus_tcp_slave_ex.c
+12 -5
View File
@@ -288,14 +288,21 @@ static u16 proto_modbus_data_read(u16 addr)
}break;
case 11 ... 18:/*通道数据*/
{
sensor_ch = (addr - 11) / 2;
if( (addr - 11) & 0x0001) /*漏液位置*/
if (leakage.sub_device_data[sensor_index].shield == BLOCKED)/*已屏蔽*/
{
data = leakage.sub_device_data[sensor_index].ch_data[sensor_ch].distance;
data = 0;
}
else /*设备状态*/
else
{
data = leakage.sub_device_data[sensor_index].ch_data[sensor_ch].state;
sensor_ch = (reg - 11) / 2;
if( (reg - 11) & 0x0001) /*漏液位置*/
{
data = leakage.sub_device_data[sensor_index].ch_data[sensor_ch].distance;
}
else /*设备状态*/
{
data = leakage.sub_device_data[sensor_index].ch_data[sensor_ch].state;
}
}
}break;
default:data = 0;