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

Commit Graph

  • 146e0bf569 protected sleep call #35 Mikayla Fischler 2022-04-27 15:56:55 -04:00
  • 67a93016c0 threaded RTU/PLC bugfixes Mikayla Fischler 2022-04-27 15:52:34 -04:00
  • 14377e7348 don't run PLC comms thread if not networked Mikayla Fischler 2022-04-27 15:01:10 -04:00
  • 8c4598e7a6 #32 new threaded RTU code Mikayla Fischler 2022-04-27 12:46:04 -04:00
  • 71be6aca1a cleanup and last_update bugfix for comms thread Mikayla Fischler 2022-04-27 12:43:32 -04:00
  • ccf06956f9 fixed another typo Mikayla Fischler 2022-04-27 12:37:28 -04:00
  • 1ba5c7f828 fixed PLC mqueue typo and removed unused mq_main Mikayla Fischler 2022-04-27 12:27:15 -04:00
  • 68011d6734 #32 new threaded PLC code Mikayla Fischler 2022-04-27 12:21:10 -04:00
  • f7f723829c #7 work on PLC session comms, bugfixes with comms, general supervisor bugfixes Mikayla Fischler 2022-04-25 21:00:50 -04:00
  • 19a4b3c0ef ticked up versions Mikayla Fischler 2022-04-25 15:50:24 -04:00
  • 3ef2902829 apparently I forgot how to spell receive a few more times Mikayla Fischler 2022-04-25 15:49:04 -04:00
  • b861d3f668 removed debug print Mikayla Fischler 2022-04-25 15:46:32 -04:00
  • e119c11204 removed debug print Mikayla Fischler 2022-04-25 15:44:28 -04:00
  • b1998b61bc #32 parallel RTU execution of packet handler Mikayla Fischler 2022-04-25 11:44:34 -04:00
  • 0fc49d312d #32 parallel reactor PLC code Mikayla Fischler 2022-04-25 11:40:53 -04:00
  • c46a7b2486 added time functions to util, also task_wait Mikayla Fischler 2022-04-25 10:36:47 -04:00
  • 1744527a41 ISS cleanup Mikayla Fischler 2022-04-25 10:34:41 -04:00
  • 074f6448e1 some supervisor bugfixes Mikayla Fischler 2022-04-24 13:22:45 -04:00
  • 74168707c6 PLC clock timing fix Mikayla Fischler 2022-04-24 13:21:55 -04:00
  • 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 Mikayla Fischler 2022-04-24 12:04:31 -04:00
  • 416255f41a PLC check sequence numbers, corrected trip time to ms Mikayla Fischler 2022-04-23 21:10:25 -04:00
  • fa19af308d bugfix and use timestamp in packet Mikayla Fischler 2022-04-23 20:46:01 -04:00
  • 852161317d #7 initial PLC session supervisor code Mikayla Fischler 2022-04-23 12:12:33 -04:00
  • 3285f829f6 updated version for using epoch() Mikayla Fischler 2022-04-23 11:54:52 -04:00
  • 812d10f374 use epoch() instead of time() Mikayla Fischler 2022-04-23 11:54:09 -04:00
  • cd289ffb1e #30 svsessions PLC comms code updated for new comms design Mikayla Fischler 2022-04-22 21:55:26 -04:00
  • 89ff502964 #30 supervisor comms code updated for new comms design Mikayla Fischler 2022-04-22 21:44:33 -04:00
  • b25d95eeb7 #30 PLC comms code updated for new comms design Mikayla Fischler 2022-04-22 21:39:03 -04:00
  • 554f09c817 #30 RTU comms code updated for new comms design Mikayla Fischler 2022-04-22 20:23:40 -04:00
  • 912011bfed #30 modbus comms changes Mikayla Fischler 2022-04-22 20:21:28 -04:00
  • 78a1073e2a #30 comms rework Mikayla Fischler 2022-04-22 15:43:25 -04:00
  • 6daf6df2d0 active-backup supervisor setups are no longer planned Mikayla Fischler 2022-04-22 11:15:16 -04:00
  • 1bf0d352a1 supervisor sessions work in progress Mikayla Fischler 2022-04-22 11:07:59 -04:00
  • 17d0213d58 RTU/PPM bugfixes Mikayla Fischler 2022-04-22 10:58:18 -04:00
  • f7c11febe5 check if interface exists before trying to get its device or type Mikayla Fischler 2022-04-22 10:21:15 -04:00
  • 805de74634
         Create LICENSE v0.0.7-pre Mikayla 2022-04-22 10:05:36 -04:00
  • fe8326a65d
         Delete old LICENSE Mikayla 2022-04-22 09:37:40 -04:00
  • 991c855c11 message queue Mikayla Fischler 2022-04-21 12:44:46 -04:00
  • b10a8d9479 send ISS status automatically along with PLC status Mikayla Fischler 2022-04-21 12:40:21 -04:00
  • 0c132f6e43 todo comment format Mikayla Fischler 2022-04-21 10:44:43 -04:00
  • 4842f9cb0d moved packet constructors and fixes to comms namespace references in plc comms code Mikayla Fischler 2022-04-21 10:26:02 -04:00
  • 04f8dc7d75 readme update about coordinator Mikayla Fischler 2022-04-21 10:17:14 -04:00
  • 3da7b74cfb initial base supervisor code Mikayla Fischler 2022-04-18 11:07:16 -04:00
  • b89724ad59 version updates Mikayla Fischler 2022-04-18 10:49:05 -04:00
  • a3920ec2d8
         Merge pull request #16 from MikaylaFischler/devel Mikayla Fischler 2022-04-18 10:35:15 -04:00
  • 6a5e0243be catch terminations that are caught by PPM #16 Mikayla Fischler 2022-04-18 10:31:24 -04:00
  • 91079eeb78 fixed RTU comms bad function calls, fixed loop clock, changed terminate logic/prints Mikayla Fischler 2022-04-18 10:21:29 -04:00
  • 2278469a8b refactored RTU devices Mikayla Fischler 2022-04-18 10:09:44 -04:00
  • 377cf8e6fc scope fixes, load comms api, debug prints Mikayla Fischler 2022-04-18 09:35:08 -04:00
  • 7d9a664d38 rsio bugfixes Mikayla Fischler 2022-04-18 00:11:23 -04:00
  • a6e1134dc3 changed modbus init function name, fixed bugs with RTU startup, improved PPM debug prints Mikayla Fischler 2022-04-18 00:10:47 -04:00
  • 6d6953d795 RTU device inits now correctly use rtu.rtu_init() not rtu_init() Mikayla Fischler 2022-04-17 22:37:09 -04:00
  • 0c5eb77cba fixed some bugs with RTU startup referencing external data/functions Mikayla Fischler 2022-04-17 22:36:18 -04:00
  • ba5975f29b RTU config fixed missing rsio reference Mikayla Fischler 2022-04-17 22:34:31 -04:00
  • 2a21d7d0be #14, #15 ppm access fault handling, report modbus exceptions, handle ppm faults in PLC/RTU code Mikayla Fischler 2022-04-17 21:12:25 -04:00
  • 945b761fc2 #2 RTU handle disconnects/reconnects Mikayla Fischler 2022-04-11 17:27:57 -04:00
  • 203d868aeb RTU print fixes, config fixes, comms init fixes and moved modem open Mikayla Fischler 2022-04-11 11:08:46 -04:00
  • 28b1c03e03 upped version Mikayla Fischler 2022-04-07 11:45:01 -04:00
  • b085baf91b #12 specifically get wireless modems Mikayla Fischler 2022-04-07 11:44:17 -04:00
  • 03f9284f30 #13 ISS tolerant of failed PPM calls, added comments Mikayla Fischler 2022-04-07 11:12:41 -04:00
  • 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 Mikayla Fischler 2022-04-05 17:58:23 -04:00
  • ba1dd1b50e #4 PLC degraded start and reconnects appear to be working now, fixed prints, and bugfixes to PPM Mikayla Fischler 2022-04-05 17:29:27 -04:00
  • 895750ea14 print, println, println_ts Mikayla Fischler 2022-04-05 17:28:19 -04:00
  • c47f45ea46 fixed bad function references in ISS Mikayla Fischler 2022-04-05 17:25:56 -04:00
  • f24b214229 fixed bugs and removed goto as lua 5.1 does not have goto Mikayla Fischler 2022-04-05 16:09:29 -04:00
  • 5b32f83890 writeLine has newline of course.. Mikayla Fischler 2022-04-05 16:08:55 -04:00
  • dbf7377c02 #11 configurable 'networked' setting for PLCs that allows for standalone ISS-only mode Mikayla Fischler 2022-04-05 15:56:48 -04:00
  • 13b0fcf65f PLC state code cleanup and bugfixes Mikayla Fischler 2022-04-05 09:41:06 -04:00
  • 02763c9cb3 #4 PLC peripheral disconnect handling and small bugfixes/cleanup Mikayla Fischler 2022-04-03 12:08:22 -04:00
  • 34fc625602 #5 finished implementing PLC packet handler, bugfixes Mikayla Fischler 2022-04-02 14:43:36 -04:00
  • ed997d53e1 #6 PLC retry SCRAM until reactor confirms unpowered Mikayla Fischler 2022-04-02 11:46:14 -04:00
  • 7c2d89e70f allow suppressing of PPM errors Mikayla Fischler 2022-04-02 11:45:43 -04:00
  • a77946ce2c #1 PLC does not shut down if failed link, repeatedly tries to maintain link as part of main loop Mikayla Fischler 2022-04-02 11:22:44 -04:00
  • 36fb4587a1 consistent packet constructors/receiving Mikayla Fischler 2022-04-02 08:28:43 -04:00
  • 013656bc4d supervisor code moved around Mikayla Fischler 2022-03-25 12:18:33 -04:00
  • 5eaeb50000 broke up comms file, setup base coordinator code Mikayla Fischler 2022-03-25 12:17:46 -04:00
  • 2ee503946c plc cleanup, removed old code Mikayla Fischler 2022-03-25 11:50:03 -04:00
  • be73b17d46 RTU linking and requesting advertisement Mikayla Fischler 2022-03-23 16:17:58 -04:00
  • 60674ec95c RTU startup code and comms Mikayla Fischler 2022-03-23 15:41:08 -04:00
  • 74ae57324b redstone I/O rework Mikayla Fischler 2022-03-23 15:36:14 -04:00
  • 1e23a2fd67 work on RTU startup and comms Mikayla Fischler 2022-03-15 12:02:31 -04:00
  • 5642e3283d fixes to modbus_packet() Mikayla Fischler 2022-03-15 11:58:52 -04:00
  • 6e1e4c4685 ppm includes get_type function now Mikayla Fischler 2022-03-15 11:58:22 -04:00
  • a9d4458103 redstone I/O constants defined, digital I/O functions with active high/low mappings added Mikayla Fischler 2022-03-15 11:58:08 -04:00
  • 17874c4658 cleanup/improvements to PLC comms Mikayla Fischler 2022-03-14 14:19:14 -04:00
  • ac4ca3e56e reactor plc utilizes ppm and is now changed to use pullEventRaw Mikayla Fischler 2022-03-10 14:23:14 -05:00
  • 5cff346cb5 ppm function renames, edited log messages, and changed protected calls to return true if function has no return Mikayla Fischler 2022-03-10 14:21:03 -05:00
  • a0b2c1f3e2 changed ppm to not wrap under ppm() function Mikayla Fischler 2022-03-10 14:12:07 -05:00
  • ea84563bb4 added protected peripheral manager and file system logger Mikayla Fischler 2022-03-10 14:09:21 -05:00
  • 3c67ee08a8 redstone RTU I/O Mikayla Fischler 2022-02-08 15:42:06 -05:00
  • 1c6244d235 README formatting Mikayla Fischler 2022-01-25 17:07:42 -05:00
  • 9cd0079d9e updated README Mikayla Fischler 2022-01-25 15:48:01 -05:00
  • d6a68ee3d9 rtu's for boiler, induction matrix, and turbine Mikayla Fischler 2022-01-25 14:51:33 -05:00
  • 8429cbfd6e scada alarms Mikayla Fischler 2022-01-25 13:51:43 -05:00
  • 14cb7f96fc supervisor comms init Mikayla Fischler 2022-01-22 14:47:54 -05:00
  • ffca88845b work on PLC comms Mikayla Fischler 2022-01-22 14:26:25 -05:00
  • c6722c4cbe updated README for repo rename Mikayla Fischler 2022-01-14 16:34:40 -05:00
  • b3a2cfabc6 reactor plc reorganization and some comms updates Mikayla Fischler 2022-01-14 16:33:09 -05:00
  • 018b228976 some comms cleanup and added wrapper for generic packet Mikayla Fischler 2022-01-14 16:32:20 -05:00
  • 00a81ab4f0 modbus comms implementation Mikayla Fischler 2022-01-14 12:42:11 -05:00