From 8f0ecac842de5f3459f81e1eb16ffe3eb03fb027 Mon Sep 17 00:00:00 2001
From: pascallanger <planger@mathworks.com>
Date: Sun, 4 Dec 2016 18:58:29 +0100
Subject: [PATCH] Core: stop transmitting if serial or ppm signal disappears

---
 Multiprotocol/MultiOrange.cpp.orangetx | 2 +-
 Multiprotocol/Multiprotocol.ino        | 9 ++++++---
 Multiprotocol/Telemetry.ino            | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Multiprotocol/MultiOrange.cpp.orangetx b/Multiprotocol/MultiOrange.cpp.orangetx
index 76fdf4d..89df83e 100644
--- a/Multiprotocol/MultiOrange.cpp.orangetx
+++ b/Multiprotocol/MultiOrange.cpp.orangetx
@@ -11,7 +11,7 @@
 #include <avr/interrupt.h>
 
 static void protocol_init(void) ;
-static void update_aux_flags(void) ;
+static void update_channels_aux(void) ;
 static uint32_t random_id(uint16_t adress, uint8_t create_new) ;
 static void update_serial_data(void) ;
 static void Mprotocol_serial_init(void) ;
diff --git a/Multiprotocol/Multiprotocol.ino b/Multiprotocol/Multiprotocol.ino
index b98631a..023b6be 100644
--- a/Multiprotocol/Multiprotocol.ino
+++ b/Multiprotocol/Multiprotocol.ino
@@ -411,7 +411,10 @@ void loop()
 		{
 			TX_MAIN_PAUSE_on;
 			tx_pause();
-			next_callback=remote_callback();
+			if(IS_INPUT_SIGNAL_on)
+				next_callback=remote_callback();
+			else
+				next_callback=2000;					// No PPM/serial signal check again in 2ms...
 			TX_MAIN_PAUSE_off;
 			tx_resume();
 			while(next_callback>4000)
@@ -520,8 +523,8 @@ static void update_channels_aux(void)
 static void update_led_status(void)
 {
 	if(IS_INPUT_SIGNAL_on)
-		if(millis()-last_signal>50)
-			INPUT_SIGNAL_off;						//no valid signal (PPM or Serial) received for 50ms
+		if(millis()-last_signal>70)
+			INPUT_SIGNAL_off;							//no valid signal (PPM or Serial) received for 70ms
 	if(blink<millis())
 	{
 		if(IS_INPUT_SIGNAL_off)
diff --git a/Multiprotocol/Telemetry.ino b/Multiprotocol/Telemetry.ino
index 491b591..4493076 100644
--- a/Multiprotocol/Telemetry.ino
+++ b/Multiprotocol/Telemetry.ino
@@ -42,7 +42,7 @@ uint8_t frame[18];
 
 #ifdef BASH_SERIAL
 // For bit-bashed serial output
-	struct t_serial_bash
+	volatile struct t_serial_bash
 	{
 		uint8_t head ;
 		uint8_t tail ;