From ec153f59a226deff627a6b369fa6430362ab4e62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrick=20Jos=C3=A9=20Pereira?= <patrickelectric@gmail.com>
Date: Fri, 18 Sep 2020 13:57:58 -0300
Subject: [PATCH] ArduCopter: Use new AP_FWVersionDefine header
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>
---
 ArduCopter/version.cpp | 49 ------------------------------------------
 ArduCopter/version.h   |  2 ++
 2 files changed, 2 insertions(+), 49 deletions(-)
 delete mode 100644 ArduCopter/version.cpp

diff --git a/ArduCopter/version.cpp b/ArduCopter/version.cpp
deleted file mode 100644
index e616abd704..0000000000
--- a/ArduCopter/version.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * This file is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This file is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#define FORCE_VERSION_H_INCLUDE
-#include "version.h"
-#undef FORCE_VERSION_H_INCLUDE
-
-#include <AP_Common/AP_FWVersion.h>
-
-const AP_FWVersion AP_FWVersion::fwver{
-    .major = FW_MAJOR,
-    .minor = FW_MINOR,
-    .patch = FW_PATCH,
-    .fw_type = FW_TYPE,
-#ifndef GIT_VERSION
-    .fw_string = THISFIRMWARE,
-    .fw_hash_str = "",
-#else
-    .fw_string = THISFIRMWARE " (" GIT_VERSION ")",
-    .fw_hash_str = GIT_VERSION,
-#endif
-    .middleware_name = nullptr,
-    .middleware_hash_str = nullptr,
-#ifdef CHIBIOS_GIT_VERSION
-    .os_name = "ChibiOS",
-    .os_hash_str = CHIBIOS_GIT_VERSION,
-#else
-    .os_name = nullptr,
-    .os_hash_str = nullptr,
-#endif
-#ifdef BUILD_DATE_YEAR
-    // encode build date in os_sw_version
-   .os_sw_version = (BUILD_DATE_YEAR*100*100) + (BUILD_DATE_MONTH*100) + BUILD_DATE_DAY,
-#else
-   .os_sw_version = 0,
-#endif
-};
diff --git a/ArduCopter/version.h b/ArduCopter/version.h
index ac2c1ab38e..c4c643a402 100644
--- a/ArduCopter/version.h
+++ b/ArduCopter/version.h
@@ -15,3 +15,5 @@
 #define FW_MINOR 1
 #define FW_PATCH 0
 #define FW_TYPE FIRMWARE_VERSION_TYPE_DEV
+
+#include <AP_Common/AP_FWVersionDefine.h>
\ No newline at end of file