Skip to content

Commit 27248cc

Browse files
edkochedkoch
committed
Added more topics
1 parent fa33e66 commit 27248cc

2 files changed

Lines changed: 39 additions & 16 deletions

File tree

‎include/vb_util_lib/topics.h‎

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -157,27 +157,38 @@ class am_topics
157157
static constexpr char STATUS_SS2[] = "/status/ss2";
158158

159159
// CTRL messages
160-
static constexpr char CTRL_VX_LOCAL_POS_NAV_ACTION[] = "/ctrl/vx/local_pos_nav_action";
161-
static constexpr char CTRL_VX_GLOBAL_POS_NAV_ACTION[] = "/ctrl/vx/global_pos_nav_action";
162-
static constexpr char CTRL_VX_WAYPOINT_NAV_ACTION [] = "/ctrl/vx/waypoint_nav_action";
160+
static constexpr char CTRL_VX_CMND[] = "/ctrl/vx/cmnd";
163161
static constexpr char CTRL_VX_FCU_STATUS[] = "/ctrl/vx/fcu_status";
164162
static constexpr char CTRL_VX_FLIGHT_CONTROL[] = "/ctrl/vx/flight_control";
165163
static constexpr char CTRL_VX_FLIGHTPLAN[] = "/ctrl/vx/flightplan";
166164
static constexpr char CTRL_VX_FLIGHTPAN_STATUS[] = "/ctrl/vx/flightplan/status";
167-
static constexpr char CTRL_VX_VEHICLE_CURRENTENU[] = "/ctrl/vx/vehicle/currentENU";
165+
static constexpr char CTRL_VX_GLOBAL_POS_NAV_ACTION[] = "/ctrl/vx/global_pos_nav_action";
168166
static constexpr char CTRL_VX_GPS_LOCATION[] = "/ctrl/vx/gps_location";
167+
static constexpr char CTRL_VX_LOCAL_POS_NAV_ACTION[] = "/ctrl/vx/local_pos_nav_action";
168+
static constexpr char CTRL_VX_MISSION[] = "/ctrl/vx/mission";
169+
static constexpr char CTRL_VX_MISSION_MESSAGE[] = "/ctrl/vx/mission/message";
169170
static constexpr char CTRL_VX_MISSION_STATUS[] = "/ctrl/vx/mission_status";
171+
static constexpr char CTRL_VX_PID_PARAM[] = "/ctrl/vx/pid_param";
172+
static constexpr char CTRL_VX_PROXIMITY[] = "/ctrl/vx/proximity";
173+
static constexpr char CTRL_VX_RTL_ACTION[] = "/ctrl/vx/rtl_action";
170174
static constexpr char CTRL_VX_TARGET_CURRENT_ENU[] = "/ctrl/vx/target/currentENU";
175+
static constexpr char CTRL_VX_VEHICLE_CURRENTENU[] = "/ctrl/vx/vehicle/currentENU";
176+
static constexpr char CTRL_VX_VELOCITY[] = "/ctrl/vx/velocity";
177+
static constexpr char CTRL_VX_WAYPOINT_NAV_ACTION [] = "/ctrl/vx/waypoint_nav_action";
178+
171179
static constexpr char CTRL_FEATURE_STATUS_LIST[] = "/ctrl/feature_status_list";
172180
static constexpr char CTRL_FEATURE_STATUS[] = "/ctrl/feature_status";
173181
static constexpr char CTRL_FEATURE_STATUS_UPDATE[] = "/ctrl/feature_status_update";
174182
static constexpr char CTRL_FEATURE_END_LIST[] = "/ctrl/feature_end_list";
175183

184+
static constexpr char CTRL_DEPTH_CMND[] = "/ctrl/depth/cmnd";
185+
static constexpr char CTRL_LOG_CONTROL[] = "/ctrl/log_control";
186+
static constexpr char CTRL_ROUTE[] = "/ctrl/route";
176187
static constexpr char CTRL_VIDEO_CMND[] = "/ctrl/video/cmnd";
177-
// static constexpr char CTRL_VX_
178-
// static constexpr char CTRL_VX_
179-
// static constexpr char CTRL_VX_
180-
// static constexpr char CTRL_VX_
188+
static constexpr char CTRL_VISION_CMND[] = "/ctrl/vision/cmnd";
189+
static constexpr char CTRL_VISION_MARKER_OFFSET[] = "/ctrl/vision/marker_offset";
190+
191+
static constexpr char REMOTE_CTRL_VX_MISSION[] = "/remote/ctrl/vx/mission";
181192

182193
static constexpr char LED_BLINK[] = "/blinkm_command";
183194
static constexpr char BATTERY_STATE[] = "/dji_sdk/battery_state";

‎src/vb_util_lib/topics.cpp‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -87,26 +87,38 @@ constexpr char am_topics::STATUS_LIDAR[];
8787
constexpr char am_topics::STATUS_SS1[];
8888
constexpr char am_topics::STATUS_SS2[];
8989

90-
constexpr char am_topics::CTRL_VX_LOCAL_POS_NAV_ACTION[];
91-
constexpr char am_topics::CTRL_VX_GLOBAL_POS_NAV_ACTION[];
92-
constexpr char am_topics::CTRL_VX_WAYPOINT_NAV_ACTION[];
90+
constexpr char am_topics::CTRL_VX_CMND[];
9391
constexpr char am_topics::CTRL_VX_FCU_STATUS[];
9492
constexpr char am_topics::CTRL_VX_FLIGHT_CONTROL[];
9593
constexpr char am_topics::CTRL_VX_FLIGHTPLAN[];
9694
constexpr char am_topics::CTRL_VX_FLIGHTPAN_STATUS[];
97-
constexpr char am_topics::CTRL_VX_VEHICLE_CURRENTENU[];
95+
constexpr char am_topics::CTRL_VX_GLOBAL_POS_NAV_ACTION[];
9896
constexpr char am_topics::CTRL_VX_GPS_LOCATION[];
97+
constexpr char am_topics::CTRL_VX_LOCAL_POS_NAV_ACTION[];
98+
constexpr char am_topics::CTRL_VX_MISSION[];
99+
constexpr char am_topics::CTRL_VX_MISSION_MESSAGE[];
99100
constexpr char am_topics::CTRL_VX_MISSION_STATUS[];
101+
constexpr char am_topics::CTRL_VX_PID_PARAM[];
102+
constexpr char am_topics::CTRL_VX_PROXIMITY[];
103+
constexpr char am_topics::CTRL_VX_RTL_ACTION[];
100104
constexpr char am_topics::CTRL_VX_TARGET_CURRENT_ENU[];
105+
constexpr char am_topics::CTRL_VX_VEHICLE_CURRENTENU[];
106+
constexpr char am_topics::CTRL_VX_VELOCITY[];
107+
constexpr char am_topics::CTRL_VX_WAYPOINT_NAV_ACTION[];
108+
101109
constexpr char am_topics::CTRL_FEATURE_STATUS_LIST[];
102110
constexpr char am_topics::CTRL_FEATURE_STATUS[];
103111
constexpr char am_topics::CTRL_FEATURE_STATUS_UPDATE[];
104112
constexpr char am_topics::CTRL_FEATURE_END_LIST[];
113+
114+
constexpr char am_topics::CTRL_DEPTH_CMND[];
115+
constexpr char am_topics::CTRL_LOG_CONTROL[];
116+
constexpr char am_topics::CTRL_ROUTE[];
105117
constexpr char am_topics::CTRL_VIDEO_CMND[];
106-
//constexpr char am_topics::
107-
//constexpr char am_topics::
108-
//constexpr char am_topics::
109-
//constexpr char am_topics::
118+
constexpr char am_topics::CTRL_VISION_CMND[];
119+
constexpr char am_topics::CTRL_VISION_MARKER_OFFSET[];
120+
121+
constexpr char am_topics::REMOTE_CTRL_VX_MISSION[];
110122

111123
constexpr char am_topics::LED_BLINK[];
112124
constexpr char am_topics::BATTERY_STATE[];

0 commit comments

Comments
 (0)