Index: leahi_dialin/common/msg_ids.py =================================================================== diff -u -redccc0fd295ef1c384046edbcc3a83901bfc9bc9 -rb32df519ba57b0f4d0ddef1dda1efded72a89738 --- leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision edccc0fd295ef1c384046edbcc3a83901bfc9bc9) +++ leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision b32df519ba57b0f4d0ddef1dda1efded72a89738) @@ -341,15 +341,16 @@ MSG_ID_DD_RINSE_PUMP_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA053 MSG_ID_DD_RINSE_PUMP_PWM_PERCENT_OVERRIDE_REQUEST = 0xA054 MSG_ID_DD_RINSE_PUMP_TURN_ON_OFF_REQUEST = 0xA055 - MSG_ID_DD_SET_CONDUCTIVITY_MODEL_REQUEST = 0xA056 - MSG_ID_DD_DRY_BICART_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA057 - MSG_ID_DD_DRY_BICART_FILL_CYCLE_MAX_OVERRIDE_REQUEST = 0xA058 - MSG_ID_DD_DRY_BICART_FILL_REQUEST_OVERRIDE_REQUEST = 0xA059 - MSG_ID_DD_BICARB_CHAMBER_FILL_REQUEST_OVERRIDE_REQUEST = 0xA05A - MSG_ID_DD_BICART_DRAIN_REQUEST_OVERRIDE_REQUEST = 0xA05B - MSG_ID_DD_BICART_CARTRIDGE_SELECT_OVERRIDE_REQUEST = 0xA05C - MSG_ID_DD_CONDUCTIVITY_SENSOR_RESISTANCE_OVERRIDE_REQUEST = 0xA05D + MSG_ID_DD_DRY_BICART_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA056 + MSG_ID_DD_DRY_BICART_FILL_CYCLE_MAX_OVERRIDE_REQUEST = 0xA057 + MSG_ID_DD_DRY_BICART_FILL_REQUEST_OVERRIDE_REQUEST = 0xA058 + MSG_ID_DD_BICARB_CHAMBER_FILL_REQUEST_OVERRIDE_REQUEST = 0xA059 + MSG_ID_DD_BICART_DRAIN_REQUEST_OVERRIDE_REQUEST = 0xA05A + MSG_ID_DD_BICART_CARTRIDGE_SELECT_OVERRIDE_REQUEST = 0xA05B + MSG_ID_DD_SET_CONDUCTIVITY_MODEL_REQUEST = 0xA100 + MSG_ID_DD_CONDUCTIVITY_SENSOR_RESISTANCE_OVERRIDE_REQUEST = 0xA101 + # Placeholder messages MSG_ID_DD_ALARM_STATE_OVERRIDE_REQUEST = 0xAF03 MSG_ID_DD_STOP_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST = 0xAF04 @@ -424,8 +425,9 @@ MSG_ID_FP_DEF_GEN_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB043 MSG_ID_FP_DEF_STATUS_REQUEST = 0xB044 MSG_ID_FP_DEF_STATUS_RESPONSE = 0xB045 - MSG_ID_FP_CONDUCTIVITY_SENSOR_RESISTANCE_OVERRIDE_REQUEST = 0xB046 + MSG_ID_FP_CONDUCTIVITY_SENSOR_RESISTANCE_OVERRIDE_REQUEST = 0xB100 + MSG_ID_TD_DEBUG_EVENT = 0xFFF1 MSG_ID_DD_DEBUG_EVENT = 0xFFF2 MSG_ID_FP_DEBUG_EVENT = 0xFFF3 Index: leahi_dialin/fp/modules/temperatures.py =================================================================== diff -u -rb7c5c99c3b19c901e05566184098d427c9b9d666 -rb32df519ba57b0f4d0ddef1dda1efded72a89738 --- leahi_dialin/fp/modules/temperatures.py (.../temperatures.py) (revision b7c5c99c3b19c901e05566184098d427c9b9d666) +++ leahi_dialin/fp/modules/temperatures.py (.../temperatures.py) (revision b32df519ba57b0f4d0ddef1dda1efded72a89738) @@ -119,7 +119,10 @@ @param reset: (int) whether to reset the override value. The default is NO_RESET @returns 1 if successful, zero otherwise """ - # FP Conductivity Sensors' Temperature Override + rst = integer_to_bytearray(reset) + value = float_to_bytearray(sensor_value) + + # FP Conductivity Sensors' Temperature Override if fp_enum_repository.FPTemperatureSensorNames.FIRST_CONDUCTIVITY_SENSOR.value <= sensor_index <= fp_enum_repository.FPTemperatureSensorNames.LAST_CONDUCTIVITY_SENSOR.value: modified_index = sensor_index - fp_enum_repository.FPTemperatureSensorNames.FIRST_CONDUCTIVITY_SENSOR.value + BETA_IOFP_COND_SENSOR_OFFSET msg_id = MsgIds.MSG_ID_FP_CONDUCTIVITY_TEMP_OVERRIDE_REQUEST