From d97c8479662d93fb74131a2ef74f742a051938a4 Mon Sep 17 00:00:00 2001
From: Peter Barker <pbarker@barker.dropbear.id.au>
Date: Fri, 8 Apr 2022 17:20:50 +1000
Subject: [PATCH] AP_Volz_Protocol: allow Volz protocol to be compiled out

---
 libraries/AP_Volz_Protocol/AP_Volz_Protocol.cpp | 12 +++++++-----
 libraries/AP_Volz_Protocol/AP_Volz_Protocol.h   | 10 ++++++++++
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/libraries/AP_Volz_Protocol/AP_Volz_Protocol.cpp b/libraries/AP_Volz_Protocol/AP_Volz_Protocol.cpp
index e0084e4798..97851e4b20 100644
--- a/libraries/AP_Volz_Protocol/AP_Volz_Protocol.cpp
+++ b/libraries/AP_Volz_Protocol/AP_Volz_Protocol.cpp
@@ -4,13 +4,14 @@
  *  Created on: Oct 31, 2017
  *      Author: guy
  */
-#include <AP_HAL/AP_HAL.h>
-#include <SRV_Channel/SRV_Channel.h>
-
 #include "AP_Volz_Protocol.h"
-#if NUM_SERVO_CHANNELS
+
+#if AP_VOLZ_ENABLED
+
+#include <AP_HAL/AP_HAL.h>
 
 #include <AP_SerialManager/AP_SerialManager.h>
+#include <SRV_Channel/SRV_Channel.h>
 
 extern const AP_HAL::HAL& hal;
 
@@ -158,4 +159,5 @@ void AP_Volz_Protocol::update_volz_bitmask(uint32_t new_bitmask)
 
     volz_time_frame_micros = channels_micros;
 }
-#endif //NUM_SERVO_CHANNELS
+
+#endif  // AP_VOLZ_ENABLED
diff --git a/libraries/AP_Volz_Protocol/AP_Volz_Protocol.h b/libraries/AP_Volz_Protocol/AP_Volz_Protocol.h
index adbf5edf13..017d8fc726 100644
--- a/libraries/AP_Volz_Protocol/AP_Volz_Protocol.h
+++ b/libraries/AP_Volz_Protocol/AP_Volz_Protocol.h
@@ -33,6 +33,14 @@
 
 #pragma once
 
+#include <AP_HAL/AP_HAL_Boards.h>
+
+#ifndef AP_VOLZ_ENABLED
+#define AP_VOLZ_ENABLED 1
+#endif
+
+#if AP_VOLZ_ENABLED
+
 #include <AP_HAL/AP_HAL.h>
 #include <AP_Param/AP_Param.h>
 
@@ -73,3 +81,5 @@ private:
     AP_Int32 bitmask;
     bool initialised;
 };
+
+#endif  // AP_VOLZ_PROTOCOL