Commit Graph

394 Commits

Author SHA1 Message Date
Mikayla Fischler
838f80c30c supervisor updates for RTU config changes 2023-11-06 10:21:42 -05:00
Mikayla Fischler
43d134d9ad comment clarity 2023-10-14 18:49:51 -04:00
Mikayla Fischler
24c787f47d fixed auto lock not restoring on reconnect 2023-10-14 17:57:50 -04:00
Mikayla
26dc6ff6d1 handle RPS_DISABLE ack packet on supervisor 2023-10-04 21:28:14 +00:00
Mikayla
24d190921d F_ALARM_ANY rsio output added 2023-10-04 21:26:07 +00:00
Mikayla Fischler
d2a1951b66 refactored TEXT_ALIGN to ALIGN 2023-10-03 23:16:46 -04:00
Mikayla Fischler
ebabd99f2b fixes and cleanup 2023-10-03 22:52:13 -04:00
Mikayla Fischler
d450c9ca3e Merge branch 'devel' into 145-graphical-configure-utilities 2023-10-01 18:43:28 -04:00
Mikayla Fischler
d38a2dea7c renderer integration with new assertion handling 2023-09-30 13:31:41 -04:00
Mikayla Fischler
9cef6e6175 added double click events to event handlers 2023-09-23 12:58:09 -04:00
Mikayla
29cc107ea5 updated comment 2023-09-19 20:40:11 +00:00
Mikayla
c24766a4db disable reactor rather than trip on auto control stop 2023-09-19 20:37:15 +00:00
Mikayla Fischler
5585088e3a resolved diagnostic warnings 2023-09-03 17:54:39 -04:00
Mikayla
b9073153b3
Merge pull request from MikaylaFischler/300-code-footprint-cleanup-tasks
300 code footprint cleanup tasks
2023-09-01 22:52:47 -04:00
Mikayla Fischler
71d8b5ba0a utilizing style file for common color pairs 2023-09-01 22:24:31 -04:00
Mikayla
f267a4e569 comms device type cleanup 2023-08-30 21:15:42 +00:00
Mikayla
cfc6479dd5 comms cleanup 2023-08-30 20:45:48 +00:00
Mikayla Fischler
31df4a7f7e removed unnecessary parentheses 2023-08-29 22:41:56 -04:00
Mikayla Fischler
ca49cf90b4 improved log message clarity 2023-08-29 22:34:30 -04:00
Mikayla
785dbe9533 print out cause of multi-condition alarms 2023-08-29 13:19:50 +00:00
Mikayla Fischler
37f8b85924 always set emergency coolant state 2023-08-27 13:42:25 -04:00
Mikayla Fischler
386a33ffd8 consistent log tags 2023-08-26 11:54:58 -04:00
Mikayla Fischler
8b3f558f68 Merge branch 'devel' into 232-waste-valve-and-flow-monitoring-display 2023-08-20 23:43:07 -04:00
Mikayla Fischler
504ee0594f switch off dynamic tank fill mode if emergency coolant is required 2023-08-20 22:56:51 -04:00
Mikayla Fischler
59950e9d15 connected valve indicators 2023-08-19 23:24:20 -04:00
Mikayla Fischler
11d86d92eb bugfixes and linked up indicators to data 2023-08-19 20:06:37 -04:00
Mikayla Fischler
1275f61113 refactor and fixed sv config verify 2023-08-19 13:42:07 -04:00
Mikayla Fischler
d17e2b8321 completed display of flow/dynamic tank/sps, dynamically sized 2023-08-19 13:38:05 -04:00
Mikayla Fischler
ac1733c46e 20s grace period for coordinator render to finish to prevent timeouts 2023-08-12 15:16:37 -04:00
Mikayla Fischler
724d13510d optimizations and cleanup for pull request 2023-07-30 00:13:26 -04:00
Mikayla Fischler
3f01ce7ec5 lowered SVS queue process time limit warning to debug level 2023-07-29 18:44:17 -04:00
Mikayla Fischler
df67795239 pocket page management and alarm test tool, supervisor pocket diagnostics system 2023-07-29 18:16:59 -04:00
Mikayla Fischler
9f8732830c , fixed sounder issues 2023-07-26 22:37:25 -04:00
Mikayla Fischler
f111b711c5 , send tones to RTUs 2023-07-26 21:02:34 -04:00
Mikayla Fischler
4192ea426c moved alarm sounder logic to supervisor and tone control to common 2023-07-26 20:48:11 -04:00
Mikayla Fischler
def02a94d2 fixed race condition with graphics element IDs 2023-07-19 11:27:33 -04:00
Mikayla Fischler
c0f45cfb8b updated comments 2023-07-17 22:47:19 -04:00
Mikayla Fischler
1202289fab mitigated false trips 2023-07-17 20:59:45 -04:00
Mikayla Fischler
6a0992c7a4 removed unused variable 2023-07-15 13:33:18 -04:00
Mikayla Fischler
cff7c724be fixed bug with transmitting unit dynamic tank table 2023-07-15 13:31:48 -04:00
Mikayla Fischler
47bda73afe basic dynamic tank data in supervisor and coordinator 2023-07-15 13:16:36 -04:00
Mikayla Fischler
084a153a79 fixed incorrect info print on extra wireless modem connection 2023-07-11 21:06:47 -04:00
Mikayla Fischler
8b136d78a8 better handling of wireless modem peripherals 2023-07-11 18:22:09 -04:00
Mikayla Fischler
61d975d13f updated error messages for consistency 2023-07-11 15:15:44 -04:00
Mikayla Fischler
96c4444184 corrected some comments 2023-07-09 23:22:24 -04:00
Mikayla Fischler
59eac62c33 validate reactor PLC status packet types 2023-07-08 18:07:40 -04:00
Mikayla Fischler
7d65bba589 fixes/cleanups for pull request 2023-07-08 17:11:51 -04:00
Mikayla Fischler
dcef5a96f0 removed unused function 2023-07-08 16:57:41 -04:00
Mikayla Fischler
ba0900ac65 sna/sps integration, plutonium fallback, waste rate reporting 2023-07-08 16:57:13 -04:00
Mikayla Fischler
8f54e95519 continued WIP waste control, main view updated and unit fields modified 2023-07-06 01:36:06 -04:00
Mikayla Fischler
0e7ea7102c removed extra verbose comment in configs 2023-06-27 19:08:33 -04:00
Mikayla Fischler
a8071db08e send serialized data to properly MAC 2023-06-27 18:36:16 -04:00
Mikayla Fischler
57763702ff init mac component from config key 2023-06-25 14:00:18 -04:00
Mikayla Fischler
336662de62 nic integration with rtu and supervisor 2023-06-25 12:59:38 -04:00
Mikayla
712c7a8f3b added health check to ppm and strengthened reliability of RTU hw state reporting 2023-06-22 19:46:17 +00:00
Mikayla Fischler
a02529b9f7 fixed bug with supervisor group map length not matching number of reactors 2023-06-18 15:19:01 -04:00
Mikayla Fischler
af38025f50 don't ever abort RTU unit parsing on error, just skip 2023-06-18 14:26:38 -04:00
Mikayla Fischler
8b926a0978 tick supervisor version to force installers to re-pull graphics 2023-06-07 21:42:21 -04:00
Mikayla Fischler
5d6dda5619 fixed rectangle element not offsetting mouse events 2023-06-07 18:38:00 -04:00
Mikayla Fischler
f1b1f0b75a updated supervisor front panel default computer ID place holders and fixed PDG establish using channel in messages 2023-06-07 14:18:13 -04:00
Mikayla Fischler
0a6fd35f93 supervisor front panel computer IDs cleanup 2023-06-06 21:56:17 -04:00
Mikayla Fischler
671f8b55bc updated supervisor front panel RTT coloring limits 2023-06-06 19:49:28 -04:00
Mikayla Fischler
e16b0d237e fixed svsessions __tostring for sessions, refactored s_addr to src_addr 2023-06-06 19:45:04 -04:00
Mikayla Fischler
b20d42ff38 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 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 work in progress comms changes 2023-06-05 05:13:22 +00:00
Mikayla Fischler
0b939be412 renamed unit a_ functions to auto_ 2023-06-03 17:59:20 -04:00
Mikayla Fischler
8d248408d4 renamed tcallbackdsp to tcd and added handler to RTU 2023-06-03 17:40:57 -04:00
Mikayla Fischler
b4932b33b6 code cleanup 2023-06-03 17:31:06 -04:00
Mikayla Fischler
24a7275543 fixed trailing whitespace 2023-06-03 15:50:44 -04:00
Mikayla Fischler
529371a0fd support supervisor running without front panel, halved heartbeat blink rate 2023-06-03 15:45:48 -04:00
Mikayla Fischler
69df5edbeb RTU and pocket lists on supervisor front panel, element delete() bugfix 2023-06-03 14:33:08 -04:00
Mikayla Fischler
ef1ec220a4 initial draft of listbox element and associated supervisor front panel test example 2023-05-31 11:44:41 -04:00
Mikayla Fischler
4c35233289 changed rectangle to use content window, significant simplification of offset logic, improved delete rendering 2023-05-30 20:43:33 -04:00
Mikayla Fischler
de9cb3bd3a graphics core updates for content windows, redrawing, and handling of addition/removal of children 2023-05-30 19:51:10 -04:00
Mikayla Fischler
f9aa75a105 graphics element hidden on creation option, changed hide/show logic to only hide/show current element 2023-05-25 17:40:16 -04:00
Mikayla Fischler
ece7c0fe9a 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
142f2c363a made debug config setting optional, defaults to false 2023-05-19 19:12:27 -04:00
Mikayla Fischler
f6610489c2 fix for RTU unit indexing on supervisor when virtual units were present 2023-05-11 20:54:43 -04:00
Mikayla Fischler
e159dbb850 updated supervisor for new mouse events 2023-05-11 20:06:41 -04:00
Mikayla Fischler
513c72ea79 Merge branch 'devel' into front-panels 2023-05-11 20:02:42 -04:00
Mikayla
50c0a4a3eb added debug log enable to configs 2023-05-10 20:57:23 +00:00
Mikayla
032284e90d 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 WIP supervisor front panel 2023-05-05 13:04:13 -04:00
Mikayla
783c4936cc strict sequence verification 2023-04-21 21:10:15 +00:00
Mikayla Fischler
5db517cedc close log files on exit (including crash) 2023-04-20 21:00:10 -04:00
Mikayla Fischler
a843c8eb79 fixes and cleanup 2023-04-19 23:00:27 -04:00
Mikayla Fischler
c49ad63d6a Merge branch 'devel' into 193-pocket-main-application 2023-04-19 20:37:19 -04:00
Mikayla Fischler
7929318096 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 log level cleanup 2023-04-19 13:30:17 +00:00
Mikayla Fischler
449e393b73 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 ()
* added shields.io elements
*  luacheck action
*  cleanup to pass luacheck
* added check statuses to readme
2023-04-12 16:02:29 -04:00
Mikayla Fischler
a2ea6438b5 updated high startup rate warning per wiki 2023-04-09 12:29:29 -04:00
Mikayla Fischler
91f72ace24 generator trip display on coordinator 2023-04-03 17:18:30 -04:00
Mikayla Fischler
0f735d049e generator trip detection on supervisor 2023-04-02 09:57:57 -04:00
Mikayla Fischler
9eddab2c23 refactored RPS dmg_high to high_dmg 2023-03-04 22:32:13 -05:00
Mikayla Fischler
83dc1064f7 refactored RPS no_cool to low_cool 2023-03-04 22:19:53 -05:00
Mikayla Fischler
c9f1bddb36 refactored RPS dmg_crit to dmg_high 2023-03-04 21:55:40 -05:00
Mikayla Fischler
85a9532962 fixed incorrect constant usage, add RCS flow low to flow stability holdoff when not using a boiler 2023-03-04 21:35:54 -05:00
Mikayla Fischler
edb5d8b96f different steam feed mismatch and RCS flow low tolerances for water vs sodium cooling 2023-03-04 21:19:35 -05:00
Mikayla Fischler
0279ecdec9 second attempt at improving damage status text 2023-03-04 19:49:56 -05:00
Mikayla Fischler
8c236eca85 fixed bug with facility update returning, improved damage status message 2023-03-04 13:38:41 -05:00
Mikayla Fischler
f7828dd05b F_ALARM use emergency+ level 2023-03-04 11:46:59 -05:00
Mikayla Fischler
d01a6d548f fixed radiation warning condition 2023-03-04 11:40:06 -05:00
Mikayla Fischler
b12f3206e2 additional messages for radiation alarm/warning with added urgency/level-specific messages 2023-03-04 02:05:36 -05:00
Mikayla Fischler
0e5113918c improved sv config validation, changed waste high thresholds, fixed monitored max burn not showing as active, fixed redstone R_ENABLE and U_ALARM, changed RPS high waste trip to 95% 2023-03-04 01:37:15 -05:00
Mikayla Fischler
523d478739 changed trip time warning to 750ms 2023-02-26 14:49:16 -05:00
Mikayla Fischler
b150072234 correctly set Water Level Low 2023-02-26 14:17:35 -05:00
Mikayla Fischler
fbb992ff12 dump excess steam on opening emergency coolant 2023-02-25 14:11:40 -05:00
Mikayla Fischler
4f285cf2b5 safety/constants common file 2023-02-25 02:25:35 -05:00
Mikayla Fischler
16d6372d7b bugfixes with cleanup 2023-02-24 23:59:39 -05:00
Mikayla Fischler
b7895080cb supervisor cleanup 2023-02-24 23:36:16 -05:00
Mikayla Fischler
82ea35168b type cleanup 2023-02-21 12:40:34 -05:00
Mikayla Fischler
424097973d refactored RTU unit types 2023-02-21 12:27:16 -05:00
Mikayla Fischler
7247d8a828 refactored fluid 2023-02-21 11:32:56 -05:00
Mikayla Fischler
a07086907e refactored DUMPING_MODE 2023-02-21 11:30:49 -05:00
Mikayla Fischler
7c64a66dd3 refactored rps_status_t 2023-02-21 11:29:04 -05:00
Mikayla Fischler
6e0dde3f30 refactoring of comms types 2023-02-21 11:05:57 -05:00
Mikayla Fischler
34cac6a8b8 cleanup started of scada-common 2023-02-21 10:31:05 -05:00
Mikayla Fischler
e2d2a0f1dc fixed bug with full builds not being sent 2023-02-20 14:50:20 -05:00
Mikayla Fischler
8df67245c5 unit auto SCRAM and improvements to emergency coolant control 2023-02-20 12:08:51 -05:00
Mikayla Fischler
1be57aaf13 partial build packet updates 2023-02-20 00:49:37 -05:00
Mikayla Fischler
052b2f3848 improved RCS flow low detection 2023-02-19 12:37:07 -05:00
Mikayla Fischler
35dfd61df1 startup rate high; also changed how clearing ASCRAM status and updating indicators works 2023-02-19 12:20:16 -05:00
Mikayla Fischler
cc5ea0dbb0 linked up redstone I/O 2023-02-19 00:14:27 -05:00
Mikayla Fischler
9f95801bfc moved supervisor unit/facility files out of sessions folder 2023-02-18 17:36:44 -05:00
Mikayla Fischler
5e65ca636e reporting comms version mismatches 2023-02-15 19:59:58 -05:00
Mikayla Fischler
2babd67198 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 linked up ASCRAM lights and added ASCRAM radiation condition 2023-02-14 22:55:40 -05:00
Mikayla Fischler
8ebdf2686b created constructors for basic types 2023-02-14 15:15:34 -05:00
Mikayla Fischler
1fe2acb5c5 added radiation monitor integration; displays, unit alarms, connection states, other bugfixes 2023-02-13 22:11:31 -05:00
Mikayla Fischler
2affe1b31c emergency coolant enabled on RPS low coolant 2023-02-13 18:20:48 -05:00
Mikayla Fischler
ccd9f4b6cc fixed race conditions and cleaned up ascram logic 2023-02-13 18:08:32 -05:00
Mikayla Fischler
fdf75350c0 increased minimum timeout 2023-02-13 12:29:59 -05:00
Mikayla Fischler
9784b4e165 increased timeout times and added to config files 2023-02-13 12:27:22 -05:00
Mikayla Fischler
4d40d08a7a fixed bug with RTU remount messages 2023-02-12 13:06:44 -05:00
Mikayla Fischler
42ff61a8a1 gen rate mode pausing on units no longer being ready 2023-02-11 14:27:29 -05:00
Mikayla Fischler
ff1bd02739 process target charge level 2023-02-11 00:21:00 -05:00
Mikayla Fischler
da9eead2d5 gain changes for generation rate control, fixed plc ready checks 2023-02-10 20:26:25 -05:00
Mikayla Fischler
44d5cec1f8 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 increased auto burn rate precision 2023-02-08 20:26:13 -05:00
Mikayla Fischler
ee739c214d 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 facility alarm acknowledge button 2023-02-07 18:44:34 -05:00
Mikayla Fischler
678dafa62f supervisor cleanups and improvements to alarms 2023-02-07 17:51:55 -05:00