Index: dialin/dg/fans.py =================================================================== diff -u -rd832b9ec145bf0c8bf3bf0bdc4844d146a60e600 -r49b0a39cd2cb1868c7953a9379f331daaf22fdbf --- dialin/dg/fans.py (.../fans.py) (revision d832b9ec145bf0c8bf3bf0bdc4844d146a60e600) +++ dialin/dg/fans.py (.../fans.py) (revision 49b0a39cd2cb1868c7953a9379f331daaf22fdbf) @@ -238,21 +238,19 @@ self.logger.debug("Timeout!!!!") return False - def cmd_fans_rpm_alarm_start_time_offset_override(self, hours: int, minutes: int, reset: int = NO_RESET) -> int: + def cmd_fans_rpm_alarm_start_time_offset_override(self, seconds: int, reset: int = NO_RESET) -> int: """ Constructs and sends the HD fan RPM alarm start time override command Constraints: Must be logged into DG. - @param hours: (int) hours that the fan alarm start time must be overridden to - @param minutes: (int) minutes that the fan alarm start time must be overridden to + @param seconds: (int) seconds that the alarm will be overridden to @param reset: (int) 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise """ reset_value = integer_to_bytearray(reset) - h = integer_to_bytearray(hours) - m = integer_to_bytearray(minutes) - payload = reset_value + h + m + s = integer_to_bytearray(seconds) + payload = reset_value + s message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, message_id=MsgIds.MSG_ID_DG_FAN_RPM_ALARM_START_TIME_OFFSET_OVERRIDE.value, Index: dialin/hd/calibration_record.py =================================================================== diff -u -rdc3b97933c58b8854781f2984083a2f8eccd3217 -r49b0a39cd2cb1868c7953a9379f331daaf22fdbf --- dialin/hd/calibration_record.py (.../calibration_record.py) (revision dc3b97933c58b8854781f2984083a2f8eccd3217) +++ dialin/hd/calibration_record.py (.../calibration_record.py) (revision 49b0a39cd2cb1868c7953a9379f331daaf22fdbf) @@ -50,6 +50,9 @@ _PAYLOAD_TRANSFER_DELAY_S = 0.2 _DIALIN_RECORD_UPDATE_DELAY_S = 0.2 + _FIRMWARE_STACK_NAME = 'HD' + _CAL_RECORD_TAB_NAME = 'Calibration Record' + def __init__(self, can_interface, logger: Logger): """ @@ -64,7 +67,6 @@ self.total_messages = 0 self.received_msg_length = 0 self._is_getting_cal_in_progress = False - self._write_fw_data_to_excel = True self.cal_data = 0 self._raw_cal_record = [] self._utilities = NVOpsUtils(logger=self.logger) Index: dialin/hd/fans.py =================================================================== diff -u -rd832b9ec145bf0c8bf3bf0bdc4844d146a60e600 -r49b0a39cd2cb1868c7953a9379f331daaf22fdbf --- dialin/hd/fans.py (.../fans.py) (revision d832b9ec145bf0c8bf3bf0bdc4844d146a60e600) +++ dialin/hd/fans.py (.../fans.py) (revision 49b0a39cd2cb1868c7953a9379f331daaf22fdbf) @@ -179,21 +179,19 @@ self.logger.debug("Timeout!!!!") return False - def cmd_fans_rpm_alarm_start_time_offset_override(self, hours: int, minutes: int, reset: int = NO_RESET) -> int: + def cmd_fans_rpm_alarm_start_time_offset_override(self, seconds: int, reset: int = NO_RESET) -> int: """ Constructs and sends the HD fan RPM alarm start time override command Constraints: Must be logged into HD. - @param hours: (int) hours that the fan alarm start time must be overridden to - @param minutes: (int) minutes that the fan alarm start time must be overridden to + @param seconds: (int) seconds that the alarm will be overridden to @param reset: (int) 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise """ reset_value = integer_to_bytearray(reset) - h = integer_to_bytearray(hours) - m = integer_to_bytearray(minutes) - payload = reset_value + h + m + s = integer_to_bytearray(seconds) + payload = reset_value + s message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, message_id=MsgIds.MSG_ID_HD_FAN_RPM_ALARM_START_TIME_OFFSET_OVERRIDE.value, Index: tests/dg_nvm_scripts.py =================================================================== diff -u -ra7f6b7938acc3b1e5e8dd9b8d5f8237a3b298e6b -r49b0a39cd2cb1868c7953a9379f331daaf22fdbf --- tests/dg_nvm_scripts.py (.../dg_nvm_scripts.py) (revision a7f6b7938acc3b1e5e8dd9b8d5f8237a3b298e6b) +++ tests/dg_nvm_scripts.py (.../dg_nvm_scripts.py) (revision 49b0a39cd2cb1868c7953a9379f331daaf22fdbf) @@ -24,5 +24,5 @@ #dg.calibration_record.cmd_set_dg_calibration_excel_to_fw('/home/fw/projects/DG_NV_Records/2022-02-14-DG-Record.xlsx') # For resetting the calibration record to benign values, use the function below - #dg.calibration_record.cmd_reset_dg_calibration_record() + dg.calibration_record.cmd_reset_dg_calibration_record()