Rebase

iNavFlight · Nov 10, 2024 · 535dbc5 · 535dbc5
1 parent ec60448
commit 535dbc5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/main/fc/fc_msp.c b/src/main/fc/fc_msp.c
@@ -1777,14 +1777,14 @@ static mspResult_e mspFcGeozoneOutCommand(sbuf_t *dst, sbuf_t *src)
 {
     const uint8_t idx = sbufReadU8(src);
     if (idx < MAX_GEOZONES_IN_CONFIG) {
+        sbufWriteU8(dst, idx);
         sbufWriteU8(dst, geoZonesConfig(idx)->type);
         sbufWriteU8(dst, geoZonesConfig(idx)->shape);
         sbufWriteU32(dst, geoZonesConfig(idx)->minAltitude);
         sbufWriteU32(dst, geoZonesConfig(idx)->maxAltitude);
         sbufWriteU8(dst, geoZonesConfig(idx)->isSealevelRef);
         sbufWriteU8(dst, geoZonesConfig(idx)->fenceAction);
         sbufWriteU8(dst, geoZonesConfig(idx)->vertexCount);
-        sbufWriteU8(dst, idx);
         return MSP_RESULT_ACK;
     } else {
         return MSP_RESULT_ERROR;

diff --git a/src/main/io/osd.h b/src/main/io/osd.h
@@ -305,13 +305,13 @@ typedef enum {
     OSD_CUSTOM_ELEMENT_6,
     OSD_CUSTOM_ELEMENT_7,
     OSD_CUSTOM_ELEMENT_8,
-    OSD_COURSE_TO_FENCE,
-    OSD_H_DIST_TO_FENCE,
-    OSD_V_DIST_TO_FENCE,
     OSD_LQ_DOWNLINK,
     OSD_RX_POWER_DOWNLINK, // 160
     OSD_RX_BAND,
     OSD_RX_MODE,
+    OSD_COURSE_TO_FENCE,
+    OSD_H_DIST_TO_FENCE,
+    OSD_V_DIST_TO_FENCE,
     OSD_ITEM_COUNT // MUST BE LAST
 } osd_items_e;