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
|
351842c9a1
|
updated RTU to say STATUS instead of POWER on first LED
|
2023-06-03 17:44:32 -04: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
|
b2115fd077
|
#229 element PSIL register/deletion, changes for RTU to use new PSIL register
|
2023-05-13 08:50:13 -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
|
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
|
ff9a18a019
|
rtu log message cleanup
|
2023-04-29 23:49:04 -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
|
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
|
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
|
2371a75130
|
#214 log level cleanup
|
2023-04-19 13:30:17 +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
|
4ef73a8580
|
#147 fixed bug with the fix for startup race condition with RTUs
|
2023-04-09 14:25:22 -04:00 |
|
Mikayla Fischler
|
c2132ea7eb
|
#147 possible fix for MODBUS failures on server startup
|
2023-04-06 12:52:25 -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
|
fbb992ff12
|
#173 dump excess steam on opening emergency coolant
|
2023-02-25 14:11:40 -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
|
424097973d
|
#118 refactored RTU unit types
|
2023-02-21 12:27:16 -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
|
c4f6c1b289
|
#159 fixed RTU facility level redstone linking
|
2023-02-19 22:41:32 -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
|
5751c320b1
|
only report not formed if its a multiblock
|
2023-02-13 18:53:00 -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
|
4d40d08a7a
|
#157 fixed bug with RTU remount messages
|
2023-02-12 13:06:44 -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
|
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
|
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
|
41913441d5
|
RTU support for non reactor specific devices
|
2022-12-07 23:17:11 -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
|
afb3b0957e
|
bugfix for RTU re-formed detection
|
2022-11-27 22:44:47 -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
|
6fcd18e17a
|
#125 moved environmental loss on boilers from build to state category
|
2022-11-14 21:50:32 -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
|
f940c136bf
|
fixes to rtu modbus
|
2022-11-11 23:49:45 -05:00 |
|
Mikayla Fischler
|
83cf645da4
|
#107, #121 RTU build changes, formed handling
|
2022-11-11 14:59:53 -05:00 |
|
Mikayla Fischler
|
c02479b52e
|
#99 updating/sending builds
|
2022-10-02 21:17:13 -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
|
50be7f9ca2
|
#97 fixed issue where traffic on other channels gets processed if channels are left open
|
2022-09-22 20:42:06 -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
|
88c34d8bca
|
fixed acknowledge packets to use error flag, fixed 'static'-like function scope of modbus functions
|
2022-09-18 22:02:17 -04:00 |
|
Mikayla Fischler
|
3267e7ff13
|
#96 RTU starts unlinked now on main thread start
|
2022-09-17 17:04:57 -04:00 |
|
Mikayla Fischler
|
1afafba501
|
wrap os.pullEventRaw to have return types
|
2022-07-19 15:18:11 -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
|
d6c8eb4d56
|
#68 check RTU unit configs while parsing
|
2022-06-05 14:49:50 -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
|
5068e47590
|
#67 turbine valve RTU supervisor session, bugfixes with redstone RTU session
|
2022-06-05 09:30:56 -04:00 |
|
Mikayla Fischler
|
6d97d45227
|
#67 imatrix RTU supervisor session
|
2022-06-04 17:45:52 -04:00 |
|
Mikayla Fischler
|
5cba8ff9f1
|
#59 environment detector RTU
|
2022-06-04 11:11:35 -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
|
4ec07ca053
|
#64 rtu code cleanup and device bugfixes
|
2022-05-31 14:54:55 -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
|
6df0a1d149
|
#9 MODBUS test code; fixed rtu, modbus, redstone_rtu, and rsio bugs
|
2022-05-27 18:10:06 -04:00 |
|
Mikayla Fischler
|
26c6010ce0
|
#56 pcall threads and restart on crash (unless shutting down)
|
2022-05-21 13:56:14 -04:00 |
|
Mikayla Fischler
|
44d30ae583
|
#48 only log every 20 PPM faults (per function)
|
2022-05-19 10:35:56 -04:00 |
|
Mikayla Fischler
|
6a168c884d
|
#23 device version reporting
|
2022-05-19 10:21:04 -04:00 |
|
Mikayla Fischler
|
62d5490dc8
|
#53 RTU redstone parse checks
|
2022-05-18 14:30:48 -04:00 |
|
Mikayla Fischler
|
cc856d4d80
|
redundant 'for_reactor' field removed from redstone RTU config
|
2022-05-18 13:32:44 -04:00 |
|
Mikayla Fischler
|
31ede51c42
|
still queue packets if RTU is busy, determine busy state by queue length rather than flag
|
2022-05-17 10:35:55 -04:00 |
|
Mikayla Fischler
|
bc6453de2b
|
RTU bugfixes, adjusted comms sleep timer
|
2022-05-14 20:07:26 -04:00 |
|
Mikayla Fischler
|
d3a926b25a
|
fixed require issues caused by using bootloader
|
2022-05-14 13:32:42 -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
|
635e7b7f59
|
RTU advertisement sends as basic array, re-ordered input registers on turbine RTU
|
2022-05-13 09:39:28 -04:00 |
|
Mikayla Fischler
|
969abca95d
|
RTU device changes, bugfixes, docs
|
2022-05-12 15:36:27 -04:00 |
|
Mikayla Fischler
|
95c4d51e67
|
#47 RTU send should be table not any
|
2022-05-11 12:09:04 -04:00 |
|
Mikayla Fischler
|
c6987f6f67
|
#47 RTU luadoc, bugfixes
|
2022-05-11 12:03:15 -04:00 |
|
Mikayla Fischler
|
02541184bd
|
bootloader
|
2022-05-11 11:31:02 -04:00 |
|
Mikayla Fischler
|
22a6159520
|
updated globals list, fixed packet references that were linking to old controller mistakenly
|
2022-05-10 17:17:55 -04:00 |
|
Mikayla Fischler
|
e3a4ed5363
|
catch nil cases, supervisor use loop clock
|
2022-05-10 17:08:38 -04:00 |
|
Mikayla Fischler
|
6e1ece8183
|
watchdog cleanup and loop clock object
|
2022-05-10 13:06:13 -04:00 |
|
Mikayla Fischler
|
168341db39
|
code cleanup and bugfixes
|
2022-05-10 12:01:56 -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 |
|
Mikayla Fischler
|
96e535fdc4
|
global scope optimizations
|
2022-05-07 13:39:12 -04:00 |
|
Mikayla Fischler
|
b575899d46
|
#33 lua module/require architecture changeover
|
2022-05-04 13:37:01 -04:00 |
|
Mikayla Fischler
|
7bcb260712
|
#27 added getMaxEnergy for turbine
|
2022-05-04 12:03:07 -04:00 |
|
Mikayla Fischler
|
1cb5a0789e
|
#27 mekanism 10.1+ RTU support
|
2022-05-04 11:23:45 -04:00 |
|
Mikayla Fischler
|
665b33fa05
|
#42 parallel RTU reads
|
2022-05-03 11:39:03 -04:00 |
|
Mikayla Fischler
|
635c70cffd
|
moved MODBUS file thanks to utilizing types file
|
2022-05-03 11:28:29 -04:00 |
|
Mikayla Fischler
|
e2f7318922
|
#27 induction matrix RTU split into two RTUs, supporting pre and post Mekansim 10.1
|
2022-05-03 10:49:14 -04:00 |
|
Mikayla Fischler
|
c76200b0e3
|
shared global types
|
2022-05-03 10:44:18 -04:00 |
|
Mikayla Fischler
|
e3e370d3ab
|
fixed RTU mgmt_pkt reference
|
2022-05-02 17:34:57 -04:00 |
|
Mikayla Fischler
|
4bc50e4bad
|
#41 RTU comms closing
|
2022-05-02 13:15:08 -04:00 |
|
Mikayla Fischler
|
e1135eac01
|
log init parameters in config files
|
2022-04-29 13:36:00 -04:00 |
|
Mikayla Fischler
|
c805b6e0c5
|
log init function to set path and write mode
|
2022-04-29 13:32:37 -04:00 |
|
Mikayla Fischler
|
3587352219
|
log exit notices as info messages not warnings
|
2022-04-29 13:20:56 -04:00 |
|
Mikayla Fischler
|
84e7ad43bc
|
#39 RTU unit threads
|
2022-04-29 13:19:01 -04:00 |
|
Mikayla Fischler
|
e833176c65
|
#40 RTU sequence number verification
|
2022-04-29 10:19:05 -04:00 |
|
Mikayla Fischler
|
ef1fdc7f39
|
#34 RTU modem disconnect/reconnect handling, bugfix in comms thread
|
2022-04-29 09:27:05 -04:00 |
|
Mikayla Fischler
|
aff166e27d
|
added util adaptive_delay to replace repeated code
|
2022-04-27 19:06:01 -04:00 |
|
Mikayla Fischler
|
7f0f423450
|
PLC bugfixes/optimizations, removed some debug prints
|
2022-04-27 18:49:54 -04:00 |
|
Mikayla Fischler
|
fe3b8e6f88
|
fixed up worker loop delay logic
|
2022-04-27 17:59:25 -04:00 |
|
Mikayla Fischler
|
46a27a3f3a
|
check shutdown flag in worker loops so they don't lock up the exit process
|
2022-04-27 16:38:41 -04:00 |
|
Mikayla Fischler
|
82726520b8
|
that was a stack not a queue, nice
|
2022-04-27 16:24:28 -04:00 |
|
Mikayla Fischler
|
146e0bf569
|
protected sleep call
|
2022-04-27 15:56:55 -04:00 |
|
Mikayla Fischler
|
67a93016c0
|
threaded RTU/PLC bugfixes
|
2022-04-27 15:52:34 -04:00 |
|
Mikayla Fischler
|
8c4598e7a6
|
#32 new threaded RTU code
|
2022-04-27 12:46:04 -04:00 |
|
Mikayla Fischler
|
f7f723829c
|
#7 work on PLC session comms, bugfixes with comms, general supervisor bugfixes
|
2022-04-25 21:00:50 -04:00 |
|
Mikayla Fischler
|
19a4b3c0ef
|
ticked up versions
|
2022-04-25 15:50:24 -04:00 |
|
Mikayla Fischler
|
3ef2902829
|
apparently I forgot how to spell receive a few more times
|
2022-04-25 15:49:04 -04:00 |
|
Mikayla Fischler
|
b1998b61bc
|
#32 parallel RTU execution of packet handler
|
2022-04-25 11:44:34 -04:00 |
|
Mikayla Fischler
|
86b0d155fa
|
#31 PPM cannot assume that we will get a fault on failure, apparently sometimes we will only get a nil return so the system can no longer check ACCESS_OK, now each device has its own fault tracking
|
2022-04-24 12:04:31 -04:00 |
|
Mikayla Fischler
|
554f09c817
|
#30 RTU comms code updated for new comms design
|
2022-04-22 20:23:40 -04:00 |
|
Mikayla Fischler
|
17d0213d58
|
RTU/PPM bugfixes
|
2022-04-22 10:58:18 -04:00 |
|
Mikayla Fischler
|
f7c11febe5
|
check if interface exists before trying to get its device or type
|
2022-04-22 10:21:15 -04:00 |
|
Mikayla Fischler
|
4842f9cb0d
|
moved packet constructors and fixes to comms namespace references in plc comms code
|
2022-04-21 10:26:02 -04:00 |
|
Mikayla Fischler
|
b89724ad59
|
version updates
|
2022-04-18 10:49:05 -04:00 |
|
Mikayla Fischler
|
6a5e0243be
|
catch terminations that are caught by PPM
|
2022-04-18 10:31:24 -04:00 |
|
Mikayla Fischler
|
91079eeb78
|
fixed RTU comms bad function calls, fixed loop clock, changed terminate logic/prints
|
2022-04-18 10:21:29 -04:00 |
|
Mikayla Fischler
|
2278469a8b
|
refactored RTU devices
|
2022-04-18 10:09:44 -04:00 |
|
Mikayla Fischler
|
377cf8e6fc
|
scope fixes, load comms api, debug prints
|
2022-04-18 09:35:08 -04:00 |
|
Mikayla Fischler
|
a6e1134dc3
|
changed modbus init function name, fixed bugs with RTU startup, improved PPM debug prints
|
2022-04-18 00:10:47 -04:00 |
|
Mikayla Fischler
|
6d6953d795
|
RTU device inits now correctly use rtu.rtu_init() not rtu_init()
|
2022-04-17 22:37:09 -04:00 |
|