This website requires JavaScript.
72da718015
optimized session lookup
2022-05-13 11:38:56 -04:00
bf0e92d6e4
refactoring
2022-05-13 11:08:22 -04:00
c53ddf1638
renamed RTU_ADVERT_TYPES to RTU_UNIT_TYPES
2022-05-13 10:27:57 -04:00
45f5843598
#8 renamed rtu_session_unit type to unit_session
2022-05-13 09:49:24 -04:00
fc39588b2e
#8 RTU session for emachine and turbine, RTU session creation, adjusted sequence number logic in svsessions
2022-05-13 09:45:11 -04:00
635e7b7f59
RTU advertisement sends as basic array, re-ordered input registers on turbine RTU
2022-05-13 09:39:28 -04:00
13fcf265b7
updated types, added dumping mode and rtu_advertisement
2022-05-13 09:38:32 -04:00
8b43c81fc0
class definition in only comments
2022-05-13 09:38:10 -04:00
e624dd431b
tank_fluid and coordinate table types
2022-05-12 15:37:42 -04:00
969abca95d
RTU device changes, bugfixes, docs
2022-05-12 15:36:27 -04:00
9695e94608
plc session terminology change, changed number/integer types
2022-05-11 13:05:20 -04:00
b985362757
#8 RTU session for boiler, added transaction controller
2022-05-11 13:02:21 -04:00
0d090fe9e2
#47 supervisor luadoc, bugfixes
2022-05-11 12:31:19 -04:00
95c4d51e67
#47 RTU send should be table not any
2022-05-11 12:09:04 -04:00
c6987f6f67
#47 RTU luadoc, bugfixes
2022-05-11 12:03:15 -04:00
5ad14205f3
#47 not going to do file level diagnostic disables
2022-05-11 12:01:18 -04:00
02541184bd
bootloader
2022-05-11 11:31:02 -04:00
bced8bf566
#47 packet frames
2022-05-10 21:51:04 -04:00
faac421b63
#47 reactor plc docs and bugfixes
2022-05-10 21:49:14 -04:00
22a6159520
updated globals list, fixed packet references that were linking to old controller mistakenly
2022-05-10 17:17:55 -04:00
f4e397ebb1
removed old controller code to not pollute workspace with globals
2022-05-10 17:16:34 -04:00
87de804a9e
proper module format
2022-05-10 17:09:02 -04:00
e3a4ed5363
catch nil cases, supervisor use loop clock
2022-05-10 17:08:38 -04:00
3c688bfafa
#47 scada-common doc comments
2022-05-10 17:06:27 -04:00
6e1ece8183
watchdog cleanup and loop clock object
2022-05-10 13:06:13 -04:00
168341db39
code cleanup and bugfixes
2022-05-10 12:01:56 -04:00
d7e38d6393
supression of warnings, added lua diagnostics global list
2022-05-10 11:41:49 -04:00
cd0d7aa5a3
cleanup/fixes of scada common code
2022-05-10 11:35:52 -04:00
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
679d98c8bf
#8 work in progress on RTU sessions and added unit object
2022-05-09 09:35:39 -04:00
469ee29b5a
cleanup of rtu comms
2022-05-09 09:34:26 -04:00
96e535fdc4
global scope optimizations
2022-05-07 13:39:12 -04:00
4aab75b842
rsio optimizations
2022-05-06 11:11:53 -04:00
17a46ae642
mqueue optimizations
2022-05-06 10:53:12 -04:00
d0b2820160
logging optimizations
2022-05-06 10:48:46 -04:00
b7e5ced2e8
PLC bugfixes
2022-05-06 09:10:50 -04:00
eaabe51537
Merge branch 'main' of github.com:MikaylaFischler/cc-mek-scada into devel
2022-05-05 23:10:56 -04:00
83fa41bbd0
#45 burn rate ramping is optional now
2022-05-05 16:00:49 -04:00
89be79192f
#44 RPS optimizations, manual trip, RPS handles all reactor state control
2022-05-05 13:14:14 -04:00
c4df8eabf9
#43 rename ISS to RPS
2022-05-05 11:55:04 -04:00
b575899d46
#33 lua module/require architecture changeover
2022-05-04 13:37:01 -04:00
7bcb260712
#27 added getMaxEnergy for turbine
2022-05-04 12:03:07 -04:00
1cb5a0789e
#27 mekanism 10.1+ RTU support
2022-05-04 11:23:45 -04:00
8b7ef47aad
removed references to alarms and now sends status on shutdown
2022-05-04 10:00:21 -04:00
e253a7b4ff
supervisor PLC session closing, re-requesting status cache if missing
2022-05-03 17:25:31 -04:00
fe5059dd51
debug print
2022-05-03 17:21:34 -04:00
25c6b311f5
clear status cache when connection is lost/reset, allow requesting of full status
2022-05-03 17:10:42 -04:00
665b33fa05
#42 parallel RTU reads
2022-05-03 11:39:03 -04:00
635c70cffd
moved MODBUS file thanks to utilizing types file
2022-05-03 11:28:29 -04:00
dc1c1db5e6
MODBUS bugfixes, utilize new types file
2022-05-03 11:27:40 -04:00
e2f7318922
#27 induction matrix RTU split into two RTUs, supporting pre and post Mekansim 10.1
2022-05-03 10:45:35 -04:00
c76200b0e3
shared global types
2022-05-03 10:44:18 -04:00
62b4b63f4a
supervisor PLC session bugfixes
2022-05-02 17:43:23 -04:00
574b85e177
PLC bugfixes and #37 optimized status packets and structure packets
2022-05-02 17:40:00 -04:00
e3e370d3ab
fixed RTU mgmt_pkt reference
2022-05-02 17:34:57 -04:00
1ac4de65a9
added close to valid scada types and fixed length checks for packet decoders
2022-05-02 17:34:24 -04:00
c19a58380c
fixed cancel not being exposed for watchdog functions
2022-05-02 17:33:54 -04:00
4bc50e4bad
#41 RTU comms closing
2022-05-02 13:15:08 -04:00
5ce3f84dfa
#41 PLC connection closing
2022-05-02 12:06:04 -04:00
b280201446
#41 cancel session watchdog timer
2022-05-02 11:44:10 -04:00
76c81395b7
#41 close session connections
2022-05-02 11:42:24 -04:00
7ff0e25711
#7 sending commands to PLCs, retrying failed sends until confirmed
2022-05-01 17:04:38 -04:00
cd46c69a66
defined push_data to be implemented
2022-05-01 15:35:07 -04:00
b76871aa07
fixed incorrect program type in startup message
2022-05-01 15:34:44 -04:00
479194b589
ISS alarm status packet adjustments
2022-05-01 13:26:02 -04:00
3fe47f99a9
PLC bugfix
2022-04-30 13:44:28 -04:00
aeda38fa01
#17 set burn rate right away if within range, reset last setpoint on SCRAM
2022-04-30 03:03:34 -04:00
10aa34a8e8
#17 PLC ramp burn rate to setpoint
2022-04-29 22:27:54 -04:00
e1135eac01
log init parameters in config files
2022-04-29 13:36:00 -04:00
c805b6e0c5
log init function to set path and write mode
2022-04-29 13:32:37 -04:00
3587352219
log exit notices as info messages not warnings
2022-04-29 13:20:56 -04:00
84e7ad43bc
#39 RTU unit threads
2022-04-29 13:19:01 -04:00
e833176c65
#40 RTU sequence number verification
2022-04-29 10:19:05 -04:00
ef1fdc7f39
#34 RTU modem disconnect/reconnect handling, bugfix in comms thread
2022-04-29 09:27:05 -04:00
07e9101ac7
PLC modem disconnect bugfix
2022-04-29 09:25:08 -04:00
4d5cbcf475
PLC comms packet length checks
2022-04-29 09:07:29 -04:00
d688f9a1c6
supervisor code cleanup, adjusted prints
2022-04-28 22:41:08 -04:00
67ec8fbd91
rx and tx threads for PLC comms to maintain quick comms and #36 only feed watchdog on valid sequence numbers
2022-04-28 22:36:45 -04:00
aff166e27d
added util adaptive_delay to replace repeated code
2022-04-27 19:06:01 -04:00
f14d715070
#7 PLC session comms link, accept statuses, functional keep-alives
2022-04-27 18:52:06 -04:00
7f0f423450
PLC bugfixes/optimizations, removed some debug prints
2022-04-27 18:49:54 -04:00
f067da31b4
#38 handle out of space when logging
2022-04-27 18:43:07 -04:00
fe3b8e6f88
fixed up worker loop delay logic
2022-04-27 17:59:25 -04:00
46a27a3f3a
check shutdown flag in worker loops so they don't lock up the exit process
2022-04-27 16:38:41 -04:00
82726520b8
that was a stack not a queue, nice
2022-04-27 16:24:28 -04:00
d40937b467
this was supposed to be in that pr merge oops
2022-04-27 16:06:30 -04:00
f996b9414a
Merge pull request #35 from MikaylaFischler/32-mek-api-parallel-exec
2022-04-27 15:58:27 -04:00
146e0bf569
protected sleep call
2022-04-27 15:56:55 -04:00
67a93016c0
threaded RTU/PLC bugfixes
2022-04-27 15:52:34 -04:00
14377e7348
don't run PLC comms thread if not networked
2022-04-27 15:01:10 -04:00
8c4598e7a6
#32 new threaded RTU code
2022-04-27 12:46:04 -04:00
71be6aca1a
cleanup and last_update bugfix for comms thread
2022-04-27 12:43:32 -04:00
ccf06956f9
fixed another typo
2022-04-27 12:37:28 -04:00
1ba5c7f828
fixed PLC mqueue typo and removed unused mq_main
2022-04-27 12:27:15 -04:00
68011d6734
#32 new threaded PLC code
2022-04-27 12:21:10 -04:00
f7f723829c
#7 work on PLC session comms, bugfixes with comms, general supervisor bugfixes
2022-04-25 21:00:50 -04:00
19a4b3c0ef
ticked up versions
2022-04-25 15:50:24 -04:00
3ef2902829
apparently I forgot how to spell receive a few more times
2022-04-25 15:49:04 -04:00
b861d3f668
removed debug print
2022-04-25 15:46:32 -04:00
e119c11204
removed debug print
2022-04-25 15:44:28 -04:00
Mikayla Fischler