Changeset 405 in flair-src for trunk


Ignore:
Timestamp:
Mar 23, 2021, 3:55:45 PM (4 years ago)
Author:
Sanahuja Guillaume
Message:

adapt demos for clone demos script

Location:
trunk
Files:
18 edited
6 moved

Legend:

Unmodified
Added
Removed

  • trunk/demos/CMakeLists.txt

    r390 r405  
    55add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/CircleFollower/)
    66add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/TwoWheelRobotCircleFollower)
    7 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/Gps/)
     7add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/DemoGps/)
    88add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/HelloWorld/)
    99add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/MixedReality/)
    10 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/OpticalFlow/)
     10add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/DemoOpticalFlow/)
    1111add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/PidStandalone/)
    1212add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/SimpleFleet/)

  • trunk/demos/DemoGps/CMakeLists.txt

    r396 r405  
    1 PROJECT(Gps)
     1PROJECT(DemoGps)
    22cmake_minimum_required(VERSION 2.8)
    33include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)

  • trunk/demos/DemoGps/simulator/CMakeLists.txt

    r365 r405  
    1 PROJECT(Gps_simulator)
     1PROJECT(DemoGps_simulator)
    22cmake_minimum_required(VERSION 2.8)
    33
    … …  
    1212
    1313FLAIR_DEMO_HOST_CXX(${PROJECT_NAME} "${SRC_FILES}"
    14            DEST_DIR Gps
     14           DEST_DIR DemoGps
    1515           COPY_RESOURCES
    1616)

  • trunk/demos/DemoGps/simulator/resources/core2-64/simulator_x4.sh

    r302 r405  
    22
    33if [ -f /proc/xenomai/version ];then
    4         EXEC=./Gps_simulator_rt
     4        EXEC=./DemoGps_simulator_rt
    55else
    6         EXEC=./Gps_simulator_nrt
     6        EXEC=./DemoGps_simulator_nrt
    77fi
    88

  • trunk/demos/DemoGps/simulator/resources/core2-64/simulator_x8.sh

    r302 r405  
    22
    33if [ -f /proc/xenomai/version ];then
    4         EXEC=./Gps_simulator_rt
     4        EXEC=./DemoGps_simulator_rt
    55else
    6         EXEC=./Gps_simulator_nrt
     6        EXEC=./DemoGps_simulator_nrt
    77fi
    88

  • trunk/demos/DemoGps/uav/CMakeLists.txt

    r401 r405  
    1 PROJECT(Gps)
     1PROJECT(DemoGps)
    22cmake_minimum_required(VERSION 2.8)
    33
    … …  
    1414
    1515FLAIR_DEMO(${PROJECT_NAME} "${SRC_FILES}"
    16            DEST_DIR Gps
     16           DEST_DIR DemoGps
    1717           COPY_RESOURCES
    1818)

  • trunk/demos/DemoGps/uav/resources/armv7a-neon/Gps_bebop.sh

    r301 r405  
    1 ./Gps_nrt -a 192.168.42.24 -p 9000 -l /tmp -x Gps_bebop.xml -n Drone_0 -t bebop
     1./DemoGps_nrt -a 192.168.42.24 -p 9000 -l /tmp -x Gps_bebop.xml -n Drone_0 -t bebop

  • trunk/demos/DemoGps/uav/resources/core2-64/x4.sh

    r302 r405  
    22
    33if [ -f /proc/xenomai/version ];then
    4         EXEC=./Gps_rt
     4        EXEC=./DemoGps_rt
    55else
    6         EXEC=./Gps_nrt
     6        EXEC=./DemoGps_nrt
    77fi
    88

  • trunk/demos/DemoOpticalFlow/CMakeLists.txt

    r396 r405  
    1 PROJECT(OpticalFlow)
     1PROJECT(DemoOpticalFlow)
    22cmake_minimum_required(VERSION 2.8)
    33include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)

  • trunk/demos/DemoOpticalFlow/simulator/CMakeLists.txt

    r365 r405  
    1 PROJECT(OpticalFlow_simulator)
     1PROJECT(DemoOpticalFlow_simulator)
    22cmake_minimum_required(VERSION 2.8)
    33
    … …  
    1212
    1313FLAIR_DEMO_HOST_CXX(${PROJECT_NAME} "${SRC_FILES}"
    14            DEST_DIR OpticalFlow
     14           DEST_DIR DemoOpticalFlow
    1515           COPY_RESOURCES
    1616)

  • trunk/demos/DemoOpticalFlow/simulator/resources/core2-64/simulator_x4.sh

    r302 r405  
    22
    33if [ -f /proc/xenomai/version ];then
    4         EXEC=./OpticalFlow_simulator_rt
     4        EXEC=./DemoOpticalFlow_simulator_rt
    55else
    6         EXEC=./OpticalFlow_simulator_nrt
     6        EXEC=./DemoOpticalFlow_simulator_nrt
    77fi
    88

  • trunk/demos/DemoOpticalFlow/simulator/resources/core2-64/simulator_x8.sh

    r302 r405  
    22
    33if [ -f /proc/xenomai/version ];then
    4         EXEC=./OpticalFlow_simulator_rt
     4        EXEC=./DemoOpticalFlow_simulator_rt
    55else
    6         EXEC=./OpticalFlow_simulator_nrt
     6        EXEC=./DemoOpticalFlow_simulator_nrt
    77fi
    88

  • trunk/demos/DemoOpticalFlow/uav/CMakeLists.txt

    r302 r405  
    1 PROJECT(OpticalFlow)
     1PROJECT(DemoOpticalFlow)
    22cmake_minimum_required(VERSION 2.8)
    33include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)
    … …  
    1616
    1717FLAIR_DEMO(${PROJECT_NAME} "${SRC_FILES}"
    18            DEST_DIR OpticalFlow
     18           DEST_DIR DemoOpticalFlow
    1919           COPY_RESOURCES
    2020)

  • trunk/demos/DemoOpticalFlow/uav/resources/armv7a-neon/OpticalFlow_ardrone2.sh

    r301 r405  
    1 ./OpticalFlow_nrt -a 192.168.147.217 -p 9000 -l /tmp -x OpticalFlow_ardrone2.xml -n Drone_0 -t ardrone2 -v ./dspcv_dsp.out
     1./DemoOpticalFlow_nrt -a 192.168.147.217 -p 9000 -l /tmp -x OpticalFlow_ardrone2.xml -n Drone_0 -t ardrone2 -v ./dspcv_dsp.out

  • trunk/demos/DemoOpticalFlow/uav/resources/core2-64/x4.sh

    r302 r405  
    22
    33if [ -f /proc/xenomai/version ];then
    4         EXEC=./OpticalFlow_rt
     4        EXEC=./DemoOpticalFlow_rt
    55else
    6         EXEC=./OpticalFlow_nrt
     6        EXEC=./DemoOpticalFlow_nrt
    77fi
    88

  • trunk/demos/DemoOpticalFlow/uav/resources/core2-64/x8.sh

    r302 r405  
    22
    33if [ -f /proc/xenomai/version ];then
    4         EXEC=./OpticalFlow_rt
     4        EXEC=./DemoOpticalFlow_rt
    55else
    6         EXEC=./OpticalFlow_nrt
     6        EXEC=./DemoOpticalFlow_nrt
    77fi
    88

  • trunk/demos/Sinus/src/main.cpp

    r291 r405  
    6565
    6666    // setup xml file, ./Sinus.xml by default
    67     ValueArg<string> xmlArg("x", "xml", "xml file", false, "./Sinus.xml",
     67    ValueArg<string> xmlArg("x", "xml", "xml file", false, "./sinus.xml",
    6868                            "string");
    6969    cmd.add(xmlArg);

  • trunk/scripts/clone_demo.sh

    r402 r405  
    6363fi
    6464
     65if [ -d ${2} ];then
     66    err "output ${2} directory already exists"
     67fi
     68
    6569echo cloning ${1} to ${2}
    66 
    67 warn "erasing output for debug"
    68 rm -rf ./${2}
    6970cp -r ${1} ./${2}
    70 
    7171cd ./${2}
    7272
Note: See TracChangeset for help on using the changeset viewer.