Changeset 263 in flair-src


Ignore:
Timestamp:
Sep 12, 2018, 4:50:01 PM (2 years ago)
Author:
Sanahuja Guillaume
Message:

CircleFollower?: remove depdency to cameras

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

Legend:

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

    r239 r263  
    3131#include <Ahrs.h>
    3232#include <AhrsData.h>
    33 #include <Camera.h>
    34 #include <CvtColor.h>
    3533
    3634using namespace std;
     
    5250    stopCircle=new PushButton(GetButtonsLayout()->LastRowLastCol(),"stop_circle");
    5351    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?
    5752
    5853    if(vrpnclient->UseXbee()==true) {
  • trunk/demos/CircleFollower/uav/src/CircleFollower.h

    r239 r263  
    3939
    4040    private:
    41         flair::filter::CvtColor* greyCameraImage;
    4241
    4342        enum class BehaviourMode_t {
  • trunk/demos/CircleFollower/uav/src/main.cpp

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