Commit Graph

221 Commits

Author SHA1 Message Date
Mikayla Fischler
336662de62 #51 nic integration with rtu and supervisor 2023-06-25 12:59:38 -04:00
Mikayla Fischler
af38025f50 #262 don't ever abort RTU unit parsing on error, just skip 2023-06-18 14:26:38 -04:00
Mikayla Fischler
e16b0d237e #225 fixed svsessions __tostring for sessions, refactored s_addr to src_addr 2023-06-06 19:45:04 -04:00
Mikayla Fischler
b20d42ff38 #225 added computer IDs to PLC/RTU front panels, updated supervisor front panel to use computer ID terminology 2023-06-05 18:10:53 -04:00
Mikayla Fischler
360609df1f #225 network changes for supervisor sessions 2023-06-05 17:24:00 -04:00
Mikayla Fischler
9a5fc92c86 Merge branch 'devel' into 225-consolidate-network-channels 2023-06-05 01:18:13 -04:00
Mikayla
337fca7e7c #225 work in progress comms changes 2023-06-05 05:13:22 +00:00
Mikayla Fischler
24a7275543 fixed trailing whitespace 2023-06-03 15:50:44 -04:00
Mikayla Fischler
529371a0fd #184 support supervisor running without front panel, halved heartbeat blink rate 2023-06-03 15:45:48 -04:00
Mikayla Fischler
69df5edbeb #184 RTU and pocket lists on supervisor front panel, element delete() bugfix 2023-06-03 14:33:08 -04:00
Mikayla Fischler
ece7c0fe9a #184 supervisor graphics updates for new system, added PLC and CRD pages on supervisor front panel 2023-05-23 19:22:22 -04:00
Mikayla Fischler
4aba79f232 Merge branch 'devel' into front-panels 2023-05-20 09:44:26 -04:00
Mikayla Fischler
f6610489c2 #224 fix for RTU unit indexing on supervisor when virtual units were present 2023-05-11 20:54:43 -04:00
Mikayla Fischler
513c72ea79 Merge branch 'devel' into front-panels 2023-05-11 20:02:42 -04:00
Mikayla
032284e90d #224 skip virtual RTU units when parsing advertisements instead of aborting 2023-05-10 20:40:52 +00:00
Mikayla Fischler
5a139c2dd6 possible luacheck fixes 2023-05-05 14:07:15 -04:00
Mikayla Fischler
30ba8bdccf luacheck fixes continued 2023-05-05 14:04:28 -04:00
Mikayla Fischler
b2e21cb6d9 luacheck fixes 2023-05-05 14:02:25 -04:00
Mikayla Fischler
2c7b98ba42 #184 WIP supervisor front panel 2023-05-05 13:04:13 -04:00
Mikayla
783c4936cc #213 strict sequence verification 2023-04-21 21:10:15 +00:00
Mikayla Fischler
c49ad63d6a Merge branch 'devel' into 193-pocket-main-application 2023-04-19 20:37:19 -04:00
Mikayla Fischler
7929318096 #201 functional pocket comms with supervisor and coordinator, adjusted some UI element positioning, bugfixes with apisessions and svsessions 2023-04-19 20:35:42 -04:00
Mikayla
2371a75130 #214 log level cleanup 2023-04-19 13:30:17 +00:00
Mikayla Fischler
449e393b73 #201 supervisor pocket diagnostics session 2023-04-18 13:49:59 -04:00
Mikayla Fischler
33c570075c supervisor code cleanup 2023-04-17 19:48:03 -04:00
Mikayla
c987d14d8d
added Luacheck GitHub action (#210)
* added shields.io elements
* #209 luacheck action
* #209 cleanup to pass luacheck
* added check statuses to readme
2023-04-12 16:02:29 -04:00
Mikayla Fischler
9eddab2c23 #188 refactored RPS dmg_high to high_dmg 2023-03-04 22:32:13 -05:00
Mikayla Fischler
83dc1064f7 #188 refactored RPS no_cool to low_cool 2023-03-04 22:19:53 -05:00
Mikayla Fischler
c9f1bddb36 #188 refactored RPS dmg_crit to dmg_high 2023-03-04 21:55:40 -05:00
Mikayla Fischler
523d478739 changed trip time warning to 750ms 2023-02-26 14:49:16 -05:00
Mikayla Fischler
b7895080cb #118 supervisor cleanup 2023-02-24 23:36:16 -05:00
Mikayla Fischler
424097973d #118 refactored RTU unit types 2023-02-21 12:27:16 -05:00
Mikayla Fischler
a07086907e #118 refactored DUMPING_MODE 2023-02-21 11:30:49 -05:00
Mikayla Fischler
6e0dde3f30 #118 refactoring of comms types 2023-02-21 11:05:57 -05:00
Mikayla Fischler
e2d2a0f1dc #172 fixed bug with full builds not being sent 2023-02-20 14:50:20 -05:00
Mikayla Fischler
1be57aaf13 #140 partial build packet updates 2023-02-20 00:49:37 -05:00
Mikayla Fischler
9f95801bfc moved supervisor unit/facility files out of sessions folder 2023-02-18 17:36:44 -05:00
Mikayla Fischler
2babd67198 #162 #168 status indicator for emergency coolant, display number of connected RTUs, added RCS hardware fault and radiation warning indicators 2023-02-15 19:52:28 -05:00
Mikayla Fischler
199ce53f52 #160 #161 linked up ASCRAM lights and added ASCRAM radiation condition 2023-02-14 22:55:40 -05:00
Mikayla Fischler
8ebdf2686b #118 created constructors for basic types 2023-02-14 15:15:34 -05:00
Mikayla Fischler
1fe2acb5c5 #144 added radiation monitor integration; displays, unit alarms, connection states, other bugfixes 2023-02-13 22:11:31 -05:00
Mikayla Fischler
2affe1b31c #139 emergency coolant enabled on RPS low coolant 2023-02-13 18:20:48 -05:00
Mikayla Fischler
ccd9f4b6cc #158 fixed race conditions and cleaned up ascram logic 2023-02-13 18:08:32 -05:00
Mikayla Fischler
9784b4e165 #146 increased timeout times and added to config files 2023-02-13 12:27:22 -05:00
Mikayla Fischler
4d40d08a7a #157 fixed bug with RTU remount messages 2023-02-12 13:06:44 -05:00
Mikayla Fischler
42ff61a8a1 #155 gen rate mode pausing on units no longer being ready 2023-02-11 14:27:29 -05:00
Mikayla Fischler
ff1bd02739 #20 process target charge level 2023-02-11 00:21:00 -05:00
Mikayla Fischler
da9eead2d5 #19 #156 gain changes for generation rate control, fixed plc ready checks 2023-02-10 20:26:25 -05:00
Mikayla Fischler
44d5cec1f8 #19 decent rate PID gains, fixed blade counting and added checks, bugfix with PLC reconnects not being in auto mode, logging cleanups 2023-02-09 22:52:10 -05:00
Mikayla Fischler
37f7319494 #154 increased auto burn rate precision 2023-02-08 20:26:13 -05:00
Mikayla Fischler
ee739c214d #19 gen rate target process control working, some tweaks will be needed as I term is unstable due to limiting decimal precision 2023-02-07 23:47:58 -05:00
Mikayla Fischler
07ee792163 #153 facility alarm acknowledge button 2023-02-07 18:44:34 -05:00
Mikayla Fischler
678dafa62f #152 supervisor cleanups and improvements to alarms 2023-02-07 17:51:55 -05:00
Mikayla Fischler
1d3a1672c8 #102 #21 auto control loop with induction matrix and unit alarm checks and handling 2023-02-07 00:32:50 -05:00
Mikayla Fischler
1100051585 #151 improved RCS alarm behavior 2023-02-05 13:04:42 -05:00
Mikayla Fischler
b5c70b0d37 fixed process controller assuming ramp complete if burn rate setpoint was identical to setpoint before process control start 2023-02-04 13:47:00 -05:00
Mikayla Fischler
ba8bfb6e14 #101 fixed averages and display them 2023-02-03 21:05:21 -05:00
Mikayla Fischler
a117d5ee97 #150 save and automatically set priority groups, added checks to set waste and set group commands, restore waste mode control if operation failed 2023-02-03 16:40:58 -05:00
Mikayla Fischler
2e78aa895d #101 #102 burn rate process mode functional 2023-02-02 22:58:51 -05:00
Mikayla Fischler
fe71615c12 #101 #102 work on bugfixes; disable unit controls while in auto mode 2023-02-01 21:55:02 -05:00
Mikayla Fischler
e9562a140c #143 #103 #101 #102 work in progress auto control, added coordinator controls, save/auto load configuration, auto enable/disable on reactor PLC for auto control (untested) 2023-01-26 18:26:26 -05:00
Mikayla Fischler
e808ee2be0 #137 save/recall waste configuration with config file 2023-01-23 20:47:45 -05:00
Mikayla Fischler
4145949ba7 #141 setting unit limits with coordinator 2023-01-15 13:11:46 -05:00
Mikayla Fischler
a1c1125d54 fixed bug with automatic limit update 2023-01-03 17:03:20 -05:00
Mikayla Fischler
41838ee340 #102 #20 #19 #21 work in progress on auto control, added control loop, started auto scram checks, implemented limiting and balancing, re-organized for priority groups 2023-01-03 16:50:31 -05:00
Mikayla Fischler
ca2983506e #24 coordinator/supervisor setting process groups and unit burn rate limits 2022-12-18 13:56:04 -05:00
Mikayla Fischler
6517f78c1c #129 induction matrix view 2022-12-10 15:44:11 -05:00
Mikayla Fischler
03f0216d51 #130 facility data object, some code cleanup, comms protocol changed from 1.0.1 to 1.1.0 2022-12-10 13:58:17 -05:00
Mikayla Fischler
2a99d1d385 #136 send rps trip cause with status, moved rps is_tripped to rps status from main status, increased plc status send rate to 2 Hz 2022-12-07 12:59:21 -05:00
Mikayla Fischler
52603e3579 #131 first pass of unit status text 2022-12-06 23:39:35 -05:00
Mikayla Fischler
6bdde02268 #131 start of unit status text, added updating coordinator waste processing option on reconnect 2022-12-05 16:17:09 -05:00
Mikayla Fischler
4030fdc5c9 #77 alarm sounder 2022-12-04 13:59:10 -05:00
Mikayla Fischler
e1d7c7b1c0 #134 #104 redstone RTU integration with supervisor unit, waste routing implemented, changed how redstone I/O works (again, should be good now), modbus fixes 2022-11-30 23:31:14 -05:00
Mikayla Fischler
d4ae18eee7 #10 #133 alarm system logic and display, change to comms to support alarm actions, get_x get_y to graphics elements, bugfixes to coord establish and rtu establish, flashing trilight and alarm light indicators 2022-11-26 16:18:31 -05:00
Mikayla Fischler
657cd15c59 #127 uncommitted changes for annunciator changes 2022-11-17 12:04:30 -05:00
Mikayla Fischler
c93a386e74 #127 adjusted annunciator rate/feed checks 2022-11-17 11:20:53 -05:00
Mikayla Fischler
6fcd18e17a #125 moved environmental loss on boilers from build to state category 2022-11-14 21:50:32 -05:00
Mikayla Fischler
7c39e8c72b #126 fixed RTU builds not being sent to coordinator at the correct times 2022-11-14 21:43:02 -05:00
Mikayla Fischler
e679b5a25a #122 versioned comms protocol with unified establish protocol 2022-11-13 14:13:30 -05:00
Mikayla Fischler
1a01bec7e4 #123 RTU startup without devices, fixed repeat RTU advert handling, added PPM virtual devices, fixed log out of space detection, updated RTU type conversion functions in comms 2022-11-12 01:35:31 -05:00
Mikayla Fischler
8b65bf4852 fixed rps alarm packet length check 2022-11-11 16:46:38 -05:00
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
806b217d58 #100 interactive reactor controls (start, scram, reset) 2022-11-06 18:41:52 -05:00
Mikayla Fischler
54264f5149 #111 support unformed reactors 2022-11-02 13:45:52 -04:00
Mikayla Fischler
b2be3ef5fc #106 reactor formed support and remounting 2022-10-25 13:29:57 -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
77dc7ec0c9 fixed rps reset infinte retry, improved time delta calculations, added last_update to rtu device databases 2022-10-07 11:43:18 -04:00
Mikayla Fischler
5dfbe650c6 #93 don't send out-of-range burn rates (won't get a good ack), fixed unit command packet ordering 2022-10-07 11:28:56 -04:00
Mikayla Fischler
62ac993dae #93, #94, unit commands and range/type checks on unit IDs on PLC/RTU connections 2022-10-06 13:54:52 -04:00
Mikayla Fischler
c02479b52e #99 updating/sending builds 2022-10-02 21:17:13 -04:00
Mikayla Fischler
1b553ad495 #83 additional reactor structure fields, bugfix to rps alarm on sv, removed spam-prone rps error messages 2022-09-30 17:33:35 -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
d0d20b1299 #95 added boiler/turbine RTUs to supervisor, tons of RTU/MODBUS related bugfixes, adjusted annunciator conditions 2022-09-18 22:25:59 -04:00
Mikayla Fischler
33695b2ed6 #74 #86 removed redundant overridden field (use rps_tripped) 2022-09-08 14:49:01 -04:00
Mikayla Fischler
17954ef3d0 #86 supervisor fixes and changes for annunciator/units; send annunciator, fixed heartbeat, change to max return flow detection 2022-09-08 10:25:00 -04:00
Mikayla Fischler
e456d34468 svsessions bugfixes 2022-09-05 16:23:03 -04:00
Mikayla Fischler
621adbbcbc #86 type bug fix 2022-09-05 11:49:23 -04:00