Commit Graph

158 Commits

Author SHA1 Message Date
Mikayla Fischler
4d87887709 #403 pocket guide fixes 2024-06-03 20:52:59 -04:00
Mikayla
b63a17bda0 Merge branch 'pocket-alpha-dev' of https://github.com/MikaylaFischler/cc-mek-scada into pocket-alpha-dev 2024-06-04 00:24:41 +00:00
Mikayla
39233dae8a Merge branch 'pocket-alpha-dev' of https://github.com/MikaylaFischler/cc-mek-scada into pocket-alpha-dev 2024-06-04 00:22:06 +00:00
Mikayla
a2af0d3829 #403 work on pocket guide app 2024-06-04 00:21:54 +00:00
Mikayla Fischler
db901129f9 #200 status display updates 2024-06-02 22:00:42 -04:00
Mikayla Fischler
c1c49ea3fb #200 unit app updates 2024-06-02 16:06:32 -04:00
Mikayla Fischler
be6c3755a4 #207 pocket turbine view 2024-06-01 00:50:19 -04:00
Mikayla Fischler
ac2d189c1a reactor and boiler view fixes 2024-05-31 19:25:36 -04:00
Mikayla Fischler
0fa0324940 #206 pocket boiler view 2024-05-31 18:16:04 -04:00
Mikayla Fischler
3181ab96f1 #206 work on boiler view and reorganized app code 2024-05-29 22:08:36 -04:00
Mikayla Fischler
30c9215658 #202 pocket reactor view 2024-05-27 23:53:35 -04:00
Mikayla Fischler
946c28c929 record additional reactor unit data 2024-05-27 23:49:53 -04:00
Mikayla Fischler
e6d6353d05 added temperature units to pocket and to common types 2024-05-27 19:31:24 -04:00
Mikayla Fischler
0e81391144 #200 fixes to alarm/info display 2024-05-22 21:45:52 -04:00
Mikayla Fischler
b18cadb53e Merge branch 'devel' into pocket-alpha-dev 2024-05-22 18:46:23 -04:00
Mikayla
a268a770f2 #200 pocket alarm/status informational display, ECAM style 2024-05-22 21:55:59 +00:00
Mikayla Fischler
9b8947fba2 #491 fixed ps table indexing for boiler/turbine online 2024-05-16 22:06:53 -04:00
Mikayla Fischler
76e85da9d5 version increments and small fix 2024-05-12 18:19:21 -04:00
Mikayla Fischler
be560cd532 luacheck fixes 2024-05-12 15:19:01 -04:00
Mikayla Fischler
2b0a536292 #200 pocket RCS overview 2024-05-12 15:14:58 -04:00
Mikayla Fischler
3e6a0a8869 #200 updated RPS indicator text 2024-05-12 14:20:48 -04:00
Mikayla Fischler
b99cf19be0 #200 placeholder for alarm page, start of RCS page 2024-05-12 13:36:46 -04:00
Mikayla Fischler
7f009f9c86 #200 RPS view on pocket 2024-05-12 13:28:34 -04:00
Mikayla Fischler
6a8ed311f3 #200 functioning pocket unit overview 2024-05-11 19:19:52 -04:00
Mikayla Fischler
c181142f75 added network details to about app 2024-05-11 15:03:14 -04:00
Mikayla Fischler
0c6c7bf9a5 #200 work in progress unit views and sidebar/app updates 2024-05-09 23:05:55 -04:00
Mikayla Fischler
473b0dd10d fixes and comments 2024-04-14 16:16:18 -04:00
Mikayla Fischler
d2df7db18b luacheck fixes 2024-04-14 15:30:13 -04:00
Mikayla Fischler
0ca002316f work on pocket, bumped comms version for PR 2024-04-14 15:28:38 -04:00
Mikayla Fischler
9fe34648c2 added system information/about app 2024-04-13 16:18:27 -04:00
Mikayla Fischler
57dc20692b need to use a compact signal bar due to how edge extensions work 2024-04-13 16:15:20 -04:00
Mikayla Fischler
23b31e0049 #410 pocket nav overhaul 2024-04-13 14:47:20 -04:00
Mikayla Fischler
2b4309afa7 pocket coordinator linking fixes 2024-04-13 11:02:41 -04:00
Mikayla
99213da760 #200 work on pocket comms for unit data 2024-04-13 00:41:47 +00:00
Mikayla Fischler
1d7104ae74 Merge branch 'devel' into pocket-alpha-dev 2024-03-31 13:35:23 -04:00
Mikayla Fischler
968b0a9122 log environment versions when debug logs are enabled 2024-03-23 00:49:19 -04:00
Mikayla Fischler
9dc3a09f4d bumped up pocket version for configurator change 2024-03-12 13:35:15 -04:00
Mikayla Fischler
89d56d3101 moved main UI palettes to themes.lua and set configurators to use it 2024-03-11 23:54:03 -04:00
Mikayla
bbe7b52662 bugfixes and cleanup 2024-03-11 16:35:06 +00:00
Mikayla
ce37a672a3 Merge branch 'devel' into pocket-alpha-dev 2024-03-07 16:21:37 +00:00
Mikayla Fischler
0892a57d35 #442 return rather than assert on configuration error 2024-03-05 20:17:52 -05:00
Mikayla Fischler
788cef8f86 comment cleanup and absolute paths while saving 2024-02-19 20:32:33 -05:00
Mikayla Fischler
c47fa5433f #408 improvements to pocket configurator 2024-02-19 19:36:27 -05:00
Mikayla Fischler
a330249c7e #408 integrate new settings with pocket 2024-02-19 14:07:26 -05:00
Mikayla Fischler
8237113577 #408 pocket configurator 2024-02-19 13:49:50 -05:00
Mikayla Fischler
526a54903e #410 moved diagnostic apps to main app list and added app page nav 2024-01-15 17:40:43 -05:00
Mikayla Fischler
d5d818e625 pocket signal bars 2024-01-14 14:20:59 -05:00
Mikayla Fischler
03de90c3d8 fixes to page navigation nav_up 2023-12-31 12:58:24 -05:00
Mikayla Fischler
0395aa95b6 indicate pocket app is a work in progress 2023-12-22 22:30:22 -05:00
Mikayla Fischler
c624baed2c #395 fixes to new pocket navigation 2023-12-22 12:46:36 -05:00
Mikayla
1a40321c0f #395 pocket navigation system 2023-12-22 16:12:47 +00:00
Mikayla Fischler
d2a1951b66 refactored TEXT_ALIGN to ALIGN 2023-10-03 23:16:46 -04:00
Mikayla Fischler
ebabd99f2b #307 fixes and cleanup 2023-10-03 22:52:13 -04:00
Mikayla Fischler
d38a2dea7c #344 renderer integration with new assertion handling 2023-09-30 13:31:41 -04:00
Mikayla Fischler
9cef6e6175 #344 added double click events to event handlers 2023-09-23 12:58:09 -04:00
Mikayla
cfc6479dd5 #300 comms cleanup 2023-08-30 20:45:48 +00:00
Mikayla Fischler
724d13510d optimizations and cleanup for pull request 2023-07-30 00:13:26 -04:00
Mikayla Fischler
df67795239 #290 pocket page management and alarm test tool, supervisor pocket diagnostics system 2023-07-29 18:16:59 -04:00
Mikayla Fischler
61d975d13f updated error messages for consistency 2023-07-11 15:15:44 -04:00
Mikayla Fischler
0e7ea7102c removed extra verbose comment in configs 2023-06-27 19:08:33 -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
da3c92b3bf Merge branch 'devel' into 51-hmac-message-authentication 2023-06-22 16:05:46 -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
1cdf66a8c3 #51 WIP network interface controller 2023-06-21 23:04:39 +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
f4e7137eb3 #225 pocket verify packets are from linked computer 2023-06-07 12:27:13 -04:00
Mikayla Fischler
cf881548d7 config file comments 2023-06-07 12:25:50 -04:00
Mikayla Fischler
cdff7af431 #225 pocket properly handle disconnects and address validation 2023-06-05 20:59:28 -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
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
4aba79f232 Merge branch 'devel' into front-panels 2023-05-20 09:44:26 -04:00
Mikayla Fischler
142f2c363a #234 made debug config setting optional, defaults to false 2023-05-19 19:12:27 -04:00
Mikayla Fischler
82e3fa494c #229 pocket changes for UI element register change 2023-05-14 19:13:44 -04:00
Mikayla Fischler
513c72ea79 Merge branch 'devel' into front-panels 2023-05-11 20:02:42 -04:00
Mikayla
a220713385
Merge branch 'devel' into graphics-rearchitect 2023-05-11 19:57:57 -04:00
Mikayla Fischler
0783c4c01f #226 bugfixes and pocket mouse events 2023-05-11 19:55:02 -04:00
Mikayla
50c0a4a3eb #222 added debug log enable to configs 2023-05-10 20:57:23 +00:00
Mikayla
e26dc905f8 #226 updated mouse events WIP 2023-05-07 01:27:36 +00:00
Mikayla Fischler
81005d3e2c pocket cleanup 2023-04-29 23:48:50 -04: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
4c8723eb32 #217 close log file on pocket too 2023-04-20 21:01:41 -04:00
Mikayla Fischler
d143015cc7 #183 RTU front panel 2023-04-20 20:40:28 -04:00
Mikayla Fischler
a843c8eb79 fixes and cleanup 2023-04-19 23:00:27 -04:00
Mikayla Fischler
a614b97d02 cleanup to pass checks 2023-04-19 21:26:54 -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 Fischler
d295c2b3c3 #201 added pocket connecting screens 2023-04-18 13:47:06 -04:00
Mikayla
14dc814925 #201 removed redundant close handling 2023-04-17 00:22:47 +00:00