From 58ed8ca60f4a83c796092da94a7983ded9ffacf2 Mon Sep 17 00:00:00 2001
From: Pascal Langer <pascal_langer@yahoo.fr>
Date: Thu, 27 May 2021 19:01:08 +0200
Subject: [PATCH] Mould King: Analog and digital sub protocols

---
 Lua_scripts/MultiChan.txt          |  3 +-
 Multiprotocol/Losi_cyrf6936.ino    |  5 ++-
 Multiprotocol/MouldKg_nrf24l01.ino | 70 +++++++++++++++++++-----------
 Multiprotocol/Multi.txt            |  2 +-
 Multiprotocol/Multi_Protos.ino     |  3 +-
 Multiprotocol/Multiprotocol.h      |  8 +++-
 Multiprotocol/_Config.h            |  3 +-
 Protocols_Details.md               | 10 ++++-
 8 files changed, 70 insertions(+), 34 deletions(-)

diff --git a/Lua_scripts/MultiChan.txt b/Lua_scripts/MultiChan.txt
index b968d16..943f2c0 100644
--- a/Lua_scripts/MultiChan.txt
+++ b/Lua_scripts/MultiChan.txt
@@ -194,4 +194,5 @@
 85,0,E016H,Std,1,Stop,Flip,n-a,HLess,RTH
 87,0,IKEA
 89,0,LOSI
-90,0,MouldKg,Std,E,F
\ No newline at end of file
+90,0,MouldKg,Analog
+90,1,MouldKg,Digit,E,F
\ No newline at end of file
diff --git a/Multiprotocol/Losi_cyrf6936.ino b/Multiprotocol/Losi_cyrf6936.ino
index e504ff4..114b09f 100644
--- a/Multiprotocol/Losi_cyrf6936.ino
+++ b/Multiprotocol/Losi_cyrf6936.ino
@@ -121,14 +121,15 @@ uint16_t LOSI_callback()
 void LOSI_init()
 {
 	LOSI_cyrf_init();
-	CYRF_FindBestChannels(hopping_frequency, 1, 0, 0x13, 75);	// 75 is unknown since dump stops at 0x27, this routine resets the CRC Seed to 0
-	CYRF_ConfigRFChannel(hopping_frequency[0] | 1);				// Only odd channels
+	//CYRF_FindBestChannels(hopping_frequency, 1, 0, 0x13, 75);	// 75 is unknown since dump stops at 0x27, this routine resets the CRC Seed to 0
+	//CYRF_ConfigRFChannel(hopping_frequency[0] | 1);				// Only odd channels
 
 	#ifdef LOSI_FORCE_ID
 		rx_tx_addr[0] = 0x47;
 		rx_tx_addr[1] = 0x52;
 		rx_tx_addr[2] = 0xAE;
 		rx_tx_addr[3] = 0xAA;
+		CYRF_ConfigRFChannel(0x27);
 	#endif
 
 	if(IS_BIND_IN_PROGRESS)
diff --git a/Multiprotocol/MouldKg_nrf24l01.ino b/Multiprotocol/MouldKg_nrf24l01.ino
index 53e38bb..c1eeb6c 100644
--- a/Multiprotocol/MouldKg_nrf24l01.ino
+++ b/Multiprotocol/MouldKg_nrf24l01.ino
@@ -22,7 +22,8 @@ Multiprotocol is distributed in the hope that it will be useful,
 #define MOULDKG_BIND_PACKET_PERIOD	12000
 #define MOULDKG_TX_BIND_CHANNEL		11
 #define MOULDKG_RX_BIND_CHANNEL		76
-#define MOULDKG_PAYLOAD_SIZE		5
+#define MOULDKG_PAYLOAD_SIZE_DIGIT	5
+#define MOULDKG_PAYLOAD_SIZE_ANALOG	10
 #define MOULDKG_BIND_PAYLOAD_SIZE	7
 #define MOULDKG_BIND_COUNT			300
 #define MOULDKG_RF_NUM_CHANNELS		4
@@ -35,6 +36,7 @@ enum {
 
 static void __attribute__((unused)) MOULDKG_send_packet()
 {
+	uint8_t len = MOULDKG_BIND_PAYLOAD_SIZE;
 	memcpy(&packet[1],rx_tx_addr,3);
 	if(IS_BIND_IN_PROGRESS)
 	{
@@ -45,41 +47,52 @@ static void __attribute__((unused)) MOULDKG_send_packet()
 	{
 		XN297_RFChannel(hopping_frequency[(packet_count>>1)&0x03]);
 
-		uint8_t val=0;
-		if(packet_count&1==0)
+		if(sub_protocol == MOULDKG_ANALOG)
 		{
-			packet[0] = 0x31;
-			//Button B
-			if(Channel_data[CH2]>CHANNEL_MAX_COMMAND) val |= 0x40;
-			else if(Channel_data[CH2]<CHANNEL_MIN_COMMAND) val |= 0x80;
-			//Button C
-			if(Channel_data[CH3]>CHANNEL_MAX_COMMAND) val |= 0x10;
-			else if(Channel_data[CH3]<CHANNEL_MIN_COMMAND) val |= 0x20;
+			packet[0] = 0x36;
+			uint8_t ch[]={ 1,0,2,3 };
+			for(uint8_t i=0;i<4;i++)
+				packet[i+4] = convert_channel_8b(ch[i]);
+			len = MOULDKG_PAYLOAD_SIZE_ANALOG;
 		}
 		else
-		{
-			packet[0] = 0x30;
-			val = 0x60
-				| GET_FLAG(CH5_SW, 0x80)	// Button E
-				| GET_FLAG(CH6_SW, 0x10);	// Button F
-		}
-		//Button A
-		if(Channel_data[CH1]>CHANNEL_MAX_COMMAND) val |= 0x01;
-		else if(Channel_data[CH1]<CHANNEL_MIN_COMMAND) val |= 0x02;
-		//Button D
-		if(Channel_data[CH4]>CHANNEL_MAX_COMMAND) val |= 0x04;
-		else if(Channel_data[CH4]<CHANNEL_MIN_COMMAND) val |= 0x08;
-		packet[4]= val;
+		{//DIGIT
+			len = MOULDKG_PAYLOAD_SIZE_DIGIT;
+			uint8_t val=0;
+			if(packet_count&1)
+			{
+				packet[0] = 0x31;
+				//Button B
+				if(Channel_data[CH2]>CHANNEL_MAX_COMMAND) val |= 0x40;
+				else if(Channel_data[CH2]<CHANNEL_MIN_COMMAND) val |= 0x80;
+				//Button C
+				if(Channel_data[CH3]>CHANNEL_MAX_COMMAND) val |= 0x10;
+				else if(Channel_data[CH3]<CHANNEL_MIN_COMMAND) val |= 0x20;
+			}
+			else
+			{
+				packet[0] = 0x30;
+				val = 0x60
+					| GET_FLAG(CH5_SW, 0x80)	// Button E
+					| GET_FLAG(CH6_SW, 0x10);	// Button F
+			}
+			//Button A
+			if(Channel_data[CH1]>CHANNEL_MAX_COMMAND) val |= 0x01;
+			else if(Channel_data[CH1]<CHANNEL_MIN_COMMAND) val |= 0x02;
+			//Button D
+			if(Channel_data[CH4]>CHANNEL_MAX_COMMAND) val |= 0x04;
+			else if(Channel_data[CH4]<CHANNEL_MIN_COMMAND) val |= 0x08;
+			packet[4]= val;
 
-		packet_count++;
+			packet_count++;
+		}
 	}
 
 	// Send
 	XN297_SetPower();
 	XN297_SetTxRxMode(TX_EN);
-	XN297_WritePayload(packet, IS_BIND_IN_PROGRESS?MOULDKG_BIND_PAYLOAD_SIZE:MOULDKG_PAYLOAD_SIZE);
+	XN297_WritePayload(packet, len);
 	#if 0
-		uint8_t len = IS_BIND_IN_PROGRESS?MOULDKG_BIND_PAYLOAD_SIZE:MOULDKG_PAYLOAD_SIZE;
 		for(uint8_t i=0; i < len; i++)
 			debug("%02X ", packet[i]);
 		debugln();
@@ -170,3 +183,8 @@ void MOULDKG_init()
 }
 
 #endif
+
+// Analog
+// Bind TX: C=11 S=Y A= 4B 44 48 P(7)= C0 46 01 00 00 00 00
+// Bind RX: 5A 46 01 00 63 82 4E
+// Norm: C=15 S=Y A= 63 82 4E P(10)= 36 46 01 00 80 80 80 80 00 00
\ No newline at end of file
diff --git a/Multiprotocol/Multi.txt b/Multiprotocol/Multi.txt
index 590275e..5191177 100644
--- a/Multiprotocol/Multi.txt
+++ b/Multiprotocol/Multi.txt
@@ -85,4 +85,4 @@
 85,E016H
 87,IKEA
 89,Losi
-90,MouldKg
\ No newline at end of file
+90,MouldKg,Analog,Digit
\ No newline at end of file
diff --git a/Multiprotocol/Multi_Protos.ino b/Multiprotocol/Multi_Protos.ino
index 060892b..650ec09 100644
--- a/Multiprotocol/Multi_Protos.ino
+++ b/Multiprotocol/Multi_Protos.ino
@@ -158,6 +158,7 @@ const char STR_SUBTYPE_REALACC[] =    "\x03""R11";
 const char STR_SUBTYPE_KYOSHO[] =     "\x04""FHSS""Hype";
 const char STR_SUBTYPE_FUTABA[] =     "\x05""SFHSS";
 const char STR_SUBTYPE_JJRC345[] =    "\x08""JJRC345\0""SkyTmblr";
+const char STR_SUBTYPE_MOULKG[] =     "\x06""Analog""Digit\0";
 
 #define NO_SUBTYPE		nullptr
 
@@ -367,7 +368,7 @@ const mm_protocol_definition multi_protocols[] = {
 		{PROTO_MLINK,      STR_MLINK,     NO_SUBTYPE,            0, OPTION_NONE,    1, 0, SW_CYRF,   MLINK_init,      MLINK_callback      },
 	#endif
 	#if defined(MOULDKG_NRF24L01_INO)
-		{PROTO_MOULDKG,    STR_MOULDKG,   NO_SUBTYPE,            0, OPTION_NONE,    0, 0, SW_NRF,    MOULDKG_init,    MOULDKG_callback    },
+		{PROTO_MOULDKG,    STR_MOULDKG,   STR_SUBTYPE_MOULKG,    2, OPTION_NONE,    0, 0, SW_NRF,    MOULDKG_init,    MOULDKG_callback    },
 	#endif
 	#if defined(MT99XX_CCNRF_INO)
 		{PROTO_MT99XX,     STR_MT99XX,    STR_SUBTYPE_MT99,      7, OPTION_NONE,    0, 0, SW_NRF,    MT99XX_init,     MT99XX_callback     },
diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h
index 0d08e67..3567b0a 100644
--- a/Multiprotocol/Multiprotocol.h
+++ b/Multiprotocol/Multiprotocol.h
@@ -19,7 +19,7 @@
 #define VERSION_MAJOR		1
 #define VERSION_MINOR		3
 #define VERSION_REVISION	2
-#define VERSION_PATCH_LEVEL	83
+#define VERSION_PATCH_LEVEL	84
 
 #define MODE_SERIAL 0
 
@@ -440,6 +440,12 @@ enum RLINK
 	RLINK_DUMBORC	= 2,
 };
 
+enum MOULDKG
+{
+	MOULDKG_ANALOG	= 0,
+	MOULDKG_DIGIT	= 1,
+};
+
 #define NONE 		0
 #define P_HIGH		1
 #define P_LOW		0
diff --git a/Multiprotocol/_Config.h b/Multiprotocol/_Config.h
index 5eb53d2..7fadddc 100644
--- a/Multiprotocol/_Config.h
+++ b/Multiprotocol/_Config.h
@@ -728,7 +728,8 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]=	{
 	PROTO_MLINK
 		NONE
 	PROTO_MOULDKG
-		NONE
+		MOULDKG_ANALOG
+		MOULDKG_DIGIT
 	PROTO_MT99XX
 		MT99
 		H7
diff --git a/Protocols_Details.md b/Protocols_Details.md
index 97ffa30..59ce912 100644
--- a/Protocols_Details.md
+++ b/Protocols_Details.md
@@ -117,7 +117,7 @@ CFlie|38|CFlie||||||||NRF24L01|
 [Losi](Protocols_Details.md#Losi---89)|89|||||||||CYRF6936|
 [MJXq](Protocols_Details.md#MJXQ---18)|18|WLH08|X600|X800|H26D|E010*|H26WH|PHOENIX*||NRF24L01|XN297
 [MLINK](Protocols_Details.md#MLINK---78)|78|||||||||CYRF6936|
-[MouldKg](Protocols_Details.md#mouldkg---90)|90|||||||||NRF24L01|XN297
+[MouldKg](Protocols_Details.md#mouldkg---90)|90|Analog|Digit|||||||NRF24L01|XN297
 [MT99xx](Protocols_Details.md#MT99XX---17)|17|MT|H7|YZ|LS|FY805|A180|DRAGON||NRF24L01|XN297
 [NCC1701](Protocols_Details.md#NCC1701---44)|44|||||||||NRF24L01|
 [OMP](Protocols_Details.md#OMP---77)|77|||||||||CC2500&NRF24L01|XN297L
@@ -1707,6 +1707,14 @@ CH16| CH8 | -100% | 0% | - | - | -
 ## MouldKg - *90*
 Mould King 2.4GHz TX: Technic Brick models
 
+### Sub_protocol Analog - *0*
+
+CH1|CH2|CH3|CH4
+---|---|---|---
+A|B|C|D
+
+### Sub_protocol Digit - *1*
+
 CH1|CH2|CH3|CH4|CH5|CH6
 ---|---|---|---|---|---
 A|B|C|D|E|F