From 4a304f38e4961b0e10db2ff3b2db65458e90e1d6 Mon Sep 17 00:00:00 2001 From: yuliang Date: Mon, 21 Jul 2025 16:22:16 +0800 Subject: [PATCH] =?UTF-8?q?FIX=20|=20=E6=B7=BB=E5=8A=A0=E8=B0=83=E8=AF=95?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E6=94=AF=E6=8C=81.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/include/pd_dbg.h | 196 +---------- app/lib/a_process/pd_dbg.c | 573 +++++++++++++++++++++++++++++++++ app/lib/a_process/pd_main.c | 6 +- app/lib/a_process/pd_upgrade.c | 5 +- 4 files changed, 593 insertions(+), 187 deletions(-) create mode 100644 app/lib/a_process/pd_dbg.c diff --git a/app/include/pd_dbg.h b/app/include/pd_dbg.h index 6194dc8..e6b8b5a 100755 --- a/app/include/pd_dbg.h +++ b/app/include/pd_dbg.h @@ -38,206 +38,38 @@ #ifdef CFG_DEV_TYPE_LAND_PD /* Includes ------------------------------------------------------------------*/ -#include "pd_main.h" /* Define --------------------------------------------------------------------*/ -#define DEBUG_DAU_FILE_UPGRADE "/lib/firmware/system_wrapper.bin.upgrade" -#define DEBUG_DAU_FILE_BAK "./bak/system_wrapper_bak.bin.bak" -#define DEBUG_DAU_FILE "/lib/firmware/system_wrapper.bin" +#define DEBUG_BUG_SIZE 1536 +#define DEBUG_BUG_UPDATE_SIZE 64 - -#define DEBUG_BUG_SIZE 1512 -#define DEBUG_CJSON_BUG_SIZE 1512 - -//#define DEBUG_NOISE_CAREFOR (0x0007) // 关注对应通道的底噪原始值, 校准底噪值. -//#define DEBUG_NOISE_POST (0x0008) // 获取底噪原始值, 校准底噪值 服务端主动提交每秒刷新一次. - -enum DebugCommand -{ - DEBUG_CONFIG_FACTORY_GET = 1, // 获取配置 - DEBUG_CONFIG_FACTORY_SET = 2, // 设置配置 - DEBUG_CONFIG_GLOBAL_SET = 3, /* 设备全局参数设置 */ - DEBUG_CONFIG_GLOBAL_GET = 4, /* 设备全局参数获取 */ - DEBUG_CONFIG_PORT_SET = 5, /* 设备端口参数设置 */ - DEBUG_CONFIG_PORT_GET = 6, /* 设备端口参数获取 */ - DEBUG_REBOOT = 7, // 重启 - DEBUG_TIME_SET = 8, // 对时 - - DEBUG_ADJSUT_COEFFICIENT_GET = 9, // 获取校准系数 - DEBUG_ADJSUT_COEFFICIENT_SET = 10, // 设置校准系数 - DEBUG_NOISE_POST = 11, // 自动获取采样值 - DEBUG_NOISE_CAREFOR = 12, // 使能自动获取采样值功能 - - DEBUG_DEVICE_STATUS = 13, // 查询设备状态（后台连接、4G连接） - - - DEBUG_ARM_UPGRADE = 0x0050, // ARM 升级 - DEBUG_FPGA1_UPGRADE = 0x0051, // FPGA 板卡升级 - DEBUG_UPGRADE_ALL = 0x0056 // ARM 和 FPGA 板卡升级 -}; - -#define BITMAP_SAVE_FILE (1 << 0) -#define BITMAP_IP_CHANGE (1 << 1) - -#define DEBUG_MANAGE_TOOL_PORT (10050) /* Exported types ------------------------------------------------------------*/ -/* 端口校准系数. */ -typedef struct { - uint16_t point[4]; // 通道分段点. - uint16_t param_a[5]; // 通道线性度校准系数 a. - uint16_t param_b[5]; // 通道线性度校准系数 b. - uint16_t alarm_ref; // 断线告警比较值. - uint16_t reserve; -} debug_pkt_adj_vport_t; - -typedef struct { - debug_pkt_adj_vport_t vport[PD_PORT_SUM]; -} debug_pkt_adj_t; - -/* 端口状态, 主要是 ADC 原始值和校准后的值.*/ -typedef struct { - uint16_t value_adc; - int16_t value_adj; -} debug_pkt_port_state_t; - -typedef struct { - debug_pkt_port_state_t vport[PD_PORT_SUM]; -} debug_pkt_port_t; - -/* 设备状态. */ -typedef struct { - uint32_t idx; // 编号. - uint32_t UTC_TimeScale; // UTC 时标 - float F50Hz_Frequency; // 同步 50Hz 频率. - uint8_t F50Hz_SynStatus; // 同步状态. - uint8_t dau_status; // 插件状态. - uint16_t sensor_status; // 传感器断线状态. - uint16_t is_server_link; // 是否连接上后台. - uint16_t version; // 软件版本 - uint32_t communication_time; // 上一次通讯的时间 - uint32_t run_time; // 设备运行时间 -} debug_pkt_status_t; - -/* 报文头. */ +/* 调试工具状态结构 */ typedef struct{ - uint16_t head; // 0x55aa. - uint16_t cmd; // 命令. - uint32_t len; // 包长. -} debug_pkt_head_t; + uint8_t is_connect:1; + uint8_t state_cnt; + struct sockaddr_in server; // 当前收包 ip +} debug_state_t; /* 调试工具全局结构 */ typedef struct{ - int fd; // TCP server 监听使用的 socket. - int fd_client; // TCP client 通讯使用的 socket. - char buf[DEBUG_BUG_SIZE]; // 通讯使用收法包 buffer. - char buf_post[DEBUG_BUG_SIZE]; // 主动上传通讯使用收法包 buffer. - int is_manual_col; // 是否手动采集. + int fd; // 通讯使用的 socket. + uint8_t buf[DEBUG_BUG_SIZE]; + uint8_t buf_send[DEBUG_BUG_SIZE]; + uint8_t buf_update[DEBUG_BUG_UPDATE_SIZE]; + struct sockaddr_in server; // 服务器 ip + debug_state_t state; } debug_ctrl_t; -/* 报文头结构. */ -typedef struct{ - uint16_t head; // 0x55aa. - - uint32_t len; - uint8_t dev_type_m; - uint8_t dev_type_s; - uint16_t dev_id; - uint8_t cmd_type; - uint8_t cmd; - uint16_t pkt_id; - uint8_t reserve[18]; -} dbg_pkt_head_t; - - -/* 基础信息 */ -typedef struct{ - uint8_t type_m; // 主设备号 - uint8_t type_s; // 次设备号 - uint8_t reserved1[2]; // 保留 - uint32_t dev_id; // 设备ID - char hostname[FILE_NAME_LEN]; // 设备名 128byte - uint32_t factory_date; // 出厂日期. - uint32_t deployment_date; // 部署日期. - uint8_t app_version[32]; // 软件版本 - uint8_t app_compile_time[32]; // 软件编译时间 - uint8_t hardware_version[32]; // 硬件版本 - uint8_t FPGA_version[32]; // fpga版本 - uint32_t ip; // 本机（服务器） IP. - uint32_t mask; // 本机（服务器） MASK. - uint32_t gw; // 本机（服务器）网关 - uint8_t mac[6]; // MAC地址. - uint16_t csg_port; // 后台端口号. - uint32_t csg_ipv4; // 后台 IP. - uint32_t running_time; //运行时间 -} dbg_device_info_t; - -/* 全局配置 */ -#pragma pack(push, 1) -typedef struct{ - uint16_t power_frequency; // 工频频率, 单位: 0.1Hz - uint16_t trend_period; // 趋势数据上送周期, 单位: 秒. - uint8_t sync_mode; // 同步方式 1: PT 同步 2: 内同步(默认) 3: 外接信号同步. - uint8_t heartbeat_period; // 心跳包周期, 单位: 分钟. - uint8_t pps_mode; // pps 主从模式 PD_PPS_XXX. - uint8_t reserved[1]; - uint16_t trend_storage; // 趋势存储文件数量阈值. - uint16_t event_storage; // 事件存储文件数量阈值 - uint8_t is_4G_enable; // 是否使用 4G 模块 - char APN[PD_4G_APN_LEN]; // 4G 模块 APN -} dbg_global_config_t; -#pragma pack(pop) - - -/* 端口配置. */ -typedef struct { - uint8_t vport; // 通道编号. - uint8_t port_type; // 采集通道类型 , 1 表示特高频局放 2 表示超声局放 3 表示 TEV 4 表示高频. - uint8_t filter; // 滤波器类型 1: 低频段 2: 全频段 3: 窄频段 4: 高频段 - uint8_t sensor_type; // 0: 无配置; 1: UHF信号传感器; 2: UHF噪声传感器 ; 3: UHF信号传感器, 关联噪声降噪. - uint8_t is_auto_noise; // 是否自动调整降噪等级. - uint8_t denoise_type; // 0-无配置 1-自动 2-手动降噪 - uint8_t reserved0[2]; - - uint32_t event_counter_h; // 事件次数阀值高. - uint16_t event_sec_h; // 事件每秒次数阀值高. - uint16_t event_thr_h; // 事件值阈值高. - uint32_t event_counter_thr_h; // 事件值阈值高的次数. - - uint32_t event_counter_l; // 事件次数阀值低. - uint16_t event_sec_l; // 事件每秒次数阀值低. - uint16_t event_thr_l; // 事件值阈值低. - uint32_t event_counter_thr_l; // 事件值阈值低的次数. - - uint8_t burst_time; // 事件突发计算时间 - uint8_t reserved1[1]; - uint16_t burst_thr; // 事件突发阈值 - - int16_t denoise_manual; // 手动底噪等级 - int16_t denoise_auto; // 自动降噪水平 -}dbg_port_config_t; - -/* 高频通道校准系数 */ -typedef struct { - uint16_t param_a[PD_PORT_SUM]; // 通道线性度校准系数 a. - uint16_t param_b[PD_PORT_SUM]; // 通道线性度校准系数 b. -} debug_hf_pkt_adj_vport_t; - -/* 设备状态. */ -typedef struct { - uint8_t csg_connect_status; // 后台连接状态. - uint8_t ec20_connect_status; // 4g模块连接状态 -} debug_pkt_dev_connect_status_t; - /* Exported macro ------------------------------------------------------------*/ /* Extern global variables ---------------------------------------------------*/ -extern debug_ctrl_t debug_ctrl; /* Extern functions ----------------------------------------------------------*/ extern int32_t debug_handle_init(void); extern int32_t debug_handle_init_after(void); -extern int32_t debug_pkt_port_state_post(void); extern void debug_upgrade_result_send(int32_t rv, char *buf); + #endif #endif /************************ (C) COPYRIGHT LandPower ***** END OF FILE ****/ diff --git a/app/lib/a_process/pd_dbg.c b/app/lib/a_process/pd_dbg.c new file mode 100644 index 0000000..3070177 --- /dev/null +++ b/app/lib/a_process/pd_dbg.c @@ -0,0 +1,573 @@ +/***************************************************************************** + * file lib/process/pd_dbg.c + * author YuLiang + * version 1.0.0 + * date 01-June-2023 + * brief This file provides all the debug server related operation functions. + ****************************************************************************** + * Attention + * + *

© COPYRIGHT(c) 2021 LandPower

+ * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * 3. Neither the name of LandPower nor the names of its contributors may be used to + * endorse or promote products derived from this software without specific + * prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + ******************************************************************************/ + +/* Includes ------------------------------------------------------------------*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#ifdef CFG_DEV_TYPE_LAND_PD +/* 标准C库头文件. */ +#include +#include +#include +#include +#include +#include + +/* 用户代码头文件. */ +#include "cJSON.h" +#include "main.h" +#include "mtimer.h" +#include "pd_dbg.h" +#include "pd_csg.h" +#include "pd_dau.h" +#include "pd_upgrade.h" + +/* Private define ------------------------------------------------------------*/ + +/* Private macro -------------------------------------------------------------*/ + +/* Private typedef -----------------------------------------------------------*/ +enum DEBUG_CMD_TYPE +{ + DEBUG_CMD_INFO_GET = 1, + DEBUG_CMD_INFO_SET = 2, + DEBUG_CMD_SLOT_GET = 3, + DEBUG_CMD_STATE_SEND = 4, + DEBUG_CMD_UPDATE = 5, + DEBUG_CMD_UPDATE_RV = 6 +}; + +/* 报文头结构. */ +typedef struct +{ + uint16_t len; + uint8_t dev_type_m; + uint8_t dev_type_s; + uint32_t dev_id; + uint8_t cmd_type; + uint8_t cmd; + uint16_t pkt_id; + uint8_t version; + uint8_t reserve[19]; +} debug_pkt_head_t; + +/* 设备信息 */ +typedef struct +{ + uint8_t type_m; // 主设备号 + uint8_t type_s; // 次设备号 + uint8_t slot; // slot id + uint8_t reserved0[1]; // 保留 + uint32_t dev_id; // 设备ID + char hostname[FILE_NAME_LEN]; // 设备名 128byte + uint32_t factory_date; // 出厂日期. + uint32_t deployment_date; // 部署日期. + uint8_t app_version[DEV_VERSION_STR_LEN]; // 软件版本 + uint8_t app_compile_time[DEV_VERSION_STR_LEN]; // 软件编译时间 + uint8_t hardware_version[DEV_VERSION_STR_LEN]; // 硬件版本 + uint8_t FPGA_version[DEV_VERSION_STR_LEN]; // fpga版本 + uint32_t ip; // 本机 IP. + uint32_t mask; // 本机 MASK. + uint32_t gw; // 本机网关 + uint8_t mac[6]; // MAC地址. + uint16_t server_port; // 服务器端口号. + uint32_t server_ipv4; // 服务器 IP. + uint8_t port[8]; + uint8_t port_type[8]; +} debug_pkt_info_t; + +/* 设备信息 */ +typedef struct +{ + uint8_t is_insert; + uint8_t is_connect; + uint8_t port_sum; + uint8_t reserved0; +} debug_pkt_slot_state_t; + +/* 设备信息 */ +typedef struct +{ + debug_pkt_info_t info; + debug_pkt_slot_state_t state; +} debug_pkt_slot_t; + +/* 设备信息 */ +typedef struct +{ + uint32_t utc; + uint32_t run_time; + uint8_t is_insert[PD_SLOTS_MAX]; + uint8_t is_connect[PD_SLOTS_MAX]; +} debug_pkt_state_t; + +typedef struct +{ + uint32_t index; + uint32_t len; +} debug_pkt_msg_t; + +/* Private variables ---------------------------------------------------------*/ +debug_ctrl_t debug_ctrl; + +/* Private function prototypes -----------------------------------------------*/ + +/* Internal functions --------------------------------------------------------*/ +/* 包头填充. */ +void _debug_pkt_head_init(uint8_t *buf, uint16_t len, uint8_t cmd) +{ + debug_pkt_head_t *head = (debug_pkt_head_t*)buf; + + /* 封装报文头. */ + head->len = len; + head->dev_type_m = device_info.type_m; + head->dev_type_s= device_info.type_s; + head->dev_id = device_info.dev_id; + head->cmd = cmd; +} + +/* 数据发送 */ +void _debug_pkt_send(uint8_t *buf, uint16_t len) +{ + int32_t rv = 0; + + //printh("#Send %d:\r\n", len); + //buf_print((char*)buf, len > 64 ? 64 : len); + //printh("\r\n"); + + rv = sendto(debug_ctrl.fd, buf, len, 0, (struct sockaddr*)&debug_ctrl.server, sizeof(debug_ctrl.server)); + if (rv < 0) + { + DBG(DBG_M_DEBUG, "Sendto return %s!\r\n", safe_strerror(errno)); + } +} + +int32_t _debug_recv_info_get(uint8_t *buf, int32_t len) +{ + debug_pkt_info_t *pinfo = (debug_pkt_info_t*)(buf + sizeof(debug_pkt_head_t)); + + memcpy(&debug_ctrl.server, &debug_ctrl.state.server, sizeof(struct sockaddr_in)); + debug_ctrl.state.is_connect = TRUE; + + pinfo->type_m = device_info.type_m; + pinfo->type_s = device_info.type_s; + pinfo->dev_id = device_info.dev_id; + snprintf(pinfo->hostname, FILE_NAME_LEN, "%s", device_info.hostname); + pinfo->factory_date = device_info.factory_date; + pinfo->deployment_date = device_info.deployment_date; + snprintf((char*)pinfo->app_version, DEV_VERSION_STR_LEN, "%s", device_info.app_version); + snprintf((char*)pinfo->app_compile_time, DEV_VERSION_STR_LEN, "%s", device_info.app_compile_time); + snprintf((char*)pinfo->hardware_version, DEV_VERSION_STR_LEN, "%s", device_info.hardware_version); + snprintf((char*)pinfo->FPGA_version, DEV_VERSION_STR_LEN, "%s", device_info.FPGA_version); + pinfo->ip = device_info.ip; + pinfo->mask = device_info.mask; + pinfo->gw = device_info.gw; + pinfo->server_port = csg.server_port; + pinfo->server_ipv4 = csg.server_ip; + + /* 封装报文头. */ + _debug_pkt_head_init(buf, sizeof(debug_pkt_head_t) + sizeof(debug_pkt_info_t), DEBUG_CMD_INFO_GET); + /* 发送报文 */ + _debug_pkt_send(buf, sizeof(debug_pkt_head_t) + sizeof(debug_pkt_info_t)); + + return E_NONE; +} + +int32_t _debug_recv_info_set(uint8_t *buf, int32_t len) +{ + debug_pkt_info_t *pinfo = (debug_pkt_info_t*)(buf + sizeof(debug_pkt_head_t)); + uint8_t mac[MAC_ADDR_LEN] = {0}; + bool change_ip = FALSE; + + device_info.dev_id = pinfo->dev_id; + snprintf(device_info.hostname, FILE_NAME_LEN, "%s", pinfo->hostname); + + snprintf((char*)pinfo->hardware_version, DEV_VERSION_STR_LEN, "%s", device_info.hardware_version); + if (device_info.ip != pinfo->ip) + { + device_info.ip = pinfo->ip; + change_ip = TRUE; + } + device_info.mask = pinfo->mask; + device_info.gw = pinfo->gw; + csg.server_port = pinfo->server_port; + csg.server_ip = pinfo->server_ipv4; + device_info.factory_date = pinfo->factory_date; + + /* 封装报文头. */ + _debug_pkt_head_init(buf, sizeof(debug_pkt_head_t), DEBUG_CMD_INFO_SET); + /* 发送报文 */ + _debug_pkt_send(buf, sizeof(debug_pkt_head_t)); + + /* 保存配置 */ + vtysh_config_save(); + if (change_ip) + { + mac_generate_from_ip(device_info.ip, mac); + memcpy(device_info.mac, mac, MAC_ADDR_LEN); + vtysh_eth0_save(); + } + vtysh_device_save(); + + return E_NONE; +} + +int32_t _debug_recv_slot_get(uint8_t *buf, int32_t len) +{ + debug_pkt_slot_t *pinfo = (debug_pkt_slot_t*)(buf + sizeof(debug_pkt_head_t)); + dau_contact_t *dau = NULL; + uint32_t slot = *(uint32_t*)(buf + sizeof(debug_pkt_head_t)); + + if (slot > PD_SLOTS_MAX + || slot < 1) + { + return E_BAD_PARAM; + } + + slot--; + if (daus[slot].state.is_connect) + { + dau = &daus[slot].info; + + pinfo->info.type_m = dau->type_m; + pinfo->info.type_s = dau->type_s; + pinfo->info.slot = slot + 1; + pinfo->info.dev_id = dau->dev_id; + snprintf(pinfo->info.hostname, FILE_NAME_LEN, "%s", dau->hostname); + pinfo->info.factory_date = dau->factory_date; + pinfo->info.deployment_date = dau->deployment_date; + snprintf((char*)pinfo->info.app_version, DEV_VERSION_STR_LEN, "%s", dau->app_version); + snprintf((char*)pinfo->info.app_compile_time, DEV_VERSION_STR_LEN, "%s", dau->app_compile_time); + snprintf((char*)pinfo->info.hardware_version, DEV_VERSION_STR_LEN, "%s", dau->hardware_version); + snprintf((char*)pinfo->info.FPGA_version, DEV_VERSION_STR_LEN, "%s", dau->FPGA_version); + pinfo->info.ip = dau->ip; + pinfo->info.mask = dau->mask; + pinfo->info.gw = dau->gw; + pinfo->info.server_port = dau->server_port; + pinfo->info.server_ipv4 = dau->server_ipv4; + + pinfo->state.is_insert = daus[slot].state.is_insert; + pinfo->state.is_connect = daus[slot].state.is_connect; + pinfo->state.port_sum = daus[slot].state.port_sum; + } + else + { + pinfo->info.type_m = 0; + pinfo->info.type_s = 0; + } + + /* 封装报文头. */ + _debug_pkt_head_init(buf, sizeof(debug_pkt_head_t) + sizeof(debug_pkt_slot_t), DEBUG_CMD_SLOT_GET); + /* 发送报文 */ + _debug_pkt_send(buf, sizeof(debug_pkt_head_t) + sizeof(debug_pkt_slot_t)); + + return E_NONE; +} + +int32_t _debug_recv_state_get(uint8_t *buf, int32_t len) +{ + debug_ctrl.state.state_cnt = 0; + return E_NONE; +} + +/* 升级文件接收 */ +int32_t _debug_recv_update(uint8_t *buf, int32_t len) +{ + static int fd = -1; + debug_pkt_msg_t *head_msg = (debug_pkt_msg_t*)(buf + sizeof(debug_pkt_head_t)); + char *data = (char*)(buf + sizeof(debug_pkt_head_t) + sizeof(debug_pkt_msg_t)); + int32_t len_wr = 0; + + /* 首保处理, 打开文件描述符, 初始化变量 */ + if (0 == head_msg->index) + { + if (fd > 0) + { + close(fd); + fd = -1; + } + + fd = open(PD_UPG_SOFTWARE, O_WRONLY | O_CREAT | O_TRUNC, 0777); + if (fd < 0) + { + DBG(DBG_M_DEBUG, "Open file " PD_UPG_SOFTWARE " error!\n"); + return E_SYS_CALL; + } + } + + /* 收包流程 */ + len_wr = write(fd, data, head_msg->len); + if (len_wr != head_msg->len) + { + DBG(DBG_M_DEBUG, "Write file " PD_UPG_SOFTWARE " error!\n"); + return E_SYS_CALL; + } + + /* 封装报文头. */ + _debug_pkt_head_init(buf, sizeof(debug_pkt_head_t) + sizeof(debug_pkt_msg_t), DEBUG_CMD_UPDATE); + /* 发送报文 */ + _debug_pkt_send(buf, sizeof(debug_pkt_head_t) + sizeof(debug_pkt_msg_t)); + + /* 最后一个报文处理 */ + if (head_msg->len < 1024) + { + close(fd); + fd = -1; + DBG(DBG_M_DEBUG, "Receive upgrade file end.\r\n"); + pd_upg_start(PD_UPG_FROM_DBG, PD_UPG_SEL_CMU); + } + + return E_NONE; +} + +/* 报文校验. */ +int32_t _debug_recv_check(uint8_t *buf, int len) +{ + debug_pkt_head_t *head = (debug_pkt_head_t*)buf; + + /* 报文长度检查 */ + if (head->len > DEBUG_BUG_SIZE) + { + return E_ERROR; + } + + /* 只收主控设备 */ + if (head->dev_type_m != 3 || head->dev_type_s != 99) + { + return E_ERROR; + } + + if (debug_ctrl.state.is_connect && debug_ctrl.server.sin_addr.s_addr != debug_ctrl.state.server.sin_addr.s_addr) + { + return E_ERROR; + } + + return E_NONE; +} + +/* 调试工具报文数据处理. */ +int32_t _debug_recv_process(uint8_t *buf, int32_t len) +{ + debug_pkt_head_t *head = (debug_pkt_head_t*)buf; + + /* 报文格式检查. */ + LD_E_RETURN(DBG_M_DEBUG, _debug_recv_check(buf, len)); + + /* 报文处理. */ + switch(head->cmd) + { + case DEBUG_CMD_INFO_GET: + _debug_recv_info_get(buf, len); + break; + case DEBUG_CMD_INFO_SET: + _debug_recv_info_set(buf, len); + break; + case DEBUG_CMD_SLOT_GET: + _debug_recv_slot_get(buf, len); + break; + case DEBUG_CMD_STATE_SEND: + _debug_recv_state_get(buf, len); + break; + case DEBUG_CMD_UPDATE: + _debug_recv_update(buf, len); + break; + default: + DBG(DBG_M_DEBUG, "Debug not support cmd:%x\n", head->cmd); + break; + } + + return E_NONE; +} + +/* 调试工具报文接收处理线程. */ +void *_debug_recv_handle(void *arg) +{ + struct sockaddr_in server; + socklen_t server_len = sizeof(struct sockaddr_in); + uint16_t data_len = 0; + + /* 等待初始化完成 */ + while(!is_system_init) + { + sleep(1); + } + + while(1) + { + /* 读取数据. */ + data_len = recvfrom(debug_ctrl.fd, debug_ctrl.buf, DEBUG_BUG_SIZE, 0, (struct sockaddr*)&server, &server_len); + if (data_len <= 0) + { + DBG(DBG_M_DEBUG, "Recvfrom return ERROR %s!\r\n", safe_strerror(errno)); + continue; + } + + //printh("#Recv %d:\r\n", data_len); + //buf_print((char*)debug_ctrl.buf, data_len > 64 ? 64 : data_len); + //printh("\r\n"); + + /* 收包长度小于头长度则不处理 */ + if (data_len < sizeof(debug_pkt_head_t)) + { + continue; + } + + memcpy(&debug_ctrl.state.server, &server, sizeof(struct sockaddr_in)); + _debug_recv_process(debug_ctrl.buf, data_len); + + } + + return NULL; +} + +int32_t _debug_send_state(void) +{ + uint8_t *buf = debug_ctrl.buf_send; + debug_pkt_state_t *pinfo = (debug_pkt_state_t*)(buf + sizeof(debug_pkt_head_t)); + uint8_t i = 0; + + /* 封装报文头. */ + _debug_pkt_head_init(buf, sizeof(debug_pkt_head_t) + sizeof(debug_pkt_state_t), DEBUG_CMD_STATE_SEND); + + pinfo->utc = time(NULL); + pinfo->run_time = start_time; + for(i = 0; i < PD_SLOTS_MAX; i++) + { + pinfo->is_insert[i] = daus[i].state.is_insert; + pinfo->is_connect[i] = daus[i].state.is_connect; + } + + /* 发送报文 */ + _debug_pkt_send(buf, sizeof(debug_pkt_head_t) + sizeof(debug_pkt_state_t)); + + return E_NONE; +} + +/* 调试工具报文接收处理线程. */ +void *_debug_send_handle(void *arg) +{ + /* 等待初始化完成 */ + while(!is_system_init) + { + sleep(1); + } + + while(1) + { + sleep(3); + + if (debug_ctrl.state.is_connect) + { + _debug_send_state(); + debug_ctrl.state.state_cnt++; + if (debug_ctrl.state.state_cnt > 3) + { + debug_ctrl.state.is_connect = FALSE; + debug_ctrl.state.state_cnt = 0; + } + } + } + + return NULL; +} + +/* Interface functions -------------------------------------------------------*/ +/* 调试工具初始化. */ +int32_t debug_handle_init(void) +{ + return E_NONE; +} + +int32_t debug_handle_init_after(void) +{ + struct sockaddr_in server; + thread_param_t param = {0}; + int fd = 0; + + /* 创建 socket. */ + fd = socket(AF_INET, SOCK_DGRAM, 0); + if (fd < 0) + { + log_err(LOG_DEBUG, "ERROR at socket create return %s!", safe_strerror(errno)); + return E_SYS_CALL; + } + + /* 绑定端口 */ + bzero(&server, sizeof(server)); + server.sin_family = AF_INET; + server.sin_addr.s_addr = htonl(INADDR_ANY); + server.sin_port = htons(42971); + if(bind(fd, (struct sockaddr*)&server, sizeof(server)) < 0) + { + log_err(LOG_CSG, "ERROR at socket bind return %s!", safe_strerror(errno)); + close(fd); + return E_SYS_CALL; + } + + /* 保存数据. */ + debug_ctrl.fd = fd; + + param.priority = 25; + param.log_module = LOG_DEBUG; + snprintf(param.thread_name, THREAD_NAME_LEN, "DEBUG_RECV"); + create_thread(_debug_recv_handle, ¶m); + + param.priority = 25; + param.log_module = LOG_DEBUG; + snprintf(param.thread_name, THREAD_NAME_LEN, "DEBUG_STATE"); + create_thread(_debug_send_handle, ¶m); + + return E_NONE; +} + +/* 升级结果回复处理 */ +void debug_upgrade_result_send(int32_t rv, char *buf) +{ + uint8_t *buf_send = debug_ctrl.buf_update; + int32_t *ret = (int32_t*)(buf_send + sizeof(debug_pkt_head_t)); + + /* 封装报文头. */ + _debug_pkt_head_init(buf_send, sizeof(debug_pkt_head_t) + sizeof(int32_t), DEBUG_CMD_UPDATE_RV); + + /* 0-错误 1-正常 */ + *ret = rv; + + /* 发送报文 */ + _debug_pkt_send(buf_send, sizeof(debug_pkt_head_t) + sizeof(int32_t)); +} +#endif +/************************ (C) COPYRIGHT LandPower ***** END OF FILE ****************/ diff --git a/app/lib/a_process/pd_main.c b/app/lib/a_process/pd_main.c index cc1d229..6877c90 100755 --- a/app/lib/a_process/pd_main.c +++ b/app/lib/a_process/pd_main.c @@ -52,7 +52,7 @@ #include "pd_csg.h" #include "pd_main.h" #include "pd_dau.h" - +#include "pd_dbg.h" /* Private typedef -----------------------------------------------------------*/ @@ -623,7 +623,7 @@ int32_t pd_main(void) rv |= _pd_main_init(); rv |= dau_handle_init(); rv |= csg_handle_init(); - //rv |= debug_handle_init(); + rv |= debug_handle_init(); return E_NONE; } @@ -635,7 +635,7 @@ int32_t pd_main_after(void) rv |= _pd_main_init_after(); rv |= dau_handle_init_after(); rv |= csg_handle_init_after(); - //rv |= debug_handle_init_after(); + rv |= debug_handle_init_after(); rv |= _pd_broadcast_init(); return rv; diff --git a/app/lib/a_process/pd_upgrade.c b/app/lib/a_process/pd_upgrade.c index 9b3b9eb..c24a516 100755 --- a/app/lib/a_process/pd_upgrade.c +++ b/app/lib/a_process/pd_upgrade.c @@ -60,6 +60,7 @@ /* Private define ------------------------------------------------------------*/ #define PD_UPG_READ_SIZE (1024*1024) #define PD_UPG_HARDWARE_VERSON "GIS7.0" +#define PD_UPG_DAU_FILE "/lib/firmware/system_wrapper.bin" /* Private macro -------------------------------------------------------------*/ @@ -215,7 +216,7 @@ int32_t _pd_upg_upgrade_dau(void) } /* 读取并写升级文件 */ - rv = _pd_upg_write_file(offset, lenth, DEBUG_DAU_FILE); + rv = _pd_upg_write_file(offset, lenth, PD_UPG_DAU_FILE); if (rv != E_NONE) { snprintf(pd_upg_ctrl.msg, 128, "DAU write file error."); @@ -529,7 +530,7 @@ int32_t pd_upg_start(uint8_t from, uint8_t type) } else if(PD_UPG_FROM_DBG == from) { - //pd_upg_ctrl.upgrade_result = debug_upgrade_result_send; + pd_upg_ctrl.upgrade_result = debug_upgrade_result_send; } else {