diff --git a/.wordlist.txt b/.wordlist.txt
index 44b2a6cfb..53019105e 100644
--- a/.wordlist.txt
+++ b/.wordlist.txt
@@ -533,4 +533,6 @@ README
USPTO
Squadding
UAV
-UAVfutures
\ No newline at end of file
+UAVfutures
+Ardupilot
+Emuflight
\ No newline at end of file
diff --git a/docs/assets/images/armingSwitch01.png b/docs/assets/images/armingSwitch01.png
new file mode 100644
index 000000000..36f136f94
Binary files /dev/null and b/docs/assets/images/armingSwitch01.png differ
diff --git a/docs/assets/images/armingSwitch02.png b/docs/assets/images/armingSwitch02.png
new file mode 100644
index 000000000..6b966c72c
Binary files /dev/null and b/docs/assets/images/armingSwitch02.png differ
diff --git a/docs/assets/images/armingSwitch03.png b/docs/assets/images/armingSwitch03.png
new file mode 100644
index 000000000..5549f2d5a
Binary files /dev/null and b/docs/assets/images/armingSwitch03.png differ
diff --git a/docs/assets/images/armingSwitch04.png b/docs/assets/images/armingSwitch04.png
new file mode 100644
index 000000000..c047dadd1
Binary files /dev/null and b/docs/assets/images/armingSwitch04.png differ
diff --git a/docs/quick-start/transmitters/tx-prep.md b/docs/quick-start/transmitters/tx-prep.md
index 01a22f887..e2192999b 100644
--- a/docs/quick-start/transmitters/tx-prep.md
+++ b/docs/quick-start/transmitters/tx-prep.md
@@ -347,3 +347,49 @@ By default, a fresh model does not have any Aux Channels configured (Aux channel

+
+### V4.0 Arming Options
+
+Starting with ExpressLRS v4.0.0 an additional Arming method is introduced.
+
+The traditional Arming method, via Channel 5 (Aux1) driven by EdgeTX Channel Mixer 5 is the default and is still encouraged to be used by majority of FPV pilots using Betaflight, INAV or Ardupilot (and their respective derivatives like Emuflight, etc.). This will now be called **Arm using CH5**.
+
+The alternative Arming method **Arm using Switch** doesn’t use CH5 /to communicate the user's Arming request to the TX module. This means your Channel 5 will be free for other functions, like controlling gains on your stabilizer, or changing flight modes, or as a regular full proportional channel when using any of the Full Resolution packet rates and Modes. **Arm using Switch** is performed by user selected sources, e.g. physical or logical switches, anything EdgeTX offers as a source really. **Arm using Switch** works for all packet rates and switch modes but is especially useful for full res packet rates in combination with PWM receivers. No more “remapping CH5” required to use CH5 as a regular proportional control channel. **Arm using Switch** can be enabled in the EdgeTX Internal/External RF Model Setup menu by changing “Arm using” to “Switch”.
+
+
+!!! Note **Arm using Switch** Requirements
+ Arming Mode Switch **requires** EdgeTX version 2.11 or newer and ExpressLRS version 4.0 or newer. If you cannot find the "Arm using" option you need to update your EdgeTX firmware.
+
+#### How to set up Arming Mode Switch:
+
+1. Press the ++"MDL"++ Key.
+ - Older Radios or those with only one Menu Key will need to short-press the ++context-menu++ Key to access the Model Menu.
+ - Consult your Radio User's Manual on how to get to the Model Menu.
+2. Press the ++"PAGE"++ Key until you reach the Model Setup Page.
+ - On radios with Colored screens, this should be the first page when you activate the Model Menu.
+ - On radios with Monochrome screens, this should be the second page upon activating the Model Menu.
+3. Scroll down until you reach the Internal or External RF settings, depending on which module you want to use for this model.
+ - Color screen radios provide separate pages for these.
+ - On Monochrome screens, the options are all in one page.
+4. Short-press the scroll-wheel button or press the ++enter++ Key and change the setting to "Switch"
+
+ 
+
+
+
+ 
+
+
+5. Press the ++enter++ Key to apply your selection.
+6. Use the scroll-wheel and set your new arming switch. It can be any switch on the radio, a Logical Switch or any source.
+
+
+ 
+
+
+
+ 
+
+
+7. Press the ++enter++ Key once more to set the switch.
+8. Press ++"RTN"++ Key once your done with your changes.
\ No newline at end of file
diff --git a/docs/software/switch-config.md b/docs/software/switch-config.md
index e72fdbbdc..1e4324d32 100644
--- a/docs/software/switch-config.md
+++ b/docs/software/switch-config.md
@@ -6,7 +6,7 @@ description: To optimize the performance of ExpressLRS, it has different Switch

!!! warning "WARNING"
- **Put your arm switch on AUX1**, and set it as **~1000 is disarmed, ~2000 is armed**.
+ IF you're using Arming Mode CH5, **put your arm switch on AUX1**, and set it as **~1000 is disarmed, ~2000 is armed**.
## Summary of Switch Configuration Modes
@@ -18,11 +18,11 @@ This table summarizes the switch configuration modes, available channel switch p
| 2 | Sticks | **Normal Range** | **Normal Range** | **CRSF Ext Limits** | CRSF Ext LimitsH | **CRSF Ext Limits** |
| 3 | Sticks | **Normal Range** | **Normal Range** | **CRSF Ext Limits** | CRSF Ext LimitsH | **CRSF Ext Limits** |
| 4 | Sticks | **Normal Range** | **Normal Range** | **CRSF Ext Limits** | CRSF Ext LimitsH | **CRSF Ext Limits** |
-| 5 | Aux 1 | **2-pos Arm** | **2-pos Arm** | **2-pos Arm** | CRSF Ext LimitsH Arm | **2-pos Arm** |
+| 5 | Aux 1 | **2-pos Arm** | **2-pos Arm** | CRSF Ext LimitsH Arm* | CRSF Ext LimitsH Arm | CRSF Ext LimitsH Arm* |
| 6 | Aux 2 | *6-pos*RR | *64/128 -pos*RR | **CRSF Ext Limits** | CRSF Ext LimitsH | CRSF Ext LimitsH |
| 7 | Aux 3 | *6-pos*RR | *64/128 -pos*RR | **CRSF Ext Limits** | CRSF Ext LimitsH | CRSF Ext LimitsH |
| 8 | Aux 4 | *6-pos*RR | *64/128 -pos*RR | **CRSF Ext Limits** | CRSF Ext LimitsH | CRSF Ext LimitsH |
-| 9 | Aux 5 | *6-pos*RR | *64/128 -pos*RR | **CRSF Ext Limits** | CRSF Ext LimitsH | CRSF Ext LimitsH |
+| 9 | Aux 5 | *6-pos*RR | *64/128 -pos*RR | - | CRSF Ext LimitsH | - |
| 10 | Aux 6 | *6-pos*RR | *64/128 -pos*RR | - | CRSF Ext LimitsH | CRSF Ext LimitsH |
| 11 | Aux 7 | *6-pos*RR | *64/128 -pos*RR | - | CRSF Ext LimitsH | CRSF Ext LimitsH |
| 12 | Aux 8 | *16-pos*RR | *64/128 -pos*RR | - | CRSF Ext LimitsH | CRSF Ext LimitsH |
@@ -31,6 +31,8 @@ This table summarizes the switch configuration modes, available channel switch p
| 15 | Aux 11 | - | - | - | CRSF Ext LimitsH | - |
| 16 | Aux 12 | - | - | - | CRSF Ext LimitsH | - |
| | Packet Rates | 50 thru F1000 | 50 thru F1000 | 100&333 Only | 100&333 Only | 100&333 Only |
+
+* v4.0 changes, with the introduction of the new arming methods
### Switch Position / Channel Resolution
@@ -45,7 +47,7 @@ This table summarizes the switch configuration modes, available channel switch p
!!! warning "WARNING"
- **Put your arm switch on AUX1**, and set it as **~1000 is disarmed, ~2000 is armed**.
+ IF you're using Arming Mode CH5, **put your arm switch on AUX1**, and set it as **~1000 is disarmed, ~2000 is armed**.
!!! note
If using a receiver with PWM outputs and you would like to use the PWM output 5 on the receiver for a servo, gear, etc. Go into the WiFi interface of the receiver and map any of the other channels to PWM Output 5. Please always still use AUX1 for the 2-pos Arm switch.