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

Catch caress-tmp up to master #1489

Merged
merged 6 commits into from
Nov 6, 2024
Merged

Catch caress-tmp up to master #1489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
affe913
merge with feature/proj-support (trndev < feature/proj-support); feat…
klheadley Nov 5, 2024
0ee5dff
Merge pull request #1487 from dwcaress/caress-tmp
dwcaress Nov 6, 2024
1d5c6ca
add stdint.h include for Ubuntu 24 build; sync updates from libtrnav …
klheadley Nov 6, 2024
8fdc0cb
sync with master (resolve conflict in mbtrnav/qnx-utils/DataLog.cc)
klheadley Nov 6, 2024
2ce22b3
add stdint.h include for Ubuntu 24 build; sync updates from libtrnav …
klheadley Nov 6, 2024
ea07d4a
Merge pull request #1488 from dwcaress/trndev
dwcaress Nov 6, 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
4 changes: 2 additions & 2 deletions src/mbtrnav/opt/rov/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ TRNXPP=trnxpp
TRNXPP_SRC= trnxpp_app.cpp
TRNXPP_HPP= trnxpp.hpp
TRNXPP_OBJ = $(TRNXPP_SRC:%.cpp=$(BUILD_DIR)/%.o)
TRNXPP_LIBS = -llcm -lstdc++ -lmb1 -ltrncli -ltrn -lnewmat -lqnx -lnetcdf -lm -lpthread -lgeolib -ludpms $(OS_LIBS) -ltrnxplug
TRNXPP_LIBS = -llcm -lstdc++ -lmb1 -ltrncli -ltrn -lnewmat -lqnx -lnetcdf -lm -lpthread -lgeocon -lgeolib -ludpms $(OS_LIBS) -ltrnxplug

FVTEST=fv-test
FVTEST_SRC = flag_var_test.cpp
Expand All @@ -164,7 +164,7 @@ LIBUDPMS_LIBS=
LIBTRNXPLUG = libtrnxplug.a
LIBTRNXPLUG_SRC = plug-common.cpp plug-idtlass.cpp plug-oisledx.cpp plug-dvl.cpp plug-idt.cpp plug-oisled.cpp plug-oisled2.cpp plug-lassmb.cpp plug-xmb1.cpp
LIBTRNXPLUG_OBJ = $(LIBTRNXPLUG_SRC:%.cpp=$(BUILD_DIR)/%.o)
LIBTRNXPLUG_LIBS = -lnewmat -lgeolib -ltrnw -lqnx -lmb1 -ltrn -ludpms -ltrncli -lnetcdf -llcm
LIBTRNXPLUG_LIBS = -lnewmat -lgeocon -lgeolib -ltrnw -lqnx -lmb1 -ltrn -ludpms -ltrncli -lnetcdf -llcm

########################################
# Build Files (mostly for cleanup)
Expand Down
2 changes: 1 addition & 1 deletion src/mbtrnav/opt/rov/trnx_utils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
#include "trn_debug.hpp"
#include "geo_cfg.hpp"
#include "NavUtils.h"
#include "GeoCon.h"
#include "GeoCon.hpp"

// /////////////////
// Macros
Expand Down
5 changes: 2 additions & 3 deletions src/mbtrnav/qnx-utils/DataLog.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,14 @@
/****************************************************************************/
#include <stdlib.h>
#include <unistd.h>
#include <stdlib.h>
#include <stdint.h>
#include <sys/stat.h>
#include <stdint.h>
#include <string.h>

#if !defined(__APPLE__)
#include <malloc.h>
#endif

#include <string.h>
#include "DataLog.h"
#include "ourTypes.h"
#include "Exception.h"
Expand Down
2 changes: 1 addition & 1 deletion src/mbtrnav/terrain-nav/TrnLog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//
////////////////////////////////////////////////////////////////////////////////
//
#include <stdint.h>
#include <cstdint>
#include "structDefs.h"
#include "TrnLog.h"

Expand Down
14 changes: 7 additions & 7 deletions src/mbtrnav/terrain-nav/TrnLog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@
//
////////////////////////////////////////////////////////////////////////////////////
//

#ifndef TRNLOG_H
#define TRNLOG_H

#define TRNLOG_NAME_DFL "TrnIO"
#define TRNLOG_MNEM_NAME_DFL "trn"

#include <stdint.h>
#include "DataLogWriter.h"
#include "IntegerData.h"
#include "DoubleData.h"
#include "ShortData.h"
#include "TimeTag.h"
#include "structDefs.h"

#ifndef TRNLOG_H
#define TRNLOG_H

#define TRNLOG_NAME_DFL "TrnIO"
#define TRNLOG_MNEM_NAME_DFL "trn"

#define TRN_MAX_BEAMS_DFL TRN_MAX_BEAMS
// size of record ID
#define TL_RID_SIZE sizeof(uint32_t)
Expand Down
9 changes: 9 additions & 0 deletions src/mbtrnav/trnw/GeoCon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,15 @@ GeoCon::GeoCon(const char *tcrs)
{
std::cerr << __func__ << ": ERR proj not supported; build using -DTRN_USE_PROJ" << std::endl;
}
GeoCon::GeoCon(void *xfm, bool autodel, const char *tcrs, const char *scrs)
{
std::cerr << __func__ << ": ERR proj not supported; build using -DTRN_USE_PROJ" << std::endl;
}

GeoCon::GeoCon(void *xfm, bool autodel)
{
std::cerr << __func__ << ": ERR proj not supported; build using -DTRN_USE_PROJ" << std::endl;
}
#endif

GeoCon::~GeoCon()
Expand Down
10 changes: 5 additions & 5 deletions src/mbtrnav/trnw/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ OPT_TRN_BUILD=-DLIBTRN_BUILD=$(build_date)
mb1rs_ver ?=0.0.0b1
OPT_MB1RS_VER=-DMB1RS_VER=$(mb1rs_ver)
OPT_MB1RS_BUILD=-DMB1RS_BUILD=$(build_date)
OPT_USE_PROJ=-DTRN_USE_PROJ
OPT_USE_PROJ= #-DTRN_USE_PROJ

# C standard e.g. -std=c99 -std=gnu99
# may be needed for Cygwin (e.g. for loop declare/init)
Expand Down Expand Up @@ -119,8 +119,8 @@ LIB_PATHS = -L$(OUTPUT_DIR) -L$(MFRAME_LIB_DIR) -L$(PROJ_LIB_DIR) $(OS_LIB_PATH)
########################################
# Target Definitions

# libgcon: Geoconversion wrapper for NavUtils/GCTP, PROJ
LIBGCON=libgcon.a
# libgeocon: Geoconversion wrapper for NavUtils/GCTP, PROJ
LIBGCON=libgeocon.a
LIBGCON_SRC = GeoCon.cpp
LIBGCON_OBJ=$(LIBGCON_SRC:%.cpp=$(BUILD_DIR)/%.o)
LIBGCON_LIBS = -lqnx $(PROJ_LIB)
Expand Down Expand Up @@ -169,7 +169,7 @@ LIBTRNCLI_LIBS = -lmframe -lpthread -lm
TRNCLI_TEST=trncli-test
TRNCLI_TEST_SRC=trncli_test.c mb1_msg.c
TRNCLI_TEST_OBJ=$(TRNCLI_TEST_SRC:%.c=$(BUILD_DIR)/%.o)
TRNCLI_TEST_LIBS = -lmframe -ltrnw -lpthread -lm -lqnx -lnewmat -ltrn -ltrncli -lgcon -lnetcdf -lgeolib $(PROJ_LIB) -lstdc++
TRNCLI_TEST_LIBS = -lmframe -ltrnw -lpthread -lm -lqnx -lnewmat -ltrn -ltrncli -lgeocon -lnetcdf -lgeolib $(PROJ_LIB) -lstdc++

# libtrnucli: TRNU client lib
LIBTRNUCLI=libtrnucli.a
Expand Down Expand Up @@ -222,7 +222,7 @@ MMCSUB_LIBS = $(MFRAME_LIB) -lmframe -lm -lstdc++
TRNIF_TEST=trnif-test
TRNIF_TEST_SRC=trnif_test.c trnif_proto.c trnif_msg.c
TRNIF_TEST_OBJ = $(TRNIF_TEST_SRC:%.c=$(BUILD_DIR)/%.o)
TRNIF_TEST_LIBS = -lnetif -lmframe -ltrnw -lpthread -lm -lqnx -lnewmat -ltrn -lnetcdf -lgeolib -lgcon $(PROJ_LIB) -lstdc++
TRNIF_TEST_LIBS = -lnetif -lmframe -ltrnw -lpthread -lm -lqnx -lnewmat -ltrn -lnetcdf -lgeolib -lgeocon $(PROJ_LIB) -lstdc++

MB1RS=mb1rs
MB1RS_SRC=mb1_msg.c mb1rs.c mb1rs-app.c
Expand Down