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
872 Commits 5 Branches 39 Tags 9 MiB
6a0992c7a4
Commit Graph

872 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mikayla Fischler
b10a8d9479 send ISS status automatically along with PLC status 2022-04-21 12:40:21 -04:00
Mikayla Fischler
0c132f6e43 todo comment format 2022-04-21 10:44:43 -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
04f8dc7d75 readme update about coordinator 2022-04-21 10:17:14 -04:00
Mikayla Fischler
3da7b74cfb initial base supervisor code 2022-04-18 11:07:16 -04:00
Mikayla Fischler
b89724ad59 version updates 2022-04-18 10:49:05 -04:00
Mikayla Fischler
a3920ec2d8
Merge pull request #16 from MikaylaFischler/devel 
Alpha PLC & RTU Code
 2022-04-18 10:35:15 -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
7d9a664d38 rsio bugfixes 2022-04-18 00:11:23 -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
28b1c03e03 upped version 2022-04-07 11:45:01 -04:00
Mikayla Fischler
b085baf91b #12 specifically get wireless modems 2022-04-07 11:44:17 -04:00
Mikayla Fischler
03f9284f30 #13 ISS tolerant of failed PPM calls, added comments 2022-04-07 11:12:41 -04:00
Mikayla Fischler
7e7e98ff6b #11 standalone de-asserts SCRAM and resets ISS before check, added prints to ISS, fixed non-networked mode related bugs, cleaned up ISS check call in startup 2022-04-05 17:58:23 -04:00
Mikayla Fischler
ba1dd1b50e #4 PLC degraded start and reconnects appear to be working now, fixed prints, and bugfixes to PPM 2022-04-05 17:29:27 -04:00
Mikayla Fischler
895750ea14 print, println, println_ts 2022-04-05 17:28:19 -04:00
Mikayla Fischler
c47f45ea46 fixed bad function references in ISS 2022-04-05 17:25:56 -04:00
Mikayla Fischler
f24b214229 fixed bugs and removed goto as lua 5.1 does not have goto 2022-04-05 16:09:29 -04:00
Mikayla Fischler
5b32f83890 writeLine has newline of course.. 2022-04-05 16:08:55 -04:00
Mikayla Fischler
dbf7377c02 #11 configurable 'networked' setting for PLCs that allows for standalone ISS-only mode 2022-04-05 15:56:48 -04:00
Mikayla Fischler
13b0fcf65f PLC state code cleanup and bugfixes 2022-04-05 09:41:06 -04:00
Mikayla Fischler
02763c9cb3 #4 PLC peripheral disconnect handling and small bugfixes/cleanup 2022-04-03 12:08:22 -04:00
Mikayla Fischler
34fc625602 #5 finished implementing PLC packet handler, bugfixes 2022-04-02 14:43:36 -04:00
Mikayla Fischler
ed997d53e1 #6 PLC retry SCRAM until reactor confirms unpowered 2022-04-02 11:46:14 -04:00
Mikayla Fischler
7c2d89e70f allow suppressing of PPM errors 2022-04-02 11:45:43 -04:00
Mikayla Fischler
a77946ce2c #1 PLC does not shut down if failed link, repeatedly tries to maintain link as part of main loop 2022-04-02 11:22:44 -04:00
Mikayla Fischler
36fb4587a1 consistent packet constructors/receiving 2022-04-02 08:28:43 -04:00
Mikayla Fischler
013656bc4d supervisor code moved around 2022-03-25 12:18:33 -04:00
Mikayla Fischler
5eaeb50000 broke up comms file, setup base coordinator code 2022-03-25 12:17:46 -04:00
Mikayla Fischler
2ee503946c plc cleanup, removed old code 2022-03-25 11:50:03 -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
5642e3283d fixes to modbus_packet() 2022-03-15 11:58:52 -04:00
Mikayla Fischler
6e1e4c4685 ppm includes get_type function now 2022-03-15 11:58:22 -04:00
Mikayla Fischler
a9d4458103 redstone I/O constants defined, digital I/O functions with active high/low mappings added 2022-03-15 11:58:08 -04:00
Mikayla Fischler
17874c4658 cleanup/improvements to PLC comms 2022-03-14 14:19:21 -04:00
Mikayla Fischler
ac4ca3e56e reactor plc utilizes ppm and is now changed to use pullEventRaw 2022-03-10 14:23:14 -05:00
Mikayla Fischler
5cff346cb5 ppm function renames, edited log messages, and changed protected calls to return true if function has no return 2022-03-10 14:21:03 -05:00
Mikayla Fischler
a0b2c1f3e2 changed ppm to not wrap under ppm() function 2022-03-10 14:12:07 -05:00