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

Don't implement print_message for fmu-v2 #13226

Merged
merged 1 commit into from
Oct 18, 2019
Merged

Don't implement print_message for fmu-v2 #13226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions msg/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,10 @@ foreach(msg_file ${msg_files})
list(APPEND uorb_sources ${msg_source_out_path}/${msg}.cpp)
endforeach()

if (px4_constrained_flash_build)
set(added_arguments --constrained-flash)
endif()

# Generate uORB headers
add_custom_command(OUTPUT ${uorb_headers}
COMMAND ${PYTHON_EXECUTABLE} tools/px_generate_uorb_topic_files.py
Expand All @@ -187,6 +191,7 @@ add_custom_command(OUTPUT ${uorb_headers}
-e templates/uorb
-t ${CMAKE_CURRENT_BINARY_DIR}/tmp/headers
-q
${added_arguments}
DEPENDS
${msg_files}
templates/uorb/msg.h.em
Expand All @@ -207,6 +212,7 @@ add_custom_command(OUTPUT ${uorb_sources}
-e templates/uorb
-t ${CMAKE_CURRENT_BINARY_DIR}/tmp/sources
-q
${added_arguments}
DEPENDS
${msg_files}
templates/uorb/msg.cpp.em
Expand Down
6 changes: 6 additions & 0 deletions msg/templates/uorb/msg.cpp.em
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
@# - md5sum (String) MD5Sum of the .msg specification
@# - search_path (dict) search paths for genmsg
@# - topics (List of String) multi-topic names
@# - constrained_flash set to true if flash is constrained
@# - ids (List) list of all RTPS msg ids
@###############################################
/****************************************************************************
Expand Down Expand Up @@ -82,9 +83,14 @@ ORB_DEFINE(@multi_topic, struct @uorb_struct, @(struct_size-padding_end_size), _

void print_message(const @uorb_struct& message)
{
@[if constrained_flash]
(void)message;
PX4_INFO_RAW("Not implemented on flash constrained hardware\n");
@[else]
PX4_INFO_RAW(" @(uorb_struct)\n");
@[for field in sorted_fields]@
@( print_field(field) )@
@[end for]@
@[end if]@

}
11 changes: 9 additions & 2 deletions msg/tools/px_generate_uorb_topic_files.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#############################################################################

"""
px_generate_uorb_topics.py
px_generate_uorb_topic_files.py
Generates c/cpp header/source files for uorb topics from .msg (ROS syntax)
message files
"""
Expand Down Expand Up @@ -85,6 +85,8 @@
TOPICS_TOKEN = '# TOPICS '
IDL_TEMPLATE_FILE = 'msg.idl.em'

CONSTRAINED_FLASH = False


class MsgScope:
NONE = 0
Expand Down Expand Up @@ -156,7 +158,8 @@ def generate_output_from_file(format_idx, filename, outputdir, package, template
"search_path": search_path,
"msg_context": msg_context,
"spec": spec,
"topics": topics
"topics": topics,
"constrained_flash": CONSTRAINED_FLASH
}

# Make sure output directory exists:
Expand Down Expand Up @@ -511,11 +514,15 @@ def append_to_include_path(path_to_append, curr_include, package):
parser.add_argument('-q', dest='quiet', default=False, action='store_true',
help='string added as prefix to the output file '
' name when converting directories')
parser.add_argument('--constrained-flash', dest='constrained_flash', default=False, action='store_true',
help='set to save flash space')
args = parser.parse_args()

if args.include_paths:
append_to_include_path(args.include_paths, INCL_DEFAULT, args.package)

CONSTRAINED_FLASH = args.constrained_flash

if args.headers:
generate_idx = 0
elif args.sources:
Expand Down