From 7b6b6ae80391e7ff79316aa12eca13db26313c57 Mon Sep 17 00:00:00 2001
From: bugobliterator <siddharthbharatpurohit@gmail.com>
Date: Thu, 8 Feb 2024 18:03:20 +1100
Subject: [PATCH] AP_Periph: fix version setting in CheckFirmware app
 descriptor

---
 Tools/AP_Periph/version.cpp | 1 +
 Tools/AP_Periph/version.h   | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Tools/AP_Periph/version.cpp b/Tools/AP_Periph/version.cpp
index e38ffded0c..d30f062321 100644
--- a/Tools/AP_Periph/version.cpp
+++ b/Tools/AP_Periph/version.cpp
@@ -1,3 +1,4 @@
 #define FORCE_VERSION_H_INCLUDE
+#include "AP_Periph.h"
 #include "version.h"
 #undef FORCE_VERSION_H_INCLUDE
diff --git a/Tools/AP_Periph/version.h b/Tools/AP_Periph/version.h
index 6166fba32d..ed2dccddb4 100644
--- a/Tools/AP_Periph/version.h
+++ b/Tools/AP_Periph/version.h
@@ -5,14 +5,16 @@
 #endif
 
 #include "ap_version.h"
+#include <AP_HAL/AP_HAL.h>
 
 #define THISFIRMWARE "AP_Periph V1.7.0-dev"
 
 // defines needed due to lack of GCS includes
+#ifndef HAVE_ENUM_FIRMWARE_VERSION_TYPE
 #define FIRMWARE_VERSION_TYPE_DEV 0
 #define FIRMWARE_VERSION_TYPE_BETA 255
 #define FIRMWARE_VERSION_TYPE_OFFICIAL 255
-
+#endif
 
 // the following line is parsed by the autotest scripts
 #define FIRMWARE_VERSION 1,7,0,FIRMWARE_VERSION_TYPE_DEV
@@ -23,3 +25,4 @@
 #define FW_TYPE FIRMWARE_VERSION_TYPE_DEV
 
 #include <AP_Common/AP_FWVersionDefine.h>
+#include <AP_CheckFirmware/AP_CheckFirmwareDefine.h>