Changeset 239 in flair-src for trunk/demos/CircleFollower/uav


Ignore:
Timestamp:
May 15, 2018, 4:42:44 PM (4 years ago)
Author:
Bayard Gildas
Message:

tests

Location:
trunk/demos/CircleFollower/uav/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/demos/CircleFollower/uav/src/CircleFollower.cpp

    r214 r239  
    3232#include <AhrsData.h>
    3333#include <Camera.h>
     34#include <CvtColor.h>
    3435
    3536using namespace std;
     
    5152    stopCircle=new PushButton(GetButtonsLayout()->LastRowLastCol(),"stop_circle");
    5253    positionHold=new PushButton(GetButtonsLayout()->LastRowLastCol(),"position hold");
     54
     55    greyCameraImage=new CvtColor(uav->GetVerticalCamera(),"gray",CvtColor::Conversion_t::ToGray);
     56    uav->GetVerticalCamera()->UseDefaultPlot(greyCameraImage->Output()); // Le defaultPlot de la caméra peut afficher n'importe quoi?
    5357
    5458    if(vrpnclient->UseXbee()==true) {
  • trunk/demos/CircleFollower/uav/src/CircleFollower.h

    r171 r239  
    2323    namespace filter {
    2424        class TrajectoryGenerator2DCircle;
     25        class CvtColor;
    2526    }
    2627    namespace meta {
     
    3839
    3940    private:
    40         enum class BehaviourMode_t {
     41        flair::filter::CvtColor* greyCameraImage;
     42
     43        enum class BehaviourMode_t {
    4144            Default,
    4245            PositionHold,
  • trunk/demos/CircleFollower/uav/src/main.cpp

    r232 r239  
    1818#include <tclap/CmdLine.h>
    1919#include <TargetEthController.h>
     20#include <VisionFilter.h>
    2021
    2122using namespace TCLAP;
     
    3839int main(int argc, char* argv[]) {
    3940    parseOptions(argc,argv);
     41
     42    if(!InitVisionFilter("file=tutu")) {
     43        exit(1);
     44    }
    4045
    4146    FrameworkManager *manager;
Note: See TracChangeset for help on using the changeset viewer.