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

Correct compilation when network port registering disabled #27817

Merged
merged 2 commits into from
Aug 13, 2024
Merged

Correct compilation when network port registering disabled #27817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5ded7b
AP_Networking: correct compilation when network port registering disa…
peterbarker Aug 12, 2024
8f7f01f
AP_Vehicle: correct compilation when network port registering disabled
peterbarker Aug 12, 2024
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: 2 additions & 0 deletions libraries/AP_Networking/AP_Networking.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,8 +198,10 @@ void AP_Networking::init()
start_tests();
#endif

#if AP_NETWORKING_REGISTER_PORT_ENABLED
// init network mapped serialmanager ports
ports_init();
#endif
}

/*
Expand Down
2 changes: 2 additions & 0 deletions libraries/AP_Vehicle/AP_Vehicle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,7 @@ const AP_Param::GroupInfo AP_Vehicle::var_info[] = {
are too deep in the parameter tree
*/

#if AP_NETWORKING_REGISTER_PORT_ENABLED
#if AP_NETWORKING_NUM_PORTS > 0
// @Group: NET_P1_
// @Path: ../AP_Networking/AP_Networking_port.cpp
Expand All @@ -246,6 +247,7 @@ const AP_Param::GroupInfo AP_Vehicle::var_info[] = {
// @Path: ../AP_Networking/AP_Networking_port.cpp
AP_SUBGROUPINFO(networking.ports[3], "NET_P4_", 25, AP_Vehicle, AP_Networking::Port),
#endif
#endif // AP_NETWORKING_REGISTER_PORT_ENABLED
#endif // AP_NETWORKING_ENABLED

#if AP_FILTER_ENABLED
Expand Down
Loading