From 3756569dd781fee5d42c86f338fc972e7d82fe1b Mon Sep 17 00:00:00 2001 From: easyblank Date: Thu, 30 Sep 2021 11:22:26 +0000 Subject: [PATCH] add gps goal --- aigo_nav/launch/aigo.launch | 2 +- aigo_nav/launch/configure.launch | 6 +- .../params/base_local_planner_params.yaml | 2 +- aigo_nav/params/costmap_common_params.yaml | 6 +- aigo_nav/params/ekf_params.yaml | 36 ++-- aigo_serial/src/aigo_serial.py | 10 +- aigo_serial/src/aigo_serial_sub.py | 31 +-- diff_drive/launch/aigo.launch | 2 +- diff_drive/nodes/diff_drive_odometry | 16 +- gps_goal/.gitbak/HEAD | 1 + gps_goal/.gitbak/config | 11 ++ gps_goal/.gitbak/description | 1 + gps_goal/.gitbak/hooks/applypatch-msg.sample | 15 ++ gps_goal/.gitbak/hooks/commit-msg.sample | 24 +++ .../.gitbak/hooks/fsmonitor-watchman.sample | 114 +++++++++++ gps_goal/.gitbak/hooks/post-update.sample | 8 + gps_goal/.gitbak/hooks/pre-applypatch.sample | 14 ++ gps_goal/.gitbak/hooks/pre-commit.sample | 49 +++++ gps_goal/.gitbak/hooks/pre-push.sample | 53 +++++ gps_goal/.gitbak/hooks/pre-rebase.sample | 169 ++++++++++++++++ gps_goal/.gitbak/hooks/pre-receive.sample | 24 +++ .../.gitbak/hooks/prepare-commit-msg.sample | 42 ++++ gps_goal/.gitbak/hooks/update.sample | 128 ++++++++++++ gps_goal/.gitbak/index | Bin 0 -> 1164 bytes gps_goal/.gitbak/info/exclude | 6 + gps_goal/.gitbak/logs/HEAD | 1 + gps_goal/.gitbak/logs/refs/heads/master | 1 + .../.gitbak/logs/refs/remotes/origin/HEAD | 1 + .../12/1aaf41dba19a0601cf5ddb3907f052768c86ca | Bin 0 -> 2196 bytes .../1c/f3cd0fef1415066997e9b34d1596f8bddaf759 | Bin 0 -> 2198 bytes .../1d/0fff5da3cb015fda2c32082bccf772725abe0a | Bin 0 -> 223 bytes .../34/b0bc02fd8e56d2857baf004e2422eae5cf3c3a | Bin 0 -> 352 bytes .../35/cae16cb3827a0163cc38a132a9ae54c1f0f8f8 | Bin 0 -> 104 bytes .../3a/e542c6da1e19b04fc77d672bb379e0d64b9f1a | Bin 0 -> 53 bytes .../3b/4981e4ac8d27606c572aa229dfbf3813fc42a8 | Bin 0 -> 53 bytes .../4a/86b8cc62cf1dcfcf35bc4d75f66d4f7c921bf8 | Bin 0 -> 391 bytes .../4c/a38ca43f9b443921f27b88453d4750011122e6 | Bin 0 -> 153 bytes .../4d/aab938c5b589be0f825d18eff5e1a1492d4bde | Bin 0 -> 352 bytes .../59/d5cd5347455e109c4d28e658bf929ce53d2c30 | Bin 0 -> 60 bytes .../5c/3d63adfac9942b7886744bc622a38d3480c6e1 | 2 + .../61/a84933bec75cfbca81b4d1b02b30b3897e1bad | Bin 0 -> 179 bytes .../68/a49daad8ff7e35068f2b7a97d643aab440eaec | Bin 0 -> 723 bytes .../6b/1607ce8a4d3eee2cff9db15581d56f394e06d8 | Bin 0 -> 51 bytes .../6c/fdb24513fd603e803a809faac404cd52979c7c | Bin 0 -> 630 bytes .../71/108766b884fac031ec7bfce16c470231f115ff | 1 + .../74/d75d544affc53486b83e44f945e1150b7a059d | Bin 0 -> 93 bytes .../79/51869c3021a7f7627613f111d81c6ea6069598 | Bin 0 -> 178 bytes .../80/121781f6ed174bd7bd32aba5b197ea80e7f38b | Bin 0 -> 427 bytes .../94/b88f81ca92f4347a520a412364c8084b65180f | 1 + .../95/977d1ac954822f44d06260517d81b426ff06a6 | Bin 0 -> 179 bytes .../98/a95f4af45b0184e2922d11d902ec549e2a1fc7 | Bin 0 -> 169 bytes .../98/d96f3e8c284350fd53c187f54ea3c0bff756d9 | Bin 0 -> 2171 bytes .../9a/f651700bea86797c7edd833ef97c8375047922 | Bin 0 -> 2193 bytes .../9b/d41f498884864b8f0a89338b2e7839f9a6e0a7 | 3 + .../9c/5732753ef3fc9b3d2145b45d132ecfb074577c | Bin 0 -> 403 bytes .../9e/267008cdc781977367f6d4f9ae65b35896912f | Bin 0 -> 351 bytes .../a6/48142c12fc09c53af08b11189ba0ca37d2c016 | Bin 0 -> 50 bytes .../a6/af7617870a5ae8e9cfd1a45533b4d7a95d3c21 | Bin 0 -> 418 bytes .../ab/2324151b67f0ab747591a9be54b4e05205e785 | Bin 0 -> 352 bytes .../b1/babca127e7d9efe488aac24af3af7dd31e9551 | Bin 0 -> 94 bytes .../bb/a73d4bf2aaf06f1df7f1cf4c28d49d631ce0e2 | Bin 0 -> 263 bytes .../cd/4e665f9d5da5b74d24b1f6a073623867e74968 | Bin 0 -> 352 bytes .../ce/42065ec766eb1dc974a0423cce585697dd1521 | Bin 0 -> 389 bytes .../cf/a0c081dc26d3b548b38fda1a4bc9d52980956e | 2 + .../d0/371d45b8a97b9ecad47dc53b0454ec076eb9dc | 4 + .../d3/257e31d642f7f912c38b7d6729ef7a4429daca | Bin 0 -> 50 bytes .../d7/b40be7553b684ba211f53ed51b5bde917b59f1 | Bin 0 -> 102 bytes .../d8/0d3834f49a777b83c034a7f649f36be9a96f67 | Bin 0 -> 51 bytes .../e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 | Bin 0 -> 15 bytes .../eb/c439705c0c7bfc2e8522dda58b30bd51c2fab5 | Bin 0 -> 53 bytes .../ed/17e8094beae72e6e98c1bcc1e04a7a8ef5e080 | Bin 0 -> 92 bytes .../ef/476929c7b2823083678e813b0ae389052e6aff | Bin 0 -> 309 bytes .../f2/2dc50f9cf18e45dc8aa9a4fe7afe55695a0a59 | Bin 0 -> 352 bytes .../f3/6dbfca991209c81c7abe3630e97829a0600573 | Bin 0 -> 93 bytes .../f3/80265f6b5c7b5a239151346056998a1f341fb1 | Bin 0 -> 95 bytes .../fa/b13542e123df24bc828252b23ee86cdeada3bb | Bin 0 -> 50 bytes .../fe/6571ba94b9fd7248b5e9eb79c57969aaf072ae | Bin 0 -> 392 bytes gps_goal/.gitbak/packed-refs | 3 + gps_goal/.gitbak/refs/heads/master | 1 + gps_goal/.gitbak/refs/remotes/origin/HEAD | 1 + gps_goal/.gitignore | 5 + gps_goal/CHANGELOG.rst | 7 + gps_goal/CMakeLists.txt | 31 +++ gps_goal/README.md | 11 ++ gps_goal/UNLICENSE | 24 +++ gps_goal/launch/gps_goal.launch | 11 ++ gps_goal/launch/initialize_origin.launch | 17 ++ gps_goal/nodes/gps_goal | 6 + gps_goal/package.xml | 31 +++ gps_goal/setup.py | 11 ++ gps_goal/src/gps_goal/__init__.py | 0 gps_goal/src/gps_goal/gps_goal.py | 183 ++++++++++++++++++ 92 files changed, 1078 insertions(+), 50 deletions(-) create mode 100644 gps_goal/.gitbak/HEAD create mode 100644 gps_goal/.gitbak/config create mode 100644 gps_goal/.gitbak/description create mode 100755 gps_goal/.gitbak/hooks/applypatch-msg.sample create mode 100755 gps_goal/.gitbak/hooks/commit-msg.sample create mode 100755 gps_goal/.gitbak/hooks/fsmonitor-watchman.sample create mode 100755 gps_goal/.gitbak/hooks/post-update.sample create mode 100755 gps_goal/.gitbak/hooks/pre-applypatch.sample create mode 100755 gps_goal/.gitbak/hooks/pre-commit.sample create mode 100755 gps_goal/.gitbak/hooks/pre-push.sample create mode 100755 gps_goal/.gitbak/hooks/pre-rebase.sample create mode 100755 gps_goal/.gitbak/hooks/pre-receive.sample create mode 100755 gps_goal/.gitbak/hooks/prepare-commit-msg.sample create mode 100755 gps_goal/.gitbak/hooks/update.sample create mode 100644 gps_goal/.gitbak/index create mode 100644 gps_goal/.gitbak/info/exclude create mode 100644 gps_goal/.gitbak/logs/HEAD create mode 100644 gps_goal/.gitbak/logs/refs/heads/master create mode 100644 gps_goal/.gitbak/logs/refs/remotes/origin/HEAD create mode 100644 gps_goal/.gitbak/objects/12/1aaf41dba19a0601cf5ddb3907f052768c86ca create mode 100644 gps_goal/.gitbak/objects/1c/f3cd0fef1415066997e9b34d1596f8bddaf759 create mode 100644 gps_goal/.gitbak/objects/1d/0fff5da3cb015fda2c32082bccf772725abe0a create mode 100644 gps_goal/.gitbak/objects/34/b0bc02fd8e56d2857baf004e2422eae5cf3c3a create mode 100644 gps_goal/.gitbak/objects/35/cae16cb3827a0163cc38a132a9ae54c1f0f8f8 create mode 100644 gps_goal/.gitbak/objects/3a/e542c6da1e19b04fc77d672bb379e0d64b9f1a create mode 100644 gps_goal/.gitbak/objects/3b/4981e4ac8d27606c572aa229dfbf3813fc42a8 create mode 100644 gps_goal/.gitbak/objects/4a/86b8cc62cf1dcfcf35bc4d75f66d4f7c921bf8 create mode 100644 gps_goal/.gitbak/objects/4c/a38ca43f9b443921f27b88453d4750011122e6 create mode 100644 gps_goal/.gitbak/objects/4d/aab938c5b589be0f825d18eff5e1a1492d4bde create mode 100644 gps_goal/.gitbak/objects/59/d5cd5347455e109c4d28e658bf929ce53d2c30 create mode 100644 gps_goal/.gitbak/objects/5c/3d63adfac9942b7886744bc622a38d3480c6e1 create mode 100644 gps_goal/.gitbak/objects/61/a84933bec75cfbca81b4d1b02b30b3897e1bad create mode 100644 gps_goal/.gitbak/objects/68/a49daad8ff7e35068f2b7a97d643aab440eaec create mode 100644 gps_goal/.gitbak/objects/6b/1607ce8a4d3eee2cff9db15581d56f394e06d8 create mode 100644 gps_goal/.gitbak/objects/6c/fdb24513fd603e803a809faac404cd52979c7c create mode 100644 gps_goal/.gitbak/objects/71/108766b884fac031ec7bfce16c470231f115ff create mode 100644 gps_goal/.gitbak/objects/74/d75d544affc53486b83e44f945e1150b7a059d create mode 100644 gps_goal/.gitbak/objects/79/51869c3021a7f7627613f111d81c6ea6069598 create mode 100644 gps_goal/.gitbak/objects/80/121781f6ed174bd7bd32aba5b197ea80e7f38b create mode 100644 gps_goal/.gitbak/objects/94/b88f81ca92f4347a520a412364c8084b65180f create mode 100644 gps_goal/.gitbak/objects/95/977d1ac954822f44d06260517d81b426ff06a6 create mode 100644 gps_goal/.gitbak/objects/98/a95f4af45b0184e2922d11d902ec549e2a1fc7 create mode 100644 gps_goal/.gitbak/objects/98/d96f3e8c284350fd53c187f54ea3c0bff756d9 create mode 100644 gps_goal/.gitbak/objects/9a/f651700bea86797c7edd833ef97c8375047922 create mode 100644 gps_goal/.gitbak/objects/9b/d41f498884864b8f0a89338b2e7839f9a6e0a7 create mode 100644 gps_goal/.gitbak/objects/9c/5732753ef3fc9b3d2145b45d132ecfb074577c create mode 100644 gps_goal/.gitbak/objects/9e/267008cdc781977367f6d4f9ae65b35896912f create mode 100644 gps_goal/.gitbak/objects/a6/48142c12fc09c53af08b11189ba0ca37d2c016 create mode 100644 gps_goal/.gitbak/objects/a6/af7617870a5ae8e9cfd1a45533b4d7a95d3c21 create mode 100644 gps_goal/.gitbak/objects/ab/2324151b67f0ab747591a9be54b4e05205e785 create mode 100644 gps_goal/.gitbak/objects/b1/babca127e7d9efe488aac24af3af7dd31e9551 create mode 100644 gps_goal/.gitbak/objects/bb/a73d4bf2aaf06f1df7f1cf4c28d49d631ce0e2 create mode 100644 gps_goal/.gitbak/objects/cd/4e665f9d5da5b74d24b1f6a073623867e74968 create mode 100644 gps_goal/.gitbak/objects/ce/42065ec766eb1dc974a0423cce585697dd1521 create mode 100644 gps_goal/.gitbak/objects/cf/a0c081dc26d3b548b38fda1a4bc9d52980956e create mode 100644 gps_goal/.gitbak/objects/d0/371d45b8a97b9ecad47dc53b0454ec076eb9dc create mode 100644 gps_goal/.gitbak/objects/d3/257e31d642f7f912c38b7d6729ef7a4429daca create mode 100644 gps_goal/.gitbak/objects/d7/b40be7553b684ba211f53ed51b5bde917b59f1 create mode 100644 gps_goal/.gitbak/objects/d8/0d3834f49a777b83c034a7f649f36be9a96f67 create mode 100644 gps_goal/.gitbak/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 create mode 100644 gps_goal/.gitbak/objects/eb/c439705c0c7bfc2e8522dda58b30bd51c2fab5 create mode 100644 gps_goal/.gitbak/objects/ed/17e8094beae72e6e98c1bcc1e04a7a8ef5e080 create mode 100644 gps_goal/.gitbak/objects/ef/476929c7b2823083678e813b0ae389052e6aff create mode 100644 gps_goal/.gitbak/objects/f2/2dc50f9cf18e45dc8aa9a4fe7afe55695a0a59 create mode 100644 gps_goal/.gitbak/objects/f3/6dbfca991209c81c7abe3630e97829a0600573 create mode 100644 gps_goal/.gitbak/objects/f3/80265f6b5c7b5a239151346056998a1f341fb1 create mode 100644 gps_goal/.gitbak/objects/fa/b13542e123df24bc828252b23ee86cdeada3bb create mode 100644 gps_goal/.gitbak/objects/fe/6571ba94b9fd7248b5e9eb79c57969aaf072ae create mode 100644 gps_goal/.gitbak/packed-refs create mode 100644 gps_goal/.gitbak/refs/heads/master create mode 100644 gps_goal/.gitbak/refs/remotes/origin/HEAD create mode 100644 gps_goal/.gitignore create mode 100644 gps_goal/CHANGELOG.rst create mode 100644 gps_goal/CMakeLists.txt create mode 100644 gps_goal/README.md create mode 100644 gps_goal/UNLICENSE create mode 100644 gps_goal/launch/gps_goal.launch create mode 100644 gps_goal/launch/initialize_origin.launch create mode 100755 gps_goal/nodes/gps_goal create mode 100644 gps_goal/package.xml create mode 100644 gps_goal/setup.py create mode 100644 gps_goal/src/gps_goal/__init__.py create mode 100755 gps_goal/src/gps_goal/gps_goal.py diff --git a/aigo_nav/launch/aigo.launch b/aigo_nav/launch/aigo.launch index 9eee4f1..0ca73f2 100644 --- a/aigo_nav/launch/aigo.launch +++ b/aigo_nav/launch/aigo.launch @@ -11,7 +11,7 @@ - + diff --git a/aigo_nav/launch/configure.launch b/aigo_nav/launch/configure.launch index 5cf4d77..f2da0ef 100644 --- a/aigo_nav/launch/configure.launch +++ b/aigo_nav/launch/configure.launch @@ -4,8 +4,10 @@ - + + - + + diff --git a/aigo_nav/params/base_local_planner_params.yaml b/aigo_nav/params/base_local_planner_params.yaml index e1106dd..4b60f5a 100644 --- a/aigo_nav/params/base_local_planner_params.yaml +++ b/aigo_nav/params/base_local_planner_params.yaml @@ -18,7 +18,7 @@ TrajectoryPlannerROS: # Goal Tolerance Parameters yaw_goal_tolerance: 3.14 # in rads - xy_goal_tolerance: 1 # in meters + xy_goal_tolerance: 0.5 # in meters latch_xy_goal_tolerance: false # Forward Simulation Parameters diff --git a/aigo_nav/params/costmap_common_params.yaml b/aigo_nav/params/costmap_common_params.yaml index 558a5e6..eedd5fc 100644 --- a/aigo_nav/params/costmap_common_params.yaml +++ b/aigo_nav/params/costmap_common_params.yaml @@ -5,8 +5,8 @@ z_resolution: 1 # The z resolution of the map in meters/cell. z_voxels: 2 # The number of voxels to in each vertical column, the height of the grid is z resolution * z voxels. # -obstacle_range: 1.5 # The default maximum distance from the robot at which an obstacle will be inserted into the cost map in meters. -raytrace_range: 1.5 # The default range in meters at which to raytrace out obstacles from the map using sensor data +obstacle_range: 1.0 # The default maximum distance from the robot at which an obstacle will be inserted into the cost map in meters. +raytrace_range: 1.0 # The default range in meters at which to raytrace out obstacles from the map using sensor data # publish_voxel_map: false @@ -20,4 +20,4 @@ cost_scaling_factor: 10 # slope of the cost decay curve with respect to distance observation_sources: laser_scan_sensor -laser_scan_sensor: {sensor_frame: base_link, data_type: LaserScan, topic: scan, marking: true, clearing: true} +laser_scan_sensor: {sensor_frame: base_link, data_type: LaserScan, topic: scan, expected_update_rate: 0.5, marking: true, clearing: true} diff --git a/aigo_nav/params/ekf_params.yaml b/aigo_nav/params/ekf_params.yaml index 50a2d16..799bf10 100644 --- a/aigo_nav/params/ekf_params.yaml +++ b/aigo_nav/params/ekf_params.yaml @@ -50,7 +50,7 @@ ekf_se_odom: # Used only for broadcasting odom to base_link transforms false, false, false, false, false, false, false, false, true, - false, false, false] + true, true, false] imu0_nodelay: false imu0_differential: false imu0_relative: false @@ -59,14 +59,14 @@ ekf_se_odom: # Used only for broadcasting odom to base_link transforms use_control: false -process_noise_covariance: [0.05, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0.05, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +process_noise_covariance: [5.05, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 5.05, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.06, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.03, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.03, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.06, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0.025, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0.025, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.04, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.01, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.01, 0, 0, 0, 0, @@ -138,16 +138,16 @@ ekf_se_map: # ------------------------------------- # GPS odometry: - # odom1: /odometry/gps - #odom1_config: [true, true, false, - # false, false, false, - # false, false, false, - # false, false, false, - # false, false, false] - #odom1_queue_size: 10 - #odom1_nodelay: true - #odom1_differential: false - #odom1_relative: false + odom1: /odometry/gps + odom1_config: [true, true, false, + false, false, false, + false, false, false, + false, false, false, + false, false, false] + odom1_queue_size: 10 + odom1_nodelay: true + odom1_differential: false + odom1_relative: false # -------------------------------------- @@ -158,7 +158,7 @@ ekf_se_map: false, false, false, false, false, false, false, false, true, - false, false, false] + true, true, false] imu0_nodelay: true imu0_differential: false imu0_relative: false @@ -173,8 +173,8 @@ process_noise_covariance: [0.05, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.03, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.03, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.06, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0.025, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0.025, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.04, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.01, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.01, 0, 0, 0, 0, diff --git a/aigo_serial/src/aigo_serial.py b/aigo_serial/src/aigo_serial.py index b32dbdf..d418a73 100755 --- a/aigo_serial/src/aigo_serial.py +++ b/aigo_serial/src/aigo_serial.py @@ -20,13 +20,13 @@ def calculate_pose(): global right_vel #in STM32, MOTOR_SPEED = OUTPUT * 15 (MOTOR_SPEED < 9000) #turn right - if(left > right+100): - left_vel = 600 - right_vel = 600 - #turn left - elif(left+100 < right): + if(left > right+50): left_vel = 600 right_vel = -600 + #turn left + elif(left+50 < right): + left_vel = -600 + right_vel = 600 elif(left > 0 and right > 0): left_vel = 400 right_vel = 400 diff --git a/aigo_serial/src/aigo_serial_sub.py b/aigo_serial/src/aigo_serial_sub.py index bb6cafd..496e728 100755 --- a/aigo_serial/src/aigo_serial_sub.py +++ b/aigo_serial/src/aigo_serial_sub.py @@ -1,7 +1,9 @@ #!/usr/bin/env python import rospy +import from std_msgs.msg import Float32, Int32 +from sensor_msgs.msg import NavSatFix import serial, time, re ser_front = serial.Serial(\ @@ -9,6 +11,11 @@ baudrate = 115200, ) +def gps_callback(msg): + global lat + global long + + def left_callback(msg): lwheel_desired_rate = msg.data @@ -17,16 +24,18 @@ def right_callback(msg): if __name__ == '__main__': rospy.init_node('aigo_serial_sub') - lwheel_desired_rate = 0 - rwheel_desired_rate = 0 - lwheel_desired_rate_sub = rospy.Subscriber('lwheel_desired_rate', Int32, left_callback) - rwheel_desired_rate_sub = rospy.Subscriber('rwheel_desired_rate', Int32, right_callback) - stm32_msg = str(lwheel_desired_rate)+','+str(rwheel_desired_rate) + # lwheel_desired_rate = 0 + # rwheel_desired_rate = 0 + gps_sub = rospy.Subscriber('/fix', NavSatFix, gps_callback) + with + #lwheel_desired_rate_sub = rospy.Subscriber('lwheel_desired_rate', Int32, left_callback) + #rwheel_desired_rate_sub = rospy.Subscriber('rwheel_desired_rate', Int32, right_callback) + # stm32_msg = str(lwheel_desired_rate)+','+str(rwheel_desired_rate) - while not rospy.is_shutdown(): - time.sleep(0.1) - ser_front.write(stm32_msg) - ser_front.flushInput() - ser_front.flushOutput() -ser_front.close() + #while not rospy.is_shutdown(): + # time.sleep(0.1) + # ser_front.write(stm32_msg) +# ser_front.flushInput() +# ser_front.flushOutput() +#ser_front.close() diff --git a/diff_drive/launch/aigo.launch b/diff_drive/launch/aigo.launch index 04df5b8..e81e7f7 100644 --- a/diff_drive/launch/aigo.launch +++ b/diff_drive/launch/aigo.launch @@ -1,6 +1,6 @@ - + diff --git a/diff_drive/nodes/diff_drive_odometry b/diff_drive/nodes/diff_drive_odometry index 71aa70e..6d21732 100755 --- a/diff_drive/nodes/diff_drive_odometry +++ b/diff_drive/nodes/diff_drive_odometry @@ -20,7 +20,7 @@ class OdometryNode: def main(self): self.odomPub = rospy.Publisher('odom', Odometry, queue_size=10) - self.tfPub = TransformBroadcaster() +# self.tfPub = TransformBroadcaster() rospy.init_node('diff_drive_odometry') self.nodeName = rospy.get_name() @@ -55,13 +55,13 @@ class OdometryNode: pose = self.odometry.getPose() q = quaternion_from_euler(0, 0, pose.theta) - self.tfPub.sendTransform( - (pose.x, pose.y, 0), - (q[0], q[1], q[2], q[3]), - now, - self.baseFrameID, - self.odomFrameID - ) +# self.tfPub.sendTransform( +# (pose.x, pose.y, 0), +# (q[0], q[1], q[2], q[3]), +# now, +# self.baseFrameID, +# self.odomFrameID +# ) odom = Odometry() odom.header.stamp = now diff --git a/gps_goal/.gitbak/HEAD b/gps_goal/.gitbak/HEAD new file mode 100644 index 0000000..cb089cd --- /dev/null +++ b/gps_goal/.gitbak/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/gps_goal/.gitbak/config b/gps_goal/.gitbak/config new file mode 100644 index 0000000..a6502e8 --- /dev/null +++ b/gps_goal/.gitbak/config @@ -0,0 +1,11 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true +[remote "origin"] + url = https://github.com/danielsnider/gps_goal + fetch = +refs/heads/*:refs/remotes/origin/* +[branch "master"] + remote = origin + merge = refs/heads/master diff --git a/gps_goal/.gitbak/description b/gps_goal/.gitbak/description new file mode 100644 index 0000000..498b267 --- /dev/null +++ b/gps_goal/.gitbak/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/gps_goal/.gitbak/hooks/applypatch-msg.sample b/gps_goal/.gitbak/hooks/applypatch-msg.sample new file mode 100755 index 0000000..a5d7b84 --- /dev/null +++ b/gps_goal/.gitbak/hooks/applypatch-msg.sample @@ -0,0 +1,15 @@ +#!/bin/sh +# +# An example hook script to check the commit log message taken by +# applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. The hook is +# allowed to edit the commit message file. +# +# To enable this hook, rename this file to "applypatch-msg". + +. git-sh-setup +commitmsg="$(git rev-parse --git-path hooks/commit-msg)" +test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"} +: diff --git a/gps_goal/.gitbak/hooks/commit-msg.sample b/gps_goal/.gitbak/hooks/commit-msg.sample new file mode 100755 index 0000000..b58d118 --- /dev/null +++ b/gps_goal/.gitbak/hooks/commit-msg.sample @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to check the commit log message. +# Called by "git commit" with one argument, the name of the file +# that has the commit message. The hook should exit with non-zero +# status after issuing an appropriate message if it wants to stop the +# commit. The hook is allowed to edit the commit message file. +# +# To enable this hook, rename this file to "commit-msg". + +# Uncomment the below to add a Signed-off-by line to the message. +# Doing this in a hook is a bad idea in general, but the prepare-commit-msg +# hook is more suited to it. +# +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" + +# This example catches duplicate Signed-off-by lines. + +test "" = "$(grep '^Signed-off-by: ' "$1" | + sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { + echo >&2 Duplicate Signed-off-by lines. + exit 1 +} diff --git a/gps_goal/.gitbak/hooks/fsmonitor-watchman.sample b/gps_goal/.gitbak/hooks/fsmonitor-watchman.sample new file mode 100755 index 0000000..e673bb3 --- /dev/null +++ b/gps_goal/.gitbak/hooks/fsmonitor-watchman.sample @@ -0,0 +1,114 @@ +#!/usr/bin/perl + +use strict; +use warnings; +use IPC::Open2; + +# An example hook script to integrate Watchman +# (https://facebook.github.io/watchman/) with git to speed up detecting +# new and modified files. +# +# The hook is passed a version (currently 1) and a time in nanoseconds +# formatted as a string and outputs to stdout all files that have been +# modified since the given time. Paths must be relative to the root of +# the working tree and separated by a single NUL. +# +# To enable this hook, rename this file to "query-watchman" and set +# 'git config core.fsmonitor .git/hooks/query-watchman' +# +my ($version, $time) = @ARGV; + +# Check the hook interface version + +if ($version == 1) { + # convert nanoseconds to seconds + $time = int $time / 1000000000; +} else { + die "Unsupported query-fsmonitor hook version '$version'.\n" . + "Falling back to scanning...\n"; +} + +my $git_work_tree; +if ($^O =~ 'msys' || $^O =~ 'cygwin') { + $git_work_tree = Win32::GetCwd(); + $git_work_tree =~ tr/\\/\//; +} else { + require Cwd; + $git_work_tree = Cwd::cwd(); +} + +my $retry = 1; + +launch_watchman(); + +sub launch_watchman { + + my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty') + or die "open2() failed: $!\n" . + "Falling back to scanning...\n"; + + # In the query expression below we're asking for names of files that + # changed since $time but were not transient (ie created after + # $time but no longer exist). + # + # To accomplish this, we're using the "since" generator to use the + # recency index to select candidate nodes and "fields" to limit the + # output to file names only. Then we're using the "expression" term to + # further constrain the results. + # + # The category of transient files that we want to ignore will have a + # creation clock (cclock) newer than $time_t value and will also not + # currently exist. + + my $query = <<" END"; + ["query", "$git_work_tree", { + "since": $time, + "fields": ["name"], + "expression": ["not", ["allof", ["since", $time, "cclock"], ["not", "exists"]]] + }] + END + + print CHLD_IN $query; + close CHLD_IN; + my $response = do {local $/; }; + + die "Watchman: command returned no output.\n" . + "Falling back to scanning...\n" if $response eq ""; + die "Watchman: command returned invalid output: $response\n" . + "Falling back to scanning...\n" unless $response =~ /^\{/; + + my $json_pkg; + eval { + require JSON::XS; + $json_pkg = "JSON::XS"; + 1; + } or do { + require JSON::PP; + $json_pkg = "JSON::PP"; + }; + + my $o = $json_pkg->new->utf8->decode($response); + + if ($retry > 0 and $o->{error} and $o->{error} =~ m/unable to resolve root .* directory (.*) is not watched/) { + print STDERR "Adding '$git_work_tree' to watchman's watch list.\n"; + $retry--; + qx/watchman watch "$git_work_tree"/; + die "Failed to make watchman watch '$git_work_tree'.\n" . + "Falling back to scanning...\n" if $? != 0; + + # Watchman will always return all files on the first query so + # return the fast "everything is dirty" flag to git and do the + # Watchman query just to get it over with now so we won't pay + # the cost in git to look up each individual file. + print "/\0"; + eval { launch_watchman() }; + exit 0; + } + + die "Watchman: $o->{error}.\n" . + "Falling back to scanning...\n" if $o->{error}; + + binmode STDOUT, ":utf8"; + local $, = "\0"; + print @{$o->{files}}; +} diff --git a/gps_goal/.gitbak/hooks/post-update.sample b/gps_goal/.gitbak/hooks/post-update.sample new file mode 100755 index 0000000..ec17ec1 --- /dev/null +++ b/gps_goal/.gitbak/hooks/post-update.sample @@ -0,0 +1,8 @@ +#!/bin/sh +# +# An example hook script to prepare a packed repository for use over +# dumb transports. +# +# To enable this hook, rename this file to "post-update". + +exec git update-server-info diff --git a/gps_goal/.gitbak/hooks/pre-applypatch.sample b/gps_goal/.gitbak/hooks/pre-applypatch.sample new file mode 100755 index 0000000..4142082 --- /dev/null +++ b/gps_goal/.gitbak/hooks/pre-applypatch.sample @@ -0,0 +1,14 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed +# by applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-applypatch". + +. git-sh-setup +precommit="$(git rev-parse --git-path hooks/pre-commit)" +test -x "$precommit" && exec "$precommit" ${1+"$@"} +: diff --git a/gps_goal/.gitbak/hooks/pre-commit.sample b/gps_goal/.gitbak/hooks/pre-commit.sample new file mode 100755 index 0000000..68d62d5 --- /dev/null +++ b/gps_goal/.gitbak/hooks/pre-commit.sample @@ -0,0 +1,49 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git commit" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message if +# it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-commit". + +if git rev-parse --verify HEAD >/dev/null 2>&1 +then + against=HEAD +else + # Initial commit: diff against an empty tree object + against=4b825dc642cb6eb9a060e54bf8d69288fbee4904 +fi + +# If you want to allow non-ASCII filenames set this variable to true. +allownonascii=$(git config --bool hooks.allownonascii) + +# Redirect output to stderr. +exec 1>&2 + +# Cross platform projects tend to avoid non-ASCII filenames; prevent +# them from being added to the repository. We exploit the fact that the +# printable range starts at the space character and ends with tilde. +if [ "$allownonascii" != "true" ] && + # Note that the use of brackets around a tr range is ok here, (it's + # even required, for portability to Solaris 10's /usr/bin/tr), since + # the square bracket bytes happen to fall in the designated range. + test $(git diff --cached --name-only --diff-filter=A -z $against | + LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 +then + cat <<\EOF +Error: Attempt to add a non-ASCII file name. + +This can cause problems if you want to work with people on other platforms. + +To be portable it is advisable to rename the file. + +If you know what you are doing you can disable this check using: + + git config hooks.allownonascii true +EOF + exit 1 +fi + +# If there are whitespace errors, print the offending file names and fail. +exec git diff-index --check --cached $against -- diff --git a/gps_goal/.gitbak/hooks/pre-push.sample b/gps_goal/.gitbak/hooks/pre-push.sample new file mode 100755 index 0000000..6187dbf --- /dev/null +++ b/gps_goal/.gitbak/hooks/pre-push.sample @@ -0,0 +1,53 @@ +#!/bin/sh + +# An example hook script to verify what is about to be pushed. Called by "git +# push" after it has checked the remote status, but before anything has been +# pushed. If this script exits with a non-zero status nothing will be pushed. +# +# This hook is called with the following parameters: +# +# $1 -- Name of the remote to which the push is being done +# $2 -- URL to which the push is being done +# +# If pushing without using a named remote those arguments will be equal. +# +# Information about the commits which are being pushed is supplied as lines to +# the standard input in the form: +# +# +# +# This sample shows how to prevent push of commits where the log message starts +# with "WIP" (work in progress). + +remote="$1" +url="$2" + +z40=0000000000000000000000000000000000000000 + +while read local_ref local_sha remote_ref remote_sha +do + if [ "$local_sha" = $z40 ] + then + # Handle delete + : + else + if [ "$remote_sha" = $z40 ] + then + # New branch, examine all commits + range="$local_sha" + else + # Update to existing branch, examine new commits + range="$remote_sha..$local_sha" + fi + + # Check for WIP commit + commit=`git rev-list -n 1 --grep '^WIP' "$range"` + if [ -n "$commit" ] + then + echo >&2 "Found WIP commit in $local_ref, not pushing" + exit 1 + fi + fi +done + +exit 0 diff --git a/gps_goal/.gitbak/hooks/pre-rebase.sample b/gps_goal/.gitbak/hooks/pre-rebase.sample new file mode 100755 index 0000000..6cbef5c --- /dev/null +++ b/gps_goal/.gitbak/hooks/pre-rebase.sample @@ -0,0 +1,169 @@ +#!/bin/sh +# +# Copyright (c) 2006, 2008 Junio C Hamano +# +# The "pre-rebase" hook is run just before "git rebase" starts doing +# its job, and can prevent the command from running by exiting with +# non-zero status. +# +# The hook is called with the following parameters: +# +# $1 -- the upstream the series was forked from. +# $2 -- the branch being rebased (or empty when rebasing the current branch). +# +# This sample shows how to prevent topic branches that are already +# merged to 'next' branch from getting rebased, because allowing it +# would result in rebasing already published history. + +publish=next +basebranch="$1" +if test "$#" = 2 +then + topic="refs/heads/$2" +else + topic=`git symbolic-ref HEAD` || + exit 0 ;# we do not interrupt rebasing detached HEAD +fi + +case "$topic" in +refs/heads/??/*) + ;; +*) + exit 0 ;# we do not interrupt others. + ;; +esac + +# Now we are dealing with a topic branch being rebased +# on top of master. Is it OK to rebase it? + +# Does the topic really exist? +git show-ref -q "$topic" || { + echo >&2 "No such branch $topic" + exit 1 +} + +# Is topic fully merged to master? +not_in_master=`git rev-list --pretty=oneline ^master "$topic"` +if test -z "$not_in_master" +then + echo >&2 "$topic is fully merged to master; better remove it." + exit 1 ;# we could allow it, but there is no point. +fi + +# Is topic ever merged to next? If so you should not be rebasing it. +only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` +only_next_2=`git rev-list ^master ${publish} | sort` +if test "$only_next_1" = "$only_next_2" +then + not_in_topic=`git rev-list "^$topic" master` + if test -z "$not_in_topic" + then + echo >&2 "$topic is already up to date with master" + exit 1 ;# we could allow it, but there is no point. + else + exit 0 + fi +else + not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` + /usr/bin/perl -e ' + my $topic = $ARGV[0]; + my $msg = "* $topic has commits already merged to public branch:\n"; + my (%not_in_next) = map { + /^([0-9a-f]+) /; + ($1 => 1); + } split(/\n/, $ARGV[1]); + for my $elem (map { + /^([0-9a-f]+) (.*)$/; + [$1 => $2]; + } split(/\n/, $ARGV[2])) { + if (!exists $not_in_next{$elem->[0]}) { + if ($msg) { + print STDERR $msg; + undef $msg; + } + print STDERR " $elem->[1]\n"; + } + } + ' "$topic" "$not_in_next" "$not_in_master" + exit 1 +fi + +<<\DOC_END + +This sample hook safeguards topic branches that have been +published from being rewound. + +The workflow assumed here is: + + * Once a topic branch forks from "master", "master" is never + merged into it again (either directly or indirectly). + + * Once a topic branch is fully cooked and merged into "master", + it is deleted. If you need to build on top of it to correct + earlier mistakes, a new topic branch is created by forking at + the tip of the "master". This is not strictly necessary, but + it makes it easier to keep your history simple. + + * Whenever you need to test or publish your changes to topic + branches, merge them into "next" branch. + +The script, being an example, hardcodes the publish branch name +to be "next", but it is trivial to make it configurable via +$GIT_DIR/config mechanism. + +With this workflow, you would want to know: + +(1) ... if a topic branch has ever been merged to "next". Young + topic branches can have stupid mistakes you would rather + clean up before publishing, and things that have not been + merged into other branches can be easily rebased without + affecting other people. But once it is published, you would + not want to rewind it. + +(2) ... if a topic branch has been fully merged to "master". + Then you can delete it. More importantly, you should not + build on top of it -- other people may already want to + change things related to the topic as patches against your + "master", so if you need further changes, it is better to + fork the topic (perhaps with the same name) afresh from the + tip of "master". + +Let's look at this example: + + o---o---o---o---o---o---o---o---o---o "next" + / / / / + / a---a---b A / / + / / / / + / / c---c---c---c B / + / / / \ / + / / / b---b C \ / + / / / / \ / + ---o---o---o---o---o---o---o---o---o---o---o "master" + + +A, B and C are topic branches. + + * A has one fix since it was merged up to "next". + + * B has finished. It has been fully merged up to "master" and "next", + and is ready to be deleted. + + * C has not merged to "next" at all. + +We would want to allow C to be rebased, refuse A, and encourage +B to be deleted. + +To compute (1): + + git rev-list ^master ^topic next + git rev-list ^master next + + if these match, topic has not merged in next at all. + +To compute (2): + + git rev-list master..topic + + if this is empty, it is fully merged to "master". + +DOC_END diff --git a/gps_goal/.gitbak/hooks/pre-receive.sample b/gps_goal/.gitbak/hooks/pre-receive.sample new file mode 100755 index 0000000..a1fd29e --- /dev/null +++ b/gps_goal/.gitbak/hooks/pre-receive.sample @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to make use of push options. +# The example simply echoes all push options that start with 'echoback=' +# and rejects all pushes when the "reject" push option is used. +# +# To enable this hook, rename this file to "pre-receive". + +if test -n "$GIT_PUSH_OPTION_COUNT" +then + i=0 + while test "$i" -lt "$GIT_PUSH_OPTION_COUNT" + do + eval "value=\$GIT_PUSH_OPTION_$i" + case "$value" in + echoback=*) + echo "echo from the pre-receive-hook: ${value#*=}" >&2 + ;; + reject) + exit 1 + esac + i=$((i + 1)) + done +fi diff --git a/gps_goal/.gitbak/hooks/prepare-commit-msg.sample b/gps_goal/.gitbak/hooks/prepare-commit-msg.sample new file mode 100755 index 0000000..10fa14c --- /dev/null +++ b/gps_goal/.gitbak/hooks/prepare-commit-msg.sample @@ -0,0 +1,42 @@ +#!/bin/sh +# +# An example hook script to prepare the commit log message. +# Called by "git commit" with the name of the file that has the +# commit message, followed by the description of the commit +# message's source. The hook's purpose is to edit the commit +# message file. If the hook fails with a non-zero status, +# the commit is aborted. +# +# To enable this hook, rename this file to "prepare-commit-msg". + +# This hook includes three examples. The first one removes the +# "# Please enter the commit message..." help message. +# +# The second includes the output of "git diff --name-status -r" +# into the message, just before the "git status" output. It is +# commented because it doesn't cope with --amend or with squashed +# commits. +# +# The third example adds a Signed-off-by line to the message, that can +# still be edited. This is rarely a good idea. + +COMMIT_MSG_FILE=$1 +COMMIT_SOURCE=$2 +SHA1=$3 + +/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE" + +# case "$COMMIT_SOURCE,$SHA1" in +# ,|template,) +# /usr/bin/perl -i.bak -pe ' +# print "\n" . `git diff --cached --name-status -r` +# if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;; +# *) ;; +# esac + +# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE" +# if test -z "$COMMIT_SOURCE" +# then +# /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE" +# fi diff --git a/gps_goal/.gitbak/hooks/update.sample b/gps_goal/.gitbak/hooks/update.sample new file mode 100755 index 0000000..80ba941 --- /dev/null +++ b/gps_goal/.gitbak/hooks/update.sample @@ -0,0 +1,128 @@ +#!/bin/sh +# +# An example hook script to block unannotated tags from entering. +# Called by "git receive-pack" with arguments: refname sha1-old sha1-new +# +# To enable this hook, rename this file to "update". +# +# Config +# ------ +# hooks.allowunannotated +# This boolean sets whether unannotated tags will be allowed into the +# repository. By default they won't be. +# hooks.allowdeletetag +# This boolean sets whether deleting tags will be allowed in the +# repository. By default they won't be. +# hooks.allowmodifytag +# This boolean sets whether a tag may be modified after creation. By default +# it won't be. +# hooks.allowdeletebranch +# This boolean sets whether deleting branches will be allowed in the +# repository. By default they won't be. +# hooks.denycreatebranch +# This boolean sets whether remotely creating branches will be denied +# in the repository. By default this is allowed. +# + +# --- Command line +refname="$1" +oldrev="$2" +newrev="$3" + +# --- Safety check +if [ -z "$GIT_DIR" ]; then + echo "Don't run this script from the command line." >&2 + echo " (if you want, you could supply GIT_DIR then run" >&2 + echo " $0 )" >&2 + exit 1 +fi + +if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then + echo "usage: $0 " >&2 + exit 1 +fi + +# --- Config +allowunannotated=$(git config --bool hooks.allowunannotated) +allowdeletebranch=$(git config --bool hooks.allowdeletebranch) +denycreatebranch=$(git config --bool hooks.denycreatebranch) +allowdeletetag=$(git config --bool hooks.allowdeletetag) +allowmodifytag=$(git config --bool hooks.allowmodifytag) + +# check for no description +projectdesc=$(sed -e '1q' "$GIT_DIR/description") +case "$projectdesc" in +"Unnamed repository"* | "") + echo "*** Project description file hasn't been set" >&2 + exit 1 + ;; +esac + +# --- Check types +# if $newrev is 0000...0000, it's a commit to delete a ref. +zero="0000000000000000000000000000000000000000" +if [ "$newrev" = "$zero" ]; then + newrev_type=delete +else + newrev_type=$(git cat-file -t $newrev) +fi + +case "$refname","$newrev_type" in + refs/tags/*,commit) + # un-annotated tag + short_refname=${refname##refs/tags/} + if [ "$allowunannotated" != "true" ]; then + echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2 + echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 + exit 1 + fi + ;; + refs/tags/*,delete) + # delete tag + if [ "$allowdeletetag" != "true" ]; then + echo "*** Deleting a tag is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/tags/*,tag) + # annotated tag + if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 + then + echo "*** Tag '$refname' already exists." >&2 + echo "*** Modifying a tag is not allowed in this repository." >&2 + exit 1 + fi + ;; + refs/heads/*,commit) + # branch + if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then + echo "*** Creating a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/heads/*,delete) + # delete branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/remotes/*,commit) + # tracking branch + ;; + refs/remotes/*,delete) + # delete tracking branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a tracking branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + *) + # Anything else (is there anything else?) + echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 + exit 1 + ;; +esac + +# --- Finished +exit 0 diff --git a/gps_goal/.gitbak/index b/gps_goal/.gitbak/index new file mode 100644 index 0000000000000000000000000000000000000000..122d4934af57c3f458c8034bf052b033b4106d8d GIT binary patch literal 1164 zcmZ?q402{*U|<4boM)vtVKWnh=+9;bhQ=if49qVen8E1v5zB%Yp6Wk( ztx9*7b{p&sJoIZT1D9TUW=UpxUVc$3&@3>3nFFJt=Cz=ickpwAT6}g)b(HeNK$C>9 znO*WG@*5d=ojn}=++BVA-Svu!OYoW3ifSH{@$4(|o*gZ1-u+yi#@%`qmOqz0SkA!b z?3XTVqQmj`}0X7ikE*K4UUmL1O;Ql_mAg&G_K4|mU-}qfiuX} z(Z$zQFE@n&tUt%`1dN87(~fEm%kGRNb64H?UuVkJuU$3$n)9kH4zJ!YaEAK%csjfK z1-s%hrxVp2#+_4k^f#WG^u?qqh|5tqk~dVXS#9)u4H zIGDR&G}L`vsOBeJ7I|!a`MUCGW#+06Me7*23lfvF6Vp@mDspqcsRpP2`%ukeG?L~2 zAG`Q8WBe^0BM$8|-;0W(_Hi+A6sMMy7U&gJ;xuO>syPe{&*nawz3JjLXYX#!b>&ev z4n64!p2#3kT$Bv=rG9)oC_Lli@tHdbHT)!w&iWQu!2PPNvZn5Cv)#{{=2DhQB{Xy4 zu@7=@NRX>5FbJkF7#b-UbNQ~?X>oLG=RW?XSc&&vA1?IN^}Yvm6N8b0A=few5gnmF zoJXxbbPGz%UU16%(g87;Q9uO-T%U9IpPDJec|xXYpP9kS3e5!xti|AnV=x5DT6;D= zS<|bYkQ1)8Nb~-F3*kRbE1<~_r1|<5?&qP_8QzNozuH}uj=ndsI`ZRz(2XM6Z- Q@GhLS#B 1630310531 +0000 clone: from https://github.com/danielsnider/gps_goal diff --git a/gps_goal/.gitbak/logs/refs/heads/master b/gps_goal/.gitbak/logs/refs/heads/master new file mode 100644 index 0000000..033b1b5 --- /dev/null +++ b/gps_goal/.gitbak/logs/refs/heads/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 6cfdb24513fd603e803a809faac404cd52979c7c easyblank 1630310531 +0000 clone: from https://github.com/danielsnider/gps_goal diff --git a/gps_goal/.gitbak/logs/refs/remotes/origin/HEAD b/gps_goal/.gitbak/logs/refs/remotes/origin/HEAD new file mode 100644 index 0000000..033b1b5 --- /dev/null +++ b/gps_goal/.gitbak/logs/refs/remotes/origin/HEAD @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 6cfdb24513fd603e803a809faac404cd52979c7c easyblank 1630310531 +0000 clone: from https://github.com/danielsnider/gps_goal diff --git a/gps_goal/.gitbak/objects/12/1aaf41dba19a0601cf5ddb3907f052768c86ca b/gps_goal/.gitbak/objects/12/1aaf41dba19a0601cf5ddb3907f052768c86ca new file mode 100644 index 0000000000000000000000000000000000000000..7ec7f8c08870084fa60d5d1aed114aec32dd325e GIT binary patch literal 2196 zcmV;F2y6Fv0o7P-Z{x-h?q~mst&IceRHE(k<&twDpiR;U2Q)8;4!95Lfmo3%i9M3b za#v@`LGs)4%#Aj<#TD&0qHl``2rh% zW!Xm}d{1$f<29-^x<6q2R(_aC`*pQBJ1f;feD%#Nw>mFXQ8lv87rKXK(puV4t=r}0 z-I)*<;>(pP-V5xBQZ0L>%t$mA z+N!0r)dwX^wQTu#5p)(4G4{xQBiH~N{wHq$9<*L4@u$Fl_3|1Yp784S<@GhF2j+p@ zKf*qs`Y#v=r~F4P1pJRQ5p3k_>0FE7zn_UE zlH-nHo*{CX_nFBO@l0^U^U5V7D7)@CQXQGgm8G(|?km9NI6f!-)Mv<4A>3Dru^G3} zx-Y9%B1eQ?2)*t_BRjF^Wup=-F^srJWm$=4ZLF9p(XHpTS*cR!7P-@*&|KBJKvr(H z{@hHwRbp)v&Z-RM7j}y^gi(9~=_l?hYytq%#1pdvtDL`;m91br%4#VZWsF<`S0h8Q zA?xaaP64iyl*~uMP^HYW?3}FRZPB4>!3WOj_kg7;l6%B7d89%z5`!`~fN|a(U}gkN ze;^MI-R@5GUO!E{InX!xK@|#t0OPVkC&Iu(LY7fbj}99K#R(D@BIJ*p+>o9i8*va) z{DfZw@5^j-W?304+d^?Ul@C?3wkt%4y;nYxJ6*NbKuhXLFn(x7+1u&t^A}XJQQWK6 zxzMetx~@8-tCG0DLY&!as?k17U!1Ra5KYYYJikC`a3z1N(7PHF)G zR@+Wn)lw*^&nmm$n?b-fmHeFF1ua) zESl^*bB!tuob1|QVio`&H_5x>=LN!#JI-JzZxX9AwA=o)3GYuSq^($MRdl#-j# zR@h#)24MrkQWM1h0mq57RjNc#Qx^a5-Rx4#w*r1gVPSECa$;AR-$;WhpxD5NvizqkR7(wy$qH@Kl>!K&TYNI` zH|Vz@(j6x@xu5Ax)t;o^ujlOdp*5cHMGEU(`T!Um353l^Y@I`TSM_P(?5wCIqHo%n zDP=QfD9uZGPW3U*Q={qyuZDiZ>n+kCO_rVEB7ngK>IQ<)kj~-uR$*>~k6`II^>!|$mELx4QlW(-BTAe}kL=S}BE$o%a%A&?H`TgUJqYX~;~M9>6?M~$w{og> z`M=h%Mc-mM-60{2P!705gbb@|KrtVtc*bXq?u=u zMx{ol`Yh&57>1cZV&qSgU&1D?vlz?$mG%IM;kYxxw;4577c)-~Qlim(jLGh?Z2O25 zd%{K9E{3pnB;0oUF6KCl(n0ocV!22=e(E3~S(P1Ph{mV+NV5T-57?*qNYMeGkLsuS zC=mvHw=Ns@n`82~jVjjMzxT@#we#RS;pPsyXwv_5E5ncY8i16eizoYx{6_zQL!f41 zi-*#Kx#11n_i!ty<7j&)5{TyRibw@9z7bbZq$^JxhX;NOx|$+FUVkOVWAW3^NoejD zVx~~b$v!L+r(;CQ@Rn4%(n=Jey5MbXcguc_v4}1L*cZ6G;IZot`qJH+4s_378D5$U zCQsa(A00rMLR>1n^tw9?c;g5q9m3>mlUud1euTjria*(#b>D4n&rdTKf-b;3H?zpS zGV9tN(>;z$j^yaLlzfe={{M&af8l4)tk6w^?hS4Hg6`;QktX9YiY}(F4t=JxljQHd z1Y>EX>Ta-bj1>iX$Q$bQjybLz;ilRG%4FO}`Wa1iTxofZiT(lsI<|z%CfC{Z5iIU= z4Avb3b8V1rP2~M2(U6jiwLOMK-SZR@jTJC>-bmbU1}*fUjM59h`T2Rw!o8b;AHqU6 zT6~_$?hA_iSlXY99JP^c-+wA41pVJ3?A;zD*%5Fb<#SaGj zR74{%JL~U%P>$9F z{^?h2_olZKCOa|HkV7T|uS_^X;_Qg3!O!KWD9)EW3c|RD3Wl<6I=CEss7iU>;@L0H W`K38$fILsgJux;e&wd3r+f;#MYEk_F literal 0 HcmV?d00001 diff --git a/gps_goal/.gitbak/objects/1c/f3cd0fef1415066997e9b34d1596f8bddaf759 b/gps_goal/.gitbak/objects/1c/f3cd0fef1415066997e9b34d1596f8bddaf759 new file mode 100644 index 0000000000000000000000000000000000000000..d057c96e7f8f7ae615d3ba030beb5159bb38b075 GIT binary patch literal 2198 zcmV;H2x<3t0o7P-kK4u(?&tdz+dCMfQi*rxvz_<~0d0~-FwitXWWXO%gIJL(X={?p za4Da3LHgVK%25Xwe49S=^m@cHU=p7nNCvS2r(T{_f)UmmAw%E_8F*?)tT9 z&UD?Ht{0uL?Jj&2l`cMnk6QNY@LLwWHch1$VWD51oh>_4i@Oxtw2EhJZQa8;tzrU^3@eSJmKZdtE($e56lC* ze}a8L^739BG|~;)43ME$&D1G0Pt)0pheF5tTHRzEKQos;KoMGzMqQ~ zlH-7xBu^G28 zrYm(Lkt4z^h1qnXmaSNJvQ`O}7)IQovaChDvAtL*(QX!%U8_=<2D#Is&|FrgKvr&d z{@hHwQ(|Kk&eE3h3%kVz!YDq0^b>a)n*e|`@x<)ND(CN{?lp`@SuI7atd%R^8e}Lo zWTo%v6yQ2Z$$TUXRmv>O&dEyN7A>k4eBi8p2Uw~ixkpTs2P!0EF(`8b80XyqW=6pD z2lC+1-Tp-H^~Y(qNBSl|s6rtSU|d${kudO(kYyayqr-+l@d$|v5%Nb)Zb%;?8*>m+ z{DfZw@5^j-W~ps2n?i9pmG`>d^lL;&f2VvTw?;R;g_hKlVEoXEvUjuj7cZ!0qqytF zxzMets?x1Bx+E^J5NGy=Dz#Prp0v~vOx>dXql$qaK}TTR8bd(BV>U|M-xs@Pl)lev-LI!Oi)Q^e1exAI?5wa){lyUROqvvlCospH>^&nmm$n?b-fmHeVHoIB= zBI@isbB!tuob1|QVio`&*U9_S=LNz~JI{h^*6X9AwA=o)2fD%puB($MQ8O3Ceb zC;Cn{7GVR!QWM1h0mq57QL02xQx^a5-Fze#I|09=@~qIgN)#m3tkztDq(I=W`-yB; z72=}P{NqrNpdQZbWC;oiF~68&1;?vtZo7gv5&-O1J8qJ z2SQo?Ll&x`R>?etvA@c5Slu}ahPHXaGbwC2^5HN(5fA zGsr&d)`g$R1O58J)I*68igqi9)sEA#21RJ zK#o<*EUuHq!n~TzF^N`w2K=hhuwt4-N>th~6}l;ritR(VEEa65I^=Tdh#nZ(%cx2! z`~xNCn}sbpy#QZSGpDkBSmkL-gbu+FOp&8fR0~;r7#?^MZ>hI{i*xHkFl-O7Shx$+ z!~gky>^(8;6KtihfW81jdC`GaNaLL?q4cbwqp)$&2ORh_?;#n##?I#(U4`}w6uH+8K1$GIg5!BiD#{*qS z;DZGye^MD2ED*O-H1xz+=TrG0hM`GH+qLV&+bJDB-H{>gogrWhZwj(Uum;`wQ+762oyvg>N%zur6kvAf!a2X&H0gL)i`y zDfWbmw0#U=?L@fk_g&0!7^Q>k;ly&0cKXyoK(Z=(#1M^7^O0r)J|D18^O2$hJ|ERj z^HCxU_-5hgU@ofMpN7qpH8TpO=1BXD( z!WNIHM{~nly8YpfP{l#_RwNM3-5ik$Vsb4mqez#YI1Uf|GITjZguMA$OeW&zUy{(= zFT`A-mXm#0Bu>YOl;LHmbfuLjLUqAQ+y2h|24fLj3$QP6mBG{3E%c?EHXZ05!!o=( zS-Sq(l>ZYyie`nWYjkgD;}=Xz7mYNTOi*+&eYNN_Z9h%^ z>Ps+|)~ad;3#V97pohGnUhkRX$_Z|&Euc&$U8JAWRL7N;=a}d(5TIjAxNLfrU7f(< zKF46~DKOUt=?+ESe-aHT$ymEnSkyfqL!z+)2G47Wd(ohU9+gpg4>&(Rk6CzdGw?%L z=!QIY#a>9G;oled^A>mR4ZrEQp}`Vnm}#pR%qe?DEE=Wvv7_2BT0*4F21_{_UGkj zP2fNNrtMz%_QGV3%rxYX>A)*fj*vJzqH6HtIVy_tC69tI?y-WQY}*zt2Op|Zo;P>| Y%yWKs&KV%j6LL?CjnUb^0O1{3z~GNc+yDRo literal 0 HcmV?d00001 diff --git a/gps_goal/.gitbak/objects/1d/0fff5da3cb015fda2c32082bccf772725abe0a b/gps_goal/.gitbak/objects/1d/0fff5da3cb015fda2c32082bccf772725abe0a new file mode 100644 index 0000000000000000000000000000000000000000..f482b19fa97471a404693d1153987bb4ce61bc61 GIT binary patch literal 223 zcmV<503iQ(0d7Jo=w#6rINjLJV^Ef zntMVb9AywEyl_28kI81aXt|Q{Yp2PCVcaQ?1pi?c1Y^E#K6#|ddZrB5^lAOK8uc!D Zr}P@sJ3&8|Wackct6$HOd;(`AYO#Q(Ze{=g literal 0 HcmV?d00001 diff --git a/gps_goal/.gitbak/objects/34/b0bc02fd8e56d2857baf004e2422eae5cf3c3a b/gps_goal/.gitbak/objects/34/b0bc02fd8e56d2857baf004e2422eae5cf3c3a new file mode 100644 index 0000000000000000000000000000000000000000..c77bab4c79b9d66655dd563aa28f9b0281792f82 GIT binary patch literal 352 zcmV-m0iXVO0V^p=O;s>9Gi5L|FfcPQQP4}zEXhpI%P&f0czwjOAcm*U1 zkH(d`$ubWfK^2Ai`FJ|J`USf(WGtDx>c;;%Q?`EXs_EC9S8Z{4^~S^i2o!P>OY@R5 z7_M*OejaL_;k`)ktKC)U=z9~ZBR@hE{(cMLKTa#4 zwiF~LXD6no>Q&_CF#Jm`+%;wA-y)B#FJD(4t;}5Yp=cdcS#fGfX@OorC4(&g|JcQ+ y8RKv17;$Ky`Ce2MwT}y8RdG==L$(6FlA6y)GsYA(of3F(@)JSQz)n`$;i*+;z}#Z&s9h-D2`9h zPs~xs%q_?-DuMI4xH8ie;^XrYb5rBv6>M!4)Z^oG6EpMT#Z_>K0Ib; J@NyE00szT#64(F$ literal 0 HcmV?d00001 diff --git a/gps_goal/.gitbak/objects/4a/86b8cc62cf1dcfcf35bc4d75f66d4f7c921bf8 b/gps_goal/.gitbak/objects/4a/86b8cc62cf1dcfcf35bc4d75f66d4f7c921bf8 new file mode 100644 index 0000000000000000000000000000000000000000..d5c8353c6f5c086f9c35c48ae26b9942e9362ee3 GIT binary patch literal 391 zcmV;20eJp+0hLtGYlAQp-noB8@IJE^b{VPcu=`+TXNmDG24fPE*y4Y`#HzIx*G>`g z-uHv|KG8zz0&TaiyC-5Ot0{+UgAh@)fs7lMb4?||eHr^luuf=|y`i`~6^!0f_iXH{05kt`twN5CGWa#*|1VmMdq*lDI(&&a4cBG*~`S5^65YBR+ zlvD|jPKgricK6O>H)Xm>vX34?haMvMBJFpht*`X|UCy%JK?(-SLH4bN6TxFE&fZ#y zd}m;voS<;RLy}eAn>UP4q86#uF4dOfOT0nQ`(A_=j1Ed|yR+5>aY(0Xi?|`4ufFt& z6BMnGrPo^KB^Xd;#;C7_BKQWF*dsGcXS#tn_HIc2=N^Ny__C!a?h#!`Qro<7+})#2 zo)57(=mxy)9wImT2zfyrtg&sY#x#b6W}TSNtc>Z*$^|-Y@fYbTl?S|rvDcZ4G}ejB lB-WXx3*V7?4$j@S$)0qhT!S1^9w*~o%#WW$A$m^ literal 0 HcmV?d00001 diff --git a/gps_goal/.gitbak/objects/4c/a38ca43f9b443921f27b88453d4750011122e6 b/gps_goal/.gitbak/objects/4c/a38ca43f9b443921f27b88453d4750011122e6 new file mode 100644 index 0000000000000000000000000000000000000000..1edd1a51536cc4771e7dd9c7ff5f227f6170d630 GIT binary patch literal 153 zcmV;K0A~Mq0hNwR4#F@D1zG15xd4^z#;zL)_P!M}`pvM97~Z0Ju*3(blb_^jE^cfCIQ6 Hu#riy!m3Ep literal 0 HcmV?d00001 diff --git a/gps_goal/.gitbak/objects/4d/aab938c5b589be0f825d18eff5e1a1492d4bde b/gps_goal/.gitbak/objects/4d/aab938c5b589be0f825d18eff5e1a1492d4bde new file mode 100644 index 0000000000000000000000000000000000000000..933333faf9f28c86fc3fa53ebb6d18992c04c441 GIT binary patch literal 352 zcmV-m0iXVO0V^p=O;s>9Gi5L|FfcPQQP4}zEXhpI%P&f0czwjOAcm*U1 zkH(d`$ubWfK^2Ai`FJ|J`USf(WGtDx>c;;%Q?`EXs_EC9S8Z{4^~S^i2o!P>OY@R5 z7_M*OejaL_;k`)ktKC)U=z9~ZBR@hE{(cMLKTa#4 zwiF~LXD6no>Q&_CF#Jm`+%;wA-y)B#FJD(4t;}5Yp=cdcS#fGfX@OorC4(&g|JcQ+ y8RKv17;$Ky`Ce2MwT}y8RdG==!!i#M9icy*N3A||3rfshaLWAB0WkpM?vvf_%&`3c literal 0 HcmV?d00001 diff --git a/gps_goal/.gitbak/objects/59/d5cd5347455e109c4d28e658bf929ce53d2c30 b/gps_goal/.gitbak/objects/59/d5cd5347455e109c4d28e658bf929ce53d2c30 new file mode 100644 index 0000000000000000000000000000000000000000..ae302c1c5b8f49c8fee42a4cd40581171a4dfb6b GIT binary patch literal 60 zcmV-C0K@-y0V^p=O;s>4W-v4`Ff%bxNG~XkPtQ-x(aT9J%}dT;m=kVPYWMliY+FUw SEwRFS=Qosu*8l*ndJ>tS-5DwX literal 0 HcmV?d00001 diff --git a/gps_goal/.gitbak/objects/5c/3d63adfac9942b7886744bc622a38d3480c6e1 b/gps_goal/.gitbak/objects/5c/3d63adfac9942b7886744bc622a38d3480c6e1 new file mode 100644 index 0000000..9c582e0 --- /dev/null +++ b/gps_goal/.gitbak/objects/5c/3d63adfac9942b7886744bc622a38d3480c6e1 @@ -0,0 +1,2 @@ +xRAj0YPllh)[.d,}eىEj*x~*|gM^I=-i&UKƁ +oC=0VR`ݚ[0b_U|=YZ( 9WBj9eAlǔqMkLb[myC){5ntraTb܊MGn_[ Ztpn0hYz }.~M[FA5`=~+939I}eFꚒRtRo|NAʧY?EzXO/P"˲@fH!>~0 N( \ No newline at end of file diff --git a/gps_goal/.gitbak/objects/61/a84933bec75cfbca81b4d1b02b30b3897e1bad b/gps_goal/.gitbak/objects/61/a84933bec75cfbca81b4d1b02b30b3897e1bad new file mode 100644 index 0000000000000000000000000000000000000000..f09d722f4c6726d0867dc6da34f9eefc857212ef GIT binary patch literal 179 zcmV;k08IaQ0j16{ZUZ3@K+)8kV){rH%rdY@R+K7DN*}-)*ugoi5;Kk>)37w*V5hlySq2d*#yFK@>-L!JihE5b=SS3$3Z$Ol`m8lpd9dLx++4uwCwC^+`@JCoC5tbbvkMq)%R;+S7?Y` z?58HR+Uk>uPcmM51|Ng+k5B!+0{0r}kJ?6pWW-EoZ9Jm2eHP}f(;+w?ZW3XV2;EDQ z{-OjkeJW9*OFg!6(8SCjUWjAPqfO=WeJ%~dPO9s8Vw$gF}kxh%U1Id1tf1!#t6)rhK0_E%Ne zNDOlrl1=iylpaOR^NdMRC+{0s0X`*%iWEPr5El2Tm+zJ!k@DVqcQy=Yl;Rsai~ zC|@l`<2E=cqeH)qO~+ZKgNB=8xoU9KPUtnZz{hip(}&yJ+2X>{Hs~AYA8$Wpe*ixT FjbFYTW556a literal 0 HcmV?d00001 diff --git a/gps_goal/.gitbak/objects/6b/1607ce8a4d3eee2cff9db15581d56f394e06d8 b/gps_goal/.gitbak/objects/6b/1607ce8a4d3eee2cff9db15581d56f394e06d8 new file mode 100644 index 0000000000000000000000000000000000000000..d391f78bad72ea6c47bd91a3f4e2568b86a0bb44 GIT binary patch literal 51 zcmV-30L=e*0V^p=O;s>9WiT-S0)_N~;`sFZ#2ki=yY?(pe}41*la5t~ygsk5y(~91 J5CC8T6Hh#V7CZm| literal 0 HcmV?d00001 diff --git a/gps_goal/.gitbak/objects/6c/fdb24513fd603e803a809faac404cd52979c7c b/gps_goal/.gitbak/objects/6c/fdb24513fd603e803a809faac404cd52979c7c new file mode 100644 index 0000000000000000000000000000000000000000..dbf559903da49f45f6f490d56a665d6cb8137981 GIT binary patch literal 630 zcmV-+0*U>20d2ArYcLy5d#bZRdy;MAq41&L@?eBFd!_Rqd`L6CV!eA ziR@H%$=&s-?nU2D+qy0}&?WqdGfIJ)5t0~+o}vWlMna`rmr(|Fn&*f@0#!rK)Fh)q zM;L85P*ZX@6IIELL{$|-hPjLrU00EksTfHTgiw~L_ScUM1a-|w6-kB!=U9`m29^Bo z%5<1&lxUJ>AVU|(z>h5hGt!i_0{f=SCR=EWpG2S+?V@!PeP=z3Z&a zLm1c}TmS;No~_g}O>1hJJ8S19Wa-A!!1D3&Roz?^=3Y%RTez+{-!Bb#dA(V6jrq;5 zC+Rq1ItqaId}=Xy9;RaIZVvr%Jcx%P>d@r-Zd!C3+faMXq+k}dV#N+;j{Jq8a#`-9 zP5e^K1(4i4xUe)6*YVrH%RC-VYLd+T@Mza_S>7YeeUbEiSfr6tMF($cv%)APuammS z+KU3Ph7g^K*40(_Y{i#!l=5=)sNY(6B~6Xvz6-BNtjb=$gi(#7QX4h1rMu2KohSBY zBY@`<&RUo1y?A%PfhH*DI)GcsBRZ>`fQ1IeT|&t}Bna zap*};@I;_8b5m1=^n&8}^!&sekTM~u^^Ug}&SGOcAA8%9{XuJjeGb`LXWic~o!a&+v%djG?_G{DAe^kX g);#Ltbm@N#^U;1mXp`^Dqz&pZWVJcWA1Ojp50>**3jhEB literal 0 HcmV?d00001 diff --git a/gps_goal/.gitbak/objects/80/121781f6ed174bd7bd32aba5b197ea80e7f38b b/gps_goal/.gitbak/objects/80/121781f6ed174bd7bd32aba5b197ea80e7f38b new file mode 100644 index 0000000000000000000000000000000000000000..5ed6279f93a808f6430ee3b7e82f6951fdec1315 GIT binary patch literal 427 zcmV;c0aX5Y0d-PMZ`&{o-8sL46MWc!Id;~fTa7rtu&+zI6iIJIV5l)|3zH>7qLXHZ z|NA7{DFO_;2oj$j$@j=-sh{EI_WI3I@>cDu)eK;X>Hvz@n6k}!`*r zd@*jyshBpR6pBHP1#cy#?Ec$k>%X~QJ|{H4%aqxp5g8e-Y@tn^wIn11IyJ5*p#%vo z#UISZT=V9{rsV%%40KCP>&n=@K~&7wag`cwcs-G%-gB9~oU+2j@Kt+s)JEoGXa8fI z#Y}bu@4U`2_}(#L`8Eu}B9TxfFy4}8P@zFM3MoARRN+Jb(!;9|#uEH|*g_#*T!a${ z0)u<)VKfu literal 0 HcmV?d00001 diff --git a/gps_goal/.gitbak/objects/94/b88f81ca92f4347a520a412364c8084b65180f b/gps_goal/.gitbak/objects/94/b88f81ca92f4347a520a412364c8084b65180f new file mode 100644 index 0000000..4c1680b --- /dev/null +++ b/gps_goal/.gitbak/objects/94/b88f81ca92f4347a520a412364c8084b65180f @@ -0,0 +1 @@ +xmQ]k0ݳ" TTeVKF ^mXLB"ENXvϽ-/OOPE]_}FkQKy.~ol7' F! B/eR KLpX"ZF6R?U+eH%)vERfƲ16x,մ/}kĉh~e(KPe=% Nnu{*h_X2v>4;g=b6F hnv{s26dQFhPbSI7VW literal 0 HcmV?d00001 diff --git a/gps_goal/.gitbak/objects/98/a95f4af45b0184e2922d11d902ec549e2a1fc7 b/gps_goal/.gitbak/objects/98/a95f4af45b0184e2922d11d902ec549e2a1fc7 new file mode 100644 index 0000000000000000000000000000000000000000..1b7c75d6e73dc43918f2884b488382b1d5d75375 GIT binary patch literal 169 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 TSwNmA6rPwHmuJ5M8>Lj`JGxwz literal 0 HcmV?d00001 diff --git a/gps_goal/.gitbak/objects/9b/d41f498884864b8f0a89338b2e7839f9a6e0a7 b/gps_goal/.gitbak/objects/9b/d41f498884864b8f0a89338b2e7839f9a6e0a7 new file mode 100644 index 0000000..5d94373 --- /dev/null +++ b/gps_goal/.gitbak/objects/9b/d41f498884864b8f0a89338b2e7839f9a6e0a7 @@ -0,0 +1,3 @@ +xAO0=+^E㵃f`AOMai1Ywy0^^_5+uWyŷURɪX#>[وFhD!?7S7C-j +K(Z[^7v+5G^i hSk8xnV.cV@ets ++a)`7۵CenbFضv/ʃ ~fӀ$hiDxIt'1 ׳9:/-/GTL]Ŝe^ 39-^|An`co͎? n (ǣ*ߠ,qfS4C?L)A~69!4 \ No newline at end of file diff --git a/gps_goal/.gitbak/objects/9c/5732753ef3fc9b3d2145b45d132ecfb074577c b/gps_goal/.gitbak/objects/9c/5732753ef3fc9b3d2145b45d132ecfb074577c new file mode 100644 index 0000000000000000000000000000000000000000..81100625925c3d9822203ef4f293e3506cb45fe8 GIT binary patch literal 403 zcmV;E0c`$w0gaPiOT#b}#eLqVh@paenB9X9BHKVjVW6wH`6N>A*4r+aCLu{DWAwY5 zq}^8kfWGx6H|L(;NxI~6Nv?)hCnFA(Sgj{LLPjVyL_mpS`kc&fli56ZxJ&Po=f|4` zB^%(C+j)(41~;gg-PUieuxpKwg-;5l-R9upp6Ryj+J(ertOlftg4(_v(kv7RdkvPG?eXuoN@Gl zrn%H5*h7fXxugI9FlbPnF^wfCl51JEaE?@tX~#>Sl90D+j(s%YqQ1m*2(S(5SU2zHSpO%UP5=j@ xj-BS3``_@Am&MAKuKQH;VVa$0uj60zsmm##jIV literal 0 HcmV?d00001 diff --git a/gps_goal/.gitbak/objects/9e/267008cdc781977367f6d4f9ae65b35896912f b/gps_goal/.gitbak/objects/9e/267008cdc781977367f6d4f9ae65b35896912f new file mode 100644 index 0000000000000000000000000000000000000000..bf6e8ab515e9495b97f1a83ae0cdb136ed178a85 GIT binary patch literal 351 zcmV-l0igbP0V^p=O;s>9Gi5L|FfcPQQP4}zEXhpI%P&f0czwjOAcm*FW8kKW69iAH~!a|vh{0MO~2;6YKz0GHzo!^ppcVTnwOlx z5P9`%u)AxVz#LzVXA%1+&3S68V*pW*m!Fba%wYA@>DVnf$qoL;YtywiS3bDrJzolH zOF?3Cc4B&}UPW#W!?N{d;_X~fFJ7L%xFpng%k`D9HZaE&rU3{7` x{+5mrhxVE8MMY8jxFA*)7bP>?;I%OMGON70`GCptZ=RpCU#`qg2LMh>kMjzfw9fzl literal 0 HcmV?d00001 diff --git a/gps_goal/.gitbak/objects/a6/48142c12fc09c53af08b11189ba0ca37d2c016 b/gps_goal/.gitbak/objects/a6/48142c12fc09c53af08b11189ba0ca37d2c016 new file mode 100644 index 0000000000000000000000000000000000000000..51283d9c23ea49166e1d6b083a9959df91829ec9 GIT binary patch literal 50 zcmV-20L}k+0V^p=O;s>9WiT-S0)_N~;`sFZ#2kjtx%*Ge6yiJ~Q?<{`;AMs8f&|uL I06c~dx-G~Tp#T5? literal 0 HcmV?d00001 diff --git a/gps_goal/.gitbak/objects/a6/af7617870a5ae8e9cfd1a45533b4d7a95d3c21 b/gps_goal/.gitbak/objects/a6/af7617870a5ae8e9cfd1a45533b4d7a95d3c21 new file mode 100644 index 0000000000000000000000000000000000000000..59ea83e3010b38b5c9c918c7456947744f1d80fd GIT binary patch literal 418 zcmV;T0bTxh0hLt2Zlf>|?YUoJcwI_Lo~VmiJ;gq4{#}(1 z+M-~w1!Ab)=(tjHP37LFU`0H5c;4-yVT`b=`WXFBDfc*F5gZpT7V;2?OZnjI|Kg#hKbguk483`Y-1DpLz)A6$hg5Mxv881 zPj0VZwoWg@wk|KDHV!X?j_td2zwLaj{eCh?4|y8WC0y16YHS*nYmlY;^ciD2{0qBR M^7D7{4uXh}iS}>KRR910 literal 0 HcmV?d00001 diff --git a/gps_goal/.gitbak/objects/ab/2324151b67f0ab747591a9be54b4e05205e785 b/gps_goal/.gitbak/objects/ab/2324151b67f0ab747591a9be54b4e05205e785 new file mode 100644 index 0000000000000000000000000000000000000000..16a0df37ce121acac61ed5ca5096e1b0b461e83c GIT binary patch literal 352 zcmV-m0iXVO0V^p=O;s>9Gi5L|FfcPQQP4}zEXhpI%P&f0czwjOAcm*U1 zkH(d`$ubWfK^2Ai`FJ|J`USf(WGtDx>c;;%Q?`EXs_EC9S8Z{4^~S^i2o!P>OY@R5 z7_M*OejaL_;k`)ktKC)U=z9~ZBR@hE{(cMLKTa#4 zwiF~LXD6no>Q&_CF#Jm`+%;wA-y)B#FJD(4t;}5Yp=cdcS#fGfX@OorC4(&g|JcQ+ y8RKv17;$Ky`Ce2MwT}y8RdG==!)4Vv!)s38e+nJ$u1(i`U*)2C>l6U|W|gNTcC#M< literal 0 HcmV?d00001 diff --git a/gps_goal/.gitbak/objects/b1/babca127e7d9efe488aac24af3af7dd31e9551 b/gps_goal/.gitbak/objects/b1/babca127e7d9efe488aac24af3af7dd31e9551 new file mode 100644 index 0000000000000000000000000000000000000000..de1acd964882e39222c3171844d386b385f749f4 GIT binary patch literal 94 zcmV-k0HObQ0V^p=O;s?rU@$Z=Ff%bxh>y?A%PfhH*DI)GcsBRZ>`fQ1IeT|&t}Bna zap*};@I;_8b5m1=^n&8}^!&sekTRLiXZhcYh_Yo)f4SLLblQ)-x4uUL0G#k74*_*9 AivR!s literal 0 HcmV?d00001 diff --git a/gps_goal/.gitbak/objects/bb/a73d4bf2aaf06f1df7f1cf4c28d49d631ce0e2 b/gps_goal/.gitbak/objects/bb/a73d4bf2aaf06f1df7f1cf4c28d49d631ce0e2 new file mode 100644 index 0000000000000000000000000000000000000000..4a6804af1c08b555a1bc8a1e0b6dc84c47292dc7 GIT binary patch literal 263 zcmV+i0r>uS0hN$VOT;h`hCSz3jMRf$XnSx`SP;R3ARYvJ5f(|4CS=FW&MZyh$G~k|iUJ-fMCHc@lMr3ki33mbABICWa`>hvYpN?$gdv7CL?@zfaua3f8}B$8 literal 0 HcmV?d00001 diff --git a/gps_goal/.gitbak/objects/cd/4e665f9d5da5b74d24b1f6a073623867e74968 b/gps_goal/.gitbak/objects/cd/4e665f9d5da5b74d24b1f6a073623867e74968 new file mode 100644 index 0000000000000000000000000000000000000000..cbe51a82b1733395588d913ffd115c3e6f3964cc GIT binary patch literal 352 zcmV-m0iXVO0V^p=O;s>9Gi5L|FfcPQQP4}zEXhpI%P&f0czwjOAcm*U1 zkH(d`$ubWfK^2Ai`FJ|J`USf(WGtDx>c;;%Q?`EXs_EC9S8Z{4^~S^i2o!P>OY@R5 z7_M*OejaL_;k`)ktKC)U=z9~ZBR@hE{(cMLKTa#4 zwiF~LXD6no>Q&_CFnG1?IFoc<_WXI%J-(&ia{X&2N&kQ7nv{l|4;OL7VJe+!M} zhzlCp!|6~_Iz!>+2i1!&wF^2v%x793<+P4<3=;J(8ytF#T{EUrAr8CjAL2=?{BJF# zJ`5JcLXUw4?2y3)`1W-PkzHuPb=X?qfIY8C7-)bldU3tC@Y6MxfF%iZTqt!?9r>RL zw{GK}yFX@c(1@e3crSuxedoMAYiQA0ITIYxwisD-z0+*NZyY02@%jE^rqultCDc2p zmSY-HWI8;^$?)xVTReJaHbY^kEBi!ETy~bNDc@dPy_wDCmzNi>%M8wq$rANs0-pj4 zdXFQOQmfTUodU;(0DH+3P_krS0BMf-#sw?R9WiT-S0)_N~;`sFZ#2ki_>#-qT|Bsrq?XYwC>H1KVyNY!# I06dou@;(~IJ{FO_@PQO^D;{^6LT`FQseWBGSf5jV0s#a#2df875Bcr*J$<9jniK>JpbGc I070TCRjGY0djJ3c literal 0 HcmV?d00001 diff --git a/gps_goal/.gitbak/objects/d8/0d3834f49a777b83c034a7f649f36be9a96f67 b/gps_goal/.gitbak/objects/d8/0d3834f49a777b83c034a7f649f36be9a96f67 new file mode 100644 index 0000000000000000000000000000000000000000..e25ec7a361ba9751b6e5d461aa802b862fa69fb4 GIT binary patch literal 51 zcmV-30L=e*0V^p=O;s>9WiT-S0)_N~;`sFZ#2kjV;x9P8Up?2$n{jZ@!3SPdeP16m J002qR5~C>W7196z literal 0 HcmV?d00001 diff --git a/gps_goal/.gitbak/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 b/gps_goal/.gitbak/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 new file mode 100644 index 0000000000000000000000000000000000000000..711223894375fe1186ac5bfffdc48fb1fa1e65cc GIT binary patch literal 15 Wcmb7V9?Sls7&V4(km`60F(J#Nu`-NDe;-b`8kOtsVVwgDXC?t LIY@i}8le+Jmhcy- literal 0 HcmV?d00001 diff --git a/gps_goal/.gitbak/objects/ed/17e8094beae72e6e98c1bcc1e04a7a8ef5e080 b/gps_goal/.gitbak/objects/ed/17e8094beae72e6e98c1bcc1e04a7a8ef5e080 new file mode 100644 index 0000000000000000000000000000000000000000..a549c68e3e6fcb46aaf091660928439eeb19a5e9 GIT binary patch literal 92 zcmV-i0HgnS0V^p=O;xZkWH2-^Ff%bxh>y?A%PfhH*DI)GcsBRZ>`fQ1IeT|&t}Bna yap*};@I7{QLrt${5?^wZBeI(XMDK@jj-sxYwlN*h2sfs3k$z*DmM) literal 0 HcmV?d00001 diff --git a/gps_goal/.gitbak/objects/ef/476929c7b2823083678e813b0ae389052e6aff b/gps_goal/.gitbak/objects/ef/476929c7b2823083678e813b0ae389052e6aff new file mode 100644 index 0000000000000000000000000000000000000000..11e063e74c3c2fcd04b376b42c862abf61013404 GIT binary patch literal 309 zcmV-50m}Y(0fmsgZi6rsg*)>UmYRVsiTX2Sb-+q#8bfVbsgq^EA#T8?Hbjb|yn9Wd zX@*K2eeU)7&OKSBGw?9Ky~=C86Reg>)?Lkv`0S(+h5v>KjbaS$rt|6jjpsE+e~7&G z%f_-&^U6sZsS4Kce8)@S=e*rX1qgb1jR*=s5U-OMBb-tX04tQ$hSj#T?q#%X4!znI z%$j{K<$IPHS(L(azJnEO4((PeW<}dI{)IdO-LL0pK_H0`1(Rb!;wKcO48t`#xmf_y zRfJiH5`;r~nPA|b>3_1NvMsNwF@x{?od1%*H3do+!p?qbaFY^}^Bgao-`e?has+wr~t Hm$;nQR9Gi5L|FfcPQQP4}zEXhpI%P&f0czwjOAcm*U1 zkH(d`$ubWfK^2Ai`FJ|J`USf(WGtDx>c;;%Q?`EXs_EC9S8Z{4^~S^i2o!P>OY@R5 z7_M*OejaL_;k`)ktKC)U=z9~ZBR@hE{(cMLKTa#4 zwiF~LXD6no>Q&_CF#Jm`+%;wA-y)B#FJD(4t;}5Yp=cdcS#fGfX@OorC4(&g|JcQ+ y8RKv17;$Ky`Ce2MwT}y8RdG==!>^5|P7jsutL$lN3fg4%BIn-P#k&Cky?A%PfhH*DI)GcsBRZ>`fQ1IeT|&t}Bna zap*};@I;_8b5m1=^n&8}^!&sekg{3d0t>ibwN=*C-EFq}S<_s~QmF(0s=On7#5*m{ literal 0 HcmV?d00001 diff --git a/gps_goal/.gitbak/objects/f3/80265f6b5c7b5a239151346056998a1f341fb1 b/gps_goal/.gitbak/objects/f3/80265f6b5c7b5a239151346056998a1f341fb1 new file mode 100644 index 0000000000000000000000000000000000000000..09652ff2d12dcf23fc1977d2592c05ffaeb6cabc GIT binary patch literal 95 zcmV-l0HFVP0ZYosPf{?nG-ik+2XHxOB<7{3=H#a9WiT-S0)_N~;`sFZ#2kh~f%dc=Ex!&JzN!B6Fvp$A@T2H| I06|z0T^_v`WdHyG literal 0 HcmV?d00001 diff --git a/gps_goal/.gitbak/objects/fe/6571ba94b9fd7248b5e9eb79c57969aaf072ae b/gps_goal/.gitbak/objects/fe/6571ba94b9fd7248b5e9eb79c57969aaf072ae new file mode 100644 index 0000000000000000000000000000000000000000..07f8ef7c7ce05300453f4d706a665d64b3f48b9a GIT binary patch literal 392 zcmV;30eAj*0hLtGYlAQp-noB8@IF%uyNpbB*nP0Fv&8rogE0w7Z1KNeVzspv*G>@f z-uHv|zM!SlCCajw-4ijCHIzfXL5L{YLe7mVxTccep^W_lSSPf~w`rDc37*ObRp6Kv z#z#2R@!5k%6n%Z}k)j8|X~a-;M4c0gBN;lrs{m0|A*mG~sx-Rcg&k?BP(Hk15rngR zODd`aNT);vHru`P*iD&kll)^q(0+gjzDS4NXy{inDiC zBHtT$OO8-F;UURu@69X5N70DXYL{xu@g?3M7=DreL;LJ@oeoY@mIOlSI$IQ4Ew{^uTpvUu52l=p}(B&luDI_~aK z&z=vlIp`L=?H?ky`T#{q9jvi!r=~Q^oHQ`U*{J@yPf+34#ceh literal 0 HcmV?d00001 diff --git a/gps_goal/.gitbak/packed-refs b/gps_goal/.gitbak/packed-refs new file mode 100644 index 0000000..3e5f718 --- /dev/null +++ b/gps_goal/.gitbak/packed-refs @@ -0,0 +1,3 @@ +# pack-refs with: peeled fully-peeled sorted +6cfdb24513fd603e803a809faac404cd52979c7c refs/remotes/origin/master +4ca38ca43f9b443921f27b88453d4750011122e6 refs/tags/0.1.0 diff --git a/gps_goal/.gitbak/refs/heads/master b/gps_goal/.gitbak/refs/heads/master new file mode 100644 index 0000000..a3b1392 --- /dev/null +++ b/gps_goal/.gitbak/refs/heads/master @@ -0,0 +1 @@ +6cfdb24513fd603e803a809faac404cd52979c7c diff --git a/gps_goal/.gitbak/refs/remotes/origin/HEAD b/gps_goal/.gitbak/refs/remotes/origin/HEAD new file mode 100644 index 0000000..6efe28f --- /dev/null +++ b/gps_goal/.gitbak/refs/remotes/origin/HEAD @@ -0,0 +1 @@ +ref: refs/remotes/origin/master diff --git a/gps_goal/.gitignore b/gps_goal/.gitignore new file mode 100644 index 0000000..ebc4397 --- /dev/null +++ b/gps_goal/.gitignore @@ -0,0 +1,5 @@ +*.pyc +*.swp +*.swo +build_isolated/ +devel_isolated/ diff --git a/gps_goal/CHANGELOG.rst b/gps_goal/CHANGELOG.rst new file mode 100644 index 0000000..f380265 --- /dev/null +++ b/gps_goal/CHANGELOG.rst @@ -0,0 +1,7 @@ +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Changelog for package gps_goal +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +0.1.0 (2017-07-20) +------------------ +* First release \ No newline at end of file diff --git a/gps_goal/CMakeLists.txt b/gps_goal/CMakeLists.txt new file mode 100644 index 0000000..9bd41f4 --- /dev/null +++ b/gps_goal/CMakeLists.txt @@ -0,0 +1,31 @@ +cmake_minimum_required(VERSION 2.8.3) + +project(gps_goal) + +find_package(catkin REQUIRED COMPONENTS + rospy + tf + actionlib + actionlib_msgs + sensor_msgs + geometry_msgs + move_base_msgs +) + +catkin_python_setup() + +catkin_package( + LIBRARIES ${PROJECT_NAME} + CATKIN_DEPENDS rospy tf actionlib actionlib_msgs sensor_msgs geometry_msgs move_base_msgs +) + +catkin_install_python( + PROGRAMS nodes/gps_goal + DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} +) + +# Install launch files +install( + DIRECTORY launch/ + DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/launch +) diff --git a/gps_goal/README.md b/gps_goal/README.md new file mode 100644 index 0000000..bba73d4 --- /dev/null +++ b/gps_goal/README.md @@ -0,0 +1,11 @@ +# gps_goal [![Build Status](http://build.ros.org/buildStatus/icon?job=Kbin_uX64__gps_goal__ubuntu_xenial_amd64__binary)](http://build.ros.org/job/Kbin_uX64__gps_goal__ubuntu_xenial_amd64__binary) + +Set a ROS navigation goal using latitude and longitude. + +## Installation + +``` +$ sudo apt-get install ros-kinetic-gps-goal hugin-tools enblend +``` + +**Full documentation on wiki: [http://wiki.ros.org/gps_goal](http://wiki.ros.org/gps_goal)** diff --git a/gps_goal/UNLICENSE b/gps_goal/UNLICENSE new file mode 100644 index 0000000..68a49da --- /dev/null +++ b/gps_goal/UNLICENSE @@ -0,0 +1,24 @@ +This is free and unencumbered software released into the public domain. + +Anyone is free to copy, modify, publish, use, compile, sell, or +distribute this software, either in source code form or as a compiled +binary, for any purpose, commercial or non-commercial, and by any +means. + +In jurisdictions that recognize copyright laws, the author or authors +of this software dedicate any and all copyright interest in the +software to the public domain. We make this dedication for the benefit +of the public at large and to the detriment of our heirs and +successors. We intend this dedication to be an overt act of +relinquishment in perpetuity of all present and future rights to this +software under copyright law. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + +For more information, please refer to diff --git a/gps_goal/launch/gps_goal.launch b/gps_goal/launch/gps_goal.launch new file mode 100644 index 0000000..94b88f8 --- /dev/null +++ b/gps_goal/launch/gps_goal.launch @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/gps_goal/launch/initialize_origin.launch b/gps_goal/launch/initialize_origin.launch new file mode 100644 index 0000000..8012178 --- /dev/null +++ b/gps_goal/launch/initialize_origin.launch @@ -0,0 +1,17 @@ + + + + + + + + + + [{ name: MDRS, + latitude: 38.40630, + longitude: -110.79201, + altitude: 0.0, + heading: 0.0}] + + + diff --git a/gps_goal/nodes/gps_goal b/gps_goal/nodes/gps_goal new file mode 100755 index 0000000..35cae16 --- /dev/null +++ b/gps_goal/nodes/gps_goal @@ -0,0 +1,6 @@ +#!/usr/bin/env python + +from gps_goal import gps_goal + +if __name__ == '__main__': + gps_goal.ros_main() diff --git a/gps_goal/package.xml b/gps_goal/package.xml new file mode 100644 index 0000000..fe6571b --- /dev/null +++ b/gps_goal/package.xml @@ -0,0 +1,31 @@ + + gps_goal + 0.1.0 + + Set a ROS navigation goal using latitude and longitude. + + Daniel Snider + Daniel Snider + Unlicense + http://wiki.ros.org/gps_goal + https://github.com/danielsnider/gps_goal + + catkin + rospy + tf + actionlib + sensor_msgs + actionlib_msgs + geometry_msgs + move_base_msgs + rospy + tf + actionlib + sensor_msgs + actionlib_msgs + geometry_msgs + move_base_msgs + python-geographiclib + click + + diff --git a/gps_goal/setup.py b/gps_goal/setup.py new file mode 100644 index 0000000..1d0fff5 --- /dev/null +++ b/gps_goal/setup.py @@ -0,0 +1,11 @@ +## ! DO NOT MANUALLY INVOKE THIS setup.py, USE CATKIN INSTEAD + +from distutils.core import setup +from catkin_pkg.python_setup import generate_distutils_setup + +# fetch values from package.xml +setup_args = generate_distutils_setup( + packages=['gps_goal'], + package_dir={'': 'src'}) + +setup(**setup_args) diff --git a/gps_goal/src/gps_goal/__init__.py b/gps_goal/src/gps_goal/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/gps_goal/src/gps_goal/gps_goal.py b/gps_goal/src/gps_goal/gps_goal.py new file mode 100755 index 0000000..11e58da --- /dev/null +++ b/gps_goal/src/gps_goal/gps_goal.py @@ -0,0 +1,183 @@ +#!/usr/bin/python +import rospy +import click +import math +import actionlib +import tf +import time +from geographiclib.geodesic import Geodesic +from actionlib_msgs.msg import GoalStatus +from geometry_msgs.msg import PoseStamped +from move_base_msgs.msg import MoveBaseAction, MoveBaseGoal +from sensor_msgs.msg import NavSatFix +from wit_node.msg import ImuGpsRaw +import paho.mqtt.publish as publish +global rad_offset +def DMS_to_decimal_format(lat,long): + # Check for degrees, minutes, seconds format and convert to decimal + if ',' in lat: + degrees, minutes, seconds = lat.split(',') + degrees, minutes, seconds = float(degrees), float(minutes), float(seconds) + if lat[0] == '-': # check for negative sign + minutes = -minutes + seconds = -seconds + lat = degrees + minutes/60 + seconds/3600 + if ',' in long: + degrees, minutes, seconds = long.split(',') + degrees, minutes, seconds = float(degrees), float(minutes), float(seconds) + if long[0] == '-': # check for negative sign + minutes = -minutes + seconds = -seconds + long = degrees + minutes/60 + seconds/3600 + + lat = float(lat) + long = float(long) + rospy.loginfo('Given GPS goal: lat %s, long %s.' % (lat, long)) + return lat, long + +def get_origin_lat_long(): + + # Get the lat long coordinates of our map frame's origin which must be publshed on topic /local_xy_origin. We use this to calculate our goal within the map frame. + rospy.loginfo("Waiting for a message to initialize the origin GPS location...") + origin_pose = rospy.wait_for_message('local_xy_origin', PoseStamped) + origin_lat = origin_pose.pose.position.y + origin_long = origin_pose.pose.position.x + rospy.loginfo('Received origin: lat %s, long %s.' % (origin_lat, origin_long)) + return origin_lat, origin_long + +def calc_goal(origin_lat, origin_long, goal_lat, goal_long, origin): + # Calculate distance and azimuth between GPS points + rospy.loginfo('Given GPS goal: lat %s, long %s.' % (goal_lat, goal_long)) + geod = Geodesic.WGS84 # define the WGS84 ellipsoid + g = geod.Inverse(origin_lat, origin_long, goal_lat, goal_long) # Compute several geodesic calculations between two GPS points + hypotenuse = distance = g['s12'] # access distance + rospy.loginfo("The distance from the origin to the goal is {:.3f} m.".format(distance)) + azimuth = g['azi1'] + rospy.loginfo("The azimuth from the origin to the goal is {:.3f} degrees.".format(azimuth)) + + # Convert polar (distance and azimuth) to x,y translation in meters (needed for ROS) by finding side lenghs of a right-angle triangle + # Convert azimuth to radians + azimuth = (math.radians(azimuth) - origin)*(-1) + print(azimuth) + x = adjacent = math.cos(azimuth) * hypotenuse + y = opposite = math.sin(azimuth) * hypotenuse + rospy.loginfo("The translation from the origin to the goal is (x,y) {:.3f}, {:.3f} m.".format(x, y)) + + return x, y + +class GpsGoal(): + def __init__(self): + rospy.init_node('gps_goal') + + rospy.loginfo("Connecting to move_base...") + self.move_base = actionlib.SimpleActionClient('move_base', MoveBaseAction) + self.move_base.wait_for_server() + rospy.loginfo("Connected.") + rospy.Subscriber('fix', NavSatFix, self.current_coord_callback) + rospy.Subscriber('gps_goal_pose', PoseStamped, self.gps_goal_pose_callback) + rospy.Subscriber('gps_goal_fix', NavSatFix, self.gps_goal_fix_callback) + rospy.Subscriber('/wit/raw_data', ImuGpsRaw, self.radian_callback) + # Get the lat long coordinates of our map frame's origin which must be publshed on topic /local_xy_origin. We use this to calculate our goal within the map frame. + time.sleep(3.0) + self.origin = rad_offset + self.origin_lat, self.origin_long = get_origin_lat_long() + + def current_coord_callback(self, data): + global current_latitude, current_longitude + current_latitude = data.latitude + current_longitude = data.longitude + + def do_gps_goal(self, goal_lat, goal_long, z=0, yaw=0, roll=0, pitch=0): + # Calculate goal x and y in the frame_id given the frame's origin GPS and a goal GPS location + x, y = calc_goal(self.origin_lat, self.origin_long, goal_lat, goal_long, self.origin) + # Create move_base goal + self.publish_goal(x=x, y=y, z=z, yaw=yaw, roll=roll, pitch=pitch) + + def gps_goal_pose_callback(self, data): + lat = data.pose.position.y + long = data.pose.position.x + z = data.pose.position.z + euler = tf.transformations.euler_from_quaternion(data.pose.orientation) + roll = euler[0] + pitch = euler[1] + yaw = euler[2] + self.do_gps_goal(lat, long, z=z, yaw=yaw, roll=roll, pitch=pitch) + + def radian_callback(self, data): + global rad_offset + rad_offset = data.rpy[2] + rad_offset = (0.5*math.pi+rad_offset)*(-1) + # if (rad_offset > 0): + # rad_offset = math.pi - rad_offset + # # # rad_offset = (-1)* rad_offset + # else: + # rad_offset = (-1) * math.pi - rad_offset + +# rospy.loginfo('radian,', x) + + def gps_goal_fix_callback(self, data): + print(data.latitude, data.longitude) + self.do_gps_goal(data.latitude, data.longitude) + + def publish_goal(self, x=0, y=0, z=0, yaw=0, roll=0, pitch=0): + # Create move_base goal + goal = MoveBaseGoal() + goal.target_pose.header.frame_id = rospy.get_param('~frame_id','map') + goal.target_pose.pose.position.x = x + goal.target_pose.pose.position.y = y + goal.target_pose.pose.position.z = z + quaternion = tf.transformations.quaternion_from_euler(roll, pitch, yaw) + goal.target_pose.pose.orientation.x = quaternion[0] + goal.target_pose.pose.orientation.y = quaternion[1] + goal.target_pose.pose.orientation.z = quaternion[2] + goal.target_pose.pose.orientation.w = quaternion[3] + rospy.loginfo('Executing move_base goal to position (x,y) %s, %s, with %s degrees yaw.' % + (x, y, yaw)) + rospy.loginfo("To cancel the goal: 'rostopic pub -1 /move_base/cancel actionlib_msgs/GoalID -- {}'") + + # Send goal + self.move_base.send_goal(goal) + rospy.loginfo('Inital goal status: %s' % GoalStatus.to_string(self.move_base.get_state())) + status = self.move_base.get_goal_status_text() + if status: + rospy.loginfo(status) + + # Wait for goal result + self.move_base.wait_for_result() + rospy.loginfo('Final goal status: %s' % GoalStatus.to_string(self.move_base.get_state())) + print(GoalStatus.to_string(self.move_base.get_state())) + if GoalStatus.to_string(self.move_base.get_state())=="SUCCEEDED": + print("MQTT published") + publish.single(topic="/goal", payload="1", hostname="163.180.117.43") + status = self.move_base.get_goal_status_text() + if status: + rospy.loginfo(status) + +@click.command() +@click.option('--lat', prompt='Latitude', help='Latitude') +@click.option('--long', prompt='Longitude', help='Longitude') +@click.option('--roll', '-r', help='Set target roll for goal', default=0.0) +@click.option('--pitch', '-p', help='Set target pitch for goal', default=0.0) +@click.option('--yaw', '-y', help='Set target yaw for goal', default=0.0) +def cli_main(lat, long, roll, pitch, yaw): + """Send goal to move_base given latitude and longitude + + \b + Two usage formats: + gps_goal.py --lat 43.658 --long -79.379 # decimal format + gps_goal.py --lat 43,39,31 --long -79,22,45 # DMS format + """ + gpsGoal = GpsGoal(); + + # Check for degrees, minutes, seconds format and convert to decimal + lat, long = DMS_to_decimal_format(lat, long) + gpsGoal.do_gps_goal(lat, long, roll=roll, pitch=pitch, yaw=yaw) + + +def ros_main(): + gpsGoal = GpsGoal(); + rospy.spin() + +if __name__ == '__main__': + cli_main() +