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
|
b2115fd077
|
#229 element PSIL register/deletion, changes for RTU to use new PSIL register
|
2023-05-13 08:50:13 -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 Fischler
|
b8a8da1ac4
|
#226 graphics core changes for mouse events
|
2023-05-09 20:29:07 -04:00 |
|
Mikayla Fischler
|
0e1f23efe8
|
fixed luacheck comments
|
2023-05-05 14:09:50 -04: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
|
8064b33a36
|
some luacheck fixes
|
2023-05-05 13:55:14 -04:00 |
|
Mikayla Fischler
|
464451c378
|
unused vararg suppression, re-enable unused args luacheck
|
2023-05-05 13:09:53 -04:00 |
|
Mikayla Fischler
|
5db517cedc
|
#217 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
|
a7ba0e43e8
|
#201 pocket comms establishes
|
2023-04-16 23:50:16 +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
|
0c0055d5ae
|
disabled debug logs for release
|
2023-04-09 18:03:28 -04:00 |
|
Mikayla Fischler
|
9bc4f0f7a6
|
#182 WIP work on PLC PSIL
|
2023-04-08 00:38:46 -04:00 |
|
Mikayla Fischler
|
6ea530635f
|
#182 WIP PLC front panel
|
2023-04-06 22:10:33 -04:00 |
|
Mikayla Fischler
|
2a681d1d37
|
disable debug prints and update ccmsi version for release
|
2023-03-04 23:01:24 -05: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
|
edb5d8b96f
|
#186 different steam feed mismatch and RCS flow low tolerances for water vs sodium cooling
|
2023-03-04 21:19:35 -05:00 |
|
Mikayla Fischler
|
b12f3206e2
|
#186 additional messages for radiation alarm/warning with added urgency/level-specific messages
|
2023-03-04 02:05:36 -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
|
b150072234
|
#177 correctly set Water Level Low
|
2023-02-26 14:17:35 -05:00 |
|
Mikayla Fischler
|
4f285cf2b5
|
#118 safety/constants common file
|
2023-02-25 02:25:35 -05:00 |
|
Mikayla Fischler
|
16d6372d7b
|
#118 bugfixes with cleanup
|
2023-02-24 23:59:39 -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
|
82ea35168b
|
#118 type cleanup
|
2023-02-21 12:40:34 -05:00 |
|
Mikayla Fischler
|
424097973d
|
#118 refactored RTU unit types
|
2023-02-21 12:27:16 -05:00 |
|
Mikayla Fischler
|
7247d8a828
|
#118 refactored fluid
|
2023-02-21 11:32:56 -05:00 |
|
Mikayla Fischler
|
a07086907e
|
#118 refactored DUMPING_MODE
|
2023-02-21 11:30:49 -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
|
35dfd61df1
|
#169 startup rate high; also changed how clearing ASCRAM status and updating indicators works
|
2023-02-19 12:20:16 -05:00 |
|
Mikayla Fischler
|
cc5ea0dbb0
|
#159 linked up redstone I/O
|
2023-02-19 00:14:27 -05:00 |
|
Mikayla Fischler
|
5e65ca636e
|
#164 reporting comms version mismatches
|
2023-02-15 19:59:58 -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
|
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
|
42ff61a8a1
|
#155 gen rate mode pausing on units no longer being ready
|
2023-02-11 14:27:29 -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
|
ba8bfb6e14
|
#101 fixed averages and display them
|
2023-02-03 21:05:21 -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
|
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
|
6fe257d1d7
|
#138 fixed bug with dmesg output resetting to default if log file is recycled
|
2022-12-18 14:11:25 -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
|
52603e3579
|
#131 first pass of unit status text
|
2022-12-06 23:39:35 -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
|
9761228b8e
|
#124 debug stack trace on error
|
2022-11-13 15:56:27 -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
|
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
|
004c960e4d
|
#106 fixes to reactor isFormed support
|
2022-10-25 23:45:59 -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
|
93286174d4
|
some sneaky semicolons
|
2022-10-20 13:59:35 -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
|
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
|
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
|
350370a084
|
notify subscriber right away if there is already a value present
|
2022-09-08 12:19:19 -04:00 |
|
Mikayla Fischler
|
17fce01ff5
|
added rps_trip_cause type
|
2022-09-03 13:10:09 -04:00 |
|
Mikayla Fischler
|
d38e5ca5ec
|
#86 send builds and statuses periodically
|
2022-08-28 12:57:36 -04:00 |
|
Mikayla Fischler
|
7f011369c4
|
util pad function
|
2022-08-16 11:22:06 -04:00 |
|
Mikayla Fischler
|
1afafba501
|
wrap os.pullEventRaw to have return types
|
2022-07-19 15:18:11 -04:00 |
|
Mikayla Fischler
|
41cc6b9acc
|
support for craftos-pc env by supporting modems instead of wireless modems for comms
|
2022-07-19 14:02:20 -04:00 |
|
Mikayla Fischler
|
2aedc015c8
|
correctly find mek 10.1+ fission reactors
|
2022-07-17 15:05:27 -04:00 |
|
Mikayla Fischler
|
ea17ba41fe
|
#74 supervisor-coordinator comms establish
|
2022-07-07 00:34:42 -04:00 |
|
Mikayla Fischler
|
1444008479
|
#74 comms establish on boot
|
2022-07-05 23:48:01 -04:00 |
|
Mikayla Fischler
|
409e8083a7
|
dmesg working status animation
|
2022-07-05 23:47:13 -04:00 |
|
Mikayla Fischler
|
ed0982a832
|
handle nil tag color
|
2022-07-05 11:18:07 -04:00 |
|
Mikayla Fischler
|
e54d5b3d85
|
#74 coordinator comms and work on database
|
2022-06-25 13:39:47 -04:00 |
|
Mikayla Fischler
|
cf6f0e3153
|
publisher-subscriber interconnect layer
|
2022-06-25 13:38:31 -04:00 |
|
Mikayla Fischler
|
5a3897572d
|
fixed bug with single word strings in strwrap
|
2022-06-18 02:15:03 -04:00 |
|
Mikayla Fischler
|
b628472d81
|
#74 work on coordinator comms
|
2022-06-15 15:35:34 -04:00 |
|
Mikayla Fischler
|
dc867095fd
|
util spaces function
|
2022-06-11 12:20:49 -04:00 |
|
Mikayla Fischler
|
1dad4bcf77
|
util string wrap function
|
2022-06-08 18:48:20 -04:00 |
|
Mikayla Fischler
|
d8bbe4b459
|
#63 added indicator icon/light, added util.strrep string repeater
|
2022-06-08 17:16:53 -04:00 |
|
Mikayla Fischler
|
254e85f3ed
|
timer callback dispatcher
|
2022-06-08 14:47:45 -04:00 |
|
Mikayla Fischler
|
285026c1fa
|
docs cleanup
|
2022-06-06 15:40:08 -04:00 |
|
Mikayla Fischler
|
8b307ea030
|
alias for color type and added read() to globals
|
2022-06-05 23:24:18 -04:00 |
|
Mikayla Fischler
|
b75d482f4a
|
use is_int in validator
|
2022-06-05 16:54:34 -04:00 |
|
Mikayla Fischler
|
0bc0decbf2
|
util.is_int
|
2022-06-05 16:51:38 -04:00 |
|
Mikayla Fischler
|
1c819779c7
|
#69 config file validation
|
2022-06-05 15:09:02 -04:00 |
|
Mikayla Fischler
|
81345f5325
|
#71 validate frame data types
|
2022-06-05 13:22:36 -04:00 |
|
Mikayla Fischler
|
f0c97e8b70
|
#65 safe concat where appropriate
|
2022-06-05 11:16:25 -04:00 |
|
Mikayla Fischler
|
fc7b83a18a
|
#28 #66 #59 new RTUs
|
2022-06-04 10:49:36 -04:00 |
|
Mikayla Fischler
|
3bb95eb441
|
#64 util code cleanup
|
2022-05-31 16:09:06 -04:00 |
|
Mikayla Fischler
|
ccc5220ca8
|
util round and trinary
|
2022-05-31 15:55:40 -04:00 |
|
Mikayla Fischler
|
309ba06f8a
|
#51 crypto system
|
2022-05-29 15:05:57 -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
|
ff5b163c1d
|
ppm patch to support multiple return value functions, changed lack of modem to emit fatal error
|
2022-05-29 14:26:40 -04:00 |
|
Mikayla Fischler
|
4d16d64cdc
|
log bugfix
|
2022-05-27 18:17:52 -04:00 |
|
Mikayla Fischler
|
6df0a1d149
|
#9 MODBUS test code; fixed rtu, modbus, redstone_rtu, and rsio bugs
|
2022-05-27 18:10:06 -04:00 |
|
Mikayla Fischler
|
51111f707f
|
more descriptive comments
|
2022-05-26 19:37:19 -04:00 |
|
Mikayla Fischler
|
7d7eecaa5e
|
log use strval
|
2022-05-25 23:24:15 -04:00 |
|
Mikayla Fischler
|
4d7d3be93b
|
power related utility functions put under util table
|
2022-05-24 22:58:42 -04:00 |
|
Mikayla Fischler
|
0cf81040fb
|
moved string value to util and added sprtinf, adjusted prints to use tostring to prevent concatentation errors on some types
|
2022-05-24 22:48:31 -04:00 |
|
Mikayla Fischler
|
9fb6b7a880
|
#9 rsio test code, fixes per test results
|
2022-05-23 17:36:54 -04:00 |
|
Mikayla Fischler
|
a93f0a4452
|
#57 updates per safety pass, fixed plc_sys fields staying nil on degraded start, fixed repeated SCRAM messages when unlinked
|
2022-05-22 17:57:24 -04:00 |
|
Mikayla Fischler
|
3b16d783d3
|
fixed bug with RSIO channel valid check
|
2022-05-21 13:55:22 -04:00 |
|
Mikayla Fischler
|
3f4fb63029
|
#52 basic reactor unit object
|
2022-05-21 12:24:43 -04:00 |
|
Mikayla Fischler
|
44d30ae583
|
#48 only log every 20 PPM faults (per function)
|
2022-05-19 10:35:56 -04:00 |
|
Mikayla Fischler
|
dd553125d6
|
#54 don't trip RPS fault on terminate as it ends up being redundant with shutdown sequence
|
2022-05-19 09:19:51 -04:00 |
|
Mikayla Fischler
|
62d5490dc8
|
#53 RTU redstone parse checks
|
2022-05-18 14:30:48 -04:00 |
|
Mikayla Fischler
|
136b09d7f2
|
util filter table
|
2022-05-16 17:11:46 -04:00 |
|
Mikayla Fischler
|
bdd8af1873
|
dmesg logging
|
2022-05-16 12:50:51 -04:00 |
|
Mikayla Fischler
|
530a40b0aa
|
changed DISCONNECT constant value to -1 to not conflict with redstone values
|
2022-05-16 11:52:03 -04:00 |
|
Mikayla Fischler
|
4834dbf781
|
changed redstone I/O capabilities, added analog read/write scaling functions
|
2022-05-16 10:38:47 -04:00 |
|
Mikayla Fischler
|
94931ef5a2
|
#8 bugfixes, redstone RTU session
|
2022-05-14 20:27:06 -04:00 |
|
Mikayla Fischler
|
282d3fcd99
|
added queue_data class
|
2022-05-13 12:23:01 -04:00 |
|
Mikayla Fischler
|
bf0e92d6e4
|
refactoring
|
2022-05-13 11:08:22 -04:00 |
|
Mikayla Fischler
|
c53ddf1638
|
renamed RTU_ADVERT_TYPES to RTU_UNIT_TYPES
|
2022-05-13 10:27:57 -04:00 |
|
Mikayla Fischler
|
13fcf265b7
|
updated types, added dumping mode and rtu_advertisement
|
2022-05-13 09:38:32 -04:00 |
|
Mikayla Fischler
|
8b43c81fc0
|
class definition in only comments
|
2022-05-13 09:38:10 -04:00 |
|
Mikayla Fischler
|
e624dd431b
|
tank_fluid and coordinate table types
|
2022-05-12 15:37:42 -04:00 |
|
Mikayla Fischler
|
bced8bf566
|
#47 packet frames
|
2022-05-10 21:51:04 -04:00 |
|
Mikayla Fischler
|
3c688bfafa
|
#47 scada-common doc comments
|
2022-05-10 17:06:27 -04:00 |
|
Mikayla Fischler
|
6e1ece8183
|
watchdog cleanup and loop clock object
|
2022-05-10 13:06:13 -04:00 |
|
Mikayla Fischler
|
d7e38d6393
|
supression of warnings, added lua diagnostics global list
|
2022-05-10 11:41:49 -04:00 |
|
Mikayla Fischler
|
cd0d7aa5a3
|
cleanup/fixes of scada common code
|
2022-05-10 11:35:52 -04:00 |
|
Mikayla Fischler
|
25558df22d
|
RTU/PLC code cleanup, #46 changed KEEP_ALIVE to scada message type and use it for the RTU too
|
2022-05-09 15:00:16 -04:00 |
|
Mikayla Fischler
|
469ee29b5a
|
cleanup of rtu comms
|
2022-05-09 09:34:26 -04:00 |
|