Skip to content
Snippets Groups Projects
Commit e4311ca9 authored by Angel's avatar Angel
Browse files

some more changes and details

parent 03aea333
No related branches found
No related tags found
No related merge requests found
...@@ -314,13 +314,11 @@ void MainWindow::updateBatteryVoltage(float battery_voltage) ...@@ -314,13 +314,11 @@ void MainWindow::updateBatteryVoltage(float battery_voltage)
QString qstr = ""; QString qstr = "";
qstr.append(QString::number(battery_voltage, 'f', 2)); qstr.append(QString::number(battery_voltage, 'f', 2));
qstr.append(" V"); qstr.append(" V");
ROS_INFO_STREAM("battery voltage " << battery_voltage);
ui->voltage_field->setText(qstr); ui->voltage_field->setText(qstr);
} }
void MainWindow::CFBatteryCallback(const std_msgs::Float32& msg) void MainWindow::CFBatteryCallback(const std_msgs::Float32& msg)
{ {
ROS_INFO("callback CFBattery received in GUI");
updateBatteryVoltage(msg.data); updateBatteryVoltage(msg.data);
} }
......
...@@ -19,9 +19,9 @@ defaultSetpoint: [0.0, 0.0, 0.4, 0.0] ...@@ -19,9 +19,9 @@ defaultSetpoint: [0.0, 0.0, 0.4, 0.0]
#take off and landing parameters (in meters and seconds) #take off and landing parameters (in meters and seconds)
takeOffDistance : 0.4 takeOffDistance : 0.4
landingDistance : 0.1 landingDistance : 0.05
durationTakeOff : 3 durationTakeOff : 1.5
durationLanding : 3 durationLanding : 1.5
# Liner Trayectory following parameters # Liner Trayectory following parameters
distanceThreshold : 0.5 distanceThreshold : 0.5
...@@ -121,7 +121,7 @@ float computeMotorPolyBackward(float thrust) { ...@@ -121,7 +121,7 @@ float computeMotorPolyBackward(float thrust) {
//-est- is an array with the estimated values : x,y,z,vx,vy,vz,roll,pitch,yaw //-est- is an array with the estimated values : x,y,z,vx,vy,vz,roll,pitch,yaw
//-estBody- is an EMPTY array which will then contain the values in the body frame used by the crazyflie //-estBody- is an EMPTY array which will then contain the values in the body frame used by the crazyflie
//-yaw_measured- is the value that came from Vicon //-yaw_measured- is the value that came from Vicon
void convertIntoBodyFrame(float est[9], float (&estBody)[9], int yaw_measured) void convertIntoBodyFrame(float est[9], float (&estBody)[9], float yaw_measured)
{ {
float sinYaw = sin(yaw_measured); float sinYaw = sin(yaw_measured);
float cosYaw = cos(yaw_measured); float cosYaw = cos(yaw_measured);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment