XK2 low batt telemetry

2025-12-13 19:13:14 +00:00 · 2025-03-28 19:13:13 +01:00
parent d3e5acf704
commit f538884d48
5 changed files with 81 additions and 32 deletions
--- a/Multiprotocol/FX_nrf24l01.ino
+++ b/Multiprotocol/FX_nrf24l01.ino
@@ -34,13 +34,12 @@ Multiprotocol is distributed in the hope that it will be useful,
 #define FX620_CH_OFFSET				1

 #define FX9630_PACKET_PERIOD		8124	//8156 on QIDI-560
-#define FX9630_BIND_PACKET_PERIOD	8124
 #define FX9630_BIND_CHANNEL			51
 #define FX9630_PAYLOAD_SIZE			8
 #define FX9630_NUM_CHANNELS			3
 #define FX9630_WRITE_TIME			500

-#define FX_QF012_BIND_PACKET_PERIOD	12194
+#define FX_QF012_PACKET_PERIOD		12194
 #define FX_QF012_RX_PAYLOAD_SIZE	3

 //#define FORCE_FX620_ID
@@ -199,7 +198,7 @@ static void __attribute__((unused)) FX_RF_init()
 	{
 		XN297_SetTXAddr((uint8_t *)"\x56\x78\x90\x12", 4);
 		XN297_RFChannel(FX9630_BIND_CHANNEL);
-		packet_period = sub_protocol == FX_QF012 ? FX_QF012_BIND_PACKET_PERIOD : FX9630_BIND_PACKET_PERIOD;
+		packet_period = sub_protocol == FX_QF012 ? FX_QF012_PACKET_PERIOD : FX9630_PACKET_PERIOD;
 		packet_length = FX9630_PAYLOAD_SIZE;
 	}
 }
@@ -291,7 +290,7 @@ uint16_t FX_callback()
 					{//Good CRC
 						//packets: A5 00 11 -> A5 01 11
 						telemetry_link = 1;
-						v_lipo1 = packet_in[1] == 0x01 ? 60:81;		// low voltage
+						v_lipo1 = packet_in[1] ? 60:81;		// low voltage 3.7V
 						#if 0
 							for(uint8_t i=0; i < FX_QF012_RX_PAYLOAD_SIZE; i++)
 								debug(" %02X", packet_in[i]);
--- a/Multiprotocol/Multiprotocol.h
+++ b/Multiprotocol/Multiprotocol.h
@@ -19,7 +19,7 @@
 #define VERSION_MAJOR		1
 #define VERSION_MINOR		3
 #define VERSION_REVISION	4
-#define VERSION_PATCH_LEVEL	48
+#define VERSION_PATCH_LEVEL	49

 #define MODE_SERIAL 0

--- a/Multiprotocol/XK2_ccnrf.ino
+++ b/Multiprotocol/XK2_ccnrf.ino
@@ -21,19 +21,30 @@ Multiprotocol is distributed in the hope that it will be useful,
 //#define FORCE_XK2_ID
 //#define FORCE_XK2_P10_ID

-#define XK2_RF_BIND_CHANNEL	71
+#define XK2_RF_BIND_CHANNEL		71
 #define XK2_P10_RF_BIND_CHANNEL	69
-#define XK2_PAYLOAD_SIZE	9
-#define XK2_PACKET_PERIOD	4911
-#define XK2_RF_NUM_CHANNELS	4
+#define XK2_PAYLOAD_SIZE		9
+#define XK2_PACKET_PERIOD		4911
+#define XK2_RF_NUM_CHANNELS		4
+#define XK2_WRITE_TIME			1000

 enum {
 	XK2_BIND1,
 	XK2_BIND2,
 	XK2_DATA_PREP,
-	XK2_DATA
+	XK2_DATA,
+	XK2_RX,
 };

+static uint8_t __attribute__((unused)) XK2_checksum(uint8_t init)
+{
+	for(uint8_t i=0; i<XK2_PAYLOAD_SIZE-1; i++)
+		init += packet[i];
+	if(sub_protocol == XK2_P10)
+		init += 0x10;
+	return init;
+}
+
 static void __attribute__((unused)) XK2_send_packet()
 {
 	static uint8_t trim_ch=0;
@@ -47,8 +58,6 @@ static void __attribute__((unused)) XK2_send_packet()
 		//memcpy(&packet[4], rx_id     , 3);
 		//Unknown
 		packet[7] = 0x00;
-		//Checksum seed
-		packet[8] = 0xC0;
 	}
 	else
 	{
@@ -77,19 +86,13 @@ static void __attribute__((unused)) XK2_send_packet()
 			packet[5] |= 0x10;											//Gyro off (senior mode)
 		else if(Channel_data[CH6] > CHANNEL_MIN_COMMAND)
 			packet[5] |= 0x08;											//3D
-
-		//Telemetry not received=00, Telemetry received=01 but sometimes switch to 1 even if telemetry is not there...
-		packet[6] = 0x00;
+		//Requiest telemetry flag
+		packet[6] = 0x01;
 		//RXID checksum
 		packet[7] = crc8;												//Sum RX_ID[0..2]
-		//Checksum seed
-		packet[8] = num_ch;												//Based on TX ID
 	}
 	//Checksum
-	for(uint8_t i=0; i<XK2_PAYLOAD_SIZE-1; i++)
-		packet[8] += packet[i];
-	if(sub_protocol == XK2_P10)
-		packet[8] += 0x10;
+	packet[8] = XK2_checksum(IS_BIND_IN_PROGRESS ? 0xC0 : num_ch);

 	// Send
 	XN297_SetFreqOffset();
@@ -160,6 +163,8 @@ static void __attribute__((unused)) XK2_initialize_txid()

 uint16_t XK2_callback()
 {
+	static bool rx = false;
+
 	switch(phase)
 	{
 		case XK2_BIND1:
@@ -178,13 +183,8 @@ uint16_t XK2_callback()
 						debug(" %02X",packet[i]);
 					debugln("");
 				#endif
-				crc8 = 0xBF;
-				for(uint8_t i=0; i<XK2_PAYLOAD_SIZE-1; i++)
-					crc8 += packet[i];
-				if(sub_protocol == XK2_P10)
-					crc8 += 0x10;
-				if(crc8 != packet[8])
-				{
+				if(XK2_checksum(0xBF) != packet[8])
+				{//Wrong checksum
 					phase = XK2_BIND1;
 					return 1000;
 				}
@@ -209,23 +209,67 @@ uint16_t XK2_callback()
 			XN297_SetTxRxMode(TXRX_OFF);
 			XN297_SetTxRxMode(TX_EN);
 			XN297_SetTXAddr(rx_tx_addr, 5);
+	#ifdef XK2_HUB_TELEMETRY
+			XN297_SetRXAddr(rx_tx_addr, XK2_PAYLOAD_SIZE);
+	#endif
 			BIND_DONE;
 			phase++;
 		case XK2_DATA:
 			#ifdef MULTI_SYNC
 				telemetry_set_input_sync(XK2_PACKET_PERIOD);
 			#endif
+	#ifdef XK2_HUB_TELEMETRY
+			rx = XN297_IsRX();
+			XN297_SetTxRxMode(TXRX_OFF);
+	#endif
+			XK2_send_packet();
+	#ifdef XK2_HUB_TELEMETRY
+			if(rx)
+			{
+				XN297_ReadPayload(packet, XK2_PAYLOAD_SIZE);
+				#if 0
+					debug("RX");
+					for(uint8_t i=0; i<XK2_PAYLOAD_SIZE; i++)
+						debug(" %02X",packet[i]);
+					debugln("");
+				#endif
+				if(XK2_checksum(0xCC) == packet[8] && memcmp(packet, rx_tx_addr, 3) == 0)
+				{//Good checksum and TXID
+					//packets: E5 20 F2 00 00 00 00 00 C3 -> E5 20 F2 80 00 00 00 00 43
+					telemetry_link = 1;
+					v_lipo1 = packet[3] ? 137:162;		// low voltage 7.1V
+				}
+			}
+	#endif
 			if(bind_counter)
 			{
 				bind_counter--;
 				if(bind_counter == 0)
-				{
 					phase = XK2_DATA_PREP;
-					//phase = XK2_BIND1;
-				}
+				break;
 			}
-			XK2_send_packet();
+	#ifndef XK2_HUB_TELEMETRY
 			break;
+	#else
+			phase++;
+			return XK2_WRITE_TIME;
+		default: //XK2_RX
+			/*{ // Wait for packet to be sent before switching to receive mode
+				uint16_t start=(uint16_t)micros(), count=0;
+				while ((uint16_t)((uint16_t)micros()-(uint16_t)start) < 500)
+				{
+					if(XN297_IsPacketSent())
+						break;
+					count++;
+				}
+				debugln("%d",count);
+			}*/
+			//Switch to RX
+			XN297_SetTxRxMode(TXRX_OFF);
+			XN297_SetTxRxMode(RX_EN);
+			phase = XK2_DATA;
+			return XK2_PACKET_PERIOD-XK2_WRITE_TIME;
+	#endif
 	}
 	return XK2_PACKET_PERIOD;
 }
@@ -242,6 +286,9 @@ void XK2_init()
 		phase = XK2_DATA_PREP;
 	bind_counter = 0;
 	hopping_frequency_no = 0;
+	#ifdef XK2_HUB_TELEMETRY
+		RX_RSSI = 100;		// Dummy value
+	#endif
 }

 #endif
--- a/Multiprotocol/_Config.h
+++ b/Multiprotocol/_Config.h
@@ -350,6 +350,7 @@
 #define V761_HUB_TELEMETRY			// Use FrSkyD Hub format to send telemetry to TX
 #define KAMTOM_HUB_TELEMETRY		// Use FrSkyD Hub format to send telemetry to TX
 #define FX_HUB_TELEMETRY			// Use FrSkyD Hub format to send telemetry to TX
+#define XK2_HUB_TELEMETRY			// Use FrSkyD Hub format to send telemetry to TX
 #define YUXIANG_HUB_TELEMETRY		// Use FrSkyD Hub format to send telemetry to TX
 #define PROPEL_HUB_TELEMETRY		// Use FrSkyD Hub format to send telemetry to TX
 #define CABELL_HUB_TELEMETRY		// Use FrSkyD Hub format to send telemetry to TX