Changeset 376 in flair-src for trunk


Ignore:
Timestamp:
Dec 9, 2020, 6:24:44 PM (4 years ago)
Author:
Sanahuja Guillaume
Message:

up ugv

Location:
trunk
Files:
13 added
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/demos/TwoWheelRobotCircleFollower/CMakeLists.txt

    r371 r376  
    22include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)
    33
     4if("${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE}" MATCHES "core2-64")
     5
    46add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/simulator)
    5 #add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/uav)
     7add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/ugv)
     8
     9else()
     10    if(DEFINED CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE)
     11        warn("${PROJECT_NAME} will not be built for ${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE} architecture")
     12    else()
     13        warn("${PROJECT_NAME} will not be built for ${CMAKE_SYSTEM_PROCESSOR} architecture")
     14    endif()
     15endif()

  • trunk/lib/FlairSensorActuator/src/Bldc.cpp

    r340 r376  
    9696}
    9797
    98 } // end namespace sensor
     98} // end namespace actuator
    9999} // end namespace flair

  • trunk/lib/FlairSensorActuator/src/Bldc.h

    r340 r376  
    1515
    1616#include <IODevice.h>
    17 #include <stdint.h>
    1817
    1918namespace flair {

  • trunk/lib/FlairSimulator/src/TwoWheelRobot.cpp

    r375 r376  
    151151// z down
    152152void TwoWheelRobot::CalcModel(void) {
    153   float speed=0.4, turn=0;
     153  float speed,turn;
    154154  Time motorTime;
    155155
Note: See TracChangeset for help on using the changeset viewer.