Merge pull request IntelRealSense#10 from IntelRealSense/nhershko_ext…

…ended_sw_device

merge  camera over ip with extended sw device branch

.travis.yml

@@ -70,9 +70,11 @@ matrix:
       script:
         - cmake .. -DBUILD_PYTHON_BINDINGS=true -DBUILD_NODEJS_BINDINGS=true -DPYBIND11_PYTHON_VERSION=2.7
         - cmake --build . --config $LRS_BUILD_CONFIG -- -j4
-        - cd ../wrappers/nodejs/test
-        - wget http://realsense-hw-public.s3.amazonaws.com/rs-tests/nodejs_record.rec
-        - mocha test-functional.js --playback nodejs_record.rec
+        - cd ../wrappers/nodejs/
+        - npm install
+        - cd test
+        - wget http://realsense-hw-public.s3.amazonaws.com/rs-tests/nodejs_records.rec
+        - mocha test-functional.js --playback nodejs_records.rec
 
     - name: "Mac - cpp"
       os: osx
@@ -115,7 +117,7 @@ before_install:
   - if [[ "$RS_CPP_TEST" == "true" ]]; then
       export LRS_LOG_LEVEL="DEBUG";
       url_records_path="http://realsense-hw-public.s3.amazonaws.com/rs-tests/lrs_2.8.3/";
-      records_name="records.txt";
+      records_name="records_test.txt";
       url_records_list=$url_records_path$records_name;
       wget $url_records_path$records_name;
       tests_list=`cat $records_name`;

CMake/lrs_options.cmake

@@ -20,6 +20,7 @@ option(BUILD_MATLAB_BINDINGS "Build Matlab bindings" OFF)
 option(BUILD_UNITY_BINDINGS "Copy the unity project to the build folder with the required dependencies" OFF)
 option(BUILD_CV_EXAMPLES "Build OpenCV examples" OFF)
 option(BUILD_DLIB_EXAMPLES "Build DLIB examples - requires DLIB_DIR" OFF)
+option(BUILD_OPENVINO_EXAMPLES "Build Intel OpenVINO Toolkit examples - requires INTEL_OPENVINO_DIR" OFF)
 option(BUILD_PCL_EXAMPLES "Build PCL examples" OFF)
 option(BUILD_NODEJS_BINDINGS "Build Node.js bindings" OFF)
 option(BUILD_OPENNI2_BINDINGS "Build OpenNI bindings" OFF)

NOTICE

@@ -382,6 +382,20 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+libusbhost (Apache License, Version 2.0 ), https://android.googlesource.com/platform/system/core/+/master/libusbhost/include/usbhost/usbhost.h
+===============================================================================
+
+Copyright (C) 2010 The Android Open Source Project
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+     http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
 libusb (LGPL 2.1), https://github.com/libusb/libusb
 ===============================================================================
           GNU LESSER GENERAL PUBLIC LICENSE

common/fw-update-helper.h

@@ -18,7 +18,7 @@ namespace rs2
     {
     public:
         firmware_update_manager(device_model& model, device dev, context ctx, std::vector<uint8_t> fw, bool is_signed) 
-            : process_manager("Firmware Update", model),
+            : process_manager("Firmware Update"), _model(model),
               _fw(fw), _is_signed(is_signed), _dev(dev), _ctx(ctx) {}
 
     private:
@@ -32,6 +32,7 @@ namespace rs2
         context _ctx;
         std::vector<uint8_t> _fw;
         bool _is_signed;
+        device_model& _model;
     };
 
     struct fw_update_notification_model : public process_notification_model

common/fw/CMakeLists.txt

@@ -11,13 +11,13 @@ message(STATUS "Fetching recommended firmwares:")
 string(REGEX MATCH "D4XX_RC_FIRMWARE_VERSION \"([0-9]+.[0-9]+.[0-9]+.[0-9]+)\"" _ ${ver})
 set(D4XX_RC_VERSION ${CMAKE_MATCH_1})
 message(STATUS "D4XX_RC_VERSION: ${D4XX_RC_VERSION}")
-set(D4XX_RC_SHA1 b81d8b8dcdbbf89d0b1451a3da002b255851eddc)
+set(D4XX_RC_SHA1 563d6075a3f34c264a86897afa09b2278353979b)
 set(D4XX_RC_URL "http://realsense-hw-public.s3-eu-west-1.amazonaws.com/Releases/RS4xx/FW")
 
 string(REGEX MATCH "D4XX_RECOMMENDED_FIRMWARE_VERSION \"([0-9]+.[0-9]+.[0-9]+.[0-9]+)\"" _ ${ver})
 set(D4XX_FW_VERSION ${CMAKE_MATCH_1})
 message(STATUS "D4XX_FW_VERSION: ${D4XX_FW_VERSION}")
-set(D4XX_FW_SHA1 b81d8b8dcdbbf89d0b1451a3da002b255851eddc)
+set(D4XX_FW_SHA1 563d6075a3f34c264a86897afa09b2278353979b)
 set(D4XX_FW_URL "http://realsense-hw-public.s3-eu-west-1.amazonaws.com/Releases/RS4xx/FW")
 
 

common/fw/firmware-version.h

@@ -3,6 +3,6 @@
 
 #pragma once
 
-#define D4XX_RECOMMENDED_FIRMWARE_VERSION "5.11.15.0"
+#define D4XX_RECOMMENDED_FIRMWARE_VERSION "5.12.1.0"
 #define SR3XX_RECOMMENDED_FIRMWARE_VERSION "3.26.1.0"
-#define D4XX_RC_FIRMWARE_VERSION "5.11.15.0"
+#define D4XX_RC_FIRMWARE_VERSION "5.12.1.0"