diff --git a/docs/assets/hardware/telemetry/jmarple/jfi_telemetry_broadcast.png b/docs/assets/hardware/telemetry/jmarple/jfi_telemetry_broadcast.png
new file mode 100644
index 0000000000..59ee2b816d
Binary files /dev/null and b/docs/assets/hardware/telemetry/jmarple/jfi_telemetry_broadcast.png differ
diff --git a/docs/assets/hardware/telemetry/jmarple/jfi_telemetry_buttons.png b/docs/assets/hardware/telemetry/jmarple/jfi_telemetry_buttons.png
new file mode 100644
index 0000000000..34a8fc2c0f
Binary files /dev/null and b/docs/assets/hardware/telemetry/jmarple/jfi_telemetry_buttons.png differ
diff --git a/docs/assets/hardware/telemetry/jmarple/jfi_telemetry_config.jpg b/docs/assets/hardware/telemetry/jmarple/jfi_telemetry_config.jpg
new file mode 100644
index 0000000000..5ccfca2bce
Binary files /dev/null and b/docs/assets/hardware/telemetry/jmarple/jfi_telemetry_config.jpg differ
diff --git a/docs/assets/hardware/telemetry/jmarple/jfi_telemetry_module.png b/docs/assets/hardware/telemetry/jmarple/jfi_telemetry_module.png
new file mode 100644
index 0000000000..5b268e3d07
Binary files /dev/null and b/docs/assets/hardware/telemetry/jmarple/jfi_telemetry_module.png differ
diff --git a/docs/assets/hardware/telemetry/jmarple/jfi_telemetry_paired.png b/docs/assets/hardware/telemetry/jmarple/jfi_telemetry_paired.png
new file mode 100644
index 0000000000..32cc05f278
Binary files /dev/null and b/docs/assets/hardware/telemetry/jmarple/jfi_telemetry_paired.png differ
diff --git a/docs/assets/hardware/telemetry/jmarple/jfi_telemetry_usage.png b/docs/assets/hardware/telemetry/jmarple/jfi_telemetry_usage.png
new file mode 100644
index 0000000000..647d89d17f
Binary files /dev/null and b/docs/assets/hardware/telemetry/jmarple/jfi_telemetry_usage.png differ
diff --git a/docs/en/SUMMARY.md b/docs/en/SUMMARY.md
index 0264482446..86a1c60563 100644
--- a/docs/en/SUMMARY.md
+++ b/docs/en/SUMMARY.md
@@ -165,7 +165,7 @@
- [AirMind MindPX](flight_controller/mindpx.md)
- [AirMind MindRacer](flight_controller/mindracer.md)
- [ARK Electronics ARKV6X](flight_controller/ark_v6x.md)
- - [ARK FPV Flight Controller](flight_controller/ark_fpv.md)
+ - [ARK FPV Flight Controller](flight_controller/ark_fpv.md)
- [ARK Pi6X Flow Flight Controller](flight_controller/ark_pi6x.md)
- [CUAV X7](flight_controller/cuav_x7.md)
- [CUAV Nora](flight_controller/cuav_nora.md)
@@ -253,7 +253,7 @@
- [GNSS (GPS)](gps_compass/index.md)
- [ARK GPS (CAN)](dronecan/ark_gps.md)
- [ARK SAM GPS](gps_compass/ark_sam_gps.md)
- - [ARK TESEO GPS](dronecan/ark_teseo_gps.md)
+ - [ARK TESEO GPS](dronecan/ark_teseo_gps.md)
- [CUAV NEO 3 GPS](gps_compass/gps_cuav_neo_3.md)
- [CUAV NEO 3 Pro GPS (CAN)](gps_compass/gps_cuav_neo_3pro.md)
- [CUAV NEO 3X GPS (CAN)](gps_compass/gps_cuav_neo_3x.md)
@@ -326,7 +326,9 @@
- [ARK Electron Microhard Serial Telemetry Radio](telemetry/ark_microhard_serial.md)
- [Holybro Microhard P900 Telemetry Radio](telemetry/holybro_microhard_p900_radio.md)
- [CUAV P8 Telemetry Radio](telemetry/cuav_p8_radio.md)
+ - [J.Fi Wireless Telemetry Module](telemetry/jfi_telemetry.md)
- [HolyBro XBP9X - Discontinued](telemetry/holybro_xbp9x_radio.md)
+
- [FrSky Telemetry](peripherals/frsky_telemetry.md)
- [TBS Crossfire (CRSF) Telemetry](telemetry/crsf_telemetry.md)
- [Satellite Comms (Iridium/RockBlock)](advanced_features/satcom_roadblock.md)
@@ -838,4 +840,4 @@
- [1.15 (stable)](releases/1.15.md)
- [1.14](releases/1.14.md)
- [1.13](releases/1.13.md)
- - [1.12](releases/1.12.md)
\ No newline at end of file
+ - [1.12](releases/1.12.md)
diff --git a/docs/en/telemetry/index.md b/docs/en/telemetry/index.md
index 282cb644df..c93f417089 100644
--- a/docs/en/telemetry/index.md
+++ b/docs/en/telemetry/index.md
@@ -10,13 +10,14 @@ PX4 supports a number of types of telemetry radios:
- _HKPilot Telemetry Radio_ (Discontinued)
- _3DR Telemetry Radio_ (Discontinued)
- [Telemetry Wifi](../telemetry/telemetry_wifi.md)
+- [J.Fi Wireless Telemetry Module](../telemetry/jfi_telemetry.md)
- [Microhard Serial Telemetry Radio](../telemetry/microhard_serial.md)
- [ARK Electron Microhard Serial Telemetry Radio](../telemetry/ark_microhard_serial.md)
- [Holybro Microhard P900 Telemetry Radio](../telemetry/holybro_microhard_p900_radio.md)
- CUAV Serial Telemetry Radio
- [CUAV P8 Telemetry Radio](../telemetry/cuav_p8_radio.md)
- XBee Serial Telemetry Radio
- - [HolyBro XBP9X Telemetry Radio](../telemetry/holybro_xbp9x_radio.md) (Discontinued)
+ - [HolyBro XBP9X Telemetry Radio](../telemetry/holybro_xbp9x_radio.md) (Discontinued)
PX4 is protocol compatible with [SiK Radio](../telemetry/sik_radio.md) and will generally work out of the box (though you may need to change/use an appropriate connector).
diff --git a/docs/en/telemetry/jfi_telemetry.md b/docs/en/telemetry/jfi_telemetry.md
new file mode 100644
index 0000000000..1e4e14ddc5
--- /dev/null
+++ b/docs/en/telemetry/jfi_telemetry.md
@@ -0,0 +1,134 @@
+# J.Fi Wireless Telemetry Module
+
+The J.MARPLE [J.Fi telemetry module](https://jmarple.ai/j-fi/) is a compact and lightweight wireless communication device featuring a PCB-integrated antenna or external antenna, enabling seamless telemetry connections between various drone flight controllers (FC) and ground control stations.
+
+This module includes a Pixhawk-standard JST 6-pin `TELEM` connector, ensuring compatibility with all PX4-based flight controllers.
+It supports quick plug-and-play operation to `TELEM1` with default settings, requiring no additional configuration.
+
+The J.Fi telemetry module provides reliable communication up to approximately 500 meters when using a PCB-integrated antenna.
+Operating in the 2.4GHz frequency band, it allows unrestricted global use without regulatory limitations.
+
+
+
+## Where to Buy
+
+- [https://jmarple.ai/j-fi/](https://jmarple.ai/j-fi/)
+
+## Technical Specifications
+
+### Wireless Performance
+
+- **Frequency Band:** 2.4GHz
+- **Speed:** Up to 11 Mbps (adjustable)
+- **Range:** Up to 500 meters (varies upon environments)
+- **Payload Capacity:** Up to 1400 bytes
+
+### Network Schemes
+
+- **Supported Topologies:** 1:1, 1:N, N:N
+- **Collision Management:** Time Slot-Based Response Delay
+
+### User-Friendly Features
+
+- **Buttons:** Pairing and Mode Switching
+- **LED Indicators:** Real-time status updates
+- **Configuration:** Web browser-based setup
+- **Micro USB Port for connecting to PC or GCS**
+
+## Broadcast Communication
+
+With default settings enabled, the device automatically broadcasts data to all nearby J.Fi devices.
+Connect your external device or system to the **Broadcast port**.
+No additional setup is required.
+
+
+
+## Paired Communication
+
+- Modules must first undergo an initial pairing procedure.
+- Once paired, communication is _restricted to paired J.Fi devices_. Connect your external device or system to the **Pair port.**
+
+
+
+### 1:1 Pairing
+
+
+
+- On **each device,** press and hold _button A_, then click the _RST button_.
+ Release _button A_ when _LED 1_ blinks.
+ - Both devices will enter pairing mode
+- Choose one module and double-click _button A_
+- On the other module, click _button A_ once
+- On the first module, click _button A_ once again to finish pairing
+ - Pairing complete
+
+### 1:N Pairing
+
+- On **each device,** press and hold _button A_, then click the _RST button_.
+ Release _button A_ when _LED 1_ blinks.
+ - All devices will enter pairing mode
+- **Host module (1):** Double-click _button A_
+- **Client modules (N):** Click _button A_ once on each module to pair
+- **Host module (1):** Click _button A_ again to finish pairing
+ - Pairing complete.
+
+
+
+## PX4 Setup
+
+PX4 is plug-and-play with J.Fi if connected to the `TELEM1` port, and should connect without further connection.
+
+If you want to use another port you will need to assign a MAVLink instance to the serial port (see [MAVLink Peripherals (GCS/OSD/Companion)](../peripherals/mavlink_peripherals.md)) (and possibly unassign whatever is currently using the port).
+
+### One-to-one (1:1) Setups
+
+The `TELEM1` port is set to use `57600` as the baud rate by default (and J.Fi is set to match).
+This default baud rate is calibrated for inexpensive low-power telemetry radios.
+While this should be sufficient for 1:1 setups, J.Fi will work with much higher rates (i.e., `115200`).
+
+If you want to change the baud rate:
+
+1. Change [SER_TEL1_BAUD](../advanced_config/parameter_reference.md#SER_TEL1_BAUD) if you're using the `TELEM1` port (see [Serial Port Configuration](../peripherals/serial_configuration.md) for other ports).
+2. Update the baud rate in the [J.Fi Configuration](#j-fi-configuration) to match.
+
+### One-to-many (1:N) Setups
+
+For one-to-many (1:N) setups a higher baud rate is _highly recommended_ to ensure stable data reception.
+All J.Fi devices should be set to the same baud rate (although communication may work even when when devices use different baud rates).
+This should be changed in both PX4 and the J.Fi modules as explained in the previous section.
+
+You will also need to make sure that all vehicles on the MAVLink network are assigned a unique **System ID** ([MAV_SYS_ID](../advanced_config/parameter_reference.md#MAV_SYS_ID)).
+
+
+
+
+
+## QGroundControl Configuration
+
+The J.Fi will connect plug-and-play to **QGroundControl** and automatically connect just like a SiK Radio.
+
+However if you change the baud rate from 57600 you will need to create and use a new link configuration:
+
+1. Disable SiK Radio in QGC (**Application Settings → General → AutoConnect**).
+2. Create a new link configuration:
+ - Go to **Application Settings → Comms Links**.
+ - Click **Add**.
+ - Set **Type** to **Serial**, configure the **Serial Port** and **Baud Rate** to match the J.Fi device.
+3. Select **Connect** to connect with the new configuration.
+
+## J.Fi Configuration
+
+- **Device:** Press and hold _button B_, then click the _RST button_.
+ Release _button B_ when _LED 2_ blinks.
+ - Device enters configuration mode
+- **Smart device:** Connect to Wi-Fi network named `J.Fi-xxxxxx` (x: alphanumeric characters)
+- **Browser:** Go to `192.168.4.1` to open the **configuration page**.
+- **Configuration page:** Adjust settings as needed, then click **Save**
+ - _LED 1_ blinks once upon saving
+
+
+
+## Further info
+
+- [User Manual](https://docs.google.com/document/d/1NaVwOLuMCuNpd0uxgilXZ_qfHAnsFgBmaPxX9WGY2h4/edit?usp=sharing)
+- [ROS Github](https://github.com/SUV-Lab/J-Fi)