Index: leahi_dialin/common/msg_ids.py =================================================================== diff -u -rfa670938681e25a1314c56aafc630e9dc2f13a4a -rcc8682c8a5dfae91f2a2b934cb21181d2188ea3e --- leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision fa670938681e25a1314c56aafc630e9dc2f13a4a) +++ leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision cc8682c8a5dfae91f2a2b934cb21181d2188ea3e) @@ -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 @@ -299,7 +351,7 @@ MSG_ID_DD_VALVE_SENSED_STATE_OVERRIDE_REQUEST = 0xA005 MSG_ID_DD_PRESSURE_SENSOR_READINGS_OVERRIDE_REQUEST = 0xA006 MSG_ID_DD_PRESSURE_SENSOR_TEMPERATURE_OVERRIDE_REQUEST = 0xA007 - MSG_ID_DD_PRESSURE_SENSOR_READ_COUNTER_OVERRIDE_REQUEST = 0xA008 + MSG_ID_DD_TREATMENT_PARAMS_OVERRIDE_REQUEST = 0xA008 MSG_ID_DD_PRESSURE_SENSOR_ERROR_COUNTER_OVERRIDE_REQUEST = 0xA009 MSG_ID_DD_PRESSURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA00A MSG_ID_DD_PRESSURE_SENSOR_FILTER_READINGS_OVERRIDE_REQUEST = 0xA00B @@ -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_PUBLISH_INTERVAL_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/td/modules/alarms.py =================================================================== diff -u -re45b20cdc5d4c5dcff8cef530b173ca94cb2e422 -rcc8682c8a5dfae91f2a2b934cb21181d2188ea3e --- leahi_dialin/td/modules/alarms.py (.../alarms.py) (revision e45b20cdc5d4c5dcff8cef530b173ca94cb2e422) +++ leahi_dialin/td/modules/alarms.py (.../alarms.py) (revision cc8682c8a5dfae91f2a2b934cb21181d2188ea3e) @@ -15,6 +15,7 @@ ############################################################################ # Module imports +from functools import partial from logging import Logger import struct from enum import unique @@ -107,11 +108,17 @@ message_id = MsgIds.MSG_ID_TD_ACTIVE_ALARMS_LIST_REQUEST_RESPONSE.value, function = self._handler_alarm_list_response) + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_to_dialin_ch_id, + message_id = MsgIds.MSG_ID_TD_ALARM_PROPERTIES_RESPONSE.value, + function = self._handler_alarm_table_response) + self.td_alarm_status_timestamp = 0.0 #: The timestamp of the last Alarm Status message self.td_alarm_triggered_timestamp = 0.0 #: The timestamp of the last Alarm Triggered message self.td_alarm_cleared_timestamp = 0.0 #: The timestamp of the last Alarm Cleared message self.td_alarm_clr_condition_timestamp = 0.0 #: The timestamp of the last Alarm Clear Condition message self.td_alarm_information_timestamp = 0.0 #: The timestamp of the last Alarm Information message + self.alarm_table_timestamp = 0.0 #: The timestamp of the last Alarm Table Properties message + # composite alarm status based on latest TD alarm status broadcast message self.alarms_priority_state = 0 #: The current Top Alarm's priority value self.alarm_top = 0 #: The current Top Alarm's value @@ -146,6 +153,9 @@ self.ui_alarm_list = [] #: The UI Alarm List content self.ui_alarm_list_timestamp = 0.0 #: The timestamp of the last Alarm List + # Alarm Table Properties + self.alarm_table = {} #: The Alarm Table with Alarm Property details + def clear_dialin_alarms(self): """ @@ -297,59 +307,21 @@ decoder_list = sensor_list, message = message, start_from_byte = len(msg_list) * DataTypes.U32.size()) - """ - vol = struct.unpack('i', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) - ach = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])) - acl = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3])) - bac = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4])) - saf = struct.unpack('i', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5])) - acp = struct.unpack('i', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6])) - trs = struct.unpack('B', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.START_POS_FIELD_7+1])) - trb = struct.unpack('B', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_7+1:MsgFieldPositions.START_POS_FIELD_7+2])) - tet = struct.unpack('B', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_7+2:MsgFieldPositions.START_POS_FIELD_7+3])) - srs = struct.unpack('B', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_7+3:MsgFieldPositions.START_POS_FIELD_7+4])) - srb = struct.unpack('B', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_7+4:MsgFieldPositions.START_POS_FIELD_7+5])) - set = struct.unpack('B', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_7+5:MsgFieldPositions.START_POS_FIELD_7+6])) - self.alarm_volume = vol[0] - self.alarm_audio_curr_hg = ach[0] - self.alarm_audio_curr_lg = acl[0] - self.alarm_backup_audio_curr = bac[0] - self.safety_shutdown_active = True if saf[0] == 1 else False - self.ac_power_lost = True if acp[0] == 1 else False - self.alarm_table_button_blockers[self.AlarmResponseButtons.TD_ALARM_RESPONSE_BUTTON_RESUME.value] = True if trs[0] == 1 else False - self.alarm_table_button_blockers[self.AlarmResponseButtons.TD_ALARM_RESPONSE_BUTTON_RINSEBACK.value] = True if trb[0] else False - self.alarm_table_button_blockers[self.AlarmResponseButtons.TD_ALARM_RESPONSE_BUTTON_END_TREATMENT.value] = True if tet[0] else False - self.alarm_state_button_blockers[self.AlarmResponseButtons.TD_ALARM_RESPONSE_BUTTON_RESUME.value] = True if srs[0] else False - self.alarm_state_button_blockers[self.AlarmResponseButtons.TD_ALARM_RESPONSE_BUTTON_RINSEBACK.value] = True if srb[0] else False - self.alarm_state_button_blockers[self.AlarmResponseButtons.TD_ALARM_RESPONSE_BUTTON_END_TREATMENT.value] = True if set[0] else False - """ self.td_alarm_information_timestamp = timestamp @publish(["msg_id_td_active_alarms_list_request_response", "accepted", "rejection_reason", "active_alarm_list"]) def _handler_alarm_list_response(self, message, timestamp=0.0): """ - Handles published TD alarm clear alarm condition messages. + Handles published TD alarm list response message. - @param message: published TD alarm clear alarm condition message + @param message: published TD alarm list response message @return: none """ self.ui_alarm_list_accepted = struct.unpack(DataTypes.U32.unpack_attrib(), bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] self.ui_alarm_list_reject_reason = struct.unpack(DataTypes.U32.unpack_attrib(), bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0] - + i = 3 for _ in range(0,10): start_pos = eval(f'MsgFieldPositions.START_POS_FIELD_{i}') @@ -360,6 +332,48 @@ self.ui_alarm_list_timestamp = timestamp + @publish(["msg_id_td_active_alarms_properties_response", "active_table", "alarm_table_timestamp"]) + def _handler_alarm_table_response(self, message, timestamp=0.0): + """ + Handles published TD alarm table properties messages. + + @param message: published TD alarm table properties message + @return: none + """ + properties_list = [] + properties_list.append(('Priority', DataTypes.U16)) + properties_list.append(('Rank', DataTypes.U16)) + properties_list.append(('Source', DataTypes.U08)) + properties_list.append(('System_Fault', DataTypes.BOOL_U08)) + properties_list.append(('DD_Fault', DataTypes.BOOL_U08)) + properties_list.append(('Stops', DataTypes.BOOL_U08)) + properties_list.append(('Clear_Immediately', DataTypes.BOOL_U08)) + properties_list.append(('No_Clear', DataTypes.BOOL_U08)) + properties_list.append(('No_Resume', DataTypes.BOOL_U08)) + properties_list.append(('No_Rinseback', DataTypes.BOOL_U08)) + properties_list.append(('No_End_Treatment', DataTypes.BOOL_U08)) + properties_list.append(('Not_in_Rinseback', DataTypes.BOOL_U08)) + properties_list.append(('Not_in_Post_Treatment', DataTypes.BOOL_U08)) + properties_list.append(('No_Blood_Recirc', DataTypes.BOOL_U08)) + properties_list.append(('No_Dial_Recirc', DataTypes.BOOL_U08)) + properties_list.append(('Auto_Resume', DataTypes.BOOL_U08)) + properties_list.append(('Clear_Alarm_Only', DataTypes.BOOL_U08)) + properties_list.append(('Treatment_Log', DataTypes.BOOL_U08)) + properties_list.append(('Alarm_Id', DataTypes.U16)) + + result = self.process_into_vars(decoder_list = properties_list, + message = message) + + # Save the result in the table + for prop in result: + if result['Alarm_Id'] not in self.alarm_table: + self.alarm_table[result['Alarm_Id']] = {} + if prop != 'Alarm_Id': + self.alarm_table[result['Alarm_Id']][prop] = result[prop] + + self.alarm_table_timestamp = timestamp + + def cmd_alarm_status_broadcast_interval_override(self, ms: int = 250, reset: int = NO_RESET): """ Constructs and sends the alarm status broadcast interval override command @@ -634,3 +648,56 @@ override_text = f'{str(current)} mA', logger = self.logger, can_interface = self.can_interface) + + + def cmd_request_alarm_table(self) -> int: + """ + Constructs and sends the Alarm details request for selected alarm. + Constraints: + Must be logged into TD. + + @param alarm_id: (Integer) The Alarm's ID + @return: 1 if successful, zero otherwise + """ + response = 1 + execute_list = [] + for alarm_enum in AlarmList: + execute_list.append(partial(self.cmd_request_alarm_details_for_alarm, alarm_enum.value)) + + # Execute the stored functions one by one + # Remove the ones that got 1 (successfully recieved) as response + # Retry the ones that are failed 2 more times + retry = 0 + while execute_list != [] and retry < 3: + failed = [] + for func in execute_list: + resp = func() + if resp == 1: + failed.append(func) + execute_list = failed + retry += 1 + response = 1 if failed == [] else 0 + return response + + + + def cmd_request_alarm_details_for_alarm(self, alarm_id: int) -> int: + """ + Constructs and sends the Alarm details request for selected alarm. + Constraints: + Must be logged into TD. + + @param alarm_id: (Integer) The Alarm's ID + @return: 1 if successful, zero otherwise + """ + payload = integer_to_bytearray(alarm_id) + + return cmd_generic_override( + payload = payload, + reset = None, + channel_id = CanChannels.dialin_to_td_ch_id, + msg_id = MsgIds.MSG_ID_TD_GET_ALARM_PROPERTIES_REQUEST, + entity_name = f'TD Alarms Details for {AlarmList(alarm_id)} ({alarm_id})', + override_text = f'requested', + logger = self.logger, + can_interface = self.can_interface) Index: leahi_dialin/utils/abstract_classes.py =================================================================== diff -u -r78b7d4b47c77f390fdb0c796e4861cc9abb343fd -rcc8682c8a5dfae91f2a2b934cb21181d2188ea3e --- leahi_dialin/utils/abstract_classes.py (.../abstract_classes.py) (revision 78b7d4b47c77f390fdb0c796e4861cc9abb343fd) +++ leahi_dialin/utils/abstract_classes.py (.../abstract_classes.py) (revision cc8682c8a5dfae91f2a2b934cb21181d2188ea3e) @@ -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: