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,491 Commits 5 Branches 39 Tags 9 MiB
035a26cc07
Commit Graph

392 Commits

Author SHA1 Message Date
Mikayla Fischler
af57c3b1fc automatic reactor scram functionality for future use 2022-11-11 16:15:44 -05:00
Mikayla Fischler
c221ffa129 #81 handle force disabled 2022-11-11 15:45:46 -05:00
Mikayla Fischler
83cf645da4 #107, #121 RTU build changes, formed handling 2022-11-11 14:59:53 -05:00
Mikayla Fischler
bc63a06b09 someone had PFE in an induction matrix so now i've gotta support some bigger numbers in the power format 2022-11-10 12:00:23 -05:00
Mikayla Fischler
806b217d58 #100 interactive reactor controls (start, scram, reset) 2022-11-06 18:41:52 -05:00
Mikayla Fischler
1828920873 #110, #114 no longer use mekanism energy helper functions as those are event consuming 2022-11-02 17:00:33 -04:00
Mikayla Fischler
c620310e51 #113 power formatting on turbine energy in main overview 2022-11-02 14:47:18 -04:00
Mikayla Fischler
54264f5149 #111 support unformed reactors 2022-11-02 13:45:52 -04:00
Mikayla Fischler
d87dfb9ebd #112 fixed bug with flasher 2022-11-02 12:02:52 -04:00
Mikayla Fischler
57bac57e3f adjusted TCD unserviced call delay 2022-10-25 13:30:41 -04:00
Mikayla Fischler
b2be3ef5fc #106 reactor formed support and remounting 2022-10-25 13:29:57 -04:00
Mikayla Fischler
a02fb6f691 #110 periodically call unserviced TCD callbacks 2022-10-23 12:21:17 -04:00
Mikayla Fischler
307bf6e2c8 added util timer functions, tweaks to flasher and some debug prints for #110 2022-10-23 01:41:02 -04:00
Mikayla Fischler
d202a49011 #108 resolved TCD race condition 2022-10-21 15:15:56 -04:00
Mikayla Fischler
788fae44aa #105 single coordinator configuration 2022-10-20 13:53:39 -04:00
Mikayla Fischler
ab757e14a7 #100 work in progress on command acks for reactive buttons 2022-10-20 12:22:03 -04:00
Mikayla Fischler
bfa87815fa #90 flashing GUI indicator lights 2022-10-12 16:37:11 -04:00
Mikayla Fischler
529951f998 automatically show current burn rate in burn rate spinbox 2022-10-07 11:21:17 -04:00
Mikayla Fischler
d4da6a7f3a fixed up types/names for hazard button 2022-10-07 10:28:46 -04:00
Mikayla Fischler
9d60777223 #93 added reset RPS command to iocontrol/gui 2022-10-07 10:19:37 -04:00
Mikayla Fischler
c02479b52e #99 updating/sending builds 2022-10-02 21:17:13 -04:00
Mikayla Fischler
4f7775ccb6 check for table type before checking length, added power conversion/formatting helpers 2022-09-22 21:31:07 -04:00
Mikayla Fischler
50be7f9ca2 #97 fixed issue where traffic on other channels gets processed if channels are left open 2022-09-22 20:42:06 -04:00
Mikayla Fischler
36557fc345 code cleanup, type hints, bugfixes, and #98 removal of support for mek 10.0 RTU peripherals 2022-09-21 15:53:51 -04:00
Mikayla Fischler
6686d8ea62 changed reactor status message text on main view 2022-09-13 16:08:11 -04:00
Mikayla Fischler
c47e0044b1 addresed monitor disconnect to-do, changed monitor requirement to minimum, fixed up connect/reconnect for #92 2022-09-13 16:07:21 -04:00
Mikayla Fischler
265368f9b2 fixed integrity % and changed to actual burn rate on main screen 2022-09-12 16:01:18 -04:00
Mikayla Fischler
d9be5ccb47 #89 fixed up ui closing to be cleaner on restart 2022-09-10 22:08:29 -04:00
Mikayla Fischler
c14fc048a1 #88 not going to actually hold UI since that hides the PLC offline state and other offline indicators, instead should expose property update capability 2022-09-10 15:26:52 -04:00
Mikayla Fischler
4275c9d408 unit detail view in div and hide waiting indicator on connect 2022-09-10 15:15:24 -04:00
Mikayla Fischler
6f3405949d #88 hold on rendering unit detail view until we get a status, added waiting animation 2022-09-10 10:42:56 -04:00
Mikayla Fischler
33695b2ed6 #74 #86 removed redundant overridden field (use rps_tripped) 2022-09-08 14:49:01 -04:00
Mikayla Fischler
c5ba95449f bugfix to trilight, change to test code in unit view 2022-09-08 10:22:11 -04:00
Mikayla Fischler
3621f53c45 #78 linked up the rest of the fields that we currently have, holding off on a few that are still WIP features 2022-09-07 11:10:20 -04:00
Mikayla Fischler
c2ac7fc973 #78 removed redundant device index from boiler/turbine ps keys 2022-09-07 10:25:22 -04:00
Mikayla Fischler
b53d2d6694 code cleanup and work on #78 linking for annunciator 2022-09-06 22:38:27 -04:00
Mikayla Fischler
117784500a #78 functional reactor stats on main view 2022-09-05 19:40:20 -04:00
Mikayla Fischler
397e311f1b #85 handling supervisor disconnected, bugfix with renderer 2022-09-05 16:24:57 -04:00
Mikayla Fischler
473763fd27 #78 removed use of data in graphics layouts since we don't have data at construct time 2022-09-05 16:04:32 -04:00
Mikayla Fischler
564b89d19c #78 linked up unit overview using psil 2022-09-03 13:10:51 -04:00
Mikayla Fischler
f36b0c7e37 #85 version for reconnecting 2022-09-03 11:54:34 -04:00
Mikayla Fischler
5a8bba5108 #85 handle loss of supervisor conn or comms modem 2022-09-03 11:51:27 -04:00
Mikayla Fischler
c3f7407689 #86 work on supervisor/coordinator comms 2022-09-03 10:50:14 -04:00
Mikayla Fischler
c985e90ec3 #73 test unit view completed, additional features held for after data integration is set 2022-08-28 11:52:43 -04:00
Mikayla Fischler
c80d861b28 #73 unit view reorganization 2022-08-16 13:56:42 -04:00
Mikayla Fischler
395c1ff9ce #73 add indicators for radiation monitor and boilers/turbines 2022-08-16 13:04:02 -04:00
Mikayla Fischler
8dac59fba4 #73 waste selection 2022-08-16 11:22:58 -04:00
Mikayla Fischler
3c2f631451 #73 additional indicators next to core map 2022-08-09 00:40:50 -04:00
Mikayla Fischler
252c48a02c #73 core map changes 2022-08-02 11:46:21 -03:00
Mikayla Fischler
6b23a32744 renamed core_view to core_map 2022-08-01 13:11:20 -03:00
Mikayla Fischler
826114e5bf #73 core map and bugfixes 2022-08-01 13:05:39 -03:00
Mikayla Fischler
42c2b1bda1 coordinator use tcallbackdsp, #73 burn rate set button click effect, test blinks of lights 2022-07-28 12:10:52 -04:00
Mikayla Fischler
2918608326 #73 updated unit layout for graphics library changes 2022-07-28 11:17:58 -04:00
Mikayla Fischler
fc14141321 #73 unit overview parent/child setup, fixed touch events by setting up children for elements 2022-07-23 20:08:37 -04:00
Mikayla Fischler
9b21a971fe #74 close supervisor connection on exit, start of touch event handling 2022-07-20 13:28:58 -04:00
Mikayla Fischler
1afafba501 wrap os.pullEventRaw to have return types 2022-07-19 15:18:11 -04:00
Mikayla Fischler
d6a201a45f #73 initial unit view 2022-07-19 14:03:02 -04:00
Mikayla Fischler
6643c7e6ed removed debug fg_bg set 2022-07-14 14:29:48 -04:00
Mikayla Fischler
bd1ab11686 #79 water cooling only support, dynamic height, changed 2 turbine 1 boiler layout 2022-07-14 13:47:39 -04:00
Mikayla Fischler
6f61203db3 #72, #78 updated main view to adapt to facility configuration, initial use of pub/sub for main view 2022-07-10 16:19:04 -04:00
Mikayla Fischler
5a96818c97 #72 ui formatting 2022-07-09 13:43:38 -04:00
Mikayla Fischler
ea17ba41fe #74 supervisor-coordinator comms establish 2022-07-07 00:34:42 -04:00
Mikayla Fischler
39672fedb4 code cleanup 2022-07-05 23:49:48 -04:00
Mikayla Fischler
1444008479 #74 comms establish on boot 2022-07-05 23:48:01 -04:00
Mikayla Fischler
9bd220cbb2 removed unused requires 2022-07-05 12:48:21 -04:00
Mikayla Fischler
33159bc677 main loop and work on #74 comms 2022-07-05 12:47:02 -04:00
Mikayla Fischler
bd33240515 #62 modifing color palette 2022-07-05 12:46:31 -04:00
Mikayla Fischler
f6708ca988 coordinator dmesg wrapper functions 2022-07-05 11:18:26 -04:00
Mikayla Fischler
7ad115bc03 #72 unit overview layout completed 2022-07-02 17:24:52 -04:00
Mikayla Fischler
3048fbed8b moved pipenet to be basic element not an indicator 2022-07-02 15:09:35 -04:00
Mikayla Fischler
20a1fab611 #72 added pipes to main overview, changed text of reactor overview 2022-06-29 17:40:46 -04:00
Mikayla Fischler
f32cdf5563 ticked version and fixed wording 2022-06-25 18:39:29 -04:00
Mikayla Fischler
1188d2f7df #72 work on main layout, reactor and boiler views exist now 2022-06-25 16:21:57 -04:00
Mikayla Fischler
e54d5b3d85 #74 coordinator comms and work on database 2022-06-25 13:39:47 -04:00
Mikayla Fischler
6980e73658 default to not even border 2022-06-16 11:31:52 -04:00
Mikayla Fischler
7f007e032d #62, #72 work on main layout, not using layout class, refactoring and bugfixes 2022-06-16 11:24:35 -04:00
Mikayla Fischler
b628472d81 #74 work on coordinator comms 2022-06-15 15:35:34 -04:00
Mikayla Fischler
13513a9ce6 #62 graphics layouts 2022-06-14 12:02:42 -04:00
Mikayla Fischler
3593493c98 #62 basic start of the UI 2022-06-11 17:58:29 -04:00
Mikayla Fischler
8ea75b9501 #62, #63 graphics primatives and added display boxes to renderer 2022-06-06 15:42:39 -04:00
Mikayla Fischler
1c819779c7 #69 config file validation 2022-06-05 15:09:02 -04:00
Mikayla Fischler
3bb95eb441 #64 util code cleanup 2022-05-31 16:09:06 -04:00
Mikayla Fischler
e65a1bf6e1 #61 monitor configuration and init, render engine started, dmesg changes, ppm monitor listing changes 2022-05-29 14:34:09 -04:00
Mikayla Fischler
d3a926b25a fixed require issues caused by using bootloader 2022-05-14 13:32:42 -04:00
Mikayla Fischler
02541184bd bootloader 2022-05-11 11:31:02 -04:00
Mikayla Fischler
f4e397ebb1 removed old controller code to not pollute workspace with globals 2022-05-10 17:16:34 -04:00
Mikayla Fischler
87de804a9e proper module format 2022-05-10 17:09:02 -04:00
Mikayla Fischler
b575899d46 #33 lua module/require architecture changeover 2022-05-04 13:37:01 -04:00
Mikayla Fischler
b76871aa07 fixed incorrect program type in startup message 2022-05-01 15:34:44 -04:00
Mikayla Fischler
c805b6e0c5 log init function to set path and write mode 2022-04-29 13:32:37 -04:00
Mikayla Fischler
5eaeb50000 broke up comms file, setup base coordinator code 2022-03-25 12:17:46 -04:00
Mikayla Fischler
3b492ead92 changed to SCADA terminology, changed RCaSS to reactor PLC, maybe changed other things 2022-01-13 10:06:55 -05:00