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

update:

Browse Source 
1.变更了引脚，并且添加了一个继电器使用PD7为报警灯
This commit is contained in:
chenzongxiong
2026-09-03 16:22:51 +08:00
parent 118727b491
commit 293b1add7c
15 changed files with 7237 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
leakage_system/usr/app/app.c
+2 -2
View File
@@ -22,8 +22,8 @@
#include "gui_tjc_hmi.h"
const char *HwVersion = "V2.0";
char SwVersion[24] = "V0.005.0";
const char *HwVersion = "V2.1";
char SwVersion[24] = "V0.006.0";
void task_idle(void);
void task_10ms(void);
void task_50ms(void);
leakage_system/usr/bsp/bsp_W5500.c
+1 -1
View File
@@ -34,7 +34,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) 根据单片机UID生成随机的MAC*/
.IP_Addr = {192,168,100,201}, /*本机IP地址*/
.IP_Addr = {192,168,100,203}, /*本机IP地址*/
.Interrupt_Process = bsp_W5500_Interrupt_Process,
leakage_system/usr/bsp/bsp_buzzer.c
+1
View File
@@ -35,6 +35,7 @@ static bsp_buzzer_flash_data_t flash_data;
/*其他外设初始化后快速闪烁，提示初始化完成*/
static void bsp_buzzer_init(void)
{
// BUZZER_ON;
BUZZER_OFF;
p_buzzer->p_flash_data = &flash_data;
bsp_buzzer_flash_data_load();
leakage_system/usr/bsp/bsp_relay.c
+3 -2
View File
@@ -13,8 +13,9 @@
#define RELAY_3_ON HAL_GPIO_WritePin (RELAY_3_GPIO_Port, RELAY_3_Pin, RELAY_GPIO_ON)
#define RELAY_3_OFF HAL_GPIO_WritePin (RELAY_3_GPIO_Port, RELAY_3_Pin, RELAY_GPIO_OFF)
#define RELAY_4_ON HAL_GPIO_WritePin (RELAY_4_GPIO_Port, RELAY_4_Pin, RELAY_GPIO_ON)
#define RELAY_4_OFF HAL_GPIO_WritePin (RELAY_4_GPIO_Port, RELAY_4_Pin, RELAY_GPIO_OFF)
/*报警灯改为PD7,使用开漏输出解决硬件电平压差不够*/
#define RELAY_4_ON HAL_GPIO_WritePin (ALARM_LED_GPIO_Port, ALARM_LED_Pin, RELAY_GPIO_OFF)
#define RELAY_4_OFF HAL_GPIO_WritePin (ALARM_LED_GPIO_Port, ALARM_LED_Pin, RELAY_GPIO_ON)
static void bsp_relay_init(void);
static void bsp_relay_task(void);
leakage_system/usr/bsp/bsp_uart.h
+1 -1
View File
@@ -19,7 +19,7 @@ typedef struct bsp_uart_t bsp_uart_t;
#define BSP_UART_BAUD_RATE_9600 (9600)
#define BSP_UART_BAUD_RATE_19200 (19200)
#define BSP_UART_BAUD_RATE_57600 (57600)
#define BSP_UART_BAUD_RATE_115200 (57600)
#define BSP_UART_BAUD_RATE_115200 (115200)
/******************************************
* 结构体: bsp_uart_relay_t
leakage_system/usr/gui/gui_tjc_hmi.c
-57
View File
@@ -1734,24 +1734,6 @@ static void gui_tjc_hmi_device_config_send(u8 cmd, u8 opa, u8 *p_data)
u8 current_enabled_index = 0; /*当前是第几个启用的设备*/
u8 device_index;
/*计算启用的设备数量*/
// enabled_device_count = 0;
// for(i = 0; i < APP_LEAKAGE_SUB_DEVICE_NUM; i++)
// {
// if(leakage.sub_device_data[i].flash_data.state == ENABLE)
// {
// enabled_device_count++;
// }
// }
//
// /*计算总页数*/
// page_num = enabled_device_count / DEVICES_PER_PAGE;
// remain_region_num = enabled_device_count % DEVICES_PER_PAGE;
// if(remain_region_num > 0)
// {
// page_num++;
// }
//
/*确保页码在有效范围内*/
if (p_tjc_hmi->page.device_config_index >= page_num)
{
@@ -2001,45 +1983,6 @@ static void gui_tjc_hmi_device_config_send(u8 cmd, u8 opa, u8 *p_data)
}
}
// /*解析波特率*/
// for(i = 0; i < 10; i++) // 波特率最大为115200
// {
// if(current_pos[i] == HMI_PROTO_ASCII_RX_DELINITER)
// {
// if(i == 0)
// {
// /*波特率不能为空*/
// return;
// }
// char baud_str[10] = {0};
// memcpy(baud_str, current_pos, i);
// baud_str[i] = '\0';
// /*将字符串波特率转换为数值*/
// if(strcmp(baud_str, "2400") == 0)
// {
// new_device.baudrate = 0;
// }
// else if(strcmp(baud_str, "4800") == 0)
// {
// new_device.baudrate = 1;
// }
// else if(strcmp(baud_str, "9600") == 0)
// {
// new_device.baudrate = 2;
// }
// else if(strcmp(baud_str, "115200") == 0)
// {
// new_device.baudrate = 3;
// }
// current_pos += (i + 1);
// field_count++;
// break;
// }
// }
/*解析区域名*/
for (i = 0; i < APP_LEAKAGE_STRING_NANE_LEN; i++)
{