Mikayla Fischler
|
b5e0183e54
|
luacheck fix and added keys to luacheck globals
|
2023-10-01 19:16:44 -04:00 |
|
Mikayla Fischler
|
d450c9ca3e
|
Merge branch 'devel' into 145-graphical-configure-utilities
|
2023-10-01 18:43:28 -04:00 |
|
Mikayla Fischler
|
894229831d
|
#307 configure bugfixes and settings file rename
|
2023-10-01 17:12:59 -04:00 |
|
Mikayla Fischler
|
bfa24b3665
|
#307 PLC integration with new config storage
|
2023-10-01 17:10:16 -04:00 |
|
Mikayla Fischler
|
02e9c09daf
|
#307 configurator error reporting
|
2023-10-01 15:30:49 -04:00 |
|
Mikayla Fischler
|
21d5cb3858
|
#307 reactor PLC configurator
|
2023-10-01 00:21:46 -04:00 |
|
Mikayla Fischler
|
d38a2dea7c
|
#344 renderer integration with new assertion handling
|
2023-09-30 13:31:41 -04:00 |
|
Mikayla Fischler
|
881a120d34
|
#145 more work on plc configurator
|
2023-09-23 20:22:02 -04:00 |
|
Mikayla Fischler
|
9cef6e6175
|
#344 added double click events to event handlers
|
2023-09-23 12:58:09 -04:00 |
|
Mikayla Fischler
|
611b048cb4
|
#307 work in progress PLC configurator
|
2023-09-20 00:02:30 -04:00 |
|
Mikayla
|
c24766a4db
|
#329 disable reactor rather than trip on auto control stop
|
2023-09-19 20:37:15 +00:00 |
|
Mikayla Fischler
|
71d8b5ba0a
|
#300 utilizing style file for common color pairs
|
2023-09-01 22:24:31 -04:00 |
|
Mikayla
|
cfc6479dd5
|
#300 comms cleanup
|
2023-08-30 20:45:48 +00:00 |
|
Mikayla Fischler
|
b7d4468cea
|
#327 close connections on timeout
|
2023-08-25 21:42:35 -04:00 |
|
Mikayla
|
17731de61b
|
#312 improved reactor peripheral handling
|
2023-08-11 14:20:13 +00:00 |
|
Mikayla Fischler
|
4d663ada8d
|
added high contrast yellow to rtu/plc/coord front panels
|
2023-07-12 13:38:37 -04:00 |
|
Mikayla Fischler
|
084a153a79
|
#268 fixed incorrect info print on extra wireless modem connection
|
2023-07-11 21:06:47 -04:00 |
|
Mikayla Fischler
|
8b136d78a8
|
#268 better handling of wireless modem peripherals
|
2023-07-11 18:22:09 -04:00 |
|
Mikayla Fischler
|
9f3ad3caf0
|
removed PLC establish packet handling when already linked
|
2023-07-11 16:17:24 -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
|
0e7ea7102c
|
removed extra verbose comment in configs
|
2023-06-27 19:08:33 -04:00 |
|
Mikayla Fischler
|
a8071db08e
|
#51 send serialized data to properly MAC
|
2023-06-27 18:36:16 -04:00 |
|
Mikayla Fischler
|
57763702ff
|
#51 init mac component from config key
|
2023-06-25 14:00:18 -04:00 |
|
Mikayla Fischler
|
336662de62
|
#51 nic integration with rtu and supervisor
|
2023-06-25 12:59:38 -04:00 |
|
Mikayla Fischler
|
9073009eb0
|
#51 usage of nic.receive and some cleanup
|
2023-06-23 14:12:41 -04:00 |
|
Mikayla Fischler
|
ffac6996ed
|
#51 PLC changes for new networking
|
2023-06-23 13:52:24 -04:00 |
|
Mikayla
|
712c7a8f3b
|
#266 added health check to ppm and strengthened reliability of RTU hw state reporting
|
2023-06-22 19:46:17 +00:00 |
|
Mikayla Fischler
|
5d6dda5619
|
#255 fixed rectangle element not offsetting mouse events
|
2023-06-07 18:38:00 -04:00 |
|
Mikayla Fischler
|
1decd88415
|
last few cleanups
|
2023-06-07 14:22:35 -04:00 |
|
Mikayla Fischler
|
15b071378c
|
#225 removed redundant checks on remote address, added clarity to log messages
|
2023-06-07 12:48:43 -04:00 |
|
Mikayla Fischler
|
5ba06dcdaf
|
#225 log message fixes and sv addr checks for RTU
|
2023-06-07 12:35:17 -04:00 |
|
Mikayla Fischler
|
cf881548d7
|
config file comments
|
2023-06-07 12:25:50 -04:00 |
|
Mikayla Fischler
|
c536b823e7
|
#225 PLC/RTUs drop incoming packets from devices other than the configured supervisor while linked
|
2023-06-05 19:12:43 -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
|
63147bfab5
|
#248 fixed network light not going out on PLC/RTU when disconnected
|
2023-06-05 17:47:43 -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
|
8d248408d4
|
#247 renamed tcallbackdsp to tcd and added handler to RTU
|
2023-06-03 17:40:57 -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
|
4c35233289
|
#243 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
|
#243 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
|
43a0ff86d7
|
#238 bugfix for push button and sidebar in bounds checks
|
2023-05-23 19:51:48 -04:00 |
|
Mikayla Fischler
|
142f2c363a
|
#234 made debug config setting optional, defaults to false
|
2023-05-19 19:12:27 -04:00 |
|
Mikayla Fischler
|
e763af9981
|
#229 PLC changes for UI element register change
|
2023-05-13 09:43:42 -04:00 |
|
Mikayla
|
a220713385
|
Merge branch 'devel' into graphics-rearchitect
|
2023-05-11 19:57:57 -04:00 |
|
Mikayla
|
50c0a4a3eb
|
#222 added debug log enable to configs
|
2023-05-10 20:57:23 +00:00 |
|
Mikayla
|
3a0d677c16
|
#226 updated PLC/RTU front panels to use new mouse events
|
2023-05-10 19:21:54 +00:00 |
|
Mikayla
|
e26dc905f8
|
#226 updated mouse events WIP
|
2023-05-07 01:27:36 +00:00 |
|
Mikayla Fischler
|
43e708aa0d
|
#219 bugfixes with renderer exit handling
|
2023-04-21 23:43:28 -04:00 |
|
Mikayla
|
783c4936cc
|
#213 strict sequence verification
|
2023-04-21 21:10:15 +00:00 |
|
Mikayla
|
e1da8b59d3
|
#219 properly close out GUI on error on pocket and coordinator
|
2023-04-21 18:53:28 +00:00 |
|
Mikayla Fischler
|
419ca2e6ef
|
#220 close ui on crash
|
2023-04-20 21:19:16 -04:00 |
|
Mikayla Fischler
|
5db517cedc
|
#217 close log files on exit (including crash)
|
2023-04-20 21:00:10 -04:00 |
|
Mikayla Fischler
|
e9788abde7
|
#219 fixed PLC renderer crash handling
|
2023-04-20 20:47:14 -04:00 |
|
Mikayla Fischler
|
d143015cc7
|
#183 RTU front panel
|
2023-04-20 20:40:28 -04:00 |
|
Mikayla
|
f6fe99a5fd
|
Merge branch 'devel' into 193-pocket-main-application
|
2023-04-19 23:01:10 -04:00 |
|
Mikayla Fischler
|
a843c8eb79
|
fixes and cleanup
|
2023-04-19 23:00:27 -04:00 |
|
Mikayla Fischler
|
eca303e289
|
#208 ui cleanup for indicating emergency coolant status
|
2023-04-19 21:21:19 -04:00 |
|
Mikayla
|
2371a75130
|
#214 log level cleanup
|
2023-04-19 13:30:17 +00:00 |
|
Mikayla
|
fee54db43e
|
#203 removed log message on failed structure send, lowered some other log levels to debug
|
2023-04-18 22:01:35 +00:00 |
|
Mikayla
|
46607dd690
|
#208 indicate emergency coolant control on PLC front panel
|
2023-04-18 15:28:46 +00: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
|
3ae39b2455
|
#204 replaced util.strwrap implementation with cc.strings.wrap
|
2023-04-11 23:53:42 -04:00 |
|
Mikayla Fischler
|
b325992a0d
|
disabled emergency coolant example config
|
2023-04-09 18:10:20 -04:00 |
|
Mikayla Fischler
|
d624690b6b
|
comment/indentation fixes
|
2023-04-08 22:00:51 -04:00 |
|
Mikayla Fischler
|
527f3446a1
|
Merge branch 'devel' of github.com:MikaylaFischler/cc-mek-scada into front-panels
|
2023-04-08 21:51:34 -04:00 |
|
Mikayla Fischler
|
27a697c27e
|
#182 added scram/reset buttons to PLC front panel
|
2023-04-08 21:35:44 -04:00 |
|
Mikayla Fischler
|
67872a1053
|
updated graphics touch events to be mouse events
|
2023-04-08 21:33:54 -04:00 |
|
Mikayla Fischler
|
4aad591d3a
|
#182 linked up PLC front panel indicators, cleaned up panel display and added flashing to RPS trip
|
2023-04-08 16:49:54 -04:00 |
|
Mikayla Fischler
|
9bc4f0f7a6
|
#182 WIP work on PLC PSIL
|
2023-04-08 00:38:46 -04:00 |
|
Mikayla Fischler
|
ccc0aa18ff
|
#181 independent emergency coolant valve control
|
2023-04-07 08:05:14 -04:00 |
|
Mikayla Fischler
|
6ea530635f
|
#182 WIP PLC front panel
|
2023-04-06 22:10:33 -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
|
0e5113918c
|
#186 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
|
446fff04da
|
#118 PLC RPS fuel check fixed
|
2023-02-25 12:07:25 -05:00 |
|
Mikayla Fischler
|
4f285cf2b5
|
#118 safety/constants common file
|
2023-02-25 02:25:35 -05:00 |
|
Mikayla Fischler
|
79494f0587
|
#118 RTU/PLC code cleanup
|
2023-02-21 23:50:43 -05:00 |
|
Mikayla Fischler
|
ce0198f389
|
#118 PLC code cleanup
|
2023-02-21 16:57:33 -05:00 |
|
Mikayla Fischler
|
424097973d
|
#118 refactored RTU unit types
|
2023-02-21 12:27:16 -05:00 |
|
Mikayla Fischler
|
7c64a66dd3
|
#118 refactored rps_status_t
|
2023-02-21 11:29:04 -05:00 |
|
Mikayla Fischler
|
6e0dde3f30
|
#118 refactoring of comms types
|
2023-02-21 11:05:57 -05:00 |
|
Mikayla Fischler
|
34cac6a8b8
|
#118 cleanup started of scada-common
|
2023-02-21 10:31:05 -05:00 |
|
Mikayla Fischler
|
e2d2a0f1dc
|
#172 fixed bug with full builds not being sent
|
2023-02-20 14:50:20 -05:00 |
|
Mikayla Fischler
|
8df67245c5
|
#171 unit auto SCRAM and improvements to emergency coolant control
|
2023-02-20 12:08:51 -05:00 |
|
Mikayla Fischler
|
5e65ca636e
|
#164 reporting comms version mismatches
|
2023-02-15 19:59:58 -05:00 |
|
Mikayla Fischler
|
fdf75350c0
|
#146 increased minimum timeout
|
2023-02-13 12:29:59 -05:00 |
|
Mikayla Fischler
|
9784b4e165
|
#146 increased timeout times and added to config files
|
2023-02-13 12:27:22 -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
|
07ee792163
|
#153 facility alarm acknowledge button
|
2023-02-07 18:44:34 -05:00 |
|
Mikayla Fischler
|
6c09772a74
|
#76 added trusted connection ranges for modem messages
|
2023-02-07 17:31:22 -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
|
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
|
eb8aab175f
|
#148 okay turns out that variable was important, ramping now works as intended, correctly
|
2023-02-02 22:51:21 -05:00 |
|
Mikayla Fischler
|
5721231ffd
|
#148 fixed burn rate ramping again for real this time
|
2023-02-02 22:04:26 -05:00 |
|