|
|
@ -108,9 +108,12 @@ class Calibrator(): |
|
|
|
return before_current + after_current |
|
|
|
return before_current + after_current |
|
|
|
|
|
|
|
|
|
|
|
def update_status(self): |
|
|
|
def update_status(self): |
|
|
|
if len(self.get_valid_idxs()) > 0: |
|
|
|
valid_idxs = self.get_valid_idxs() |
|
|
|
max_rpy_calib = np.array(np.max(self.rpys[self.get_valid_idxs()], axis=0)) |
|
|
|
if valid_idxs: |
|
|
|
min_rpy_calib = np.array(np.min(self.rpys[self.get_valid_idxs()], axis=0)) |
|
|
|
rpys = self.rpys[valid_idxs] |
|
|
|
|
|
|
|
self.rpy = np.mean(rpys, axis=0) |
|
|
|
|
|
|
|
max_rpy_calib = np.array(np.max(rpys, axis=0)) |
|
|
|
|
|
|
|
min_rpy_calib = np.array(np.min(rpys, axis=0)) |
|
|
|
self.calib_spread = np.abs(max_rpy_calib - min_rpy_calib) |
|
|
|
self.calib_spread = np.abs(max_rpy_calib - min_rpy_calib) |
|
|
|
else: |
|
|
|
else: |
|
|
|
self.calib_spread = np.zeros(3) |
|
|
|
self.calib_spread = np.zeros(3) |
|
|
@ -165,8 +168,6 @@ class Calibrator(): |
|
|
|
self.block_idx += 1 |
|
|
|
self.block_idx += 1 |
|
|
|
self.valid_blocks = max(self.block_idx, self.valid_blocks) |
|
|
|
self.valid_blocks = max(self.block_idx, self.valid_blocks) |
|
|
|
self.block_idx = self.block_idx % INPUTS_WANTED |
|
|
|
self.block_idx = self.block_idx % INPUTS_WANTED |
|
|
|
if len(self.get_valid_idxs()) > 0: |
|
|
|
|
|
|
|
self.rpy = np.mean(self.rpys[self.get_valid_idxs()], axis=0) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
self.update_status() |
|
|
|
self.update_status() |
|
|
|
|
|
|
|
|
|
|
|