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,209 Commits 5 Branches 39 Tags 9 MiB
1c0f61b3e0
Commit Graph

243 Commits

Author SHA1 Message Date
Mikayla Fischler
88c34d8bca fixed acknowledge packets to use error flag, fixed 'static'-like function scope of modbus functions 2022-09-18 22:02:17 -04:00
Mikayla Fischler
3267e7ff13 #96 RTU starts unlinked now on main thread start 2022-09-17 17:04:57 -04:00
Mikayla Fischler
1afafba501 wrap os.pullEventRaw to have return types 2022-07-19 15:18:11 -04:00
Mikayla Fischler
0bc0decbf2 util.is_int 2022-06-05 16:51:38 -04:00
Mikayla Fischler
1c819779c7 #69 config file validation 2022-06-05 15:09:02 -04:00
Mikayla Fischler
d6c8eb4d56 #68 check RTU unit configs while parsing 2022-06-05 14:49:50 -04:00
Mikayla Fischler
81345f5325 #71 validate frame data types 2022-06-05 13:22:36 -04:00
Mikayla Fischler
f0c97e8b70 #65 safe concat where appropriate 2022-06-05 11:16:25 -04:00
Mikayla Fischler
5068e47590 #67 turbine valve RTU supervisor session, bugfixes with redstone RTU session 2022-06-05 09:30:56 -04:00
Mikayla Fischler
6d97d45227 #67 imatrix RTU supervisor session 2022-06-04 17:45:52 -04:00
Mikayla Fischler
5cba8ff9f1 #59 environment detector RTU 2022-06-04 11:11:35 -04:00
Mikayla Fischler
fc7b83a18a #28 #66 #59 new RTUs 2022-06-04 10:49:36 -04:00
Mikayla Fischler
3bb95eb441 #64 util code cleanup 2022-05-31 16:09:06 -04:00
Mikayla Fischler
4ec07ca053 #64 rtu code cleanup and device bugfixes 2022-05-31 14:54:55 -04:00
Mikayla Fischler
ff5b163c1d ppm patch to support multiple return value functions, changed lack of modem to emit fatal error 2022-05-29 14:26:40 -04:00
Mikayla Fischler
6df0a1d149 #9 MODBUS test code; fixed rtu, modbus, redstone_rtu, and rsio bugs 2022-05-27 18:10:06 -04:00
Mikayla Fischler
26c6010ce0 #56 pcall threads and restart on crash (unless shutting down) 2022-05-21 13:56:14 -04:00
Mikayla Fischler
44d30ae583 #48 only log every 20 PPM faults (per function) 2022-05-19 10:35:56 -04:00
Mikayla Fischler
6a168c884d #23 device version reporting 2022-05-19 10:21:04 -04:00
Mikayla Fischler
62d5490dc8 #53 RTU redstone parse checks 2022-05-18 14:30:48 -04:00
Mikayla Fischler
cc856d4d80 redundant 'for_reactor' field removed from redstone RTU config 2022-05-18 13:32:44 -04:00
Mikayla Fischler
31ede51c42 still queue packets if RTU is busy, determine busy state by queue length rather than flag 2022-05-17 10:35:55 -04:00
Mikayla Fischler
bc6453de2b RTU bugfixes, adjusted comms sleep timer 2022-05-14 20:07:26 -04:00
Mikayla Fischler
d3a926b25a fixed require issues caused by using bootloader 2022-05-14 13:32:42 -04:00
Mikayla Fischler
bf0e92d6e4 refactoring 2022-05-13 11:08:22 -04:00
Mikayla Fischler
c53ddf1638 renamed RTU_ADVERT_TYPES to RTU_UNIT_TYPES 2022-05-13 10:27:57 -04:00
Mikayla Fischler
635e7b7f59 RTU advertisement sends as basic array, re-ordered input registers on turbine RTU 2022-05-13 09:39:28 -04:00
Mikayla Fischler
969abca95d RTU device changes, bugfixes, docs 2022-05-12 15:36:27 -04:00
Mikayla Fischler
95c4d51e67 #47 RTU send should be table not any 2022-05-11 12:09:04 -04:00
Mikayla Fischler
c6987f6f67 #47 RTU luadoc, bugfixes 2022-05-11 12:03:15 -04:00
Mikayla Fischler
02541184bd bootloader 2022-05-11 11:31:02 -04:00
Mikayla Fischler
22a6159520 updated globals list, fixed packet references that were linking to old controller mistakenly 2022-05-10 17:17:55 -04:00
Mikayla Fischler
e3a4ed5363 catch nil cases, supervisor use loop clock 2022-05-10 17:08:38 -04:00
Mikayla Fischler
6e1ece8183 watchdog cleanup and loop clock object 2022-05-10 13:06:13 -04:00
Mikayla Fischler
168341db39 code cleanup and bugfixes 2022-05-10 12:01:56 -04:00
Mikayla Fischler
25558df22d RTU/PLC code cleanup, #46 changed KEEP_ALIVE to scada message type and use it for the RTU too 2022-05-09 15:00:16 -04:00
Mikayla Fischler
469ee29b5a cleanup of rtu comms 2022-05-09 09:34:26 -04:00
Mikayla Fischler
96e535fdc4 global scope optimizations 2022-05-07 13:39:12 -04:00
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
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
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
e3e370d3ab fixed RTU mgmt_pkt reference 2022-05-02 17:34:57 -04:00
Mikayla Fischler
4bc50e4bad #41 RTU comms closing 2022-05-02 13:15:08 -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
aff166e27d added util adaptive_delay to replace repeated code 2022-04-27 19:06:01 -04:00
Mikayla Fischler
7f0f423450 PLC bugfixes/optimizations, removed some debug prints 2022-04-27 18:49:54 -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
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
8c4598e7a6 #32 new threaded RTU code 2022-04-27 12:46:04 -04:00
Mikayla Fischler
f7f723829c #7 work on PLC session comms, bugfixes with comms, general supervisor bugfixes 2022-04-25 21:00:50 -04:00
Mikayla Fischler
19a4b3c0ef ticked up versions 2022-04-25 15:50:24 -04:00
Mikayla Fischler
3ef2902829 apparently I forgot how to spell receive a few more times 2022-04-25 15:49:04 -04:00
Mikayla Fischler
b1998b61bc #32 parallel RTU execution of packet handler 2022-04-25 11:44:34 -04:00
Mikayla Fischler
86b0d155fa #31 PPM cannot assume that we will get a fault on failure, apparently sometimes we will only get a nil return so the system can no longer check ACCESS_OK, now each device has its own fault tracking 2022-04-24 12:04:31 -04:00
Mikayla Fischler
554f09c817 #30 RTU comms code updated for new comms design 2022-04-22 20:23:40 -04:00
Mikayla Fischler
17d0213d58 RTU/PPM bugfixes 2022-04-22 10:58:18 -04:00
Mikayla Fischler
f7c11febe5 check if interface exists before trying to get its device or type 2022-04-22 10:21:15 -04:00
Mikayla Fischler
4842f9cb0d moved packet constructors and fixes to comms namespace references in plc comms code 2022-04-21 10:26:02 -04:00
Mikayla Fischler
b89724ad59 version updates 2022-04-18 10:49:05 -04:00
Mikayla Fischler
6a5e0243be catch terminations that are caught by PPM 2022-04-18 10:31:24 -04:00
Mikayla Fischler
91079eeb78 fixed RTU comms bad function calls, fixed loop clock, changed terminate logic/prints 2022-04-18 10:21:29 -04:00
Mikayla Fischler
2278469a8b refactored RTU devices 2022-04-18 10:09:44 -04:00
Mikayla Fischler
377cf8e6fc scope fixes, load comms api, debug prints 2022-04-18 09:35:08 -04:00
Mikayla Fischler
a6e1134dc3 changed modbus init function name, fixed bugs with RTU startup, improved PPM debug prints 2022-04-18 00:10:47 -04:00
Mikayla Fischler
6d6953d795 RTU device inits now correctly use rtu.rtu_init() not rtu_init() 2022-04-17 22:37:09 -04:00
Mikayla Fischler
0c5eb77cba fixed some bugs with RTU startup referencing external data/functions 2022-04-17 22:36:18 -04:00
Mikayla Fischler
ba5975f29b RTU config fixed missing rsio reference 2022-04-17 22:34:49 -04:00
Mikayla Fischler
2a21d7d0be #14, #15 ppm access fault handling, report modbus exceptions, handle ppm faults in PLC/RTU code 2022-04-17 21:12:25 -04:00
Mikayla Fischler
945b761fc2 #2 RTU handle disconnects/reconnects 2022-04-11 17:27:57 -04:00
Mikayla Fischler
203d868aeb RTU print fixes, config fixes, comms init fixes and moved modem open 2022-04-11 11:08:46 -04:00
Mikayla Fischler
b085baf91b #12 specifically get wireless modems 2022-04-07 11:44:17 -04:00
Mikayla Fischler
36fb4587a1 consistent packet constructors/receiving 2022-04-02 08:28:43 -04:00
Mikayla Fischler
5eaeb50000 broke up comms file, setup base coordinator code 2022-03-25 12:17:46 -04:00
Mikayla Fischler
be73b17d46 RTU linking and requesting advertisement 2022-03-23 16:17:58 -04:00
Mikayla Fischler
60674ec95c RTU startup code and comms 2022-03-23 15:41:08 -04:00
Mikayla Fischler
74ae57324b redstone I/O rework 2022-03-23 15:36:14 -04:00
Mikayla Fischler
1e23a2fd67 work on RTU startup and comms 2022-03-15 12:02:31 -04:00
Mikayla Fischler
3c67ee08a8 redstone RTU I/O 2022-02-08 15:42:06 -05:00
Mikayla Fischler
d6a68ee3d9 rtu's for boiler, induction matrix, and turbine 2022-01-25 14:51:33 -05:00
Mikayla Fischler
00a81ab4f0 modbus comms implementation 2022-01-14 12:42:11 -05:00
Mikayla Fischler
78cbb9e67d RTU object and started modbus 2022-01-13 10:12:44 -05:00