Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/modules/simulation/gz_bridge/GZGimbal.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ void GZGimbal::publishDeviceAttitude()
void GZGimbal::publishJointCommand(gz::transport::Node::Publisher &publisher, const float att_stp, const float rate_stp,
float &last_stp, const float min_stp, const float max_stp, const float dt)
{
gz::msgs::Double msg;
gz::msgs::Float msg;

float new_stp = computeJointSetpoint(att_stp, rate_stp, last_stp, dt);
new_stp = math::constrain(new_stp, min_stp, max_stp);
Expand Down
4 changes: 2 additions & 2 deletions src/modules/simulation/gz_bridge/GZMixingInterfaceServo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@ bool GZMixingInterfaceServo::init(const std::string &model_name)
return false;
}

double min_val = get_servo_angle_min(i);
double max_val = get_servo_angle_max(i);
double min_val = (double)get_servo_angle_min(i);
double max_val = (double)get_servo_angle_max(i);
_angle_min_rad.push_back(min_val);
_angular_range_rad.push_back(max_val - min_val);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ void MovingPlatformController::updateWrenchCommand(

if (accel_xy > max_accel) {
const float scaling = max_accel / accel_xy;
_force += feedback_force * gz::math::Vector3d(scaling, scaling, 1.);
_force += feedback_force * gz::math::Vector3d((double)scaling, (double)scaling, 1.);

} else {
_force += feedback_force;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ class OpticalFlowSensor : public gz::sensors::Sensor
int _integration_time_us;

// Camera
double _horizontal_fov {0.0};
double _vertical_fov {0.0};
//double _horizontal_fov {0.0};
//double _vertical_fov {0.0};

cv::Mat _last_image_gray;
uint32_t _last_image_timestamp {0};
Expand Down
Loading