From 9509569c40e0f93fc9562e3e43af6c55f233ad10 Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Sun, 22 Aug 2021 17:33:27 +0200
Subject: [PATCH] [nv14] aligned telemetry signal polarity on other radios and
 fixed requested polarity for MPM

Resolves #590
Resolves #613
---
 radio/src/pulses/multi.cpp                  |  2 +-
 radio/src/targets/nv14/telemetry_driver.cpp | 23 +++++++++------------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/radio/src/pulses/multi.cpp b/radio/src/pulses/multi.cpp
index f7c4d89a0..1e4c4fcd9 100644
--- a/radio/src/pulses/multi.cpp
+++ b/radio/src/pulses/multi.cpp
@@ -134,7 +134,7 @@ void setupPulsesMulti(uint8_t moduleIdx)
 {
   static int counter[2] = {0,0}; //TODO
   static uint8_t invert[2] = {0x00,        //internal
-#if defined(PCBTARANIS) || defined(PCBHORUS) || defined(NV14)
+#if defined(PCBTARANIS) || defined(PCBHORUS) || defined(PCBNV14)
     0x08        //external
 #else
     0x00	//external
diff --git a/radio/src/targets/nv14/telemetry_driver.cpp b/radio/src/targets/nv14/telemetry_driver.cpp
index 3e89f0c05..d2fa496ed 100644
--- a/radio/src/targets/nv14/telemetry_driver.cpp
+++ b/radio/src/targets/nv14/telemetry_driver.cpp
@@ -65,17 +65,14 @@ void telemetryPortInitCommon(uint32_t baudrate, uint8_t mode, uint8_t noinv = 0)
   GPIO_InitStructure.GPIO_Mode = GPIO_Mode_OUT;
   GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_NOPULL;
   GPIO_Init(TELEMETRY_REV_GPIO, &GPIO_InitStructure);
-	
-	if (noinv == 0)
-	{
-	  TELEMETRY_TX_POL_NORM();
-		TELEMETRY_RX_POL_NORM();
-	}
-	else
-	{
-	  TELEMETRY_TX_POL_INV();
-		TELEMETRY_RX_POL_INV();
-	}
+
+  if (noinv != 0) {
+    TELEMETRY_TX_POL_NORM();
+    TELEMETRY_RX_POL_NORM();
+  } else {
+    TELEMETRY_TX_POL_INV();
+    TELEMETRY_RX_POL_INV();
+  }
 
   USART_InitStructure.USART_BaudRate = baudrate;
   if (mode & TELEMETRY_SERIAL_8E2) {
@@ -100,12 +97,12 @@ void telemetryPortInitCommon(uint32_t baudrate, uint8_t mode, uint8_t noinv = 0)
 
 void telemetryPortInit(uint32_t baudrate, uint8_t mode)
 {
-	telemetryPortInitCommon(baudrate, mode, 0);
+  telemetryPortInitCommon(baudrate, mode, 0);
 }
 
 void telemetryPortInvertedInit(uint32_t baudrate)
 {
-	telemetryPortInitCommon(baudrate, TELEMETRY_SERIAL_DEFAULT, 1);
+  telemetryPortInitCommon(baudrate, TELEMETRY_SERIAL_DEFAULT, 1);
 }
 
 /*void extmoduleSendInvertedByte(uint8_t byte)