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

updated IPs for loading Schertz arduinos

Browse Source
This commit is contained in:
RobertJDavis
2025-12-10 09:37:18 -06:00
parent 6630a01638
commit d30cba5036
4 changed files with 1 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/BMS/CRAH/PHX3_CRAH_LIEBERT_80_SLAB_TCP/StateUtils.cpp
View File

@@ -73,43 +73,25 @@ void updateAnalogs(Equipment<ModbusIP>* equipment){
equipment->setModbus_Point("Supply Air Temp", 90.0f);
equipment->setModbus_Point("SA Temp Low Alarm ON", 0);
}
}
void updateReturnAirTempAlarms(Equipment<ModbusIP>* equipment){
Modbus_Point<ModbusIP>* returnAirTemp = equipment -> getModbus_Point("Return Air Temp");
Modbus_Point<ModbusIP>* returnTempHighAlarmSP = equipment->getModbus_Point("Return Air Temp Alarm High SP");
Modbus_Point<ModbusIP>* returnTempLowAlarmSP = equipment->getModbus_Point("Return Air Temp Alarm Low SP");
//Modbus_Point<ModbusIP>* returnTempHighAlarm = equipment->getModbus_Point("Alarm High Return Air Temp");
//Modbus_Point<ModbusIP>* returnTempLowAlarm = equipment->getModbus_Point("Alarm Low Return Air Temp");
/**
int RATemp = returnAirTemp->getValue();
int RATempHighAlm = returnTempHighAlarmSP->getValue();
int RATempLowAlm = returnTempLowAlarmSP->getValue();
equipment->setModbus_Point("RATemp Value", RATemp);
equipment->setModbus_Point("RATempHighAlm Value", RATempHighAlm);
equipment->setModbus_Point("RATempLowAlm Value", RATempLowAlm);
*/
if (returnAirTemp->getValue() < returnTempLowAlarmSP->getValue()) {
equipment->setModbus_Point("Alarm Low Return Air Temp", 1);
equipment->setModbus_Point("Alarm High Return Air Temp", 0);
//returnTempHighAlarm->setValue(1);
}
else if (returnAirTemp->getValue() > returnTempHighAlarmSP->getValue()) {
equipment->setModbus_Point("Alarm High Return Air Temp", 1);
equipment->setModbus_Point("Alarm Low Return Air Temp", 0);
//returnTempLowAlarm->setValue(1);
}
else{
equipment->setModbus_Point("Alarm High Return Air Temp", 0);
equipment->setModbus_Point("Alarm Low Return Air Temp", 0);
//returnTempHighAlarm->setValue(0);
//returnTempLowAlarm->setValue(0);
}
}
void updateSupplyAirTempAlarms(Equipment<ModbusIP>* equipment){
@@ -117,16 +99,6 @@ void updateSupplyAirTempAlarms(Equipment<ModbusIP>* equipment){
Modbus_Point<ModbusIP>* supplyTempHighAlarmSP = equipment->getModbus_Point("Supply Air Temp Alarm High SP");
Modbus_Point<ModbusIP>* supplyTempLowAlarmSP = equipment->getModbus_Point("Supply Air Temp Alarm Low SP");
/**
int SATemp = supplyAirTemp->getValue();
int SATempHighAlm = supplyTempHighAlarmSP->getValue();
int SATempLowAlm = supplyTempLowAlarmSP->getValue();
equipment->setModbus_Point("SATemp Value", SATemp);
equipment->setModbus_Point("SATempHighAlm Value", SATempHighAlm);
equipment->setModbus_Point("SATempLowAlm Value", SATempLowAlm);
*/
if (supplyAirTemp->getValue() > supplyTempHighAlarmSP->getValue()) {
equipment->setModbus_Point("Alarm High Supply Temp", 1);
equipment->setModbus_Point("Alarm Low Supply Temp", 0);
@@ -146,16 +118,6 @@ void updateReturnHumidityAlarms(Equipment<ModbusIP>* equipment){
Modbus_Point<ModbusIP>* returnHumHighAlarmSP = equipment->getModbus_Point("Return Humidity Alarm High SP");
Modbus_Point<ModbusIP>* returnHumLowAlarmSP = equipment->getModbus_Point("Return Humidity Alarm Low SP");
/**
int RAHum = returnHumidity->getValue();
int RAHumHighAlm = returnHumHighAlarmSP->getValue();
int RAHumLowAlm = returnHumLowAlarmSP->getValue();
equipment->setModbus_Point("RAHum Value", RAHum);
equipment->setModbus_Point("RAHumHighAlm Value", RAHumHighAlm);
equipment->setModbus_Point("RAHumLowAlm Value", RAHumLowAlm);
*/
if (returnHumidity->getValue() > returnHumHighAlarmSP->getValue()) {
equipment->setModbus_Point("Alarm High Return Humidity", 1);
equipment->setModbus_Point("Alarm Low Return Humidity", 0);

4
src/BMS/CRAH/PHX3_CRAH_LIEBERT_80_SLAB_TCP/State_Running.cpp
View File

@@ -48,10 +48,6 @@ RunningState<ModbusIP>::RunningState() {
addStrategy("Return Air Temp", new SawStrategy(78.0f, 88.0f, 1.0f, 3000));
addStrategy("Supply Air Temp", new SawStrategy(73.0f, 77.0f, 1.0f, 5000));
//addStrategy("Return Humidity", new SingleValueStrategy(10.0f, 0.0f, 1000));
//addStrategy("Return Air Temp", new SingleValueStrategy(50.0f, 0.0f, 1000));
//addStrategy("Supply Air Temp", new SingleValueStrategy(60.0f, 0.0f, 1000));
addStrategy("Supply Air Flow", new SawStrategy(7.0f, 10.0f, 1.0f, 1000));
addStrategy("Fan Speed", new PIDStrategy("Return Air Temp Setpoint", 1000, "Return Air Temp"));
addStrategy("Fluid Control Valve Position 1", new PIDStrategy("Supply Air Temp Setpoint", 1000, "Supply Air Temp"));

7
src/BMS/CRAH/PHX3_CRAH_LIEBERT_80_SLAB_TCP/State_Standby.cpp
View File

@@ -46,13 +46,6 @@ StandbyState<ModbusIP>::StandbyState() {
addStrategy("Supply Air Flow", new RampStrategy(0.0f, 1.0f, 5000));
addStrategy("Fluid Control Valve Position 1", new RampStrategy(0.0f, 5.0f, 1000));
addStrategy("Fluid Control Valve Position 2", new RampStrategy(0.0f, 5.0f, 1000));
//addStrategy("Return Humidity Alarm High SP", new SingleValueStrategy(60.0f, 0.0f, 1000));
//addStrategy("Return Humidity Alarm Low SP", new SingleValueStrategy(20.0f, 0.0f, 1000));
//addStrategy("Return Air Temp Alarm High SP", new SingleValueStrategy(100.0f, 0.0f, 1000));
//addStrategy("Return Air Temp Alarm Low SP", new SingleValueStrategy(72.0f, 0.0f, 1000));
//addStrategy("Supply Air Temp Alarm High SP", new SingleValueStrategy(78.0f, 0.0f, 1000));
//addStrategy("Supply Air Temp Alarm Low SP", new SingleValueStrategy(72.0f, 0.0f, 1000));
}
/**

2
src/BMS/CRAH/PHX3_CRAH_LIEBERT_80_SLAB_TCP/config.h
View File

@@ -23,7 +23,7 @@
#include <ModbusIP_ESP8266.h>
const char *ssid = "ArduinoWifiB"; /**< @brief The SSID of the WiFi network. */
const char *password = "123abc456"; /**< @brief The password for the WiFi network. */
IPAddress local_IP(172, 17, 32, 63); /**< @brief The static IP address for the device. */
IPAddress local_IP(172, 17, 32, 66); /**< @brief The static IP address for the device. */
IPAddress gateway(172, 17, 32, 1); /**< @brief The gateway IP address. */
IPAddress subnet(255, 255, 255, 0); /**< @brief The subnet mask. */