Index: leahi_dialin/dd/modules/heaters.py =================================================================== diff -u -r6d104d3185ac3ed7c18c97ecdc13fd59bf53a8d1 -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 --- leahi_dialin/dd/modules/heaters.py (.../heaters.py) (revision 6d104d3185ac3ed7c18c97ecdc13fd59bf53a8d1) +++ leahi_dialin/dd/modules/heaters.py (.../heaters.py) (revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943) @@ -95,16 +95,16 @@ @returns none """ sensor_list = [] - sensor_list.append((dd_enum_repository.DDHeaterNames.D5_HEAT, dd_enum_repository.DDHeaterAttributes.HEAT_DUTY_CYCLE, DataTypes.F32)) - sensor_list.append((dd_enum_repository.DDHeaterNames.D45_HEAT, dd_enum_repository.DDHeaterAttributes.HEAT_DUTY_CYCLE, DataTypes.F32)) - sensor_list.append((dd_enum_repository.DDHeaterNames.D5_HEAT, dd_enum_repository.DDHeaterAttributes.HEAT_TARGET_TEMP, DataTypes.F32)) - sensor_list.append((dd_enum_repository.DDHeaterNames.D45_HEAT, dd_enum_repository.DDHeaterAttributes.HEAT_TARGET_TEMP, DataTypes.F32)) - sensor_list.append((dd_enum_repository.DDHeaterNames.D5_HEAT, dd_enum_repository.DDHeaterAttributes.HEAT_STATE, DataTypes.U32)) - sensor_list.append((dd_enum_repository.DDHeaterNames.D45_HEAT, dd_enum_repository.DDHeaterAttributes.HEAT_STATE, DataTypes.U32)) - sensor_list.append((dd_enum_repository.DDHeaterNames.D5_HEAT, dd_enum_repository.DDHeaterAttributes.FEED_FORWARD, DataTypes.F32)) - sensor_list.append((dd_enum_repository.DDHeaterNames.D5_HEAT, dd_enum_repository.DDHeaterAttributes.PWM_PERIOD, DataTypes.F32)) - sensor_list.append((dd_enum_repository.DDHeaterNames.D5_HEAT, dd_enum_repository.DDHeaterAttributes.ADJUSTED_TARGET_TEMP, DataTypes.F32)) - sensor_list.append((dd_enum_repository.DDHeaterNames.D5_HEAT, dd_enum_repository.DDHeaterAttributes.TARGET_TEMP_TD, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDHeaterNames.D5_HEAT.name, dd_enum_repository.DDHeaterAttributes.HEAT_DUTY_CYCLE.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDHeaterNames.D45_HEAT.name, dd_enum_repository.DDHeaterAttributes.HEAT_DUTY_CYCLE.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDHeaterNames.D5_HEAT.name, dd_enum_repository.DDHeaterAttributes.HEAT_TARGET_TEMP.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDHeaterNames.D45_HEAT.name, dd_enum_repository.DDHeaterAttributes.HEAT_TARGET_TEMP.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDHeaterNames.D5_HEAT.name, dd_enum_repository.DDHeaterAttributes.HEAT_STATE.name, DataTypes.U32)) + sensor_list.append((dd_enum_repository.DDHeaterNames.D45_HEAT.name, dd_enum_repository.DDHeaterAttributes.HEAT_STATE.name, DataTypes.U32)) + sensor_list.append((dd_enum_repository.DDHeaterNames.D5_HEAT.name, dd_enum_repository.DDHeaterAttributes.FEED_FORWARD.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDHeaterNames.D5_HEAT.name, dd_enum_repository.DDHeaterAttributes.PWM_PERIOD.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDHeaterNames.D5_HEAT.name, dd_enum_repository.DDHeaterAttributes.ADJUSTED_TARGET_TEMP.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDHeaterNames.D5_HEAT.name, dd_enum_repository.DDHeaterAttributes.TARGET_TEMP_TD.name, DataTypes.F32)) msg_list =[] msg_list.append(('self.dbg1', DataTypes.F32)) msg_list.append(('self.dbg2', DataTypes.F32)) @@ -122,7 +122,6 @@ self.process_into_vars(decoder_list = msg_list, message = message, start_from_byte = len(sensor_list) * DataTypes.U32.size()) - self.dd_heaters_timestamp = timestamp