From 5afdff847716b4ace6d43d7f743b5008830fa398 Mon Sep 17 00:00:00 2001
From: Pascal Langer <pascal_langer@yahoo.fr>
Date: Mon, 28 Jun 2021 18:10:44 +0200
Subject: [PATCH] V911S: Rate channel on CH6 (default is high)

---
 Lua_scripts/MultiChan.txt     |  4 ++--
 Multiprotocol/Multiprotocol.h |  2 +-
 Multiprotocol/V911S_ccnrf.ino |  8 ++++----
 Protocols_Details.md          | 10 ++++++----
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/Lua_scripts/MultiChan.txt b/Lua_scripts/MultiChan.txt
index 943f2c0..69c704e 100644
--- a/Lua_scripts/MultiChan.txt
+++ b/Lua_scripts/MultiChan.txt
@@ -167,8 +167,8 @@
 5,1,V2x2,JXD506,1,Flip,Light,Pict,Video,HLess,StaSto,Emerg,Cam_UD
 48,0,V761,3CH,0,Gyro,Calib,Flip,RtnAct,Rtn
 48,1,V761,4CH,0,Gyro,Calib,Flip,RtnAct,Rtn
-46,0,V911s,V911s,1,Calib
-46,1,V911s,E119,1,Calib
+46,0,V911s,V911s,1,Calib,Rate
+46,1,V911s,E119,1,Calib,Rate
 22,0,WFLY,WFR0xS,0,CH5,CH6,CH7,CH8,CH9
 30,0,WK2x01,WK2801,0,CH5,CH6,CH7,CH8
 30,1,WK2x01,WK2401,0
diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h
index bd13f7a..829f5aa 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	86
+#define VERSION_PATCH_LEVEL	87
 
 #define MODE_SERIAL 0
 
diff --git a/Multiprotocol/V911S_ccnrf.ino b/Multiprotocol/V911S_ccnrf.ino
index 8201659..bb25159 100644
--- a/Multiprotocol/V911S_ccnrf.ino
+++ b/Multiprotocol/V911S_ccnrf.ino
@@ -30,7 +30,7 @@
 
 // flags going to packet[1]
 #define	V911S_FLAG_EXPERT	0x04
-#define	E119_FLAG_EXPERT	0x08
+#define	E119_FLAG_EXPERT	0x08	//0x00 low, 0x08 high
 #define	E119_FLAG_CALIB		0x40
 // flags going to packet[2]
 #define	V911S_FLAG_CALIB	0x01
@@ -66,12 +66,12 @@ static void __attribute__((unused)) V911S_send_packet()
 		memset(packet+1, 0x00, V911S_PACKET_SIZE - 1);
 		if(sub_protocol==V911S_STD)
 		{
-			packet[ 1]=V911S_FLAG_EXPERT;					// short press on left button
+			packet[ 1]=GET_FLAG(!CH6_SW,V911S_FLAG_EXPERT);	// short press on left button
 			packet[ 2]=GET_FLAG(CH5_SW,V911S_FLAG_CALIB);	// long  press on right button
 		}
 		else
-			packet[ 1]=E119_FLAG_EXPERT						// short  press on left button
-					  |GET_FLAG(CH5_SW,E119_FLAG_CALIB);	// short  press on right button
+			packet[ 1]=GET_FLAG(!CH6_SW,E119_FLAG_EXPERT)	// short  press on left button
+					  |GET_FLAG( CH5_SW,E119_FLAG_CALIB);	// short  press on right button
 			
 		//packet[3..6]=trims TAER signed
 		uint16_t ch=convert_channel_16b_limit(THROTTLE ,0,0x7FF);
diff --git a/Protocols_Details.md b/Protocols_Details.md
index e9e75a8..afd4ea4 100644
--- a/Protocols_Details.md
+++ b/Protocols_Details.md
@@ -1265,15 +1265,17 @@ MODE: -100% level, +100% acro
 
 ## V911S - *46*
 
-CH1|CH2|CH3|CH4|CH5
----|---|---|---|---
-A|E|T|R|CALIB
+CH1|CH2|CH3|CH4|CH5|CH6
+---|---|---|---|---|---
+A|E|T|R|CALIB|RATE
+
+Rate: -100% High, +100% Low
 
 ### Sub_protocol V911S - *0*
 Models: WLtoys V911S, XK A110
 
 ### Sub_protocol E119 - *1*
-Models: Eachine E119
+Models: Eachine E119, JJRC W01-J3
 
 ## XK - *62*