Index: dialin/dg/load_cells.py =================================================================== diff -u -rd8a3f72286485cdf8c5300a303c75eb3590564c3 -r261e20e67e69d22b36d729b61703e8f997de3196 --- dialin/dg/load_cells.py (.../load_cells.py) (revision d8a3f72286485cdf8c5300a303c75eb3590564c3) +++ dialin/dg/load_cells.py (.../load_cells.py) (revision 261e20e67e69d22b36d729b61703e8f997de3196) @@ -85,12 +85,7 @@ self.load_cell_B2 = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] - self.load_cell_A1 = a1[0] - self.load_cell_A2 = a2[0] - self.load_cell_B1 = b1[0] - self.load_cell_B2 = b2[0] - - def cmd_load_cell_override(self, sensor: int, grams: float, reset: int = NO_RESET, raw: int = 0) -> 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: @@ -99,9 +94,8 @@ @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 reset: integer - 1 to reset a previous override, 0 to 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 Load Cell sensor IDs: \n @@ -111,13 +105,9 @@ 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) + grm = float_to_bytearray(grams) cal = integer_to_bytearray(raw) payload = rst + grm + idx + cal