Minecraft/cc-mek-scada
1
0
Fork 0
mirror of https://github.com/MikaylaFischler/cc-mek-scada.git synced 2024-08-30 18:22:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,457 Commits 5 Branches 39 Tags 9 MiB
bee96ed12e
Commit Graph

1457 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mikayla Fischler
b575899d46 #33 lua module/require architecture changeover 2022-05-04 13:37:01 -04:00
Mikayla Fischler
7bcb260712 #27 added getMaxEnergy for turbine 2022-05-04 12:03:07 -04:00
Mikayla Fischler
1cb5a0789e #27 mekanism 10.1+ RTU support 2022-05-04 11:23:45 -04:00
Mikayla Fischler
8b7ef47aad removed references to alarms and now sends status on shutdown 2022-05-04 10:00:21 -04:00
Mikayla Fischler
e253a7b4ff supervisor PLC session closing, re-requesting status cache if missing 2022-05-03 17:25:31 -04:00
Mikayla Fischler
fe5059dd51 debug print 2022-05-03 17:21:34 -04:00
Mikayla Fischler
25c6b311f5 clear status cache when connection is lost/reset, allow requesting of full status 2022-05-03 17:10:42 -04:00
Mikayla Fischler
665b33fa05 #42 parallel RTU reads 2022-05-03 11:39:03 -04:00
Mikayla Fischler
635c70cffd moved MODBUS file thanks to utilizing types file 2022-05-03 11:28:29 -04:00
Mikayla Fischler
dc1c1db5e6 MODBUS bugfixes, utilize new types file 2022-05-03 11:27:40 -04:00
Mikayla Fischler
e2f7318922 #27 induction matrix RTU split into two RTUs, supporting pre and post Mekansim 10.1 2022-05-03 10:49:14 -04:00
Mikayla Fischler
c76200b0e3 shared global types 2022-05-03 10:44:18 -04:00
Mikayla Fischler
62b4b63f4a supervisor PLC session bugfixes 2022-05-02 17:43:23 -04:00
Mikayla Fischler
574b85e177 PLC bugfixes and #37 optimized status packets and structure packets 2022-05-02 17:40:00 -04:00
Mikayla Fischler
e3e370d3ab fixed RTU mgmt_pkt reference 2022-05-02 17:34:57 -04:00
Mikayla Fischler
1ac4de65a9 added close to valid scada types and fixed length checks for packet decoders 2022-05-02 17:34:24 -04:00
Mikayla Fischler
c19a58380c fixed cancel not being exposed for watchdog functions 2022-05-02 17:33:54 -04:00
Mikayla Fischler
4bc50e4bad #41 RTU comms closing 2022-05-02 13:15:08 -04:00
Mikayla Fischler
5ce3f84dfa #41 PLC connection closing 2022-05-02 12:06:04 -04:00
Mikayla Fischler
b280201446 #41 cancel session watchdog timer 2022-05-02 11:44:10 -04:00
Mikayla Fischler
76c81395b7 #41 close session connections 2022-05-02 11:42:24 -04:00
Mikayla Fischler
7ff0e25711 #7 sending commands to PLCs, retrying failed sends until confirmed 2022-05-01 17:04:38 -04:00
Mikayla Fischler
cd46c69a66 defined push_data to be implemented 2022-05-01 15:35:07 -04:00
Mikayla Fischler
b76871aa07 fixed incorrect program type in startup message 2022-05-01 15:34:44 -04:00
Mikayla Fischler
479194b589 ISS alarm status packet adjustments 2022-05-01 13:26:02 -04:00
Mikayla Fischler
3fe47f99a9 PLC bugfix 2022-04-30 13:44:28 -04:00
Mikayla Fischler
aeda38fa01 #17 set burn rate right away if within range, reset last setpoint on SCRAM 2022-04-30 03:03:34 -04:00
Mikayla Fischler
10aa34a8e8 #17 PLC ramp burn rate to setpoint 2022-04-29 22:27:54 -04:00
Mikayla Fischler
e1135eac01 log init parameters in config files 2022-04-29 13:36:00 -04:00
Mikayla Fischler
c805b6e0c5 log init function to set path and write mode 2022-04-29 13:32:37 -04:00
Mikayla Fischler
3587352219 log exit notices as info messages not warnings 2022-04-29 13:20:56 -04:00
Mikayla Fischler
84e7ad43bc #39 RTU unit threads 2022-04-29 13:19:01 -04:00
Mikayla Fischler
e833176c65 #40 RTU sequence number verification 2022-04-29 10:19:05 -04:00
Mikayla Fischler
ef1fdc7f39 #34 RTU modem disconnect/reconnect handling, bugfix in comms thread 2022-04-29 09:27:05 -04:00
Mikayla Fischler
07e9101ac7 PLC modem disconnect bugfix 2022-04-29 09:25:08 -04:00
Mikayla Fischler
4d5cbcf475 PLC comms packet length checks 2022-04-29 09:07:29 -04:00
Mikayla Fischler
d688f9a1c6 supervisor code cleanup, adjusted prints 2022-04-28 22:41:08 -04:00
Mikayla Fischler
67ec8fbd91 rx and tx threads for PLC comms to maintain quick comms and #36 only feed watchdog on valid sequence numbers 2022-04-28 22:36:45 -04:00
Mikayla Fischler
aff166e27d added util adaptive_delay to replace repeated code 2022-04-27 19:06:01 -04:00
Mikayla Fischler
f14d715070 #7 PLC session comms link, accept statuses, functional keep-alives 2022-04-27 18:52:06 -04:00
Mikayla Fischler
7f0f423450 PLC bugfixes/optimizations, removed some debug prints 2022-04-27 18:49:54 -04:00
Mikayla Fischler
f067da31b4 #38 handle out of space when logging 2022-04-27 18:43:07 -04:00
Mikayla Fischler
fe3b8e6f88 fixed up worker loop delay logic 2022-04-27 17:59:25 -04:00
Mikayla Fischler
46a27a3f3a check shutdown flag in worker loops so they don't lock up the exit process 2022-04-27 16:38:41 -04:00
Mikayla Fischler
82726520b8 that was a stack not a queue, nice 2022-04-27 16:24:28 -04:00
Mikayla Fischler
d40937b467 this was supposed to be in that pr merge oops 2022-04-27 16:06:30 -04:00
Mikayla
f996b9414a
Merge pull request #35 from MikaylaFischler/32-mek-api-parallel-exec 
32 mek api parallel exec
 2022-04-27 15:58:27 -04:00
Mikayla Fischler
146e0bf569 protected sleep call 2022-04-27 15:56:55 -04:00
Mikayla Fischler
67a93016c0 threaded RTU/PLC bugfixes 2022-04-27 15:52:34 -04:00
Mikayla Fischler
14377e7348 don't run PLC comms thread if not networked 2022-04-27 15:01:10 -04:00