Skip to content

Commit

Permalink
Add (deprecated) to old rover position control parameters
Browse files Browse the repository at this point in the history
  • Loading branch information
chfriedrich98 committed Feb 3, 2025
1 parent c4e020e commit 7037a5f
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion src/lib/rover_control/RoverControl.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/****************************************************************************
*
* Copyright (c) 2024 PX4 Development Team. All rights reserved.
* Copyright (c) 2025 PX4 Development Team. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ void AckermannPosControl::updatePosControl()
_speed_setpoint.setForcedValue(0.f);
}

// Publish attitude controller status (logging only)
// Publish position controller status (logging only)
rover_position_status_s rover_position_status;
rover_position_status.timestamp = _timestamp;
rover_position_status.measured_forward_speed = _vehicle_forward_speed;
Expand Down
34 changes: 17 additions & 17 deletions src/modules/rover_pos_control/rover_pos_control_params.c
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
* @min 0.0
* @decimal 3
* @increment 0.01
* @group Rover Position Control
* @group Rover Position Control (Deprecated)
*/
PARAM_DEFINE_FLOAT(GND_WHEEL_BASE, 0.31f);

Expand All @@ -73,7 +73,7 @@ PARAM_DEFINE_FLOAT(GND_WHEEL_BASE, 0.31f);
* @max 50.0
* @decimal 1
* @increment 0.1
* @group Rover Position Control
* @group Rover Position Control (Deprecated)
*/
PARAM_DEFINE_FLOAT(GND_L1_DIST, 1.0f);

Expand All @@ -90,7 +90,7 @@ PARAM_DEFINE_FLOAT(GND_L1_DIST, 1.0f);
* @max 50.0
* @decimal 1
* @increment 0.5
* @group Rover Position Control
* @group Rover Position Control (Deprecated)
*/
PARAM_DEFINE_FLOAT(GND_L1_PERIOD, 5.0f);

Expand All @@ -103,7 +103,7 @@ PARAM_DEFINE_FLOAT(GND_L1_PERIOD, 5.0f);
* @max 0.9
* @decimal 2
* @increment 0.05
* @group Rover Position Control
* @group Rover Position Control (Deprecated)
*/
PARAM_DEFINE_FLOAT(GND_L1_DAMPING, 0.75f);

Expand All @@ -118,7 +118,7 @@ PARAM_DEFINE_FLOAT(GND_L1_DAMPING, 0.75f);
* @max 1.0
* @decimal 2
* @increment 0.01
* @group Rover Position Control
* @group Rover Position Control (Deprecated)
*/
PARAM_DEFINE_FLOAT(GND_THR_CRUISE, 0.1f);

Expand All @@ -133,7 +133,7 @@ PARAM_DEFINE_FLOAT(GND_THR_CRUISE, 0.1f);
* @max 1.0
* @decimal 2
* @increment 0.01
* @group Rover Position Control
* @group Rover Position Control (Deprecated)
*/
PARAM_DEFINE_FLOAT(GND_THR_MAX, 0.3f);

Expand All @@ -148,7 +148,7 @@ PARAM_DEFINE_FLOAT(GND_THR_MAX, 0.3f);
* @max 1.0
* @decimal 2
* @increment 0.01
* @group Rover Position Control
* @group Rover Position Control (Deprecated)
*/
PARAM_DEFINE_FLOAT(GND_THR_MIN, 0.0f);

Expand All @@ -160,7 +160,7 @@ PARAM_DEFINE_FLOAT(GND_THR_MIN, 0.0f);
* @max 1
* @value 0 open loop control
* @value 1 close the loop with gps speed
* @group Rover Position Control
* @group Rover Position Control (Deprecated)
*/
PARAM_DEFINE_INT32(GND_SP_CTRL_MODE, 1);

Expand All @@ -174,7 +174,7 @@ PARAM_DEFINE_INT32(GND_SP_CTRL_MODE, 1);
* @max 50.0
* @decimal 3
* @increment 0.005
* @group Rover Position Control
* @group Rover Position Control (Deprecated)
*/
PARAM_DEFINE_FLOAT(GND_SPEED_P, 2.0f);

Expand All @@ -188,7 +188,7 @@ PARAM_DEFINE_FLOAT(GND_SPEED_P, 2.0f);
* @max 50.0
* @decimal 3
* @increment 0.005
* @group Rover Position Control
* @group Rover Position Control (Deprecated)
*/
PARAM_DEFINE_FLOAT(GND_SPEED_I, 3.0f);

Expand All @@ -202,7 +202,7 @@ PARAM_DEFINE_FLOAT(GND_SPEED_I, 3.0f);
* @max 50.0
* @decimal 3
* @increment 0.005
* @group Rover Position Control
* @group Rover Position Control (Deprecated)
*/
PARAM_DEFINE_FLOAT(GND_SPEED_D, 0.001f);

Expand All @@ -216,7 +216,7 @@ PARAM_DEFINE_FLOAT(GND_SPEED_D, 0.001f);
* @max 50.0
* @decimal 3
* @increment 0.005
* @group Rover Position Control
* @group Rover Position Control (Deprecated)
*/
PARAM_DEFINE_FLOAT(GND_SPEED_IMAX, 1.0f);

Expand All @@ -230,7 +230,7 @@ PARAM_DEFINE_FLOAT(GND_SPEED_IMAX, 1.0f);
* @max 50.0
* @decimal 3
* @increment 0.005
* @group Rover Position Control
* @group Rover Position Control (Deprecated)
*/
PARAM_DEFINE_FLOAT(GND_SPEED_THR_SC, 1.0f);

Expand All @@ -243,7 +243,7 @@ PARAM_DEFINE_FLOAT(GND_SPEED_THR_SC, 1.0f);
* @max 40
* @decimal 1
* @increment 0.5
* @group Rover Position Control
* @group Rover Position Control (Deprecated)
*/
PARAM_DEFINE_FLOAT(GND_SPEED_TRIM, 3.0f);

Expand All @@ -256,7 +256,7 @@ PARAM_DEFINE_FLOAT(GND_SPEED_TRIM, 3.0f);
* @max 40
* @decimal 1
* @increment 0.5
* @group Rover Position Control
* @group Rover Position Control (Deprecated)
*/
PARAM_DEFINE_FLOAT(GND_SPEED_MAX, 10.0f);

Expand All @@ -271,7 +271,7 @@ PARAM_DEFINE_FLOAT(GND_SPEED_MAX, 10.0f);
* @max 3.14159
* @decimal 3
* @increment 0.01
* @group Rover Position Control
* @group Rover Position Control (Deprecated)
*/
PARAM_DEFINE_FLOAT(GND_MAX_ANG, 0.7854f);

Expand All @@ -282,6 +282,6 @@ PARAM_DEFINE_FLOAT(GND_MAX_ANG, 0.7854f);
* @min 0.0
* @max 400
* @decimal 1
* @group Rover Position Control
* @group Rover Position Control (Deprecated)
*/
PARAM_DEFINE_FLOAT(GND_MAN_Y_MAX, 150.0f);

0 comments on commit 7037a5f

Please sign in to comment.