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

Fixing servo/motor/transfer segfault #181

Merged
merged 1 commit into from
Oct 25, 2022
Merged

Fixing servo/motor/transfer segfault #181

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: 3 additions & 3 deletions module/camera/dependencies/zlib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ set(ZLIB_COMMON_OPTIONS
if (CMAKE_CROSSCOMPILING)
get_property(ARCH GLOBAL PROPERTY arch)
ExternalProject_Add(dep_zlib
URL https://www.zlib.net/zlib-1.2.12.tar.gz
URL https://www.zlib.net/zlib-1.2.13.tar.gz
CMAKE_ARGS
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
${ZLIB_COMMON_OPTIONS}
INSTALL_COMMAND make install
)
else()
ExternalProject_Add(dep_zlib
URL https://www.zlib.net/zlib-1.2.12.tar.gz
URL https://www.zlib.net/zlib-1.2.13.tar.gz
CMAKE_ARGS
${ZLIB_COMMON_OPTIONS}
INSTALL_COMMAND make install
Expand All @@ -36,4 +36,4 @@ target_include_directories(zlib_wrapper INTERFACE ${ZLIB_INCLUDE_DIR})
# z
add_library(z_wrapper INTERFACE)
add_dependencies(z_wrapper zlib_wrapper)
target_link_libraries(z_wrapper INTERFACE zlib_wrapper z)
target_link_libraries(z_wrapper INTERFACE zlib_wrapper z)
2 changes: 1 addition & 1 deletion module/core/src/device/wombat/wombat_device.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ class WombatDevice : public kipr::core::Device
return false;
}

if (read_buffer[0] != 'J')
if (read_buffer && read_buffer[0] != 'J')
{
logger.error() << "DMA de-synchronized";
return false;
Expand Down