Commit Graph

155 Commits

Author SHA1 Message Date
1b8c4baf2b Fix MainCB_Total_kW value in config.h
HRF64058 -> 63058
2026-04-02 08:59:32 -05:00
3e9b8e2465 Merge pull request #57 from emmanuelsrlok/zggutierrez96-patch-3
Remove duplicate setPointValue calls in State_Standby.cpp
2026-04-01 16:35:25 -05:00
6fc7550249 Remove duplicate setPointValue calls in State_Standby.cpp
Removed duplicate setPointValue calls for MainCB_Total_kW and MainCB_maxCurrent.
2026-04-01 16:34:59 -05:00
4e7d463aa8 Merge pull request #56 from emmanuelsrlok/zggutierrez96-patch-2
Fix MainCB_L1_PF index in config.h
2026-04-01 16:28:58 -05:00
c382c02257 Fix MainCB_L1_PF index in config.h 2026-04-01 16:28:44 -05:00
86c6557c8d Add dynamic strategy addition for CB PF values 2026-04-01 14:05:05 -05:00
080b04f8f9 Update config.h 2026-04-01 14:03:18 -05:00
b3cf712a24 Update MainCB_L1 and L2 current definitions 2026-04-01 14:00:01 -05:00
1da0f62676 Update MainCB parameters in config.h 2026-04-01 13:52:19 -05:00
528150a2f8 Merge pull request #54 from emmanuelsrlok/zggutierrez96-patch-1
Add new HR_FLOAT entries for total KW and PF
2026-04-01 13:39:08 -05:00
a7b0b11b71 Add new HR_FLOAT entries for total KW and PF 2026-04-01 13:38:51 -05:00
Emmanuel HC
d565830f18 Merge pull request #52 from emmanuelsrlok/ecruz/Oracle/RPP
Ecruz/oracle/rpp
2026-02-12 11:36:20 -06:00
Emmanuel HC
09be54e330 RPP program added 2026-02-12 11:35:04 -06:00
Emmanuel HC
43ad28afa6 Merge pull request #51 from emmanuelsrlok:ecruz/Oracle/CDU
CoolIT CDU equipment added to library
2026-02-05 14:44:31 -06:00
Emmanuel HC
be348deee3 CoolIT CDU equipment added to library 2026-02-05 14:43:19 -06:00
Emmanuel HC
99ed857c62 Merge pull request #50 from emmanuelsrlok/develop
Develop
2026-02-05 08:11:59 -06:00
Emmanuel HC
80f718606e Merge branch 'develop' of https://github.com/emmanuelsrlok/Industrial_Emulator into develop 2026-02-05 08:08:30 -06:00
Emmanuel HC
d792990bee q 2026-01-09 10:47:04 -06:00
Emmanuel HC
0660080312 Merge pull request #45 from emmanuelsrlok/ecruz/MVG
Ecruz/mvg
2025-11-14 11:27:17 -06:00
Emmanuel HC
96f68f8d43 Breaker ABB Emax 2
Configuration of Breaker ABB Emax 2 Template
2025-11-14 11:24:55 -06:00
Emmanuel HC
bd3814aca7 gen 2025-11-10 16:28:31 -06:00
Emmanuel HC
b7e7107a2b Merge pull request #44 from emmanuelsrlok/ecruz/MVG
Ecruz/mvg
2025-11-10 09:25:38 -06:00
Emmanuel HC
587945cf1f MVG Template created 2025-11-10 09:24:44 -06:00
Emmanuel HC
210a53800e MVG template added 2025-11-10 08:22:18 -06:00
RobertJDavis
aa204e615e PHX3 uploading to EPMS devices
Changed "SEL_2440 (MVG)" to "SEL_2440_MVG" so device can load onto Arduino.
Uploaded existing EPMS code to PHX3 EPMS Arduinos.
Changes to run status bit of UMAS CRAH.
Modified a few PHX3 VFD ACH580 registers from HR to HR_10x.
2025-11-06 17:40:55 -07:00
RobertJDavis
b4a626b908 minor adjustments to CRAH UMAS TCP
added Fan Speed Feedback register 40029, initialized unit to run for better image visualization while we wait for PICS-Arduino solution.
2025-11-06 06:52:10 -07:00
RobertJDavis
e5ae233875 Added Fan Speed Feedback register to UMAS DH CRAH.
Added Fan Speed Feedback register to UMAS DH CRAH.
2025-11-05 07:13:59 -07:00
RobertJDavis
dfc103f1e1 updated PHX3 VFD registers per new UDT 2025-11-04 15:15:45 -07:00
RobertJDavis
f0e3a3a5e5 change com port during testing 2025-11-04 14:21:19 -07:00
RobertJDavis
40282fca0d updates for Schertz testing 2025-11-04 14:16:03 -07:00
Emmanuel HC
8b164606a9 Merge pull request #37 from emmanuelsrlok/rdavis/PHX3_CRAH_LIEBERT_80_SLAB_TCP
Added PHX3 EG CRAH
2025-11-04 08:27:39 -06:00
Emmanuel HC
bcd627f785 Merge branch 'develop' into rdavis/PHX3_CRAH_LIEBERT_80_SLAB_TCP 2025-11-04 08:27:14 -06:00
Emmanuel HC
077ecdfab8 Merge pull request #38 from emmanuelsrlok/rdavis/PHX3_VFD_ABB_ACH580_RTU
added Run Status and Fault Status
2025-11-04 08:26:20 -06:00
Emmanuel HC
41474af889 Merge pull request #41 from emmanuelsrlok/rdavis/HUM_DriSteem_RTS_RX36_TCP
Adding HUM DriSteem TCP for PHX3
2025-11-04 08:26:02 -06:00
Emmanuel HC
261dcce5a0 Merge branch 'develop' into rdavis/HUM_DriSteem_RTS_RX36_TCP 2025-11-04 08:25:51 -06:00
Emmanuel HC
fe1bdfa887 Merge pull request #43 from emmanuelsrlok/rdavis/York_Chiller_RTU
Update Rdavis/york chiller rtu
2025-11-04 08:25:18 -06:00
RobertJDavis
428bb7b367 test for pull request 2025-11-04 07:20:02 -07:00
RobertJDavis
e04196dd11 minor adjustments 2025-10-31 15:07:43 -07:00
RobertJDavis
dad0ad3ff4 Changed to 32-bit registers
Changed from 16-bit to 32-bit registers per request from Alex H.
2025-10-31 14:47:33 -07:00
RobertJDavis
4c8425d077 changed to 32 bit registers 2025-10-31 14:20:38 -07:00
RobertJDavis
94dbd4c5c0 minor adjustments 2025-10-31 11:08:48 -07:00
RobertJDavis
2836257015 10x registers
Modified to 10x registers: Supply Temp, Return Temp, Return Humidity.
Changed Supply and Return Temp in RunningState for PID strategy to work.
2025-10-31 10:56:43 -07:00
RobertJDavis
25688908f2 Added General Alarm, Fail State
Added General Alarm, Fail State, changed some registers to 10x.
2025-10-31 10:34:07 -07:00
Emmanuel HC
b785c25ee2 Merge pull request #40 from emmanuelsrlok/develop
Update Main branch from development to keep the latest devices from DFR and PHX equipment added.
2025-10-31 10:42:50 -05:00
Emmanuel HC
fddbea9ebf Merge pull request #39 from emmanuelsrlok/ecruz/epms
CDR EPMS devices update, ATS, Brakers, PDU, UPS, tested
2025-10-31 10:41:45 -05:00
Emmanuel HC
79984d2524 Merge branch 'develop' into ecruz/epms 2025-10-31 10:41:06 -05:00
Emmanuel HC
b6c00d32e2 ATS update 2025-10-31 10:40:19 -05:00
Emmanuel HC
12e397c855 save 2025-10-30 16:53:26 -05:00
RobertJDavis
7ff7a3ae12 Added Speed Feedback (hard IO) 2025-10-30 14:22:15 -07:00
RobertJDavis
8157deaae7 Added General Alarm, VSD Output Freq
Added General Alarm, VSD Output Frequency registers. Updated modbus register to actual instead of test registers.
2025-10-30 12:32:28 -07:00