File system clean-up:

a. Adding JSON to COPYING
b. Moving advanced mode into the library
c. Moving images into img under doc
d. Making "fake-color" profile default for the RS400

CMakeLists.txt

@@ -138,11 +138,9 @@ set(REALSENSE_CPP
     src/win/win-hid.cpp
     src/win/win-backend.cpp
 
-    rs400/rs400_advanced_mode/src/rs2_advanced_mode.cpp
-    rs400/rs400_advanced_mode/src/presets.cpp
-    rs400/rs400_advanced_mode/src/json.hpp
-    rs400/rs400_advanced_mode/src/json_loader.hpp
-    rs400/rs400_advanced_mode/src/advanced_mode.cpp
+    src/ds5/advanced_mode/rs2_advanced_mode.cpp
+    src/ds5/advanced_mode/presets.cpp
+    src/ds5/advanced_mode/advanced_mode.cpp
 
     third-party/easyloggingpp/src/easylogging++.cc
     third-party/sqlite/sqlite3.c
@@ -187,7 +185,7 @@ set(REALSENSE_HPP
     include/librealsense/rs2_advanced_mode.hpp
     include/librealsense/h/rs2_advanced_mode_command.h
 
-	src/res/resource.h
+    src/res/resource.h
 
     src/core/streaming.h
     src/core/debug.h
@@ -252,6 +250,9 @@ set(REALSENSE_HPP
     src/media/ros/ros_reader.h
     src/media/ros/ros_writer.h
 
+    src/ds5/advanced_mode/json_loader.hpp
+    src/ds5/advanced_mode/presets.h
+
     third-party/easyloggingpp/src/easylogging++.h
     third-party/sqlite/sqlite3.h
     src/mock/sql.h
@@ -355,7 +356,7 @@ if(WIN32)
     source_group("Source Files\\API" FILES
         src/rs.cpp
         src/verify.c
-        rs400/rs400_advanced_mode/src/rs2_advanced_mode.cpp
+        src/ds5/advanced_mode/rs2_advanced_mode.cpp
         )
 
     source_group("Header Files\\Media" FILES
@@ -396,6 +397,17 @@ if(WIN32)
         src/ivcam/ivcam-private.cpp
         )
 
+    source_group("Source Files\\Devices\\Advanced Mode" FILES
+        src/ds5/advanced_mode/rs2_advanced_mode.cpp
+        src/ds5/advanced_mode/presets.cpp
+        src/ds5/advanced_mode/advanced_mode.cpp
+        )
+
+    source_group("Header Files\\Devices\\Advanced Mode" FILES
+        src/ds5/advanced_mode/json_loader.hpp
+        src/ds5/advanced_mode/presets.h
+        )
+
     source_group("Header Files\\Devices" FILES
         src/ds5/ds5-device.h
         src/ds5/ds5-options.h

COPYING

@@ -1,6 +1,30 @@
 This project uses code from the following third-party projects, listed here
 with the full text of their respective licenses.
 
+JSON for Modern C++ (BSD 2 Clause) - https://github.com/nlohmann/json
+===============================================================================
+MIT License 
+
+Copyright (c) 2013-2017 Niels Lohmann
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
 LZ4 Library (BSD 2 Clause) - https://github.com/lz4/lz4/tree/dev/lib
 ===============================================================================
 LZ4 Library

common/model-views.h

@@ -19,7 +19,7 @@
 #include "imgui-fonts-karla.hpp"
 #include "imgui-fonts-fontawesome.hpp"
 
-#include "realsense-ui/realsense-ui-advanced-mode.h"
+#include "realsense-ui-advanced-mode.h"
 
 inline ImVec4 from_rgba(uint8_t r, uint8_t g, uint8_t b, uint8_t a)
 {

doc/installation_windows.md

@@ -4,7 +4,7 @@
 
 librealsense shall be built on Windows using CMake and Visual Studio 2015:  
 (MSVC2013 and older are not compatible with the C++11 features set).
-![Windows CMake](./windows_cmake.png)
+![Windows CMake](./img/windows_cmake.png)
 
 Don't forget to check `BUILD_EXAMPLES` if you wish to use librealsense samples.
 
@@ -17,14 +17,14 @@ Prerequisites:
 #### Installation:
 - Verifying OS version:
  - Run "winver" command from desktop/terminal - "Version 1607" or later is expected.  
- ![winver](./winver_Win10.png)
+ ![winver](./img/winver_Win10.png)
 
 
 - Installing WinSDK ver10:
  - Navigate to "Control Panel" -> "Programs and Features"
  - Double-click on "Microsoft Visual Studio" and select "Modify"
  - Check that SDK version 10.0.10586 or later is present, install if needed:    
- ![winsdk](./WinSDK_10.0.10586.png)
+ ![winsdk](./img/WinSDK_10.0.10586.png)
 
 
 - Registering Intel® RealSense™ device for metadata:
@@ -35,15 +35,15 @@ Windows OS requires a dedicated registry entry to be present for each unique vid
   - Select the first device from the list, e.g. `Intel® RealSense™ Camera SR300 Depth` (Step 1)
   - Find its path (Step 2) and additional interfaces (Step 3)
 
-    ![win_dev_master_interface](./win_device_interface.png)
-    ![win_dev_master_interface](./win_device_sibling_interfaces.png)
+    ![win_dev_master_interface](./img/win_device_interface.png)
+    ![win_dev_master_interface](./img/win_device_sibling_interfaces.png)
   - Modify Registry
     - For each interface (Steps 2 and 3) perform
       - Using Registry Editing tool such as "regedit" navigate to	`HKLM\SYSTEM\CurrentControlSet\Control\DeviceClasses\{e5323777-f976-4f5b-9b55-b94699c46e44}` branch (Step 1)
       - Browse into the subdirectory with the name identical to the `Device instance path` obtained from the previous step
       - Expand the entry into `#GLOBAL` -> `Device Parameters` (Step 2)
       - Add `DWORD 32bit` value named `MetadataBufferSizeInKB0` with value 4 (Step 3)
-      ![win_md_reg_key](./win_md_reg_key.png)  
+      ![win_md_reg_key](./img/win_md_reg_key.png)  
 
       - Repeat the last two steps for   
       `HKLM\SYSTEM\CurrentControlSet\Control\DeviceClasses\{65E8773D-8F56-11D0-A3B9-00A0C9223196}` branch
@@ -57,7 +57,7 @@ The user may alter the policy and require that the metadata block will be always
 When set, the compiler will check for target platform version, and actively interrupt the build if the found version is below 10.0.10586.
 
 When WinSDK10 is installed, CMake will automatically create MSVC project files targeted for the active platform (WinSDK8.1/10). In case it fails to select the required version correctly, it can be manually altered by retargetting the solution for the proper WinSDK version:
-![win_retarget_platform](./win_retarget_platform.png)
+![win_retarget_platform](./img/win_retarget_platform.png)