Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-06-07 17:35:22 +08:00
Code Issues Actions 30 Packages Projects Releases Wiki Activity

vtol remove Wno-write-strings

Browse Source
This commit is contained in:
Daniel Agar
2016-05-19 00:02:57 -04:00
committed by Lorenz Meier
parent 4e26c7fcd4
commit 3d1713f79e
4 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/vtol_att_control/CMakeLists.txt
-2
View File
@@ -34,8 +34,6 @@ px4_add_module(
MODULE modules__vtol_att_control
MAIN vtol_att_control
COMPILE_FLAGS
-Wno-write-strings
SRCS
vtol_att_control_main.cpp
tiltrotor.cpp
src/modules/vtol_att_control/standard.cpp
+7 -3
View File
@@ -395,10 +395,12 @@ Standard::set_max_mc(unsigned pwm_value)
{
int ret;
unsigned servo_count;
char *dev = PWM_OUTPUT0_DEVICE_PATH;
const char *dev = PWM_OUTPUT0_DEVICE_PATH;
int fd = px4_open(dev, 0);
if (fd < 0) {PX4_WARN("can't open %s", dev);}
if (fd < 0) {
PX4_WARN("can't open %s", dev);
}
ret = px4_ioctl(fd, PWM_SERVO_GET_COUNT, (unsigned long)&servo_count);
struct pwm_output_values pwm_values;
@@ -411,7 +413,9 @@ Standard::set_max_mc(unsigned pwm_value)
ret = px4_ioctl(fd, PWM_SERVO_SET_MAX_PWM, (long unsigned int)&pwm_values);
if (ret != OK) {PX4_WARN("failed setting max values");}
if (ret != OK) {
PX4_WARN("failed setting max values");
}
px4_close(fd);
}
src/modules/vtol_att_control/tiltrotor.cpp
+4 -2
View File
@@ -433,10 +433,12 @@ void Tiltrotor::set_rear_motor_state(rear_motor_state state)
int ret;
unsigned servo_count;
char *dev = PWM_OUTPUT0_DEVICE_PATH;
const char *dev = PWM_OUTPUT0_DEVICE_PATH;
int fd = px4_open(dev, 0);
if (fd < 0) {PX4_WARN("can't open %s", dev);}
if (fd < 0) {
PX4_WARN("can't open %s", dev);
}
ret = px4_ioctl(fd, PWM_SERVO_GET_COUNT, (unsigned long)&servo_count);
struct pwm_output_values pwm_max_values;
src/modules/vtol_att_control/vtol_type.cpp
+14 -6
View File
@@ -86,10 +86,12 @@ void VtolType::set_idle_mc()
{
int ret;
unsigned servo_count;
char *dev = PWM_OUTPUT0_DEVICE_PATH;
const char *dev = PWM_OUTPUT0_DEVICE_PATH;
int fd = px4_open(dev, 0);
if (fd < 0) {PX4_WARN("can't open %s", dev);}
if (fd < 0) {
PX4_WARN("can't open %s", dev);
}
ret = px4_ioctl(fd, PWM_SERVO_GET_COUNT, (unsigned long)&servo_count);
unsigned pwm_value = _params->idle_pwm_mc;
@@ -103,7 +105,9 @@ void VtolType::set_idle_mc()
ret = px4_ioctl(fd, PWM_SERVO_SET_MIN_PWM, (long unsigned int)&pwm_values);
if (ret != OK) {PX4_WARN("failed setting min values");}
if (ret != OK) {
PX4_WARN("failed setting min values");
}
px4_close(fd);
@@ -116,10 +120,12 @@ void VtolType::set_idle_mc()
void VtolType::set_idle_fw()
{
int ret;
char *dev = PWM_OUTPUT0_DEVICE_PATH;
const char *dev = PWM_OUTPUT0_DEVICE_PATH;
int fd = px4_open(dev, 0);
if (fd < 0) {PX4_WARN("can't open %s", dev);}
if (fd < 0) {
PX4_WARN("can't open %s", dev);
}
struct pwm_output_values pwm_values;
memset(&pwm_values, 0, sizeof(pwm_values));
@@ -132,7 +138,9 @@ void VtolType::set_idle_fw()
ret = px4_ioctl(fd, PWM_SERVO_SET_MIN_PWM, (long unsigned int)&pwm_values);
if (ret != OK) {PX4_WARN("failed setting min values");}
if (ret != OK) {
PX4_WARN("failed setting min values");
}
px4_close(fd);
}