Index: leahi_dialin/td/modules/air_pump.py
===================================================================
diff -u -rf03c9a32180573f2430105ad69eb91d9f597a96b -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943
--- leahi_dialin/td/modules/air_pump.py	(.../air_pump.py)	(revision f03c9a32180573f2430105ad69eb91d9f597a96b)
+++ leahi_dialin/td/modules/air_pump.py	(.../air_pump.py)	(revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943)
@@ -8,17 +8,19 @@
 # @file    air_pump.py
 #
 # @author  (last)      Zoltan Miskolci
-# @date    (last)      08-Jan-2026
+# @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
@@ -44,10 +46,9 @@
         self.logger = logger
 
         if self.can_interface is not None:
-            channel_id = DenaliChannels.td_sync_broadcast_ch_id
-            self.msg_id_td_air_pump_data = MsgIds.MSG_ID_TD_AIR_PUMP_DATA.value
-            self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_td_air_pump_data,
-                                                                       self._handler_air_pump_sync)
+            self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.td_sync_broadcast_ch_id,
+                                                                       message_id = MsgIds.MSG_ID_TD_AIR_PUMP_DATA.value,
+                                                                       function = self._handler_air_pump_sync)
 
         self.td_air_pump_timestamp = 0.0                        #: The timestamp of the last message
 
@@ -74,21 +75,17 @@
         @return: None
         """
         sensor_list =[]
-        sensor_list.append((td_enum_repository.TDAirPumpAttributes.STATE.name, 'i'))
-        sensor_list.append((td_enum_repository.TDAirPumpAttributes.DUTY_CYCLE.name, 'f'))
-        sensor_list.append((td_enum_repository.TDAirPumpAttributes.RPM.name, 'i'))
+        sensor_list.append((td_enum_repository.TDAirPumpNames.H12_AIR_PUMP.name, td_enum_repository.TDAirPumpAttributes.STATE.name,         DataTypes.U32))
+        sensor_list.append((td_enum_repository.TDAirPumpNames.H12_AIR_PUMP.name, td_enum_repository.TDAirPumpAttributes.DUTY_CYCLE.name,    DataTypes.F32))
+        sensor_list.append((td_enum_repository.TDAirPumpNames.H12_AIR_PUMP.name, td_enum_repository.TDAirPumpAttributes.RPM.name,           DataTypes.U32))
         # TODO remove after FPGA air pump speed validation
-        sensor_list.append((td_enum_repository.TDAirPumpAttributes.FPGA_RPM.name, 'i'))
+        sensor_list.append((td_enum_repository.TDAirPumpNames.H12_AIR_PUMP.name, td_enum_repository.TDAirPumpAttributes.FPGA_RPM.name,      DataTypes.U32))
         # TODO remove after FPGA air pump speed validation
-        sensor_list.append((td_enum_repository.TDAirPumpAttributes.SCALAR_POWER.name, 'i'))
+        sensor_list.append((td_enum_repository.TDAirPumpNames.H12_AIR_PUMP.name, td_enum_repository.TDAirPumpAttributes.SCALAR_POWER.name,  DataTypes.U32))
         
-        i = 1
-        for sensor in sensor_list:
-            start_pos = eval(f'MsgFieldPositions.START_POS_FIELD_{i}')
-            end_pos = eval(f'MsgFieldPositions.END_POS_FIELD_{i}')
-            self.td_air_pump[td_enum_repository.TDAirPumpNames.H12_AIR_PUMP.name][sensor[0]] = struct.unpack(sensor[1], bytearray(message['message'][start_pos:end_pos]))[0]
-            i += 1
-
+        self.process_into_dict(dict_to_update = self.td_air_pump,
+                               decoder_list = sensor_list,
+                               message = message)
         self.td_air_pump_timestamp = timestamp