Skip to content

Commit

Permalink
SDK and base image upgrade to v3.0.1 content
Browse files Browse the repository at this point in the history
  • Loading branch information
jari-hodju committed Oct 2, 2023
1 parent e6fd2f4 commit 05e30c1
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 14 deletions.
27 changes: 14 additions & 13 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=${BUILDPLATFORM:-linux/amd64} ghcr.io/tiiuae/fog-ros-sdk:sha-6d67ecf-${TARGETARCH:-amd64} AS builder
FROM --platform=${BUILDPLATFORM:-linux/amd64} ghcr.io/tiiuae/fog-ros-sdk:sha-ba8047f-${TARGETARCH:-amd64} AS builder

ARG TARGETARCH

Expand Down Expand Up @@ -31,7 +31,7 @@ RUN /packaging/build_colcon_sdk.sh ${TARGETARCH:-amd64}
# ▲ runtime ──┐
# └── build ▼

FROM ghcr.io/tiiuae/fog-ros-baseimage:sha-6d67ecf
FROM ghcr.io/tiiuae/fog-ros-baseimage:sha-ba8047f

RUN mkdir /depthai_configs
COPY --from=builder /main_ws/src/params /depthai_configs/.
Expand All @@ -46,22 +46,23 @@ COPY entrypoint.sh /entrypoint.sh

RUN apt update \
&& apt install -y --no-install-recommends \
libusb-1.0-0 \
eudev-staticdev \
nlohmann-json-dev \
yaml-cpp-vendor \
cv-bridge \
vision-msgs \
camera-info-manager \
camera-calibration-parsers \
xacro \
camera-info-manager \
cv-bridge \
eudev-staticdev \
image-transport \
libdepthai-core20 \
libopencv-ts \
libusb-1.0-0 \
libyaml-cpp0.6 \
libyaml-0-staticdev \
libyaml-vendor \
libopencv-ts \
libyaml-0-staticdev \
nlohmann-json-dev \
opencv-staticdev \
libdepthai-core20 \
vision-msgs \
xacro \
yaml-cpp-vendor \
&& apt clean \
&& rm -rf /var/lib/apt/lists/*

COPY --from=builder $INSTALL_DIR $INSTALL_DIR
2 changes: 1 addition & 1 deletion depthai-core
Submodule depthai-core updated 83 files
+2 −2 .github/workflows/main.workflow.yml
+2 −2 .github/workflows/test.workflow.yml
+1 −5 CMakeLists.txt
+0 −24 README.md
+2 −2 cmake/Depthai/DepthaiBootloaderConfig.cmake
+1 −1 cmake/Depthai/DepthaiDeviceSideConfig.cmake
+4 −4 cmake/Hunter/config.cmake
+7 −7 cmake/depthaiDependencies.cmake
+0 −8 examples/CMakeLists.txt
+0 −46 examples/ColorCamera/rgb_isp_scale.cpp
+5 −1 examples/ColorCamera/rgb_preview.cpp
+0 −41 examples/CrashReport/crash_report.cpp
+3 −1 examples/FeatureTracker/feature_tracker.cpp
+58 −24 examples/IMU/imu_firmware_update.cpp
+0 −28 examples/SpatialDetection/spatial_location_calculator.cpp
+1 −0 examples/StereoDepth/stereo_depth_video.cpp
+1 −23 examples/bootloader/flash_bootloader.cpp
+1 −23 examples/bootloader/flash_user_bootloader.cpp
+1 −1 examples/calibration/calibration_flash.cpp
+0 −13 include/depthai/common/CameraExposureOffset.hpp
+0 −43 include/depthai/common/CameraFeatures.hpp
+0 −27 include/depthai/common/CameraImageOrientation.hpp
+0 −27 include/depthai/common/CameraSensorType.hpp
+1 −9 include/depthai/device/DataQueue.hpp
+1 −1 include/depthai/device/Device.hpp
+14 −81 include/depthai/device/DeviceBase.hpp
+1 −12 include/depthai/device/DeviceBootloader.hpp
+0 −11 include/depthai/device/EepromError.hpp
+2 −10 include/depthai/openvino/OpenVINO.hpp
+0 −24 include/depthai/pipeline/Pipeline.hpp
+0 −13 include/depthai/pipeline/datatype/ImageManipConfig.hpp
+3 −16 include/depthai/pipeline/datatype/ImgFrame.hpp
+0 −7 include/depthai/pipeline/datatype/StereoDepthConfig.hpp
+0 −340 include/depthai/pipeline/node/Camera.hpp
+0 −28 include/depthai/pipeline/node/ColorCamera.hpp
+1 −2 include/depthai/pipeline/node/DetectionParser.hpp
+0 −28 include/depthai/pipeline/node/MonoCamera.hpp
+0 −5 include/depthai/pipeline/node/ObjectTracker.hpp
+2 −2 include/depthai/pipeline/node/SPIOut.hpp
+1 −8 include/depthai/pipeline/node/SpatialDetectionNetwork.hpp
+0 −42 include/depthai/pipeline/node/StereoDepth.hpp
+1 −1 include/depthai/pipeline/node/Warp.hpp
+4 −1 include/depthai/utility/LockingQueue.hpp
+0 −514 include/depthai/utility/span.hpp
+1 −4 include/depthai/xlink/XLinkConnection.hpp
+0 −1 include/depthai/xlink/XLinkStream.hpp
+1 −1 shared/depthai-shared
+2 −2 src/device/CalibrationHandler.cpp
+2 −11 src/device/DataQueue.cpp
+14 −0 src/device/Device.cpp
+87 −96 src/device/DeviceBase.cpp
+14 −34 src/device/DeviceBootloader.cpp
+14 −29 src/openvino/OpenVINO.cpp
+7 −7 src/pipeline/Node.cpp
+5 −17 src/pipeline/Pipeline.cpp
+0 −45 src/pipeline/datatype/ImageManipConfig.cpp
+0 −27 src/pipeline/datatype/ImgFrame.cpp
+0 −5 src/pipeline/datatype/StereoDepthConfig.cpp
+0 −279 src/pipeline/node/Camera.cpp
+9 −41 src/pipeline/node/ColorCamera.cpp
+3 −23 src/pipeline/node/MonoCamera.cpp
+1 −1 src/pipeline/node/NeuralNetwork.cpp
+0 −3 src/pipeline/node/ObjectTracker.cpp
+2 −2 src/pipeline/node/SPIIn.cpp
+0 −4 src/pipeline/node/SpatialDetectionNetwork.cpp
+0 −24 src/pipeline/node/StereoDepth.cpp
+3 −18 src/utility/Initialization.cpp
+5 −5 src/utility/PimplImpl.hpp
+7 −6 src/utility/Resources.cpp
+1 −1 src/utility/Resources.hpp
+26 −16 src/xlink/XLinkConnection.cpp
+4 −9 tests/CMakeLists.txt
+2 −1 tests/src/bootloader_config_test.cpp
+2 −1 tests/src/bootloader_version_test.cpp
+2 −1 tests/src/device_usbspeed_test.cpp
+26 −27 tests/src/filesystem_test.cpp
+2 −1 tests/src/logging_test.cpp
+2 −1 tests/src/neural_network_test.cpp
+4 −65 tests/src/openvino_blob_test.cpp
+2 −1 tests/src/pipeline_test.cpp
+2 −1 tests/src/serialization_test.cpp
+2 −1 tests/src/unlimited_io_connection_test.cpp
+2 −1 tests/src/xlink_roundtrip_test.cpp

0 comments on commit 05e30c1

Please sign in to comment.