support automatic identification platform

Author: dennis-ard

jetson/CMakeLists.txt

@@ -5,12 +5,7 @@ include_directories(BEFORE /usr/include/c  /usr/include/cpp)
 find_package( OpenCV REQUIRED )
 include_directories( ${OpenCV_INCLUDE_DIRS} )
 
-project(NanoPreview)
-add_executable(nano_preview jetson_nano_preview.cpp )
-target_link_libraries( nano_preview ArducamDepthCamera  ${OpenCV_LIBS} )
-
-project(NxPreview)
-add_executable(nx_preview jetson_nx_preview.cpp )
-target_link_libraries( nx_preview ArducamDepthCamera  ${OpenCV_LIBS} )
-
+project(JetsonPreview)
+add_executable(jetson_preview jetson_preview.cpp )
+target_link_libraries( jetson_preview ArducamDepthCamera  ${OpenCV_LIBS} )
 

jetson/compile_nano.sh renamed to jetson/Install_dependecies_jetson.sh

@@ -7,11 +7,6 @@ sudo curl -s --compressed -o /etc/apt/sources.list.d/arducam_list_files.list "ht
 sudo apt update
 sudo apt install arducam-config-parser-dev arducam-usb-sdk-dev arducam-tof-sdk-dev
 
-# compile
-cd `find ~ -name Arducam_tof_camera`
-cd `find . -name jetson`
-
-mkdir build && cd build
-cmake ..
-make 
-./nano_preview 
+wget https://github.com/ArduCAM/MIPI_Camera/releases/download/v0.0.3/install_full.sh
+chmod +x install_full.sh
+./install_full.sh -m arducam

jetson/README.md

@@ -1,20 +1,23 @@
 ## ArduCam Depth Camera
 ### Run project on Jetson
-### Driver install 
+#### Install dependencies
+> Run in the Arducam_tof_camera/jetson folder
 ```Shell
-  wget https://github.com/ArduCAM/MIPI_Camera/releases/download/v0.0.3/install_full.sh
-  chmod +x install_full.sh
-  ./install_full.sh -m arducam
+  ./Install_dependencies.sh
 ```
 ### Compile && Run
-> Run in the Arducam_tof_camera folder
+> Run in the Arducam_tof_camera/jetson folder
 ```Shell
-  ./compile_nano.sh
-  # or
-  ./compile_nx.sh
+  ./compile.sh
 ```
 > You can also manually install and compile according to the following steps
 ### example
+### Driver install 
+```Shell
+  wget https://github.com/ArduCAM/MIPI_Camera/releases/download/v0.0.3/install_full.sh
+  chmod +x install_full.sh
+  ./install_full.sh -m arducam
+```
 #### project dependencies
 ```Shell
   sudo apt-get update
@@ -43,7 +46,5 @@
 #### cpp example
 > Run in the example/build folder
 ```Shell
-  ./jetson/nx_preview   
-  #or
-  ./jetson/nano_preview   
+  ./jetson/jetson_preview 
 ```

jetson/compile.sh

@@ -0,0 +1,9 @@
+
+# compile
+cd `find ~ -name Arducam_tof_camera`
+cd jetson
+
+mkdir build && cd build
+cmake ..
+make 
+./jetson_preview 

jetson/compile_nx.sh

@@ -37,7 +37,7 @@ void getPreview(uint8_t *preview_ptr, float *phase_image_ptr, float *amplitude_i
 
 int main()
 {
-    ArduCam::ArduCamTOFCamera tof(ArduCam::Jetson_NX);
+    ArduCam::ArduCamTOFCamera tof;
     ArduCam::FrameBuffer *frame;
     if (tof.init(ArduCam::CSI,ArduCam::DEPTH_TYPE)){
         std::cerr<<"initialization failed"<<std::endl;

jetson/jetson_nano_preview.cpp

@@ -4,18 +4,18 @@ find_package(PCL QUIET)
 include_directories(BEFORE /usr/include/c  /usr/include/cpp)
 
 if(PCL_FOUND)
-    if(PLATFORM STREQUAL "NANO")
-        message("JETSON_NANO!")
-        add_definitions(-D__JETSON_NANO__)
-    endif()
-    if(PLATFORM STREQUAL "NX")
-        message("JETSON_NX!")
-        add_definitions(-D__JETSON_NX__)
-    endif()
-    if(PLATFORM STREQUAL "DEFAULT")
-        message("DEFAULT!")
-        add_definitions(-D__DEFAULT__)
-    endif()
+    # if(PLATFORM STREQUAL "NANO")
+    #     message("JETSON_NANO!")
+    #     add_definitions(-D__JETSON_NANO__)
+    # endif()
+    # if(PLATFORM STREQUAL "NX")
+    #     message("JETSON_NX!")
+    #     add_definitions(-D__JETSON_NX__)
+    # endif()
+    # if(PLATFORM STREQUAL "DEFAULT")
+    #     message("DEFAULT!")
+    #     add_definitions(-D__DEFAULT__)
+    # endif()
     include_directories(BEFORE /usr/include/c /usr/include/cpp)
     find_package(OpenCV REQUIRED)
     include_directories(${OpenCV_INCLUDE_DIRS})

jetson/jetson_nx_preview.cpp renamed to jetson/jetson_preview.cpp

@@ -14,12 +14,7 @@
   cd Arducam_tof_camera/pcl_preview
   mkdir build && cd build
 
-  # If the platform running the program is Jetson nano
-  cmake -DPLATFORM:STRING=NANO ..
-  # Else if the platform running the program is Jetson NX
-  cmake -DPLATFORM:STRING=NX ..
-  # Else
-  cmake -DPLATFORM:STRING=DEFAULT ..
+  cmake ..
 
   make
 ```

pcl_preview/CMakeLists.txt

@@ -50,15 +50,8 @@ void getPreview(uint8_t *preview_ptr, float *depth_image_ptr, float *amplitude_i
 
 int main()
 {
-    #ifdef __JETSON_NANO__
-        ArduCam::ArduCamTOFCamera tof(ArduCam::Jetson_Nano);
-    #endif
-    #ifdef __JETSON_NX__
-        ArduCam::ArduCamTOFCamera tof(ArduCam::Jetson_NX);
-    #endif
-    #ifdef __DEFAULT__
-        ArduCam::ArduCamTOFCamera tof;
-    #endif
+
+    ArduCam::ArduCamTOFCamera tof;
     ArduCam::FrameBuffer *frame;
     std::time_t t;
     tm *nowtime;