diff --git a/module/device/platform/emulator_windows.py b/module/device/platform/emulator_windows.py index 021203ae7..b04787c8e 100644 --- a/module/device/platform/emulator_windows.py +++ b/module/device/platform/emulator_windows.py @@ -299,10 +299,18 @@ class Emulator(EmulatorBase): for folder in self.list_folder('../vms', is_dir=True): for file in iter_folder(folder, ext='.nemu'): serial = Emulator.vbox_file_to_serial(file) + name = os.path.basename(folder) if serial: yield EmulatorInstance( serial=serial, - name=os.path.basename(folder), + name=name, + path=self.path, + ) + # Fix for MuMu12 v4.0.4, default instance of which has no forward record in vbox config + elif name == 'MuMuPlayer-12.0-0': + yield EmulatorInstance( + serial='127.0.0.1:16384', + name=name, path=self.path, ) elif self == Emulator.MEmuPlayer: diff --git a/tasks/item/inventory.py b/tasks/item/inventory.py index 2386c9cd8..6802d7863 100644 --- a/tasks/item/inventory.py +++ b/tasks/item/inventory.py @@ -52,6 +52,8 @@ class InventoryItem: image = color_similarity_2d(image, (255, 255, 255)) param = { 'height': 160, + # [ 10 110 114] + 'distance': 10, } hori = cv2.reduce(image, 1, cv2.REDUCE_AVG).flatten() peaks, _ = signal.find_peaks(hori, **param)