From bf88dc02c0b0e0371d20916ea5be51af5e0e4354 Mon Sep 17 00:00:00 2001 From: Patrick Menschel Date: Wed, 13 Nov 2024 20:05:51 +0100 Subject: [PATCH] Move VTX entry to next group. Squash afterwards. --- libraries/AP_OSD/AP_OSD_Screen.cpp | 33 +++++++++++++++--------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/libraries/AP_OSD/AP_OSD_Screen.cpp b/libraries/AP_OSD/AP_OSD_Screen.cpp index 937df603ec17c5..c3c17ef0c9fe53 100644 --- a/libraries/AP_OSD/AP_OSD_Screen.cpp +++ b/libraries/AP_OSD/AP_OSD_Screen.cpp @@ -1045,23 +1045,6 @@ const AP_Param::GroupInfo AP_OSD_Screen::var_info[] = { AP_SUBGROUPINFO(rrpm, "RPM", 62, AP_OSD_Screen, AP_OSD_Setting), #endif - - // @Param: VTX_TEMP_EN - // @DisplayName: VTX_TEMP_EN - // @Description: Displays the VTX Temperature. A Value of '-1' indicates that temperature is not available. - // @Values: 0:Disabled,1:Enabled - - // @Param: VTX_TEMP_X - // @DisplayName: VTX_TEMP_X - // @Description: Horizontal position on screen for VTX_TEMP item - // @Range: 0 59 - - // @Param: VTX_TEMP_Y - // @DisplayName: VTX_TEMP_Y - // @Description: Vertical position on screen for VTX_TEMP item - // @Range: 0 21 - AP_SUBGROUPINFO(vtx_temp, "VTX_TEMP", 63, AP_OSD_Screen, AP_OSD_Setting), - AP_GROUPEND }; @@ -1191,6 +1174,22 @@ const AP_Param::GroupInfo AP_OSD_Screen::var_info2[] = { AP_GROUPINFO("ESC_IDX", 10, AP_OSD_Screen, esc_index, 0), #endif + // @Param: VTX_TEMP_EN + // @DisplayName: VTX_TEMP_EN + // @Description: Displays the VTX Temperature. A Value of '-1' indicates that temperature is not available. + // @Values: 0:Disabled,1:Enabled + + // @Param: VTX_TEMP_X + // @DisplayName: VTX_TEMP_X + // @Description: Horizontal position on screen for VTX_TEMP item + // @Range: 0 59 + + // @Param: VTX_TEMP_Y + // @DisplayName: VTX_TEMP_Y + // @Description: Vertical position on screen for VTX_TEMP item + // @Range: 0 21 + AP_SUBGROUPINFO(vtx_temp, "VTX_TEMP", 11, AP_OSD_Screen, AP_OSD_Setting), + AP_GROUPEND };