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.

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

Catch caress-tmp up to master #1486

Merged
merged 25 commits into from
Nov 5, 2024
Merged
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
96bc84a
partial merge trndev < master (support for proj w/ TRN), preserving s…
klheadley Jul 19, 2024
41f688c
WIP: replace ifdefs for proj support with update to libtrnav that use…
klheadley Jul 21, 2024
9d5e04a
add comments
klheadley Jul 21, 2024
3bf235f
refactor GeoCon for cmake build (separate C/C++); update rovtrn for G…
klheadley Jul 22, 2024
3445ade
add missing type, typestr methods to C API; add geocon-test target (G…
klheadley Jul 22, 2024
5ea5ad1
fix bug: cut and paste error print format causes segfault
klheadley Jul 23, 2024
e4d9432
add support for proj configuration options (use-proj, projection, trn…
klheadley Jul 25, 2024
180cbc7
add missing options to help; fix bug: incorrect format string (%s->%d…
klheadley Jul 25, 2024
3a7907c
sync with master
klheadley Aug 10, 2024
7ca676d
Merge pull request #1482 from dwcaress/caress-tmp
dwcaress Sep 6, 2024
db60f9e
Merge pull request #1483 from dwcaress/caress-tmp
dwcaress Oct 2, 2024
2b760a1
Create github-actions-demo.yml
tomoreilly Oct 17, 2024
910ab2e
fix bugs: invalid CRS handling caused segfault in mbtrnpp; use lonlat…
klheadley Oct 19, 2024
6998393
add bare-bones PROJ wrapper CTOR (proj instance only, not source/targ…
klheadley Oct 20, 2024
df4c1ca
add SIGINT handler to release resources on CTRL-C; release geocon res…
klheadley Oct 21, 2024
2b3dbbf
add comments
klheadley Oct 21, 2024
c41a5af
add/remove/rename default CRS values for clarity; add comments
klheadley Oct 21, 2024
7782960
rename wgeocon_destroy to wgeocon_delete
klheadley Oct 21, 2024
e014552
add m_debug initializer to GeoConIF
klheadley Oct 21, 2024
928f0f0
add GeoCon API that uses application callbacks instead of GeoCon wrap…
klheadley Oct 21, 2024
7faa27c
refactor trnw pose/meas mb1 conversions to reduce duplicate code from…
klheadley Oct 21, 2024
b9b8211
make pjptr static; add comments
klheadley Oct 28, 2024
7d5099b
clean up: remove TRN_USE_PROJ, remove related unused code
klheadley Nov 4, 2024
c9f6703
sync w/ master: feature/proj-support < master
klheadley Nov 5, 2024
c2eb92e
Merge pull request #1485 from dwcaress/feature/proj-support
dwcaress Nov 5, 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
18 changes: 18 additions & 0 deletions .github/workflows/github-actions-demo.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: GitHub Actions Demo
run-name: ${{ github.actor }} is testing out GitHub Actions 🚀
on: [push]
jobs:
Explore-GitHub-Actions:
runs-on: ubuntu-latest
steps:
- run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event."
- run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by GitHub!"
- run: echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}."
- name: Check out repository code
uses: actions/checkout@v4
- run: echo "💡 The ${{ github.repository }} repository has been cloned to the runner."
- run: echo "🖥️ The workflow is now ready to test your code on the runner."
- name: List files in the repository
run: |
ls ${{ github.workspace }}
- run: echo "🍏 This job's status is ${{ job.status }}."
3 changes: 2 additions & 1 deletion src/mbtrn/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,8 @@ target_link_libraries(mb1r_test PRIVATE mb1r m pthread)
#
add_executable(mb1-cli mb1r/mb1cli-app.c)
target_include_directories(mb1-cli PRIVATE ${CMAKE_SOURCE_DIR}/src/mbtrnframe
${CMAKE_SOURCE_DIR}/src/mbtrnav/trnw)
${LibPROJ_INCLUDE_DIRS}
${CMAKE_SOURCE_DIR}/src/mbtrnav/trnw)
target_link_libraries(mb1-cli PRIVATE mbtrnframe mb1r mb1 m pthread)
#
#------------------------------------------------------------------------------
Expand Down
75 changes: 49 additions & 26 deletions src/mbtrn/tools/mbtrncfg/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,31 @@ <h2>mbtrnpp Configuration Tool</h2>
<td class="entry"><input type="text" size="8" name="median-filter" value="">
</td>
</tr>
<tr>
<td class="param" onmouseover="showhelp('platform-file')"><a>platform-file</a></td>
<td class="entry"><input type="text" size="8" name="platform-file" value="">
</td>
</tr>
<tr>
<td class="param" onmouseover="showhelp('tide-model')"><a>tide-model</a></td>
<td class="entry"><input type="text" size="8" name="tide-model" value="">
</td>
</tr>
<tr>
<td class="param" onmouseover="showhelp('statsec')"><a>statsec</a></td>
<td class="entry"><input type="text" size="8" name="statsec" value="">
</td>
</tr>
<tr>
<td class="param" onmouseover="showhelp('statflags')"><a>statflags</a></td>
<td class="entry"><input type="text" size="64" name="statflags" value="">
</td>
</tr>
<tr>
<td class="param" onmouseover="showhelp('delay')"><a>delay</a></td>
<td class="entry"><input type="text" size="8" name="delay" value="">
</td>
</tr>
<tr><td><div style="height:5px;"></div></td></tr>
<tr>
<td class="param" onmouseover="showhelp('trn-en')"><a>trn-en</a></td>
Expand All @@ -151,11 +176,29 @@ <h2>mbtrnpp Configuration Tool</h2>
<td class="entry"><input type="text" size="8" name="trn-sensor" value="">
</td>
</tr>
<tr>
<td class="param" onmouseover="showhelp('trn-utm')"><a>trn-utm</a></td>
<td class="entry"><input type="text" size="8" name="trn-utm" value="">
</td>
</tr>
<tr><td><div style="height:5px;"></div></td></tr>
<tr>
<td class="param" onmouseover="showhelp('use-proj')"><a>use-proj</a></td>
<td class="entry">
Y<input type="radio" size="48" name="use-proj" value="en" checked>
N<input type="radio" size="48" name="use-proj" value="dis">
</td>
</tr>
<tr>
<td class="param" onmouseover="showhelp('projection')"><a>projection</a></td>
<td class="entry"><input type="text" size="8" name="projection" value="">
</td>
</tr>
<tr>
<td class="param" onmouseover="showhelp('trn-crs')"><a>trn-crs</a></td>
<td class="entry"><input type="text" size="8" name="trn-crs" value="">
</td>
</tr>
<tr>
<td class="param" onmouseover="showhelp('trn-utm')"><a>trn-utm</a></td>
<td class="entry"><input type="text" size="8" name="trn-utm" value="">
</td>
</tr>
<tr>
<td class="param" onmouseover="showhelp('trn-map')"><a>trn-map</a></td>
<td class="entry"><input type="text" size="64" name="trn-map" value="">
Expand Down Expand Up @@ -230,7 +273,7 @@ <h2>mbtrnpp Configuration Tool</h2>
<tr>
<td class="param" onmouseover="showhelp('reinit-gain')"><a>reinit-gain</a></td>
<td class="entry">
Y<input type="radio" size="48" name="reinit-gain" value="di" checked>
Y<input type="radio" size="48" name="reinit-gain" value="en" checked>
N<input type="radio" size="48" name="reinit-gain" value="dis">
</td>
</tr>
Expand Down Expand Up @@ -264,11 +307,6 @@ <h2>mbtrnpp Configuration Tool</h2>
<td class="entry"><input type="text" size="8" name="convergence-repeat-min" value="">
</td>
</tr>
<tr>
<td class="param" onmouseover="showhelp('tide-model')"><a>tide-model</a></td>
<td class="entry"><input type="text" size="8" name="tide-model" value="">
</td>
</tr>
<tr><td><div style="height:5px;"></div></td></tr>
<tr>
<td class="param" onmouseover="showhelp('trn-out')"><a>trn-out</a></td>
Expand All @@ -295,21 +333,6 @@ <h2>mbtrnpp Configuration Tool</h2>
<td class="entry"><input type="text" size="8" name="mbhbt" value="">
</td>
</tr>
<tr>
<td class="param" onmouseover="showhelp('statsec')"><a>statsec</a></td>
<td class="entry"><input type="text" size="8" name="statsec" value="">
</td>
</tr>
<tr>
<td class="param" onmouseover="showhelp('statflags')"><a>statflags</a></td>
<td class="entry"><input type="text" size="64" name="statflags" value="">
</td>
</tr>
<tr>
<td class="param" onmouseover="showhelp('delay')"><a>delay</a></td>
<td class="entry"><input type="text" size="8" name="delay" value="">
</td>
</tr>
</table>
<table>
<tr>
Expand Down
Loading