|
48 | 48 |
|
49 | 49 | def socket_type_pair(arg):
|
50 | 50 | socket, type = arg.split(',')
|
51 |
| - if not (socket in ['rgb', 'left', 'right', 'camd']): |
| 51 | + if not (socket in ['rgb', 'left', 'right', 'cama', 'camb', 'camc', 'camd']): |
52 | 52 | raise ValueError("")
|
53 | 53 | if not (type in ['m', 'mono', 'c', 'color']):
|
54 | 54 | raise ValueError("")
|
@@ -112,20 +112,19 @@ def socket_type_pair(arg):
|
112 | 112 | 'rgb' : dai.CameraBoardSocket.CAM_A,
|
113 | 113 | 'left' : dai.CameraBoardSocket.CAM_B,
|
114 | 114 | 'right': dai.CameraBoardSocket.CAM_C,
|
| 115 | + 'cama' : dai.CameraBoardSocket.CAM_A, |
| 116 | + 'camb' : dai.CameraBoardSocket.CAM_B, |
| 117 | + 'camc' : dai.CameraBoardSocket.CAM_C, |
115 | 118 | 'camd' : dai.CameraBoardSocket.CAM_D,
|
116 | 119 | }
|
117 | 120 |
|
118 |
| -cam_socket_to_name = { |
119 |
| - 'RGB': 'rgb', |
120 |
| - 'LEFT': 'left', |
121 |
| - 'RIGHT': 'right', |
122 |
| - 'CAM_D': 'camd', |
123 |
| -} |
124 |
| - |
125 | 121 | rotate = {
|
126 | 122 | 'rgb': args.rotate in ['all', 'rgb'],
|
127 | 123 | 'left': args.rotate in ['all', 'mono'],
|
128 | 124 | 'right': args.rotate in ['all', 'mono'],
|
| 125 | + 'cama': args.rotate in ['all', 'rgb'], |
| 126 | + 'camb': args.rotate in ['all', 'mono'], |
| 127 | + 'camc': args.rotate in ['all', 'mono'], |
129 | 128 | 'camd': args.rotate in ['all', 'rgb'],
|
130 | 129 | }
|
131 | 130 |
|
@@ -231,7 +230,7 @@ def exit_cleanly(signum, frame):
|
231 | 230 | f' -socket {p.socket.name:6}: {p.sensorName:6} {p.width:4} x {p.height:4} focus:', end='')
|
232 | 231 | print('auto ' if p.hasAutofocus else 'fixed', '- ', end='')
|
233 | 232 | print(*[type.name for type in p.supportedTypes])
|
234 |
| - cam_name[cam_socket_to_name[p.socket.name]] = p.sensorName |
| 233 | + cam_name[p.socket.name] = p.sensorName |
235 | 234 |
|
236 | 235 | print('USB speed:', device.getUsbSpeed().name)
|
237 | 236 |
|
@@ -311,7 +310,7 @@ def exit_cleanly(signum, frame):
|
311 | 310 | frame = pkt.getCvFrame()
|
312 | 311 | if c in capture_list:
|
313 | 312 | width, height = pkt.getWidth(), pkt.getHeight()
|
314 |
| - capture_file_name = ('capture_' + c + '_' + cam_name[c] |
| 313 | + capture_file_name = ('capture_' + c + '_' + cam_name[cam_socket_opts[c].name] |
315 | 314 | + '_' + str(width) + 'x' + str(height)
|
316 | 315 | + '_exp_' +
|
317 | 316 | str(int(
|
|
0 commit comments