Index: leahi_dialin/common/msg_ids.py =================================================================== diff -u -rfa670938681e25a1314c56aafc630e9dc2f13a4a -r8f1ef718ce3c23a6cc5a22ae13bc1a0627008f24 --- leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision fa670938681e25a1314c56aafc630e9dc2f13a4a) +++ leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision 8f1ef718ce3c23a6cc5a22ae13bc1a0627008f24) @@ -193,14 +193,66 @@ MSG_ID_TD_WATER_SAMPLE_RESULT_RESPONSE = 0xAB MSG_ID_TD_WATER_SAMPLE_DATA = 0xAC MSG_ID_TD_TREATMENT_LOG_AVERAGE_DATA = 0xAD - MSG_ID_TD_TUBE_SET_AUTHENTICATION_REQUEST = 0xAE - MSG_ID_UI_TUBE_SET_AUTHENTICATION_ACK_RESPONSE = 0xAF + MSG_ID_TD_DRY_SELF_TEST_PROGRESS_DATA = 0xAE + MSG_ID_TD_TUBE_SET_AUTHENTICATION_REQUEST = 0xAF + MSG_ID_UI_TUBE_SET_AUTHENTICATION_ACK_RESPONSE = 0xB0 MSG_ID_TD_SYRINGE_PUMP_DATA = 0xB1 MSG_ID_TD_HEPARIN_PAUSE_RESUME_RESPONSE= 0xB2 MSG_ID_FFU_SIGNAL_TD_UPDATE_AVAILABLE = 0xB3 MSG_ID_FFU_SIGNAL_DD_UPDATE_AVAILABLE = 0xB4 - MSG_ID_DD_SUBSTITUTION_PUMP_DATA = 0xB5 + MSG_ID_TD_UI_CONFIRMATION_REQUEST = 0xB5 + MSG_ID_UI_CONFIRMATION_RESULT_RESPONSE = 0xB6 + MSG_ID_TD_POWER_OFF_REQUEST = 0xB7 + MSG_ID_UI_VITALS_ADJUSTMENT_REQUEST = 0xB8 + MSG_ID_TD_VITALS_ADJUSTMENT_RESPONSE = 0xB9 + MSG_ID_UI_DD_NVM_GET_RECORD_REQUEST = 0xBA + MSG_ID_DD_NVM_SYSTEM_RECORD_RESPONSE = 0xBB + MSG_ID_UI_DD_NVM_SET_SYSTEM_RECORD = 0xBC + MSG_ID_DD_NVM_SERVICE_RECORD_RESPONSE = 0xBD + MSG_ID_DD_NVM_SET_SERVICE_RECORD = 0xBE + MSG_ID_DD_NVM_INSTITUTIONAL_RECORD_RESPONSE = 0xBF + MSG_ID_DD_NVM_SET_INSTITUTIONAL_RECORD = 0xC0 + MSG_ID_DD_NVM_USAGE_INFO_RECORD_RESPONSE = 0xC1 + MSG_ID_DD_NVM_SET_USAGE_INFO_RECORD = 0xC2 + MSG_ID_DD_NVM_CAL_PRESSURE_SENSOR_RESPONSE = 0xC3 + MSG_ID_DD_NVM_SET_CAL_PRESSURE_SENSOR = 0xC4 + MSG_ID_DD_NVM_CAL_TEMP_SENSOR_RESPONSE = 0xC5 + MSG_ID_DD_NVM_SET_CAL_TEMP_SENSOR = 0xC6 + MSG_ID_DD_NVM_CAL_CONC_PUMP_RESPONSE = 0xC7 + MSG_ID_DD_NVM_SET_CAL_CONC_PUMP = 0xC8 + MSG_ID_DD_NVM_CAL_D12_PUMP_RESPONSE = 0xC9 + MSG_ID_DD_NVM_SET_CAL_D12_PUMP = 0xCA + MSG_ID_DD_NVM_CAL_D48_PUMP_RESPONSE = 0xCB + MSG_ID_DD_NVM_SET_CAL_D48_PUMP = 0xCC + MSG_ID_DD_NVM_CAL_ACID_CONCENTRATE_RESPONSE = 0xCD + MSG_ID_DD_NVM_SET_CAL_ACID_CONCENTRATE = 0xCE + MSG_ID_DD_NVM_CAL_BICARB_CONCENTRATE_RESPONSE = 0xCF + MSG_ID_DD_NVM_SET_CAL_BICARB_CONCENTRATE = 0xD0 + MSG_ID_DD_NVM_CAL_ACCEL_SENSOR_RESPONSE = 0xD1 + MSG_ID_DD_NVM_SET_CAL_ACCEL_SENSOR = 0xD2 + MSG_ID_DD_NVM_CAL_BLOOD_LEAK_SENSOR_RESPONSE = 0xD3 + MSG_ID_DD_NVM_SET_CAL_BLOOD_LEAK_SENSOR = 0xD4 + MSG_ID_DD_NVM_RECORD_CRC_OVERRIDE_REQUEST = 0xD5 + MSG_ID_UI_SETUP_CONNECTION_CONFIRM_REQUEST = 0xD6 + MSG_ID_TD_SETUP_CONNECTION_CONFIRM_RESPONSE = 0xD7 + MSG_ID_TD_POST_FINAL_TEST_RESULT = 0xD8 + MSG_ID_TD_POST_SINGLE_TEST_RESULT = 0xD9 + MSG_ID_TD_UI_CANCEL_REQUEST = 0xDA + MSG_ID_DD_SUBSTITUTION_PUMP_DATA = 0xDB + MSG_ID_DD_CONDUCTIVITY_SENSOR_RESISTANCE_DATA = 0xDC + MSG_ID_UI_TD_NVM_GET_RECORD_REQUEST = 0xDD + MSG_ID_TD_NVM_SYSTEM_RECORD_RESPONSE = 0xDE + MSG_ID_UI_TD_NVM_SET_SYSTEM_RECORD = 0xDF + MSG_ID_TD_NVM_SERVICE_RECORD_RESPONSE = 0xE0 + MSG_ID_UI_TD_NVM_SET_SERVICE_RECORD = 0xE1 + MSG_ID_TD_NVM_INSTITUTIONAL_RECORD_RESPONSE = 0xE2 + MSG_ID_UI_TD_NVM_SET_INSTITUTIONAL_RECORD = 0xE3 + MSG_ID_TD_NVM_USAGE_INFO_RECORD_RESPONSE = 0xE4 + MSG_ID_UI_TD_NVM_SET_USAGE_INFO_RECORD = 0xE5 + MSG_ID_TD_NVM_CAL_RESPONSE = 0xE6 + MSG_ID_UI_TD_NVM_SET_CAL_RECORD = 0xE7 + MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0xF0 MSG_ID_TD_TESTER_LOGIN_REQUEST = 0x8000 @@ -382,14 +434,31 @@ 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 = 0xA05C + MSG_ID_DD_CONDUCTIVITY_SENSOR_RESISTANCE_OVERRIDE_REQUEST = 0xA05D + MSG_ID_DD_CONDUCTIVITY_SENSOR_VERSION_REQUEST = 0xA05E + MSG_ID_DD_CONDUCTIVITY_SENSOR_VERSION_RESPONSE = 0xA05F + MSG_ID_DD_BICARB_MIX_VOL_CONTROL_KP_GAIN_COEFF_OVERRIDE_REQUEST = 0xA060 + MSG_ID_DD_BICARB_MIX_VOL_CONTROL_KI_GAIN_COEFF_OVERRIDE_REQUEST = 0xA061 + MSG_ID_DD_ACID_MIX_VOL_CONTROL_KP_GAIN_COEFF_OVERRIDE_REQUEST = 0xA062 + MSG_ID_DD_ACID_MIX_VOL_CONTROL_KI_GAIN_COEFF_OVERRIDE_REQUEST = 0xA063 + MSG_ID_DD_ACID_MIX_VOL_OVERRIDE_REQUEST = 0xA064 + MSG_ID_DD_BICARB_MIX_VOL_OVERRIDE_REQUEST = 0xA065 + MSG_ID_DD_BICARB_TARGET_CONDUCTIVITY_OVERRIDE_REQUEST = 0xA066 + MSG_ID_DD_BICARB_DELTA_CONDUCTIVITY_OVERRIDE_REQUEST = 0xA067 + MSG_ID_DD_DIALYSATE_TARGET_CONDUCTIVITY_OVERRIDE_REQUEST = 0xA068 + MSG_ID_DD_DIALYSATE_DELTA_CONDUCTIVITY_OVERRIDE_REQUEST = 0xA069 + MSG_ID_DD_BICART_UPPER_PRESSURE_OVERRIDE_REQUEST = 0xA06A + MSG_ID_DD_BICART_LOWER_PRESSURE_OVERRIDE_REQUEST = 0xA06B MSG_ID_DD_FLOATER_LEVEL_OVERRIDE_REQUEST = 0xA06C MSG_ID_DD_SUBSTITUTION_PUMP_START_STOP_OVERRIDE_REQUEST = 0xA06D MSG_ID_DD_SUBSTITUTION_PUMP_BROADCAST_OVERRIDE_REQUEST = 0xA06E MSG_ID_DD_SUBSTITUTION_PUMP_TARGET_SPEED_OVERRIDE_REQUEST = 0xA06F - - MSG_ID_DD_SET_CONDUCTIVITY_MODEL_REQUEST = 0xA100 - MSG_ID_DD_CONDUCTIVITY_SENSOR_RESISTANCE_OVERRIDE_REQUEST = 0xA101 - + MSG_ID_DD_CONDUCTIVITY_SENSOR_CAL_REQUEST = 0xA070 + MSG_ID_DD_CONDUCTIVITY_SENSOR_CAL_RESPONSE = 0xA071 + MSG_ID_DD_MIXING_CONTROL_DATA = 0xA072 + MSG_ID_DD_MIXING_CONTROL_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA073 + MSG_ID_DD_BICART_DEPRESSURISE_REQUEST_OVERRIDE_REQUEST = 0xA074 # Placeholder messages MSG_ID_DD_ALARM_STATE_OVERRIDE_REQUEST = 0xAF03 MSG_ID_DD_STOP_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST = 0xAF04 @@ -464,13 +533,16 @@ 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_SET_OP_SUB_MODE_REQUEST = 0xB046 - + MSG_ID_FP_SET_OPERATION_SUB_MODE_REQUEST = 0xB046 + MSG_ID_FP_CONDUCTIVITY_SENSOR_RESISTANCE_OVERRIDE_REQUEST = 0xB047 + MSG_ID_FP_SET_RECOVERY_VALVES_REQUEST = 0xB048 MSG_ID_FP_BOOST_PUMP_INSTALL_STATUS_REQUEST = 0xB049 MSG_ID_FP_BOOST_PUMP_INSTALL_STATUS_RESPONSE = 0xB04A + MSG_ID_FP_CONDUCTIVITY_SENSOR_VERSION_REQUEST = 0xB04B + MSG_ID_FP_CONDUCTIVITY_SENSOR_VERSION_RESPONSE = 0xB04C + MSG_ID_FP_CONDUCTIVITY_SENSOR_CAL_REQUEST = 0xB04D + MSG_ID_FP_CONDUCTIVITY_SENSOR_CAL_RESPONSE = 0xB04E - 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/utils/abstract_classes.py =================================================================== diff -u -r78b7d4b47c77f390fdb0c796e4861cc9abb343fd -r8f1ef718ce3c23a6cc5a22ae13bc1a0627008f24 --- leahi_dialin/utils/abstract_classes.py (.../abstract_classes.py) (revision 78b7d4b47c77f390fdb0c796e4861cc9abb343fd) +++ leahi_dialin/utils/abstract_classes.py (.../abstract_classes.py) (revision 8f1ef718ce3c23a6cc5a22ae13bc1a0627008f24) @@ -98,7 +98,7 @@ if 'nan' in str(value).lower(): value = None # raise ValueError(f'{value} is not an accepted value!') - if datatype is DataTypes.BOOL: + if datatype in [DataTypes.BOOL, DataTypes.BOOL_U08]: value = True if value == 1 else False results[variable_name] = value @@ -148,7 +148,7 @@ value = None # raise ValueError(f'{value} is not an accepted value!') # If the type is Bool, convert the value from Integer to Boolean - if datatype is DataTypes.BOOL: + if datatype in [DataTypes.BOOL, DataTypes.BOOL_U08]: value = True if value == 1 else False # Save the value into the Dictionary if len(decode_details) == 2: