Skip to content

Commit

Permalink
Bump third_party/libsbp from 84f224f to 1bfe255 (#610)
Browse files Browse the repository at this point in the history
Bumps [third_party/libsbp](https://github.com/swift-nav/libsbp) from
`84f224f` to `1bfe255`.
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/swift-nav/libsbp/commit/1bfe2554826414350c45abd1d4e3abe0d3112776"><code>1bfe255</code></a>
Bump node.js version to 18.17.0 [AP-1081] (<a
href="https://redirect.github.com/swift-nav/libsbp/issues/1392">#1392</a>)</li>
<li><a
href="https://github.com/swift-nav/libsbp/commit/e149901e63ddcdb0d818adcd8f8e4dbd0e2738d6"><code>e149901</code></a>
update how to for new rust instruction #no_auto_pr (<a
href="https://redirect.github.com/swift-nav/libsbp/issues/1390">#1390</a>)</li>
<li><a
href="https://github.com/swift-nav/libsbp/commit/79884c6850e62407605bcad60a9cf717168aef76"><code>79884c6</code></a>
update web structs (<a
href="https://redirect.github.com/swift-nav/libsbp/issues/1391">#1391</a>)</li>
<li><a
href="https://github.com/swift-nav/libsbp/commit/d7b3b4464edbc29e4f419880adc315907b778d3d"><code>d7b3b44</code></a>
remove -i option from sed (<a
href="https://redirect.github.com/swift-nav/libsbp/issues/1389">#1389</a>)</li>
<li><a
href="https://github.com/swift-nav/libsbp/commit/3d8c0be3b37b1a246f89465827db79a275688f9e"><code>3d8c0be</code></a>
Add missing bindings to check generated artefacts CI stage [AP-1075] (<a
href="https://redirect.github.com/swift-nav/libsbp/issues/1387">#1387</a>)</li>
<li><a
href="https://github.com/swift-nav/libsbp/commit/c40d17b7ecb63c93b01fa94968565abf466266f8"><code>c40d17b</code></a>
reduce number of python tests to 2 (<a
href="https://redirect.github.com/swift-nav/libsbp/issues/1386">#1386</a>)</li>
<li><a
href="https://github.com/swift-nav/libsbp/commit/a389e3317f4634abbc67593853f83b78e6f3ba7b"><code>a389e33</code></a>
Revert &quot;prep for next release #no_auto_pr&quot;</li>
<li><a
href="https://github.com/swift-nav/libsbp/commit/3a24af6e6f64abae2768a3b87e13fed037110261"><code>3a24af6</code></a>
prep for next release #no_auto_pr</li>
<li><a
href="https://github.com/swift-nav/libsbp/commit/4ad18e7cb8a7e2ebc2fbc4410373a47d7747a28e"><code>4ad18e7</code></a>
update CHANGELOG.md, prep for next release #no_auto_pr</li>
<li><a
href="https://github.com/swift-nav/libsbp/commit/11b564aba958b8bdb577cc28db1a042b2589376f"><code>11b564a</code></a>
Release v5.0.4</li>
<li>Additional commits viewable in <a
href="https://github.com/swift-nav/libsbp/compare/84f224f53016f83bf526d9991bad139edfabd593...1bfe2554826414350c45abd1d4e3abe0d3112776">compare
view</a></li>
</ul>
</details>
<br />


Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

[AP-1081]:
https://swift-nav.atlassian.net/browse/AP-1081?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ
[AP-1075]:
https://swift-nav.atlassian.net/browse/AP-1075?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Matt Woodward <[email protected]>
  • Loading branch information
dependabot[bot] and woodfell authored Dec 24, 2023
1 parent 75875de commit 7cd334a
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 12 deletions.
4 changes: 4 additions & 0 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ add_library(settings
setting_type_float.c
setting_type_int.c
setting_type_str.c)
target_compile_options(settings
PRIVATE
-Wno-error=deprecated-declarations
)

target_link_libraries(settings swiftnav)

Expand Down
4 changes: 3 additions & 1 deletion src/setting_sbp_cb.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include <stdlib.h>
#include <string.h>

#include <libsbp/settings.h>
#include <libsbp/legacy/settings.h>

#include <swiftnav/logging.h>

Expand All @@ -26,6 +26,8 @@
#include <internal/setting_macros.h>
#include <internal/setting_sbp_cb.h>

#define SBP_SENDER_ID 0x42

#define UPDATE_FILTER_NONE 0x0
#define UPDATE_FILTER_BASIC (0x1 << 3)
#define UPDATE_FILTER_READONLY (0x1 << 1)
Expand Down
4 changes: 3 additions & 1 deletion src/settings.c
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@
#include <string.h>
#include <sys/stat.h>

#include <libsbp/legacy/settings.h>
#include <libsbp/sbp.h>
#include <libsbp/settings.h>

#include <swiftnav/logging.h>

Expand All @@ -98,6 +98,8 @@
#define __attribute__(x)
#endif

#define SBP_SENDER_ID 0x42

#define REGISTER_TIMEOUT_MS 500
#define REGISTER_TRIES 5

Expand Down
17 changes: 9 additions & 8 deletions tests/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
add_executable(
add_executable(
test_libsettings
src/test_request_state.cpp
src/test_setting_data.cpp
Expand All @@ -20,28 +20,29 @@
${PROJECT_SOURCE_DIR}/src/settings.c
${PROJECT_SOURCE_DIR}/src/settings_util.c)

target_include_directories(test_libsettings
target_include_directories(test_libsettings
PRIVATE
${PROJECT_SOURCE_DIR}/include
${PROJECT_SOURCE_DIR}/tests/include
$<TARGET_PROPERTY:sbp,INCLUDE_DIRECTORIES>
)

target_link_libraries(test_libsettings swiftnav gtest_main)
target_link_libraries(test_libsettings swiftnav gtest_main)
target_compile_options(test_libsettings PRIVATE -Wno-error=deprecated-declarations)

if (WIN32)
add_custom_command(
if (WIN32)
add_custom_command(
TARGET test_libsettings POST_BUILD
COMMENT "Running unit tests"
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/bin/libgtest.dll ${CMAKE_BINARY_DIR}/tests
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/bin/libgtest_main.dll ${CMAKE_BINARY_DIR}/tests
COMMAND test_libsettings
)
else (WIN32)
add_custom_command(
else (WIN32)
add_custom_command(
TARGET test_libsettings POST_BUILD
COMMENT "Running unit tests"
COMMAND test_libsettings
)
endif (WIN32)
endif (WIN32)

2 changes: 1 addition & 1 deletion third_party/libsbp
Submodule libsbp updated 2182 files

0 comments on commit 7cd334a

Please sign in to comment.