From 747fa192597aaeade5a06124bdb5c5fcaac775f9 Mon Sep 17 00:00:00 2001
From: Ben Lye <ben@lye.co.nz>
Date: Wed, 2 Oct 2019 22:11:18 +0100
Subject: [PATCH 1/2] Update package_multi_4in1_board_index.json

---
 .../package_multi_4in1_board_index.json       | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/BootLoaders/package_multi_4in1_board_index.json b/BootLoaders/package_multi_4in1_board_index.json
index b0a68c6..4f580ae 100644
--- a/BootLoaders/package_multi_4in1_board_index.json
+++ b/BootLoaders/package_multi_4in1_board_index.json
@@ -152,6 +152,24 @@
         ],
         "toolsDependencies": []
       },
+      {
+        "name": "Multi 4-in-1 AVR Boards",
+        "architecture": "avr",
+        "version": "1.1.0",
+        "category": "Contributed",
+        "help": {
+          "online": "https://github.com/pascallanger/DIY-Multiprotocol-TX-Module"
+        },
+        "url": "https://github.com/pascallanger/DIY-Multiprotocol-TX-Module-Boards/raw/master/archives/package_multi_4in1_avr_board_v1.1.0.tar.gz",
+        "archiveFileName": "package_multi_4in1_avr_board_v1.1.0.tar.gz",
+        "checksum": "SHA-256:7bacf2db754ceb890a203de5ce89d97aa787a9e6462debeb44cf04830859687a",
+        "size": "326431",
+        "boards": [
+          {"name": "Multi 4-in-1 (Atmega328p, 3.3V, 16MHz)"},
+          {"name": "Multi 4-in-1 (OrangeRX)"}
+        ],
+        "toolsDependencies": []
+      },
       {
         "name": "Multi 4-in-1 STM32 Board",
         "architecture": "STM32F1",
@@ -488,6 +506,27 @@
           "version": "4.8.3-2014q1"
         }]
       },
+      {
+        "name": "Multi 4-in-1 STM32 Board",
+        "architecture": "STM32F1",
+        "version": "1.1.7",
+        "category": "Contributed",
+        "help": {
+          "online": "https://github.com/pascallanger/DIY-Multiprotocol-TX-Module"
+        },
+        "url": "https://github.com/pascallanger/DIY-Multiprotocol-TX-Module-Boards/raw/master/archives/package_multi_4in1_stm32_board_v1.1.7.tar.gz",
+        "archiveFileName": "package_multi_4in1_stm32_board_v1.1.7.tar.gz",
+        "checksum": "SHA-256:37cccde7eafad3d0587d28d13d5f8b2b3244bf7c83e6819b6cb08f4f468815e2",
+        "size": "7966348",
+        "boards": [{
+          "name": "Multi 4-in-1 (STM32F103C)"
+        }],
+        "toolsDependencies": [{
+          "packager": "arduino",
+          "name": "arm-none-eabi-gcc",
+          "version": "4.8.3-2014q1"
+        }]
+      },
       {
         "name": "Multi 4-in-1 OrangeRX Board - DEPRECATED, USE MULTI 4-IN-1 AVR BOARDS PACKAGE INSTEAD",
         "architecture": "orangerx",

From d8acc6a5e88c18d65ba9d78a956e046d178d4249 Mon Sep 17 00:00:00 2001
From: pascallanger <pascal_langer@yahoo.fr>
Date: Fri, 4 Oct 2019 10:14:52 +0200
Subject: [PATCH 2/2] New boards with bin signatures

---
 Multiprotocol/AFHDS2A_Rx_a7105.ino | 2 +-
 Multiprotocol/FrSkyX_Rx_cc2500.ino | 2 +-
 Multiprotocol/Multiprotocol.h      | 2 +-
 Multiprotocol/Validate.h           | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Multiprotocol/AFHDS2A_Rx_a7105.ino b/Multiprotocol/AFHDS2A_Rx_a7105.ino
index d4c8b8e..657ecc2 100644
--- a/Multiprotocol/AFHDS2A_Rx_a7105.ino
+++ b/Multiprotocol/AFHDS2A_Rx_a7105.ino
@@ -182,7 +182,7 @@ uint16_t AFHDS2A_Rx_callback()
 		// packets per second
 		if (millis() - pps_timer >= 1000) {
 			pps_timer = millis();
-			debugln("%ld pps", pps_counter);
+			debugln("%d pps", pps_counter);
 			RX_LQI = pps_counter / 2;
 			pps_counter = 0;
 		}
diff --git a/Multiprotocol/FrSkyX_Rx_cc2500.ino b/Multiprotocol/FrSkyX_Rx_cc2500.ino
index 4b9ea1a..3054429 100644
--- a/Multiprotocol/FrSkyX_Rx_cc2500.ino
+++ b/Multiprotocol/FrSkyX_Rx_cc2500.ino
@@ -351,7 +351,7 @@ uint16_t FrSkyX_Rx_callback()
 		// packets per second
 		if (millis() - pps_timer >= 1000) {
 			pps_timer = millis();
-			debugln("%ld pps", pps_counter);
+			debugln("%d pps", pps_counter);
 			RX_LQI = pps_counter;
 			pps_counter = 0;
 		}
diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h
index 9f47a6f..d407479 100644
--- a/Multiprotocol/Multiprotocol.h
+++ b/Multiprotocol/Multiprotocol.h
@@ -19,7 +19,7 @@
 #define VERSION_MAJOR		1
 #define VERSION_MINOR		2
 #define VERSION_REVISION	1
-#define VERSION_PATCH_LEVEL	84
+#define VERSION_PATCH_LEVEL	85
 
 //******************
 // Protocols
diff --git a/Multiprotocol/Validate.h b/Multiprotocol/Validate.h
index 7ced7b1..ea713e8 100644
--- a/Multiprotocol/Validate.h
+++ b/Multiprotocol/Validate.h
@@ -19,9 +19,9 @@
 #endif
 
 // Check for minimum board file definition version for DIY multi-module boards
-#define MIN_AVR_BOARD 109
-#define MIN_ORX_BOARD 109
-#define MIN_STM32_BOARD 116
+#define MIN_AVR_BOARD 110
+#define MIN_ORX_BOARD 110
+#define MIN_STM32_BOARD 117
 //AVR
 #if (defined(ARDUINO_MULTI_NO_BOOT) && ARDUINO_MULTI_NO_BOOT < MIN_AVR_BOARD) || (defined(ARDUINO_MULTI_FLASH_FROM_TX) && ARDUINO_MULTI_FLASH_FROM_TX < MIN_AVR_BOARD)
 	#error You need to update your Multi 4-in-1 board definition.  Open Boards Manager and update to the latest version of the Multi 4-in-1 AVR Boards.