Added state estimation

bjajoh · Nov 10, 2020 · 611ea72 · 611ea72
1 parent 3bb8719
commit 611ea72
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 264 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,12 @@
 [submodule "ros-mpu9250-ahrs"]
 	path = ros-mpu9250-ahrs
 	url = https://github.com/bjajoh/ros-mpu9250-ahrs
+[submodule "nmea_msgs"]
+	path = nmea_msgs
+	url = https://github.com/ros-drivers/nmea_msgs.git
+[submodule "geographic_info"]
+	path = geographic_info
+	url = https://github.com/ros-geographic-info/geographic_info
+[submodule "uiid"]
+	path = uiid
+	url = https://github.com/ros-geographic-info/unique_identifier
diff --git a/README.md b/README.md
@@ -12,6 +12,8 @@ Generate Correction Data NEMA code https://nmeagen.org/
 
 LEDs with Pi: https://learn.adafruit.com/neopixels-on-raspberry-pi/python-usage
 
+Use catkin build instead of catkin_make: https://catkin-tools.readthedocs.io/en/latest/installing.html
+
 
 ### Running the camera
 ```
@@ -20,7 +22,9 @@ roslaunch common perception.launch
 ```
 roslaunch common gnss.launch
 ```
-
+```
+roslaunch common state_estimation.launch
+```
 ``` 
 roslaunch ueye mono.launch
 ``` 

diff --git a/common/launch/state_estimation.launch b/common/launch/state_estimation.launch
@@ -0,0 +1,4 @@
+<launch>
+	<include file="$(find common)/launch/gnss.launch"/>
+	<include file="$(find mpu9250-driver)/launch/mpu9250.launch"/>
+</launch>
diff --git a/geographic_info b/geographic_info
diff --git a/master_control/.catkin_workspace b/master_control/.catkin_workspace
diff --git a/master_control/src/stateNode/__pycache__/ilocator_pythonLib.cpython-38.pyc b/master_control/src/stateNode/__pycache__/ilocator_pythonLib.cpython-38.pyc
diff --git a/master_control/stateNode/CMakeLists.txt b/master_control/stateNode/CMakeLists.txt
diff --git a/master_control/stateNode/package.xml b/master_control/stateNode/package.xml
diff --git a/nmea_msgs b/nmea_msgs
diff --git a/ublox_f9p/ublox_gps/CMakeLists.txt b/ublox_f9p/ublox_gps/CMakeLists.txt
@@ -24,7 +24,7 @@ include_directories(${PROJECT_SOURCE_DIR}/include)
 include_directories(${catkin_INCLUDE_DIRS})
 
 # link pthread
-SET(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -std=c++11 -pthread")
+SET(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -std=c++17 -pthread")
 
 # build library
 add_library(ublox_gps src/gps.cpp)

diff --git a/uiid b/uiid