From 5f269009da2f1463ac1d720893a0f7ce26103393 Mon Sep 17 00:00:00 2001
From: DonLakeFlyer <don@thegagnes.com>
Date: Wed, 8 Jul 2020 09:27:13 -0700
Subject: [PATCH] Base channel max solely on channel count

---
 src/QmlControls/RCChannelMonitorController.cc | 9 +--------
 src/QmlControls/RCChannelMonitorController.h  | 5 -----
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/QmlControls/RCChannelMonitorController.cc b/src/QmlControls/RCChannelMonitorController.cc
index 2ab945af3..fddd8fdcd 100644
--- a/src/QmlControls/RCChannelMonitorController.cc
+++ b/src/QmlControls/RCChannelMonitorController.cc
@@ -18,9 +18,7 @@ RCChannelMonitorController::RCChannelMonitorController(void)
 
 void RCChannelMonitorController::_rcChannelsChanged(int channelCount, int pwmValues[Vehicle::cMaxRcChannels])
 {
-    int maxChannel = std::min(channelCount, _chanMax());
-
-    for (int channel=0; channel<maxChannel; channel++) {
+    for (int channel=0; channel<channelCount; channel++) {
         int channelValue = pwmValues[channel];
 
         if (_chanCount != channelCount) {
@@ -33,8 +31,3 @@ void RCChannelMonitorController::_rcChannelsChanged(int channelCount, int pwmVal
         }
     }
 }
-
-int RCChannelMonitorController::_chanMax(void) const
-{
-    return _vehicle->firmwareType() == MAV_AUTOPILOT_PX4 ? _chanMaxPX4 : _chanMaxAPM;
-}
diff --git a/src/QmlControls/RCChannelMonitorController.h b/src/QmlControls/RCChannelMonitorController.h
index 1bd5971b5..68d158fd7 100644
--- a/src/QmlControls/RCChannelMonitorController.h
+++ b/src/QmlControls/RCChannelMonitorController.h
@@ -37,12 +37,7 @@ private slots:
     void _rcChannelsChanged(int channelCount, int pwmValues[Vehicle::cMaxRcChannels]);
 
 private:
-    int _chanMax(void) const;
-
     int _chanCount;
-
-    static const int _chanMaxPX4 = 18;  ///< Maximum number of supported rc channels, PX4 Firmware
-    static const int _chanMaxAPM = 14;  ///< Maximum number of supported rc channels, APM firmware
 };
 
 #endif // RCChannelMonitorController_H
-- 
2.22.0