GitHub/cc-mek-scada
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • e6f5ab8ef4 #604 reworked supervisor redstone RTU interface Mikayla 2025-04-29 02:38:42 +00:00
  • be462db50b #604 new redstone initialization logic Mikayla 2025-04-29 01:44:52 +00:00
  • 1dc3d82e59 #604 work on redstone RTU rework Mikayla Fischler 2025-04-27 22:40:42 -04:00
  • fa2a6d7786 Merge branch 'devel' into rtu-redstone-enhancements Mikayla Fischler 2025-04-26 15:30:31 -04:00
  • 04c53c7074 #616 pocket pellet color options Mikayla Fischler 2025-04-26 15:24:50 -04:00
  • 1af2cdba8d #616 fixes to coordinator pellet color option Mikayla Fischler 2025-04-26 15:21:09 -04:00
  • 0d7302dc8e #604 start of total rework of redstone RTUs for relay functionalitiy Mikayla Fischler 2025-04-21 22:18:09 -04:00
  • 48ec973695 #616 added pellet color option to the coordinator Mikayla Fischler 2025-04-21 22:13:58 -04:00
  • ee868eb607 #616 updated flow view to match fluid colors not pellet colors Mikayla Fischler 2025-04-20 21:36:40 -04:00
  • e4da9a62d9 Merge pull request #617 from MikaylaFischler/rtu-redstone-enhancements Mikayla 2025-04-20 17:41:26 -04:00
  • c8910bfc40 clear inverted on analog creation Mikayla Fischler 2025-04-20 17:40:40 -04:00
  • d6e3a67562 #484 redstone inversion support Mikayla Fischler 2025-04-20 17:36:16 -04:00
  • f7c0a1d97d #484 work on redstone inversion Mikayla Fischler 2025-04-20 11:28:02 -04:00
  • 13509136b8 cleanup Mikayla 2025-04-19 22:20:57 +00:00
  • bfab2d6af2 #583 fixes for pocket crash display Mikayla Fischler 2025-04-19 18:09:43 -04:00
  • ae055a7d99 luacheck fixes and version increment Mikayla Fischler 2025-04-19 00:21:15 -04:00
  • 592f1110ed define pocket global in craftos-pc environment pocket application Mikayla Fischler 2025-04-19 00:16:43 -04:00
  • 97875f4e52 #583 graphical crash screens Mikayla Fischler 2025-04-19 00:15:41 -04:00
  • 657261642c Merge pull request #615 from MikaylaFischler/364-rtu-configurator-self-check Mikayla 2025-04-05 21:18:15 -04:00
  • 0da944c3ea #364 updated scroll height max and reduced duplicate text Mikayla Fischler 2025-04-05 21:17:19 -04:00
  • 1b692b5b9a #364 fail self check if using a side for both bundled and unbundled redstone Mikayla Fischler 2025-04-05 21:14:33 -04:00
  • b4a9366f73 #364 fixes to redstone and peripheral checks Mikayla Fischler 2025-04-05 21:00:16 -04:00
  • 2b3099ac59 #364 check validity of redstone and peripheral entries and check redstone side/color combos are not repeated Mikayla Fischler 2025-04-04 00:17:40 -04:00
  • cd654fb9b8 shorter variable for self.settings in PLC self check Mikayla Fischler 2025-04-03 23:21:31 -04:00
  • ad834218c2 #364 check all configured RTU peripherals in self check Mikayla Fischler 2025-04-03 23:21:06 -04:00
  • c6a7de2669 #364 base RTU gateway self checks Mikayla Fischler 2025-04-03 23:06:45 -04:00
  • d374967cb7 #614 fixed reactor PLC self check when configured as not networked Mikayla Fischler 2025-04-03 22:56:54 -04:00
  • b1ad2084f2 Merge pull request #610 from MikaylaFischler/devel v1.9.1-beta Mikayla 2025-02-26 18:52:56 -05:00
  • 1971153dae configurator summary enhancements Mikayla Fischler 2025-02-26 18:38:21 -05:00
  • 5fc8912590 #480 fixed aux coolant connection to boilers with emergency coolant Mikayla Fischler 2025-02-26 13:08:58 -05:00
  • 122fa1a7a7 Merge pull request #609 from MikaylaFischler/480-auxiliarybackup-water-control Mikayla 2025-02-25 16:44:23 -05:00
  • 2b73196130 #480 updated aux coolant logic Mikayla Fischler 2025-02-25 16:43:03 -05:00
  • d45f19c8a6 refactor Mikayla Fischler 2025-02-25 15:32:07 -05:00
  • a9f68ce3ea Merge branch 'devel' into 480-auxiliarybackup-water-control Mikayla Fischler 2025-02-25 14:53:44 -05:00
  • 7ab5ea710f additional supervisor config validations Mikayla Fischler 2025-02-25 14:52:05 -05:00
  • de41ee56aa #480 auxiliary water coolant Mikayla Fischler 2025-02-25 14:33:25 -05:00
  • 99ea59a86b #526 coordinator front panel scale to term size Mikayla Fischler 2025-02-16 13:32:08 -05:00
  • 234652b886 #526 cleanup Mikayla Fischler 2025-02-16 13:21:00 -05:00
  • e37e3ba696 #526 supervisor front panel scale to term size Mikayla Fischler 2025-02-16 13:20:23 -05:00
  • 20b71bead1 #526 RTU gateway front panel scale to term size Mikayla Fischler 2025-02-16 12:51:10 -05:00
  • 18d093e72d #526 reactor PLC front panel scale to term size Mikayla Fischler 2025-02-16 12:34:06 -05:00
  • 21eae4932f #607 updated deny message Mikayla Fischler 2025-02-16 11:54:45 -05:00
  • 9163fb14c4 RTU gateway version increment Mikayla Fischler 2025-02-16 11:45:26 -05:00
  • 02db01524c Merge branch 'devel' of github.com:MikaylaFischler/cc-mek-scada into devel Mikayla Fischler 2025-02-16 11:44:44 -05:00
  • e0d1eb3445 #608 fixed front panel network lights Mikayla Fischler 2025-02-16 11:44:30 -05:00
  • 7c22c172d5 #607 deny reactor PLC with index out of range Mikayla Fischler 2025-02-16 11:43:32 -05:00
  • 7b29702000 #480 auxiliary coolant control logic Mikayla 2025-02-11 22:42:52 +00:00
  • 425a6c8775 #480 added auxiliary coolant redstone output Mikayla 2025-02-11 22:42:07 +00:00
  • eafcd89aba updated SNA RTU note after #564's changes Mikayla 2025-02-11 22:40:17 +00:00
  • 016cd988e1 #564 improved SNA statistic clarity Mikayla Fischler 2025-02-09 16:17:37 -05:00
  • 06a8e3d9ca Merge pull request #603 from MikaylaFischler/589-reboot-recovery Mikayla 2025-02-09 15:25:48 -05:00
  • 5f22069ce1 #589 cleanup and fixes Mikayla Fischler 2025-02-09 14:19:06 -05:00
  • ecdaf78ed0 #589 moved boot recovery to facility update file Mikayla Fischler 2025-02-09 13:48:20 -05:00
  • 3b2fb00285 cleanup Mikayla Fischler 2025-02-09 13:37:22 -05:00
  • 54167e2113 #589 only scram reactor on plc boot if networked Mikayla Fischler 2025-02-09 13:13:18 -05:00
  • 22cdbc8638 #589 supervisor control reboot recovery Mikayla Fischler 2025-02-09 13:07:36 -05:00
  • 556331f75b better unit ready check Mikayla Fischler 2025-02-09 13:07:01 -05:00
  • 40cb9f599a #602 only auto reset units that should be Mikayla Fischler 2025-02-09 13:06:44 -05:00
  • cab3427c70 #601 only reset on timeout once per unit per supervisor boot Mikayla Fischler 2025-02-09 12:10:13 -05:00
  • 4e31b33b09 #601 reset RPS if the triggering condition is a timeout on PLC session establish Mikayla Fischler 2025-02-09 11:59:03 -05:00
  • f32855084e #589 WIP reboot recovery Mikayla Fischler 2025-02-08 22:20:00 -05:00
  • b3cf40a01a #589 initial attempt at reboot recovery Mikayla 2025-02-08 20:35:04 +00:00
  • cf9e26ac8f Merge pull request #599 from MikaylaFischler/devel v1.9.0-beta Mikayla 2025-01-27 12:52:32 -05:00
  • cbc84c5998 Merge pull request #598 from MikaylaFischler/559-modbus-device-busy-unrecoverable Mikayla 2025-01-27 11:49:50 -05:00
  • 869e67710f #559 supervisor bugfix Mikayla Fischler 2025-01-26 14:49:44 -05:00
  • 1b9d3d3f23 Merge branch 'devel' into 559-modbus-device-busy-unrecoverable Mikayla Fischler 2025-01-26 12:05:42 -05:00
  • 0a060b656c Merge pull request #595 from MikaylaFischler/pocket-alpha-dev Mikayla 2025-01-20 17:18:01 -05:00
  • c859c22964 cleanup Mikayla Fischler 2025-01-20 17:01:49 -05:00
  • 3767c0f8d9 luacheck fixes and coordinator version bump Mikayla Fischler 2025-01-20 16:26:41 -05:00
  • fbebc2a021 prep for beta Mikayla Fischler 2025-01-20 16:24:18 -05:00
  • afd6800be6 updated pocket version Mikayla Fischler 2025-01-20 15:40:00 -05:00
  • baba2e1411 #557 facility app data and fixes Mikayla Fischler 2025-01-20 15:38:53 -05:00
  • 127c878794 #557 facility app ui design complete Mikayla Fischler 2025-01-20 12:21:51 -05:00
  • 767b54c3e6 #557 facility tank overview page Mikayla 2025-01-15 22:49:55 +00:00
  • 1c57fc1fe3 #557 work on facility app Mikayla Fischler 2025-01-11 11:57:28 -05:00
  • 2d83de8b88 moved ETA string generation to icontrol Mikayla Fischler 2025-01-11 11:57:06 -05:00
  • 4a4234c8c8 #557 ui improvements Mikayla Fischler 2025-01-10 22:52:27 -05:00
  • eb197e7fdd updated dynamic tank page to indicate which tank it is Mikayla 2025-01-09 23:51:02 +00:00
  • 78b0e1bf24 #557 facility app and induction matrix updates Mikayla 2025-01-09 23:50:47 +00:00
  • cbc004a6c7 #557 induction matrix page updates Mikayla Fischler 2025-01-08 22:49:05 -05:00
  • d05abf6e00 #557 facility app and sps page fixes Mikayla Fischler 2025-01-08 21:54:45 -05:00
  • 813e30bcde Merge branch 'devel' into pocket-alpha-dev Mikayla 2025-01-09 00:17:22 +00:00
  • fb139949f8 fix to induction matrix transfer bars not rescaling with capacity changes Mikayla 2025-01-09 00:17:00 +00:00
  • 2fdc9feea7 #557 work on induction matrix page Mikayla 2025-01-09 00:15:12 +00:00
  • eabb065d17 #557 ui cleanup on sps page Mikayla 2025-01-09 00:14:49 +00:00
  • fb221a566c #557 facility app bug fix Mikayla 2025-01-09 00:14:28 +00:00
  • cd4caf0163 #559 supervisor updates to handle busy errors Mikayla Fischler 2025-01-08 19:07:53 -05:00
  • 1190fe2dd5 #559 discard modbus messages if busy Mikayla Fischler 2025-01-08 19:04:38 -05:00
  • 4cb6f9ca0f #557 work on message data Mikayla 2025-01-07 23:21:48 +00:00
  • 872082b970 #557 sps page Mikayla 2025-01-07 23:21:29 +00:00
  • 071df9e431 #557 include matrix page Mikayla Fischler 2025-01-05 15:08:41 -05:00
  • ae85cfc579 #557 start of induction matrix and sps pages Mikayla Fischler 2025-01-05 15:05:01 -05:00
  • 1dece587b2 cleanup Mikayla Fischler 2025-01-05 14:40:36 -05:00
  • 01c5d62f38 #557 skeleton of facility app with some pages Mikayla Fischler 2025-01-05 14:39:16 -05:00
  • c6a5d487e0 comment updates and refactors Mikayla 2025-01-04 15:33:57 +00:00
  • ba4a5aa85e #557 work on facility app Mikayla 2025-01-04 15:33:37 +00:00
  • 451232ce91 Merge pull request #586 from MikaylaFischler/devel v1.8.24-beta Mikayla 2024-12-21 12:30:33 -05:00
  • 11fa9f625d #587 bumped up ccmsi version for release after testing Mikayla Fischler 2024-12-21 12:14:17 -05:00
  • b61fd2c620 #479 updated comms protocol versions for sodium emergency coolant changes Mikayla Fischler 2024-12-21 12:13:51 -05:00
  • cb2ebd409d #588 close main UI via queue Mikayla Fischler 2024-12-21 11:54:25 -05:00