Changeset 313 in flair-src for trunk/lib


Ignore:
Timestamp:
Mar 21, 2019, 11:30:17 AM (3 years ago)
Author:
Sanahuja Guillaume
Message:

maj thread

Location:
trunk/lib
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/lib/FlairCore/src/FrameworkManager_impl.cpp

    r290 r313  
    152152  SafeStop();
    153153  Join();
     154 
     155  if(gcs_watchdog!=NULL) gcs_watchdog->SafeStop();
    154156
    155157  if (rcv_buf != NULL)
  • trunk/lib/FlairCore/src/Thread.cpp

    r307 r313  
    127127  //usleep(time);
    128128  struct timespec req;
    129   req.tv_sec = (Time)time / (Time)1000;
    130   req.tv_nsec = (Time)time%(Time)1000;
     129  req.tv_sec = (Time)time / (Time)1000000;
     130  req.tv_nsec = ((Time)time%(Time)1000000)*((Time)1000);
    131131  struct timespec rem;
    132132  if(nanosleep(&req,&rem)!=0) Err("error in nanosleep\n");//todo, handle EINTR
  • trunk/lib/FlairMeta/src/UavStateMachine.cpp

    r310 r313  
    124124}
    125125
    126 const TargetController *UavStateMachine::GetJoystick(void) const {
     126const TargetController *UavStateMachine::GetTargetController(void) const {
    127127    return controller;
     128}
     129
     130MetaDualShock3 *UavStateMachine::GetJoystick(void) const {
     131    return joy;
    128132}
    129133
  • trunk/lib/FlairMeta/src/UavStateMachine.h

    r206 r313  
    226226  void AddDataToControlLawLog(const core::io_data *data);
    227227
    228   const sensor::TargetController *GetJoystick(void) const;
    229   MetaDualShock3 *joy;
     228  const sensor::TargetController *GetTargetController(void) const;
     229  MetaDualShock3 *GetJoystick(void) const;
    230230 
    231231  filter::NestedSat *GetURoll(void);
     
    269269  bool IsValuePossible(float value,std::string desc);
    270270
    271   meta::Uav *uav;
     271  Uav *uav;
     272  MetaDualShock3 *joy;
    272273  sensor::TargetController *controller;
    273274
Note: See TracChangeset for help on using the changeset viewer.