Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add EMAX targets #1787

Merged
merged 15 commits into from
Sep 5, 2022
Merged

Add EMAX targets #1787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
f53c7db
Added EMAX targets
pkendall64 Apr 30, 2022
2a8526f
Add RGB on 900 module
pkendall64 Jul 25, 2022
dfa9260
Add PIO files for EMAX targets
pkendall64 Aug 1, 2022
ebf52b1
Merge remote-tracking branch 'origin/3.x.x-maintenance' into emax
pkendall64 Aug 1, 2022
fa9da8d
Added targets to platformio.ini
maybenikhil Aug 2, 2022
bc6a36f
Fix emax RX target after merge
pkendall64 Aug 2, 2022
60c56d3
Merge branch 'emax' of github.com:ExpressLRS/ExpressLRS into emax
pkendall64 Aug 2, 2022
95ad52c
Add in the actual plain jane RX
pkendall64 Aug 3, 2022
9b08dcb
Add fan feature
pkendall64 Aug 7, 2022
a68f7ca
Merge branch '3.x.x-maintenance' into emax
pkendall64 Aug 22, 2022
2e4aa59
Remove RX targets as we can use aliases
pkendall64 Aug 22, 2022
7efebcf
Remove Emax "plain-jane" as the pins are wrongly ordered
pkendall64 Aug 24, 2022
c900c07
Add DCDC to the PA target
pkendall64 Aug 24, 2022
9763194
EMAX 2400 OLED power value calibration
SunjunKim Aug 30, 2022
539f813
Adjusted power values to EMAX supplied ones
pkendall64 Sep 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
35 changes: 35 additions & 0 deletions src/hardware/TX/EMAX 2400 OLED.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"serial_rx": 13,
"serial_tx": 13,
"radio_busy": 21,
"radio_dio1": 4,
"radio_miso": 19,
"radio_mosi": 23,
"radio_nss": 5,
"radio_rst": 14,
"radio_sck": 18,
"power_rxen": 27,
"power_txen": 26,
"power_min": 0,
"power_high": 6,
"power_max": 6,
"power_default": 2,
"power_control": 0,
"power_values": [-18,-15,-12,-9,-4,-1,3],
"joystick": 35,
"joystick_values": [1905, 1160, 580, 2580, 0, 4095],
"led_rgb": 12,
"led_rgb_isgrb": true,
"screen_sck": 32,
"screen_sda": 33,
"screen_type": 1,
"screen_reversed": 1,
"use_backpack": true,
"debug_backpack_baud": 460800,
"debug_backpack_rx": 16,
"debug_backpack_tx": 17,
"backpack_boot": 15,
"backpack_en": 25,
"passthrough_baud": 230400,
"misc_fan_en": 22
}
34 changes: 34 additions & 0 deletions src/hardware/TX/EMAX 900 OLED.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"serial_rx": 13,
"serial_tx": 13,
"radio_dio0": 4,
"radio_miso": 19,
"radio_mosi": 23,
"radio_nss": 5,
"radio_rst": 14,
"radio_sck": 18,
"power_rxen": 12,
"power_min": 0,
"power_high": 7,
"power_max": 7,
"power_default": 2,
"power_control": 3,
"power_values": [8,18,25,35,50,70,105,225],
"power_apc2": 26,
"joystick": 33,
"joystick_values": [2010, 1230, 635, 2730, 0, 4095],
"led_rgb": 27,
"led_rgb_isgrb": true,
"screen_sck": 21,
"screen_sda": 22,
"screen_type": 1,
"screen_reversed": 1,
"use_backpack": true,
"debug_backpack_baud": 460800,
"debug_backpack_rx": 16,
"debug_backpack_tx": 17,
"backpack_boot": 15,
"backpack_en": 25,
"passthrough_baud": 230400,
"misc_fan_en": 32
}
47 changes: 47 additions & 0 deletions src/hardware/targets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,53 @@
}
}
},
"emax": {
"name": "EMAX",
"tx_900": {
"plain": {
"product_name": "EMAX OLED 900MHz TX",
"lua_name": "EMAX 900TX",
"layout_file": "EMAX 900 OLED.json",
"features": ["fan"],
"upload_methods": ["uart", "wifi"],
"platform": "esp32",
"firmware": "Unified_ESP32_900_TX"
}
},
"rx_900": {
"plain": {
"product_name": "EMAX 900MHz RX",
"lua_name": "EMAX 900RX",
"layout_file": "Generic 900.json",
"upload_methods": ["uart", "wifi", "betaflight"],
"platform": "esp8285",
"firmware": "Unified_ESP8285_900_RX"
}
},
"tx_2400": {
"plain": {
"product_name": "EMAX OLED 2.4GHz TX",
"lua_name": "EMAX 2400TX",
"layout_file": "EMAX 2400 OLED.json",
"upload_methods": ["uart", "wifi"],
"platform": "esp32",
"firmware": "Unified_ESP32_2400_TX"
}
},
"rx_2400": {
pkendall64 marked this conversation as resolved.
Show resolved Hide resolved
"pa": {
"product_name": "EMAX 2.4GHz PA RX",
"lua_name": "EMAX 2400RX",
"layout_file": "Generic 2400 PA.json",
"overlay": {
"radio_dcdc": true
},
"upload_methods": ["uart", "wifi", "betaflight"],
"platform": "esp8285",
"firmware": "Unified_ESP8285_2400_RX"
}
}
},
"generic": {
"name": "Generic targets used as a base",
"rx_900": {
Expand Down
2 changes: 2 additions & 0 deletions src/platformio.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ extra_configs =
targets/ELRS_2400.ini
targets/axis_2400.ini
targets/frsky.ini
targets/emax_900.ini
targets/emax_2400.ini
targets/happymodel_900.ini
targets/happymodel_2400.ini
targets/betafpv_900.ini
Expand Down
10 changes: 10 additions & 0 deletions src/targets/emax_2400.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# ********************************
# Transmitter targets
# ********************************

[env:EMAX_2400_TX_via_UART]
extends = env:Unified_ESP32_2400_TX_via_UART
board_config = emax.tx_2400.plain

[env:EMAX_2400_TX_via_WIFI]
extends = env:EMAX_2400_TX_via_UART
10 changes: 10 additions & 0 deletions src/targets/emax_900.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# ********************************
# Transmitter targets
# ********************************

[env:EMAX_900_TX_via_UART]
extends = env:Unified_ESP32_900_TX_via_UART
board_config = emax.tx_900.plain

[env:EMAX_900_TX_via_WIFI]
extends = env:EMAX_900_TX_via_UART