Bluesun
/
sun_ems
forked from gary/ems
2
0
Fork 0
Code Pull Requests Activity

更新修改

This commit is contained in:
ahu_gq 2025-05-24 17:16:28 +08:00
parent 4284000661
commit a9d99a9a5c
14 changed files with 483 additions and 579 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ems_c/app/app_comm.h
View File

@ -1,5 +1,5 @@
/***************************************************************************** /*****************************************************************************
* @copyright 1997-2010, . POWER SUPPLY CO., LTD. * @copyright Copyright (c) 2025-2055 Gary. All rights reserved.
* @file app_comm.h * @file app_comm.h
* @brief xx功能 * @brief xx功能
* @author Gary * @author Gary

11
ems_c/app/app_parse.c
View File

@ -1,5 +1,5 @@
/***************************************************************************** /*****************************************************************************
* @copyright 1997-2010, . POWER SUPPLY CO., LTD. * @copyright Copyright (c) 2025-2055 Gary. All rights reserved.
* @file app_parse.c * @file app_parse.c
* @brief 解析所有配置文件的入口 * @brief 解析所有配置文件的入口
* @author Gary * @author Gary
@ -28,15 +28,16 @@ uint16_t gStDevTypePointNum[kDev_Type_End] =
kEms_DataEnd, kEms_DataEnd,
kPccMeter_DataEnd, kPccMeter_DataEnd,
kBsMeter_DataEnd, kBsMeter_DataEnd,
kPcs_DataEnd,
kBsu_DataEnd, kBsu_DataEnd,
kBcu_DataEnd, kBcu_DataEnd,
kPcs_DataEnd,
kAcLiquidMac_DataEnd,
kTHSenor_DataEnd, kTHSenor_DataEnd,
kWater_DataEnd,
kYg_DataEnd,
kFireprotect_DataEnd,
kDiDoSign_DataEnd, kDiDoSign_DataEnd,
kUps_DataEnd, kUps_DataEnd,
kAcLiquidMac_DataEnd,
kWater_DataEnd,
kRev1_DataEnd,
kRev2_DataEnd, kRev2_DataEnd,
kRev3_DataEnd, kRev3_DataEnd,
kRev4_DataEnd, kRev4_DataEnd,

2
ems_c/app/app_parse.h
View File

@ -1,6 +1,6 @@
/***************************************************************************** /*****************************************************************************
* @copyright 1997-2010, . POWER SUPPLY CO., LTD. * @copyright Copyright (c) 2025-2055 Gary. All rights reserved.
* @file app_parse.h * @file app_parse.h
* @brief 解析所有配置文件的入口 * @brief 解析所有配置文件的入口
* @author Gary * @author Gary

2
ems_c/bsp/bsp_comm.h
View File

@ -1,5 +1,5 @@
/***************************************************************************** /*****************************************************************************
* @copyright 1997-2010, . POWER SUPPLY CO., LTD. * @copyright Copyright (c) 2025-2055 Gary. All rights reserved.
* @file bsp_comm.h * @file bsp_comm.h
* @brief xx功能 * @brief xx功能
* @author Gary * @author Gary

4
ems_c/bsp/bsp_data_mode.c
View File

@ -1,5 +1,5 @@
/***************************************************************************** /*****************************************************************************
* @copyright 1997-2010, . POWER SUPPLY CO., LTD. * @copyright Copyright (c) 2025-2055 Gary. All rights reserved.
* @file bsp_data_mode.c * @file bsp_data_mode.c
* @brief xx功能 * @brief xx功能
* @author Gary * @author Gary
@ -119,8 +119,6 @@ void getGpioMsge()
setRtdbPointValue(kSign_ShMem, kDev_Type_EMS, 0, (kEms_Di_Start + loop), (double_t)tmp); setRtdbPointValue(kSign_ShMem, kDev_Type_EMS, 0, (kEms_Di_Start + loop), (double_t)tmp);
} }
} }
// 掉电检测 可能没用因为掉电之后很快就宕机 建议用drvGpioFlFcu2601Read(kForlinux_FC2601_Pow)直接获取不通过RTDB
setRtdbPointValue(kSign_ShMem, kDev_Type_EMS, 0, kEms_Pow, drvGpioFlFcu2601Read(kForlinux_FC2601_Pow));
} }
// 本机设备数量获取 直接写入共享内存 // 本机设备数量获取 直接写入共享内存

978
ems_c/bsp/bsp_data_mode.h
View File

File diff suppressed because it is too large Load Diff

2
ems_c/bsp/bsp_redis.h
View File

@ -7,7 +7,7 @@
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/ */
/***************************************************************************** /*****************************************************************************
* @copyright 1997-2010, . POWER SUPPLY CO., LTD. * @copyright Copyright (c) 2025-2055 Gary. All rights reserved.
* @file bsp_redis.h * @file bsp_redis.h
* @brief xx功能 * @brief xx功能
* @author Gary * @author Gary

2
ems_c/bsp/bsp_shm.h
View File

@ -7,7 +7,7 @@
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/ */
/***************************************************************************** /*****************************************************************************
* @copyright 1997-2010, . POWER SUPPLY CO., LTD. * @copyright Copyright (c) 2025-2055 Gary. All rights reserved.
* @file bsp_shm.h * @file bsp_shm.h
* @brief 共享内存接口封装 * @brief 共享内存接口封装
* @author Gary * @author Gary

2
ems_c/kernel/kit_data.h
View File

@ -1,5 +1,5 @@
/***************************************************************************** /*****************************************************************************
* @copyright 1997-2010, . POWER SUPPLY CO., LTD. * @copyright Copyright (c) 2025-2055 Gary. All rights reserved.
* @file kit_data.h * @file kit_data.h
* @brief 所有的数据类型定义以及 * @brief 所有的数据类型定义以及
* @author Gary * @author Gary

2
ems_c/kernel/kit_log.c
View File

@ -1,5 +1,5 @@
/***************************************************************************** /*****************************************************************************
* @copyright 1997-2010, . POWER SUPPLY CO., LTD. * @copyright Copyright (c) 2025-2055 Gary. All rights reserved.
* @file bsp_log.c * @file bsp_log.c
* @brief 日志功能 * @brief 日志功能
* @author Gary * @author Gary

2
ems_c/kernel/kit_log.h
View File

@ -1,6 +1,6 @@
/***************************************************************************** /*****************************************************************************
* @copyright 1997-2010, . POWER SUPPLY CO., LTD. * @copyright Copyright (c) 2025-2055 Gary. All rights reserved.
* @file kit_log.h * @file kit_log.h
* @brief 日志功能 * @brief 日志功能
* @author Gary * @author Gary

2
ems_c/kernel/kit_math.h
View File

@ -1,5 +1,5 @@
/***************************************************************************** /*****************************************************************************
* @copyright 1997-2010, . POWER SUPPLY CO., LTD. * @copyright Copyright (c) 2025-2055 Gary. All rights reserved.
* @file kit_math.h * @file kit_math.h
* @brief xx功能 * @brief xx功能
* @author Gary * @author Gary

8
ems_c/logic/logic_bcu2bsu.c
View File

@ -5,7 +5,7 @@
// 定义哈希表的结构 // 定义哈希表的结构
// 声明全局变量 // 声明全局变量
#if 1
// 初始化全局哈希表 // 初始化全局哈希表
void init_bcu_bsu_map(BcuBsuMap **bsu_map) void init_bcu_bsu_map(BcuBsuMap **bsu_map)
{ {
@ -15,8 +15,8 @@ void init_bcu_bsu_map(BcuBsuMap **bsu_map)
{kBsu_SysVolt, kBcu_TotalVolt}, {kBsu_SysVolt, kBcu_TotalVolt},
{kBsu_SysCur, kBcu_TotalCur}, {kBsu_SysCur, kBcu_TotalCur},
{kBsu_SysSOC, kBcu_SOC}, {kBsu_SOC, kBcu_SOC},
{kBsu_SysSOH, kBcu_SOH}, {kBsu_SOH, kBcu_SOH},
{kBsu_MaxCellTemp, kBcu_MaxCellTemp}, {kBsu_MaxCellTemp, kBcu_MaxCellTemp},
{kBsu_MinCellTemp, kBcu_MinCellTemp}, {kBsu_MinCellTemp, kBcu_MinCellTemp},
{kBsu_TotalChgE, kBcu_TotalChgCap}, {kBsu_TotalChgE, kBcu_TotalChgCap},
@ -87,3 +87,5 @@ double getBsuRTDBPointValue(BcuBsuMap *bsu_map, rtdb_type_e type, uint16_t devTy
return getRtdbPointValue(type, devType, devId, pointId); return getRtdbPointValue(type, devType, devId, pointId);
} }
} }
#endif

27
ems_c/logic/logic_dido.c
View File

@ -158,33 +158,6 @@ void faultDataGet()
// RTDB数据写入 // RTDB数据写入
void faultDataSet(uint8_t cabt) void faultDataSet(uint8_t cabt)
{ {
setRtdbPointValue(kSign_ShMem, kDev_Type_EMS, 0, kEmsEmgStopL1 + cabt, (double)gpioRtdbData.emergStop[cabt]);
setRtdbPointValue(kSign_ShMem, kDev_Type_EMS, 0, kEmsSmokeL1 + cabt, (double)gpioRtdbData.smokeDetec[cabt]);
setRtdbPointValue(kSign_ShMem, kDev_Type_EMS, 0, kEmsDoorCtrlL1 + cabt, (double)gpioRtdbData.accessSensor[cabt]);
if (gpioRtdbData.smokeDetec[cabt] && gpioRtdbData.tempSensor[cabt])
{
setRtdbPointValue(kSign_ShMem, kDev_Type_EMS, 0, kEmsFireAlarmL1 + cabt, (double)kGpioSwitch_on);
}
else
{
setRtdbPointValue(kSign_ShMem, kDev_Type_EMS, 0, kEmsFireAlarmL1 + cabt, (double)kGpioSwitch_off);
}
setRtdbPointValue(kSign_ShMem, kDev_Type_EMS, 0, kEmsFireFaultL1 + cabt, (double)gpioRtdbData.fireFault[cabt]);
setRtdbPointValue(kSign_ShMem, kDev_Type_EMS, 0, kEmsFireSprayL1 + cabt, (double)gpioRtdbData.fireFeedback[cabt]);
if (gpioRtdbData.waterLow[cabt] && gpioRtdbData.waterHigh[cabt])
{
setRtdbPointValue(kSign_ShMem, kDev_Type_EMS, 0, kEmsFireFloodL1 + cabt, (double)kGpioSwitch_on);
}
else
{
setRtdbPointValue(kSign_ShMem, kDev_Type_EMS, 0, kEmsFireFloodL1 + cabt, (double)kGpioSwitch_off);
}
setRtdbPointValue(kSign_ShMem, kDev_Type_EMS, 0, kEmsSurge1 + cabt, (double)gpioRtdbData.surge[cabt]);
setRtdbPointValue(kSign_ShMem, kDev_Type_EMS, 0, kEmsTemp1 + cabt, (double)gpioRtdbData.tempSensor[cabt]);
return; return;
} }