Index: leahi_dialin/td/modules/ejector.py
===================================================================
diff -u -rf03c9a32180573f2430105ad69eb91d9f597a96b -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943
--- leahi_dialin/td/modules/ejector.py	(.../ejector.py)	(revision f03c9a32180573f2430105ad69eb91d9f597a96b)
+++ leahi_dialin/td/modules/ejector.py	(.../ejector.py)	(revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943)
@@ -7,18 +7,20 @@
 #
 # @file    ejector.py
 #
-# @author  (last)      Micahel Garthwaite
-# @date    (last)      10-Mar-2023
+# @author  (last)      Zoltan Miskolci
+# @date    (last)      05-May-2026
 # @author  (original)  Micahel Garthwaite
 # @date    (original)  01-Nov-2024
 #
 ############################################################################
 
-import struct
+# Module imports
 from logging import Logger
 
+# Project imports
 from leahi_dialin.common.constants import NO_RESET
-from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
+from leahi_dialin.common.generic_defs import DataTypes
+from leahi_dialin.common.msg_defs import MsgIds
 from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override
 from leahi_dialin.common import td_enum_repository
 from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels
@@ -43,10 +45,9 @@
         self.logger = logger
 
         if self.can_interface is not None:
-            channel_id = DenaliChannels.td_sync_broadcast_ch_id
-            self.msg_id_td_ejector_data = MsgIds.MSG_ID_TD_EJECTOR_DATA.value
-            self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_td_ejector_data,
-                                                                       self._handler_ejector_sync)
+            self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.td_sync_broadcast_ch_id,
+                                                                       message_id = MsgIds.MSG_ID_TD_EJECTOR_DATA.value,
+                                                                       function = self._handler_ejector_sync)
 
         self.td_ejector_timestamp = 0           #: The timestamp of the last message
 
@@ -55,8 +56,8 @@
             td_enum_repository.TDEjectorNames.H5_MOTOR.name: {
                 td_enum_repository.TDEjectorAttributes.STATE.name: td_enum_repository.TDEjectorStates.EJECTOR_STATE_INIT.value,
                 td_enum_repository.TDEjectorAttributes.SET_SPEED.name: 0.0,
-                td_enum_repository.TDEjectorAttributes.OPT_SNSR_RETRACT: 0,         # H25 Optical Sensor
-                td_enum_repository.TDEjectorAttributes.OPT_SNSR_ENGAGE: 0           # H24 Optical Sensor
+                td_enum_repository.TDEjectorAttributes.OPT_SNSR_RETRACT.name: 0,         # H25 Optical Sensor
+                td_enum_repository.TDEjectorAttributes.OPT_SNSR_ENGAGE.name: 0           # H24 Optical Sensor
             }
         }
 
@@ -69,15 +70,15 @@
         @param message:  published ejector data message as: ejector state
         @return: None
         """
-        self.h5_motor[td_enum_repository.TDEjectorNames.H5_MOTOR.name][td_enum_repository.TDEjectorAttributes.STATE.name] = struct.unpack('i', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
-        self.h5_motor[td_enum_repository.TDEjectorNames.H5_MOTOR.name][td_enum_repository.TDEjectorAttributes.SET_SPEED.name] = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
-        self.h5_motor[td_enum_repository.TDEjectorNames.H5_MOTOR.name][td_enum_repository.TDEjectorAttributes.OPT_SNSR_RETRACT.name] = struct.unpack('i', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0]
-        self.h5_motor[td_enum_repository.TDEjectorNames.H5_MOTOR.name][td_enum_repository.TDEjectorAttributes.OPT_SNSR_ENGAGE.name] = struct.unpack('i', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0]
+        sensor_list =[]
+        sensor_list.append((td_enum_repository.TDEjectorNames.H5_MOTOR.name, td_enum_repository.TDEjectorAttributes.STATE.name,             DataTypes.U32))
+        sensor_list.append((td_enum_repository.TDEjectorNames.H5_MOTOR.name, td_enum_repository.TDEjectorAttributes.SET_SPEED.name,         DataTypes.F32))
+        sensor_list.append((td_enum_repository.TDEjectorNames.H5_MOTOR.name, td_enum_repository.TDEjectorAttributes.OPT_SNSR_RETRACT.name,  DataTypes.U32))
+        sensor_list.append((td_enum_repository.TDEjectorNames.H5_MOTOR.name, td_enum_repository.TDEjectorAttributes.OPT_SNSR_ENGAGE.name,   DataTypes.U32))
 
+        self.process_into_dict(dict_to_update = self.h5_motor,
+                               decoder_list = sensor_list,
+                               message = message)
         self.td_ejector_timestamp = timestamp