Yuxiang remove CH8

pascallanger · Jan 16, 2025 · 8db90fb · 8db90fb
1 parent 406f5fe
commit 8db90fb
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/Lua_scripts/MultiChan.txt b/Lua_scripts/MultiChan.txt
@@ -221,4 +221,4 @@
 97,1,SGF22,F22S,1,Mode,Flip,LED,Pict,Video,TrRes
 61,0,EazyRC
 98,0,Kyosho3,ASF,0
-100,0,YuXiang,Std,0,Lock,Rate,Land,AltHol,Manual,Flip,Mode,Pitch
+100,0,YuXiang,Std,0,Lock,Rate,Land,Manual,Flip,Mode,Pitch
diff --git 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	15
+#define VERSION_PATCH_LEVEL	16
 
 #define MODE_SERIAL 0
 

diff --git a/Multiprotocol/Yuxiang_nrf24l01.ino b/Multiprotocol/Yuxiang_nrf24l01.ino
@@ -64,14 +64,14 @@ static void __attribute__((unused)) YUXIANG_send_packet()
 			| GET_FLAG(telemetry_lost, 0x20)	// No telem
 			| GET_FLAG(!CH5_SW, 0x10)			// Lock
 			| GET_FLAG(CH6_SW, 0x08)			// High
-			| GET_FLAG(CH12_SW, 0x01);			// Screw pitch -> temporary
+			| GET_FLAG(CH11_SW, 0x01);			// Screw pitch -> temporary
 
 	packet[1] = GET_FLAG(CH7_SW, 0x08)			// Land only when unlock
-			| GET_FLAG(CH11_SW, 0x20);			// Mode
+			| GET_FLAG(CH10_SW, 0x20);			// Mode
 
-	packet[2] = GET_FLAG(CH8_SW, 0x02)			// Altitude hold
-			| GET_FLAG(CH9_SW, 0x03)			// Manual
-			| GET_FLAG(CH10_SW, 0x40);			// Flip
+	packet[2] = GET_FLAG(CH5_SW, 0x02)			// Altitude hold set when unlock
+			| GET_FLAG(CH8_SW, 0x01)			// Manual
+			| GET_FLAG(CH9_SW, 0x40);			// Flip
 
 	uint16_t value = convert_channel_16b_limit(AILERON,0,1000);
 	packet[3] = value;

diff --git a/Protocols_Details.md b/Protocols_Details.md
@@ -2190,11 +2190,13 @@ Same channels assignement as above.
 
 ## YuXiang - *100*
 
-**Only 1 TX ID**. Bind might not work... Telemetry is received but content unknown yet.
+Models: E190, F07 UH-1D
 
-CH1|CH2|CH3|CH4|CH5|CH6|CH7|CH8|CH9|CH10|CH11|CH12
----|---|---|---|---|---|---|---|---|---|---|---
-A|E|T|R|LOCK|RATE|LAND|ALTHOL|MANUAL|FLIP|MODE|PITCH
+**Only 2 TX ID, use the RX number to switch**. Work in progress, bind might not work... Telemetry is received but content unknown yet.
+
+CH1|CH2|CH3|CH4|CH5|CH6|CH7|CH8|CH9|CH10|CH11
+---|---|---|---|---|---|---|---|---|---|---
+A|E|T|R|LOCK|RATE|LAND|MANUAL|FLIP|MODE|PITCH
 
 ## ZSX - *52*
 Model: JJRC ZSX-280