Commit Graph

202 Commits

Author SHA1 Message Date
Emmanuel HC
2791048b6a Merge pull request #61 from emmanuelsrlok/develop
Develop
2026-05-21 09:24:56 -05:00
Emmanuel HC
aa70458a72 Merge branch 'main' into develop 2026-05-21 09:24:29 -05:00
Emmanuel HC
d132ef49b2 Merge pull request #46 from emmanuelsrlok/rdavis/PHX3_VFD_ABB_ACH580_RTU
Rdavis/phx3 vfd abb ach580 rtu
2026-05-21 09:21:01 -05:00
Emmanuel HC
593bddae02 Merge branch 'develop' into rdavis/PHX3_VFD_ABB_ACH580_RTU 2026-05-21 09:20:42 -05:00
Emmanuel HC
96ab14fae6 Merge pull request #49 from emmanuelsrlok/rdavis/UMAS_CRAH_TCP
Rdavis/umas crah tcp
2026-05-21 09:19:56 -05:00
Emmanuel HC
1204269e9f Merge branch 'develop' into rdavis/UMAS_CRAH_TCP 2026-05-21 09:19:46 -05:00
Emmanuel HC
f2c67275f1 Merge pull request #47 from emmanuelsrlok/rdavis/York_Chiller_RTU
Rdavis/york chiller rtu
2026-05-21 09:18:13 -05:00
Emmanuel HC
c9de80895d Merge branch 'develop' into rdavis/York_Chiller_RTU 2026-05-21 09:18:02 -05:00
Emmanuel HC
ff31fe3a80 Merge pull request #48 from emmanuelsrlok/rdavis/PHX3_CRAH_LIEBERT_80_SLAB_TCP
Rdavis/phx3 crah liebert 80 slab tcp
2026-05-21 09:17:22 -05:00
Emmanuel HC
76be3b914d Merge branch 'develop' into rdavis/PHX3_CRAH_LIEBERT_80_SLAB_TCP 2026-05-21 09:17:10 -05:00
Emmanuel HC
5d57f11b8d Merge pull request #60 from emmanuelsrlok/efren/Chiller
phxa7
2026-05-21 09:15:17 -05:00
a455ed62e2 Update platformio.ini
PHXA7
2026-05-20 16:24:44 -05:00
89435deb42 phxa7 2026-05-20 15:38:03 -05:00
Emmanuel HC
a7b1d5c911 Merge branch 'main' of https://github.com/emmanuelsrlok/Industrial_Emulator 2026-05-15 16:30:24 -05:00
Emmanuel HC
1925417e30 cortex test 2026-05-15 16:30:19 -05:00
Emmanuel HC
5bb265bcdf Update State_Standby.cpp 2026-04-02 11:55:14 -05:00
8962f61ca2 Merge pull request #59 from emmanuelsrlok/zggutierrez96-patch-5
Refactor power factor strategy additions
2026-04-02 09:01:41 -05:00
6595958de8 Refactor power factor strategy additions
The PF loop in the constructor (lines 87–90) used string concatenation, while the rest of the constructor uses explicit string literals. 

Changed CB1-8_PF to string literals to match syntax.
2026-04-02 09:01:17 -05:00
15b3cbec07 Merge pull request #58 from emmanuelsrlok/zggutierrez96-patch-4
Fix MainCB_Total_kW value in config.h
2026-04-02 08:59:48 -05:00
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
RobertJDavis
1226c45418 Update config.h 2026-02-24 15:34:17 -07:00
e1d43e9de8 changes
changes
2026-02-16 16:03:09 -06:00
c075b2c0ea upload
upload
2026-02-12 11:54:36 -06:00
50f4c21a23 Merge branch 'develop' of https://github.com/emmanuelsrlok/Industrial_Emulator into develop 2026-02-12 11:39:01 -06:00
Emmanuel HC
3000d1d477 Merge pull request #53 from emmanuelsrlok/ecruz/Oracle/RPP
RPP program added
2026-02-12 11:37:13 -06: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
48f0e4837a Created new TCP_CRAH program names HTS_PLC
Created new TCP_CRAH program names HTS_PLC
2026-01-05 15:20:52 -06:00
RobertJDavis
cde17f28e7 added comments 2025-12-12 11:32:17 -07:00
RobertJDavis
08436c1df6 added comments 2025-12-12 11:26:39 -07:00
RobertJDavis
2f0ef4b09c clean up code 2025-12-12 10:52:03 -07:00
RobertJDavis
716038970f lengthened counter time 2025-12-10 18:37:49 -06:00
RobertJDavis
79e28c1f34 local tests 2025-12-10 18:24:39 -06:00
RobertJDavis
72feb87603 local testing adjustments 2025-12-10 16:34:29 -06:00
RobertJDavis
a04324a8d6 updated and added registers to match UDT
copy-pasted develop version of code, added tags required for UDT.
2025-12-10 15:06:36 -06:00