Index: dialin/common/dg_defs.py =================================================================== diff -u -r2189886992bd1ad988432a15052d0469d30ad4cb -rc6cc1660a1ca051ce6b1e270d85927d5df3ae507 --- dialin/common/dg_defs.py (.../dg_defs.py) (revision 2189886992bd1ad988432a15052d0469d30ad4cb) +++ dialin/common/dg_defs.py (.../dg_defs.py) (revision c6cc1660a1ca051ce6b1e270d85927d5df3ae507) @@ -7,8 +7,8 @@ # # @file dg_defs.py # -# @author (last) Dara Navaei -# @date (last) 15-Jul-2022 +# @author (last) Micahel Garthwaite +# @date (last) 15-Aug-2022 # @author (original) Peter Lucia # @date (original) 22-Jun-2021 # Index: dialin/common/hd_defs.py =================================================================== diff -u -r2189886992bd1ad988432a15052d0469d30ad4cb -rc6cc1660a1ca051ce6b1e270d85927d5df3ae507 --- dialin/common/hd_defs.py (.../hd_defs.py) (revision 2189886992bd1ad988432a15052d0469d30ad4cb) +++ dialin/common/hd_defs.py (.../hd_defs.py) (revision c6cc1660a1ca051ce6b1e270d85927d5df3ae507) @@ -7,8 +7,8 @@ # # @file hd_defs.py # -# @author (last) Behrouz NematiPour -# @date (last) 09-Sep-2022 +# @author (last) Micahel Garthwaite +# @date (last) 06-Oct-2022 # @author (original) Peter Lucia # @date (original) 04-Dec-2020 # Index: dialin/dg/load_cells.py =================================================================== diff -u -rfe051f80c87d4d43ff6c8c1a598eacd62f61c5f8 -rc6cc1660a1ca051ce6b1e270d85927d5df3ae507 --- dialin/dg/load_cells.py (.../load_cells.py) (revision fe051f80c87d4d43ff6c8c1a598eacd62f61c5f8) +++ dialin/dg/load_cells.py (.../load_cells.py) (revision c6cc1660a1ca051ce6b1e270d85927d5df3ae507) @@ -85,7 +85,7 @@ self.load_cell_B2 = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] - def cmd_load_cell_override(self, sensor: int, grams: float, add_reservoir_weight: bool = False, reset: int = NO_RESET) -> int: + def cmd_load_cell_override(self, sensor: int, grams: float, raw: int, reset: int = NO_RESET) -> int: """ Constructs and sends the load cell override command Constraints: @@ -94,7 +94,7 @@ @param sensor: unsigned int - sensor ID @param grams: float - weight (in grams) to override sensor with - @param add_reservoir_weight: bool - Adds the empty reservoir weight, 1600g to the override + @param raw: integer - 1 to override calibrated weight, 0 to override filtered/tared weight @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise @@ -105,14 +105,11 @@ 3 = B2 \n """ - if add_reservoir_weight: - grm = float_to_bytearray(grams + self.EMPTY_RESERVOIR_WEIGHT_GRAMS) - else: - grm = float_to_bytearray(grams) - rst = integer_to_bytearray(reset) idx = integer_to_bytearray(sensor) - payload = rst + grm + idx + grm = float_to_bytearray(grams) + cal = integer_to_bytearray(raw) + payload = rst + grm + idx + cal message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, message_id=MsgIds.MSG_ID_LOAD_CELL_OVERRIDE.value, Index: dialin/hd/alarms.py =================================================================== diff -u -r2189886992bd1ad988432a15052d0469d30ad4cb -rc6cc1660a1ca051ce6b1e270d85927d5df3ae507 --- dialin/hd/alarms.py (.../alarms.py) (revision 2189886992bd1ad988432a15052d0469d30ad4cb) +++ dialin/hd/alarms.py (.../alarms.py) (revision c6cc1660a1ca051ce6b1e270d85927d5df3ae507) @@ -7,8 +7,8 @@ # # @file alarms.py # -# @author (last) Dara Navaei -# @date (last) 03-Aug-2022 +# @author (last) Micahel Garthwaite +# @date (last) 08-Aug-2022 # @author (original) Peter Lucia # @date (original) 02-Apr-2020 #