From 0316c9eea996f35ea1b784ab56a887f2058d98b2 Mon Sep 17 00:00:00 2001
From: Pascal Langer <planger@mathworks.com>
Date: Fri, 5 Jun 2020 22:44:32 +0200
Subject: [PATCH] HoTT: telem code cleanup

---
 Multiprotocol/HOTT_cc2500.ino | 19 +++++++++++--------
 Multiprotocol/Multiprotocol.h |  2 +-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/Multiprotocol/HOTT_cc2500.ino b/Multiprotocol/HOTT_cc2500.ino
index 2350b4b..665ba9b 100644
--- a/Multiprotocol/HOTT_cc2500.ino
+++ b/Multiprotocol/HOTT_cc2500.ino
@@ -443,15 +443,18 @@ uint16_t ReadHOTT()
 										HOTT_sensor_pages = 0x1E;						// Switch to next sensor
 									}
 								}
-								if(HOTT_sensor_valid && packet_in[11] )					// Valid & page !=0
-								{
-									packet_in[10] = HOTT_sensor_cur+9;					// Marking telem with sensor ID
-									HOTT_sensor_pages |= 1<<packet_in[11];				// Page received
+								if(packet_in[11])
+								{ //Page != 0
+									if(HOTT_sensor_valid)								// Valid
+									{
+										packet_in[10] = HOTT_sensor_cur+9;				// Mark telem with sensor ID
+										HOTT_sensor_pages |= 1<<packet_in[11];			// Page received
+									}
+									else
+										send_telem=false;								// Do not send
 								}
-								if(packet_in[11] && !HOTT_sensor_valid)
-									send_telem=false;
-								if(packet_in[11]==0)
-									packet_in[10]=0;
+								else
+									packet_in[10]=0;									// Mark telem with sensor 0=RX
 							}
 							debug("T%d=",send_telem);
 							for(uint8_t i=10;i < HOTT_RX_PACKET_LEN; i++)
diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h
index 5baf326..1803d30 100644
--- a/Multiprotocol/Multiprotocol.h
+++ b/Multiprotocol/Multiprotocol.h
@@ -19,7 +19,7 @@
 #define VERSION_MAJOR		1
 #define VERSION_MINOR		3
 #define VERSION_REVISION	1
-#define VERSION_PATCH_LEVEL	11
+#define VERSION_PATCH_LEVEL	12
 
 //******************
 // Protocols