diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a59780397a..fbfd0e2a68 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -46,50 +46,49 @@ endif() target_sources(${LRS_TARGET} PRIVATE - "${CMAKE_CURRENT_LIST_DIR}/environment.cpp" - "${CMAKE_CURRENT_LIST_DIR}/device_hub.cpp" + "${CMAKE_CURRENT_LIST_DIR}/algo.cpp" "${CMAKE_CURRENT_LIST_DIR}/archive.cpp" + "${CMAKE_CURRENT_LIST_DIR}/backend.cpp" "${CMAKE_CURRENT_LIST_DIR}/context.cpp" "${CMAKE_CURRENT_LIST_DIR}/device.cpp" - "${CMAKE_CURRENT_LIST_DIR}/sensor.cpp" - "${CMAKE_CURRENT_LIST_DIR}/algo.cpp" - "${CMAKE_CURRENT_LIST_DIR}/sync.cpp" - "${CMAKE_CURRENT_LIST_DIR}/stream.cpp" - "${CMAKE_CURRENT_LIST_DIR}/option.cpp" + "${CMAKE_CURRENT_LIST_DIR}/device_hub.cpp" + "${CMAKE_CURRENT_LIST_DIR}/environment.cpp" "${CMAKE_CURRENT_LIST_DIR}/error-handling.cpp" "${CMAKE_CURRENT_LIST_DIR}/hw-monitor.cpp" "${CMAKE_CURRENT_LIST_DIR}/image.cpp" "${CMAKE_CURRENT_LIST_DIR}/image-avx.cpp" "${CMAKE_CURRENT_LIST_DIR}/log.cpp" + "${CMAKE_CURRENT_LIST_DIR}/option.cpp" "${CMAKE_CURRENT_LIST_DIR}/rs.cpp" - "${CMAKE_CURRENT_LIST_DIR}/types.cpp" - "${CMAKE_CURRENT_LIST_DIR}/backend.cpp" - "${CMAKE_CURRENT_LIST_DIR}/verify.c" + "${CMAKE_CURRENT_LIST_DIR}/sensor.cpp" "${CMAKE_CURRENT_LIST_DIR}/software-device.cpp" "${CMAKE_CURRENT_LIST_DIR}/source.cpp" + "${CMAKE_CURRENT_LIST_DIR}/stream.cpp" + "${CMAKE_CURRENT_LIST_DIR}/sync.cpp" + "${CMAKE_CURRENT_LIST_DIR}/types.cpp" + "${CMAKE_CURRENT_LIST_DIR}/verify.c" - "${CMAKE_CURRENT_LIST_DIR}/software-device.h" - "${CMAKE_CURRENT_LIST_DIR}/environment.h" - "${CMAKE_CURRENT_LIST_DIR}/device_hub.h" + "${CMAKE_CURRENT_LIST_DIR}/algo.h" + "${CMAKE_CURRENT_LIST_DIR}/api.h" "${CMAKE_CURRENT_LIST_DIR}/archive.h" + "${CMAKE_CURRENT_LIST_DIR}/backend.h" "${CMAKE_CURRENT_LIST_DIR}/concurrency.h" "${CMAKE_CURRENT_LIST_DIR}/context.h" - "${CMAKE_CURRENT_LIST_DIR}/sensor.h" - "${CMAKE_CURRENT_LIST_DIR}/sync.h" - "${CMAKE_CURRENT_LIST_DIR}/sensor.h" - "${CMAKE_CURRENT_LIST_DIR}/stream.h" - "${CMAKE_CURRENT_LIST_DIR}/algo.h" - "${CMAKE_CURRENT_LIST_DIR}/option.h" - "${CMAKE_CURRENT_LIST_DIR}/metadata.h" - "${CMAKE_CURRENT_LIST_DIR}/metadata-parser.h" + "${CMAKE_CURRENT_LIST_DIR}/device.h" + "${CMAKE_CURRENT_LIST_DIR}/device_hub.h" + "${CMAKE_CURRENT_LIST_DIR}/environment.h" "${CMAKE_CURRENT_LIST_DIR}/error-handling.h" + "${CMAKE_CURRENT_LIST_DIR}/frame-archive.h" "${CMAKE_CURRENT_LIST_DIR}/hw-monitor.h" "${CMAKE_CURRENT_LIST_DIR}/image.h" "${CMAKE_CURRENT_LIST_DIR}/image-avx.h" + "${CMAKE_CURRENT_LIST_DIR}/metadata.h" + "${CMAKE_CURRENT_LIST_DIR}/metadata-parser.h" + "${CMAKE_CURRENT_LIST_DIR}/option.h" + "${CMAKE_CURRENT_LIST_DIR}/sensor.h" + "${CMAKE_CURRENT_LIST_DIR}/software-device.h" "${CMAKE_CURRENT_LIST_DIR}/source.h" - "${CMAKE_CURRENT_LIST_DIR}/ivcam/ivcam-private.h" + "${CMAKE_CURRENT_LIST_DIR}/stream.h" + "${CMAKE_CURRENT_LIST_DIR}/sync.h" "${CMAKE_CURRENT_LIST_DIR}/types.h" - "${CMAKE_CURRENT_LIST_DIR}/backend.h" - "${CMAKE_CURRENT_LIST_DIR}/device.h" - "${CMAKE_CURRENT_LIST_DIR}/api.h" ) diff --git a/src/l500/l500-color.cpp b/src/l500/l500-color.cpp index ad0075d405..65d120b925 100644 --- a/src/l500/l500-color.cpp +++ b/src/l500/l500-color.cpp @@ -58,4 +58,4 @@ namespace librealsense _color_device_idx = add_sensor(create_color_device(ctx, color_devs_info)); } -}; +} diff --git a/src/tm2/tm-context.cpp b/src/tm2/tm-context.cpp index f610531402..6e45f724ab 100644 --- a/src/tm2/tm-context.cpp +++ b/src/tm2/tm-context.cpp @@ -36,7 +36,7 @@ namespace librealsense [](perc::TrackingManager* ptr) { perc::TrackingManager::ReleaseInstance(ptr); }); if (_manager == nullptr) { - LOG_WARNING("Failed to create TrackingManager"); + LOG_INFO("Failed to create TrackingManager"); return; } _t = std::thread(&tm2_context::thread_proc, this); diff --git a/src/tm2/tm-device.cpp b/src/tm2/tm-device.cpp index a9eed3eea9..3c17d53d3d 100644 --- a/src/tm2/tm-device.cpp +++ b/src/tm2/tm-device.cpp @@ -790,7 +790,7 @@ namespace librealsense } else { - LOG_WARNING("Dropped frame. alloc_frame(...) returned nullptr"); + LOG_INFO("Dropped frame. alloc_frame(...) returned nullptr"); return; } _source.invoke_callback(std::move(frame)); @@ -1012,12 +1012,12 @@ namespace librealsense } else { - LOG_WARNING("Dropped frame. alloc_frame(...) returned nullptr"); + LOG_INFO("Dropped frame. alloc_frame(...) returned nullptr"); return; } _source.invoke_callback(std::move(frame)); } - + void tm2_sensor::raise_hardware_event(const std::string& msg, const std::string& json_data, double timestamp) { notification controller_event{ RS2_NOTIFICATION_CATEGORY_HARDWARE_EVENT, 0, RS2_LOG_SEVERITY_INFO, msg }; @@ -1025,7 +1025,7 @@ namespace librealsense controller_event.timestamp = timestamp; get_notifications_processor()->raise_notification(controller_event); } - + void tm2_sensor::raise_error_notification(const std::string& msg) { notification error{ RS2_NOTIFICATION_CATEGORY_HARDWARE_ERROR, 0, RS2_LOG_SEVERITY_ERROR, msg }; @@ -1049,7 +1049,7 @@ namespace librealsense } }); } - + void tm2_sensor::detach_controller(int id) { perc::Status status = _tm_dev->ControllerDisconnect(id); diff --git a/third-party/libtm/versions.cmake b/third-party/libtm/versions.cmake index b8b1dc0821..289c1b836a 100644 --- a/third-party/libtm/versions.cmake +++ b/third-party/libtm/versions.cmake @@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 2.8) # If FW source = Local - FW versions are defined according to /resources/remote_versions.log # If FW source = Internal - FW versions are defined according to fw.h, CentralAppFw.h, CentralBlFw.h set(INTERNAL_HOST_VERSION "0.19.3.1711") -set(INTERNAL_FW_VERSION "0.0.18.5129") +set(INTERNAL_FW_VERSION "0.0.18.5448") set(INTERNAL_CENTRAL_APP_VERSION "2.0.19.271") set(INTERNAL_CENTRAL_BL_VERSION "1.0.1.112") set(INTERNAL_FW_SOURCE "Remote" CACHE STRING "Select TM2 FW archive: Remote/Local (to avoid FW polling from remote server)")