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

chore: use single target to support nv14/el18/pl18/pl18ev/nb4p #5397

Merged
merged 25 commits into from
Feb 4, 2025
Merged

chore: use single target to support nv14/el18/pl18/pl18ev/nb4p #5397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
754a155
Initial merge of nv14 target to pl18 target
richardclli Aug 6, 2024
bcc553d
LCD and touch works for EL18
richardclli Aug 6, 2024
7899911
Fixed audio volume, LED strip, int module pwr, battery divider
richardclli Aug 7, 2024
33f906a
Fixed gimbal, SPI flash, yaml saving, keys, trims
richardclli Aug 7, 2024
a731534
Updated build scripts
richardclli Aug 7, 2024
6dfc609
Fixed charging mechanism, EL18 and NB4P use the same chip have the sa…
richardclli Aug 7, 2024
db6a8c5
Fixed build errors of other targets
richardclli Aug 8, 2024
c752a49
Battery divider value is wrong according to schematic
richardclli Sep 11, 2024
dc05ada
Fixed yaml data structure
richardclli Dec 24, 2024
98b6d24
NV14 should support AFHDS3 as well (FRM303)
richardclli Jan 3, 2025
a0036ea
Fixed audio after rebase
richardclli Jan 20, 2025
05ef6d4
nv14/el18 did not have led driver
richardclli Jan 24, 2025
05f41e4
chore: add note about LiHV on some handsets
pfeerick Jan 28, 2025
1be5ac6
Add back old targets for easy checking
richardclli Jan 28, 2025
e2c8d2d
Fixed chksize for old nv14 target
richardclli Jan 28, 2025
0c1fd8c
Missing board revision detection init
richardclli Jan 28, 2025
c4419cd
Wrong pin definition compare to v2.10
richardclli Jan 28, 2025
4346323
Touch driver crash in debug build
richardclli Jan 28, 2025
0dd1614
Fixed CST836U touch
richardclli Jan 28, 2025
2ee93bd
chore: cosmetics
pfeerick Jan 29, 2025
f8144da
chore: generate-yaml
pfeerick Jan 29, 2025
1f202b2
fix: nv14 does not have a USB switch
pfeerick Jan 29, 2025
1306a2a
Better fix for nv14 bootloader without USB switch
richardclli Jan 31, 2025
9d3ad62
Fixed build error after rebase
richardclli Jan 31, 2025
c15ee04
Fixed nv14 int module
richardclli Feb 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion companion/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ elseif(PCB STREQUAL X10 AND PCBREV STREQUAL T16)
set(FLAVOUR t16)
elseif(PCB STREQUAL X10 AND PCBREV STREQUAL T18)
set(FLAVOUR t18)
elseif(PCB STREQUAL NV14 AND PCBREV STREQUAL EL18)
elseif(PCB STREQUAL PL18 AND PCBREV STREQUAL EL18)
set(FLAVOUR el18)
elseif(PCB STREQUAL PL18 AND PCBREV STREQUAL PL18EV)
set(FLAVOUR pl18ev)
Expand Down
8 changes: 4 additions & 4 deletions radio/src/datastructs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ static inline void check_struct()
CHKSIZE(TimerData, 17);
CHKSIZE(ModelHeader, 131);
CHKSIZE(CustomScreenData, 1892);
#if defined(PCBNV14) || defined(RADIO_NB4P)
#if defined(PCBNV14) || defined(RADIO_NB4P) || defined(RADIO_NV14_FAMILY)
CHKTYPE(TopBarPersistentData, 704);
#else
CHKTYPE(TopBarPersistentData, 1048);
Expand Down Expand Up @@ -104,14 +104,14 @@ static inline void check_struct()
CHKSIZE(ModelData, 6770);
#elif defined(PCBX7) || defined(PCBXLITE) || defined(PCBX9LITE)
CHKSIZE(ModelData, 6329);
#elif defined(PCBNV14)
CHKSIZE(ModelData, 26463);
#elif defined(PCBPL18)
#if defined(RADIO_NB4P)
#if defined(RADIO_NB4P) || defined(RADIO_NV14_FAMILY)
CHKSIZE(ModelData, 26499);
#else
CHKSIZE(ModelData, 26845);
#endif
#elif defined(PCBNV14)
CHKSIZE(ModelData, 26463);
#elif defined(RADIO_T15)
CHKSIZE(ModelData, 26834);
#elif defined(PCBHORUS)
Expand Down
2 changes: 2 additions & 0 deletions radio/src/storage/yaml/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ elseif(PCB STREQUAL NV14)
elseif(PCB STREQUAL PL18)
if(PCBREV STREQUAL NB4P)
set(YAML_GEN_OUTPUT storage/yaml/yaml_datastructs_nb4p.cpp)
elseif(PCBREV STREQUAL NV14)
set(YAML_GEN_OUTPUT storage/yaml/yaml_datastructs_nv14_family.cpp)
else()
set(YAML_GEN_OUTPUT storage/yaml/yaml_datastructs_pl18.cpp)
endif()
Expand Down
6 changes: 4 additions & 2 deletions radio/src/storage/yaml/yaml_datastructs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,16 @@
#else
#include "yaml_datastructs_x10.cpp"
#endif
#elif defined(PCBNV14)
#include "yaml_datastructs_nv14.cpp"
#elif defined(PCBPL18)
#if defined(RADIO_NB4P)
#include "yaml_datastructs_nb4p.cpp"
#elif defined(RADIO_NV14_FAMILY)
#include "yaml_datastructs_nv14_family.cpp"
#else
#include "yaml_datastructs_pl18.cpp"
#endif
#elif defined(PCBNV14)
#include "yaml_datastructs_nv14.cpp"
#elif defined(PCBX7)
#if defined(RADIO_TPRO) || defined(RADIO_TPROV2) || defined(RADIO_BUMBLEBEE)
#include "yaml_datastructs_tpro.cpp"
Expand Down
Loading
Loading