From 837f429bf019d9f68ccbd814718477cc4262a63f Mon Sep 17 00:00:00 2001 From: Rustom Jehangir Date: Sun, 10 Apr 2016 14:43:35 -0700 Subject: [PATCH] Sub: Refactor 'strafe' to 'lateral' --- ArduSub/Sub.h | 2 +- ArduSub/control_acro.cpp | 2 +- ArduSub/control_althold.cpp | 2 +- ArduSub/control_stabilize.cpp | 2 +- ArduSub/joystick.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ArduSub/Sub.h b/ArduSub/Sub.h index 2345e2dac1..85d4ecc010 100644 --- a/ArduSub/Sub.h +++ b/ArduSub/Sub.h @@ -158,7 +158,7 @@ private: RC_Channel *channel_throttle; RC_Channel *channel_yaw; RC_Channel *channel_forward; - RC_Channel *channel_strafe; + RC_Channel *channel_lateral; // Dataflash DataFlash_Class DataFlash{FIRMWARE_STRING}; diff --git a/ArduSub/control_acro.cpp b/ArduSub/control_acro.cpp index a1affa1a86..8e85538194 100644 --- a/ArduSub/control_acro.cpp +++ b/ArduSub/control_acro.cpp @@ -50,7 +50,7 @@ void Sub::acro_run() //control_in is range 0-1000 //radio_in is raw pwm value motors.set_forward(channel_forward->radio_in); - motors.set_strafe(channel_strafe->radio_in); + motors.set_lateral(channel_lateral->radio_in); } diff --git a/ArduSub/control_althold.cpp b/ArduSub/control_althold.cpp index 493b23a57d..28989ddfdf 100644 --- a/ArduSub/control_althold.cpp +++ b/ArduSub/control_althold.cpp @@ -156,5 +156,5 @@ void Sub::althold_run() //control_in is range 0-1000 //radio_in is raw pwm value motors.set_forward(channel_forward->radio_in); - motors.set_strafe(channel_strafe->radio_in); + motors.set_lateral(channel_lateral->radio_in); } diff --git a/ArduSub/control_stabilize.cpp b/ArduSub/control_stabilize.cpp index f66dbb2460..59c43fd783 100644 --- a/ArduSub/control_stabilize.cpp +++ b/ArduSub/control_stabilize.cpp @@ -60,5 +60,5 @@ void Sub::stabilize_run() //control_in is range -1000-1000 //radio_in is raw pwm value motors.set_forward(channel_forward->radio_in); - motors.set_strafe(channel_strafe->radio_in); + motors.set_lateral(channel_lateral->radio_in); } diff --git a/ArduSub/joystick.cpp b/ArduSub/joystick.cpp index 1bfef5c86c..f26cd26369 100644 --- a/ArduSub/joystick.cpp +++ b/ArduSub/joystick.cpp @@ -51,7 +51,7 @@ void Sub::transform_manual_control_to_rc_override(int16_t x, int16_t y, int16_t channels[3] = r*rpyScale+rpyCenter; // yaw channels[4] = mode; // for testing only channels[5] = x*rpyScale+rpyCenter; // forward for ROV - channels[6] = y*rpyScale+rpyCenter; // strafe for ROV + channels[6] = y*rpyScale+rpyCenter; // lateral for ROV channels[7] = camTilt; // camera tilt channels[8] = lights1; channels[9] = 0;