Skip to content
Open

Develop #1120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
2f0b3fe
Changed traceLevel as argument
MaticTonin Aug 5, 2023
b3b62c8
Adding argument for disableCamera
MaticTonin Aug 9, 2023
35a5982
Small changes in arguments
MaticTonin Aug 9, 2023
64f580d
Fixing the default values
MaticTonin Aug 10, 2023
470812d
Adding argument for enablepoylgons
MaticTonin Aug 10, 2023
d1e0067
Adding invertHorizontal/Vertical
MaticTonin Aug 10, 2023
3f1b013
Saving changes
MaticTonin Aug 14, 2023
96cb51e
Finishing combinedImage display
MaticTonin Aug 14, 2023
5c7e008
Remove numMarkers and board arg
MaticTonin Aug 16, 2023
0a1add9
Default board argument
MaticTonin Aug 16, 2023
8dfec27
Tested with different cameras
MaticTonin Aug 18, 2023
7d6ec7e
Editing boards detection
MaticTonin Aug 18, 2023
273fb81
Bug in default boards
MaticTonin Aug 22, 2023
0596285
Setting markers count as intiger
MaticTonin Aug 22, 2023
67365b7
Merge pull request #1110 from luxonis/develop
daniilpastukhov Sep 4, 2023
26a7e66
Adding boards and changes in name
MaticTonin Sep 4, 2023
67fc426
Tested on 4 devices
MaticTonin Sep 5, 2023
0bec8f1
Changes in gitmodules
MaticTonin Sep 5, 2023
6f9c06b
Merge branch 'main' into calib_arguments_tmp
MaticTonin Sep 5, 2023
2abd526
Change in dictionary
MaticTonin Sep 5, 2023
79f185b
Adding optional disable cameras
MaticTonin Sep 6, 2023
36be75f
Merge branch 'calib_arguments_tmp' of https://github.com/luxonis/dept…
MaticTonin Sep 6, 2023
cf6877b
Changing submodules
MaticTonin Sep 7, 2023
d95eb02
Merge pull request #1104 from luxonis/calib_arguments_tmp
MaticTonin Sep 7, 2023
d9361eb
Fixing fisheye
MaticTonin Sep 7, 2023
36cddb9
Merge pull request #1111 from luxonis/fix_fisheye_tmp
MaticTonin Sep 8, 2023
bac0eac
Updated manifest, so visualizers get included
Erol444 Sep 8, 2023
280e394
Update submodules
MaticTonin Sep 8, 2023
745ecef
Merge branch 'main' of https://github.com/luxonis/depthai into update…
MaticTonin Sep 8, 2023
aaa0c4e
Bump version
daniilpastukhov Sep 8, 2023
4c82993
Merge pull request #1112 from luxonis/hotfix_main
daniilpastukhov Sep 8, 2023
dde0ba5
Merge pull request #1113 from luxonis/update_submodules
themarpe Sep 8, 2023
506df8f
User calib fixes (#1114)
CenekAlbl Sep 8, 2023
ae226f2
Fix path option
MaticTonin Sep 8, 2023
a6959cc
Add path
MaticTonin Sep 8, 2023
a015490
Merge pull request #1116 from luxonis/change_path
MaticTonin Sep 11, 2023
cbc669b
Added set_exposure_iso to camera_control.py
Hutch07 Sep 15, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@

[submodule "depthai_calibration"]
path = depthai_calibration
url = git@github.com:luxonis/depthai-calibration.git
url = https://github.com/luxonis/depthai-calibration
487 changes: 308 additions & 179 deletions calibrate.py

Large diffs are not rendered by default.

File renamed without changes.
Binary file added charuco_boards_user_calib/charuco_24inch_13x7.pdf
Binary file not shown.
Binary file added charuco_boards_user_calib/charuco_28inch_15x8.pdf
Binary file not shown.
Binary file added charuco_boards_user_calib/charuco_32inch_17x9.pdf
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion depthai_calibration
2 changes: 1 addition & 1 deletion depthai_sdk/MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ include src/depthai_sdk/oak_outputs/xout/*.py
include src/depthai_sdk/readers/*.py
recursive-include src/depthai_sdk/recorders *.py
include src/depthai_sdk/tracking/*.py
include src/depthai_sdk/visualize/*.py
recursive-include src/depthai_sdk/visualize/ *.py
include requirements.txt
include src/depthai_sdk/logger.py
2 changes: 1 addition & 1 deletion depthai_sdk/docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
author = 'Luxonis'

# The full version, including alpha/beta/rc tags
release = '1.13.0'
release = '1.13.1'


# -- General configuration ---------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion depthai_sdk/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

setup(
name='depthai-sdk',
version='1.13.0',
version='1.13.1',
description='This package provides an abstraction of the DepthAI API library.',
long_description=io.open("README.md", encoding="utf-8").read(),
long_description_content_type="text/markdown",
Expand Down
2 changes: 1 addition & 1 deletion depthai_sdk/src/depthai_sdk/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from depthai_sdk.utils import _create_config, get_config_field, _sentry_before_send
from depthai_sdk.visualize import *

__version__ = '1.13.0'
__version__ = '1.13.1'


def __import_sentry(sentry_dsn: str) -> None:
Expand Down
25 changes: 25 additions & 0 deletions depthai_sdk/src/depthai_sdk/components/camera_control.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,31 @@ def sensitivity_down(self, step=50):
self._current_vals['sensitivity'] -= step
self.send_controls(
{'exposure': {'manual': [self._current_vals['exposure_time'], self._current_vals['sensitivity']]}})
def set_exposure_iso(self, exposure, gain=-1):
"""
Set exposure time and ISO value
Args:
exposure: Integer - In microseconds 1 to 33000
gain: Integer - 100 - 1600
"""
if exposure < LIMITS['exposure'][0] :
exposure = LIMITS['exposure'][0]
logger.error(f'Exposure time cannot be less than {LIMITS["exposure"][0]}')
elif exposure > LIMITS['exposure'][1] :
exposure = LIMITS['exposure'][1]
logger.error(f'Exposure time cannot be greater than {LIMITS["exposure"][1]}')
if gain < 1:
gain = self._current_vals['sensitivity']
elif gain < LIMITS['gain'][0] :
gain = LIMITS['gain'][0]
logger.error(f'ISO Gain cannot be less than {LIMITS["gain"][0]}')
elif gain > LIMITS['gain'][1] :
gain = LIMITS['gain'][1]
logger.error(f'ISO Gain cannot be greater than {LIMITS["gain"][1]}')
self._current_vals['exposure_time'] = int(exposure)
self._current_vals['sensitivity'] = int(gain)
self.send_controls(
{'exposure': {'manual': [self._current_vals['exposure_time'], self._current_vals['sensitivity']]}})

def focus_up(self, step=3):
"""
Expand Down
2 changes: 1 addition & 1 deletion resources/depthai_boards
Submodule depthai_boards updated 54 files
+91 −0 PERCEPT.json
+2 −3 batch/eeprom/BC2087_R1M1E1_oak_d_lr.json
+12 −0 batch/eeprom/BC2087_R3M1E3_oak_d_lr.json
+12 −0 batch/eeprom/DM2080_R3M2E3_oak_d_sr.json
+12 −0 batch/eeprom/DM2080_R4M2E4_oak_d_sr.json
+12 −0 batch/eeprom/DM3370_R1M1E1_rae.json
+12 −0 batch/eeprom/DM3370_R4M2E4_rae.json
+12 −0 batch/eeprom/DM3370_R5M2E5_rae.json
+12 −0 batch/eeprom/DM3390_R0M0E0_oak_ffc_6p.json
+12 −0 batch/eeprom/DM3390_R1M0E1_oak_ffc_6p.json
+12 −0 batch/eeprom/DM6031_R0M0E0_percept.json
+2 −0 batch/eeprom/DM9095_EARLY_oak_d_lite.json
+0 −0 batch/eeprom/DM9095_R3M2E4_oak_d_lite_af.json
+12 −0 batch/eeprom/DM9095_R3M2E4_oak_d_lite_ff.json
+13 −0 batch/eeprom/DM9098_R7M2E7_oak_d_w_97.json
+12 −0 batch/eeprom/EL2086_R0M0E0_oak_d_sr_poe.json
+12 −0 batch/eeprom/EL2086_R1M1E1_oak_d_sr_poe.json
+0 −0 batch/eeprom/NG9097_R4M2E4_BMI270_oak_d_w_poe_97.json
+12 −0 batch/eeprom/NG9097_R4M2E4_BNO086_oak_d_pro_poe_ff_97.json
+13 −0 batch/eeprom/NG9097_R4M2E4_BNO086_oak_d_w_poe_97.json
+12 −0 batch/eeprom/NG9097_R4M2E4_BNO086_oak_d_w_poe_c23.json
+1 −1 batch/eeprom/NG9097_R5M3E5_BNO086_oak_d_pro_poe_af.json
+1 −1 batch/oak_1.json
+1 −1 batch/oak_1_lite.json
+1 −1 batch/oak_1_poe.json
+1 −13 batch/oak_d.json
+1 −1 batch/oak_d_cm4.json
+1 −1 batch/oak_d_cm4_poe.json
+24 −5 batch/oak_d_lite.json
+9 −2 batch/oak_d_lr.json
+14 −2 batch/oak_d_poe.json
+1 −1 batch/oak_d_pro.json
+7 −1 batch/oak_d_pro_poe.json
+1 −1 batch/oak_d_s2.json
+1 −1 batch/oak_d_s2_poe.json
+13 −1 batch/oak_d_sr.json
+21 −0 batch/oak_d_sr_poe.json
+27 −0 batch/oak_d_w.json
+4 −4 batch/oak_ffc_1p_poe.json
+2 −2 batch/oak_ffc_3p.json
+2 −2 batch/oak_ffc_4p.json
+2 −2 batch/oak_ffc_4p_poe.json
+28 −0 batch/oak_ffc_4p_rvc3.json
+27 −0 batch/oak_ffc_6p.json
+20 −0 batch/percept.json
+52 −0 batch/rae.json
+1 −1 boards/DM2097-C11.json
+1 −1 boards/DM2097.json
+54 −0 boards/OAK-D-SR-POE.json
+45 −0 boards/RAE-A-B-C.json
+37 −0 boards/RAE-D-E.json
+40 −0 boards/TOF-FFC-A-B.json
+37 −0 boards/TOF-FFC-C-D.json
+62 −22 boards_reader.py