Revision 5f29f640

View differences:

include/humotion/server/eyelid_motion_generator.h
73 73
    static const float EYEBLINK_BLOCKING_TIME;
74 74

  
75 75
    boost::system_time periodic_blink_start_time;
76
    boost::system_time eyeblink_timeout[SIDE_ID_SIZE+10];
76
    boost::system_time eyeblink_timeout[SIDE_ID_SIZE];
77 77
    boost::system_time eyeblink_blocked_timeout;
78 78

  
79 79
};
src/server/eye_motion_generator.cpp
80 80
    //tilt:
81 81
    float eye_tilt_target = requested_gaze_state.tilt - (neck_tilt_now);
82 82

  
83
    if (0){
84
        eye_pan_r_target = 0.0;
85
        eye_pan_l_target = 0.0;
86
        eye_tilt_target  = 0.0;
87
    }
88

  
83 89
    //fetch current angles:
84 90
    float eye_pan_l_now = get_current_position(JointInterface::ID_EYES_LEFT_LR);
85 91
    float eye_pan_r_now = get_current_position(JointInterface::ID_EYES_RIGHT_LR);
src/server/neck_motion_generator.cpp
34 34
using namespace humotion;
35 35
using namespace humotion::server;
36 36

  
37
const float NeckMotionGenerator::CONST_GUITTON87_A = 4.39; // / 2.0;
38
const float NeckMotionGenerator::CONST_GUITTON87_B = 160.0; // /2.0;
37
const float NeckMotionGenerator::CONST_GUITTON87_A = 4.39/2.0; // / 2.0;
38
const float NeckMotionGenerator::CONST_GUITTON87_B = 106.0/2.0; // /2.0;
39 39

  
40 40
//healthy adult human: 12-15 breaths/min (see "Ganong's review of medical physiology")
41 41
//total: 60/12-15 = 3-5s

Also available in: Unified diff