Skip to content

Commit df49daa

Browse files
authored
Merge pull request #1892 from luxonis/main
Merge main back into develop
2 parents ae9000c + f9bb49f commit df49daa

17 files changed

Lines changed: 59 additions & 40 deletions

File tree

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ else()
7575
endif()
7676

7777
# Create depthai project
78-
project(depthai VERSION "3.7.1" LANGUAGES CXX C)
78+
project(depthai VERSION "3.8.0" LANGUAGES CXX C)
7979
set(DEPTHAI_PRE_RELEASE_TYPE "") # Valid options are "alpha", "beta", "rc", ""
8080
set(DEPTHAI_PRE_RELEASE_VERSION "0") # Valid options are "0", "1", "2", ...
8181

bindings/python/src/pipeline/node/SyncBindings.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ void bind_sync(pybind11::module& m, void* pCallstack) {
4747
.def("setSyncAttempts", &Sync::setSyncAttempts, py::arg("maxDataSize"), DOC(dai, node, Sync, setSyncAttempts))
4848
.def("getSyncThreshold", &Sync::getSyncThreshold, DOC(dai, node, Sync, getSyncThreshold))
4949
.def("getSyncAttempts", &Sync::getSyncAttempts, DOC(dai, node, Sync, getSyncAttempts))
50-
.def("setProcessor", &Sync::setProcessor, DOC(dai, node, Sync, setProcessor))
50+
.def("setProcessor", &Sync::setProcessor, py::arg("processorType"), DOC(dai, node, Sync, setProcessor))
5151
.def("getProcessor", &Sync::getProcessor, DOC(dai, node, Sync, getProcessor))
52-
.def("setTimestampSource", &Sync::setTimestampSource, DOC(dai, node, Sync, setTimestampSource))
52+
.def("setTimestampSource", &Sync::setTimestampSource, py::arg("source"), DOC(dai, node, Sync, setTimestampSource))
5353
.def("getTimestampSource", &Sync::getTimestampSource, DOC(dai, node, Sync, getTimestampSource))
5454
.def("setRunOnHost", &Sync::setRunOnHost, py::arg("runOnHost"), DOC(dai, node, Sync, setRunOnHost))
5555
.def("runOnHost", &Sync::runOnHost, DOC(dai, node, Sync, runOnHost));

cmake/Depthai/DepthaiDeviceRVC4Config.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
set(DEPTHAI_DEVICE_RVC4_MATURITY "snapshot")
44

55
# "version if applicable"
6-
set(DEPTHAI_DEVICE_RVC4_VERSION "0.0.1+8e36240607dae771a53ffd0810a5fcd3700c7e33")
6+
set(DEPTHAI_DEVICE_RVC4_VERSION "0.0.1+c0f6b6100c93f21e29c361cffad1f83bba0418ca")

cmake/Depthai/DepthaiDeviceSideConfig.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set(DEPTHAI_DEVICE_SIDE_MATURITY "snapshot")
33

44
# "full commit hash of device side binary"
5-
set(DEPTHAI_DEVICE_SIDE_COMMIT "45274630e27b04617985d3e80360f15052a99686")
5+
set(DEPTHAI_DEVICE_SIDE_COMMIT "c3f4bc9cef3937fa987135129757d950d1fbbd19")
66

77
# "version if applicable"
88
set(DEPTHAI_DEVICE_SIDE_VERSION "")
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# "full commit hash of depthai visualizer static files"
2-
set(DEPTHAI_VISUALIZER_COMMIT "3.3.2")
2+
set(DEPTHAI_VISUALIZER_COMMIT "3.5.2")

examples/cpp/ToF/tof_all_queues.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ cv::Mat normalizeFrame(const cv::Mat& frame) {
5050
int main() {
5151
dai::Pipeline pipeline;
5252

53-
// show depth in range 0.5m - 10m
54-
constexpr float minDepth = 500.0f;
55-
constexpr float maxDepth = 10000.0f;
53+
// show depth in range 0.1m - 7m
54+
constexpr float minDepth = 100.0f;
55+
constexpr float maxDepth = 7000.0f;
5656

5757
// choose one of profiles LOW_RANGE / MID_RANGE / HIGH_RANGE
5858
auto profile = dai::ToFConfig::Profile::MID_RANGE;

examples/cpp/ToF/tof_minimal.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ int main() {
4343
auto device = std::make_shared<dai::Device>();
4444
dai::Pipeline pipeline(device);
4545

46-
// Show depth in range 0.5 m to 10 m.
47-
constexpr float minDepth = 500.0f;
48-
constexpr float maxDepth = 10000.0f;
46+
// Show depth in range 0.1 m to 7 m.
47+
constexpr float minDepth = 100.0f;
48+
constexpr float maxDepth = 7000.0f;
4949

5050
// Choose one of the profiles: LOW_RANGE, MID_RANGE, or HIGH_RANGE.
5151
auto profile = dai::ToFConfig::Profile::MID_RANGE;

examples/python/ToF/tof_align.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
FPS = 10.0
1818
CAMERA_SIZE = (640, 400)
1919

20-
# show depth in range 0m - 7m
21-
MIN_DEPTH = 0
20+
# show depth in range 0.1m - 7m
21+
MIN_DEPTH = 100
2222
MAX_DEPTH = 7000
2323

2424

examples/python/ToF/tof_all_queues.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ def normalizeFrame(frame: np.ndarray) -> np.ndarray:
3434
def main():
3535
pipeline = dai.Pipeline()
3636

37-
# show depth in range 0m - 7m
38-
minDepth = 0
37+
# show depth in range 0.1m - 7m
38+
minDepth = 100
3939
maxDepth = 7000
4040

4141
# choose one of profiles LOW_RANGE / MID_RANGE / HIGH_RANGE

examples/python/ToF/tof_minimal.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ def colorizeDepth(frame: np.ndarray, minDepth: float, maxDepth: float) -> np.nda
3030
def main():
3131
pipeline = dai.Pipeline()
3232

33-
# show depth in range 0m - 7m
34-
minDepth = 0
33+
# show depth in range 0.1m - 7m
34+
minDepth = 100
3535
maxDepth = 7000
3636

3737
# choose one of profiles LOW_RANGE / MID_RANGE / HIGH_RANGE

0 commit comments

Comments
 (0)