e.cruz/Industrial_Emulator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'main' of https://github.com/emmanuelsrlok/Industrial_Emulator

Browse Source
This commit is contained in:
Emmanuel HC
2026-05-15 16:30:24 -05:00
parent 1925417e30 8962f61ca2
commit a7b1d5c911
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/EPMS/RPP/RPP_Cortex_TCP/State_Standby.cpp
View File

@@ -84,10 +84,14 @@ StandbyState<ModbusIP>::StandbyState() {
addStrategy("CB15_kW", new SingleValueStrategy(3.1F, 3.0f, 1000)); addStrategy("CB15_kW", new SingleValueStrategy(3.1F, 3.0f, 1000));
addStrategy("CB16_kW", new SingleValueStrategy(3.1F, 3.0f, 1000)); addStrategy("CB16_kW", new SingleValueStrategy(3.1F, 3.0f, 1000));
addStrategy("MainCB_PF", new SingleValueStrategy(0.9F, 0.05f, 1000)); addStrategy("CB1_PF", new SingleValueStrategy(0.9F, 0.05f, 1000));
for (int i = 1; i <= 8; i++) { addStrategy("CB2_PF", new SingleValueStrategy(0.9F, 0.05f, 1000));
addStrategy("CB" + std::to_string(i) + "_PF", new SingleValueStrategy(0.9F, 0.05f, 1000)); addStrategy("CB3_PF", new SingleValueStrategy(0.9F, 0.05f, 1000));
} addStrategy("CB4_PF", new SingleValueStrategy(0.9F, 0.05f, 1000));
addStrategy("CB5_PF", new SingleValueStrategy(0.9F, 0.05f, 1000));
addStrategy("CB6_PF", new SingleValueStrategy(0.9F, 0.05f, 1000));
addStrategy("CB7_PF", new SingleValueStrategy(0.9F, 0.05f, 1000));
addStrategy("CB8_PF", new SingleValueStrategy(0.9F, 0.05f, 1000));
} }
/** /**

2
src/EPMS/RPP/RPP_Cortex_TCP/config.h
View File

@@ -193,7 +193,7 @@ modbusMap mb_map[] =
{HR_FLOAT, 17352, 0, "CB15_maxCurrent"}, {HR_FLOAT, 17352, 0, "CB15_maxCurrent"},
{HR_FLOAT, 17356, 0, "CB16_maxCurrent"}, {HR_FLOAT, 17356, 0, "CB16_maxCurrent"},
{HR_FLOAT, 64058, 0, "MainCB_Total_kW"}, {HR_FLOAT, 63058, 0, "MainCB_Total_kW"},
{HR_FLOAT, 63178, 0, "MainCB_maxCurrent"}, {HR_FLOAT, 63178, 0, "MainCB_maxCurrent"},
{HR_FLOAT, 63068, 0, "MainCB_neutralCurrent"}, {HR_FLOAT, 63068, 0, "MainCB_neutralCurrent"},
{HR_FLOAT, 63070, 0, "MainCB_PF"}, {HR_FLOAT, 63070, 0, "MainCB_PF"},