diff --git a/config.json b/config.json index 37ae749..cd7d239 100644 --- a/config.json +++ b/config.json @@ -9,12 +9,10 @@ "external_net_port": 19683, "mqtt_user": "zxwl", "mqtt_password": "zxwl1234@", - "pub_gps_topic": "/zxwl/vehicle/V060003/gps", - "remote_topic": "/zxwl/vehicle/V060003/ctrl", - "mqtt_topic_push_status": "/zxwl/vehicle/V060003/task/status", - "mqtt_topic_sub_task": "/zxwl/vehicle/V060003/task", - "info_topic": "/zxwl/vehicle/V060003/info", - "fault_topic": "/zxwl/vehicle/V060003/fault" + "pub_gps_topic": "/zxwl/sweeper/V060003/gps", + "remote_topic": "/zxwl/sweeper/V060003/ctrl", + "mqtt_topic_push_status": "/zxwl/sweeper/V060003/task/status", + "mqtt_topic_sub_task": "/zxwl/sweeper/V060003/task" }, "detect_line_tolerance": 3.06, "detect_head_tolerance": 2, diff --git a/gps_load_now.txt b/gps_load_now.txt index 01fd512..f886a2f 100644 --- a/gps_load_now.txt +++ b/gps_load_now.txt @@ -1,68 +1,308 @@ -32.0309247030 -120.91507181700 -175.167999 +32.0309270710 +120.91508380700 +174.522003 0.000000 -32.0309153960 -120.91507298400 -169.643997 +32.0309177630 +120.91508508700 +170.716995 0.000000 -32.0309064620 -120.91507499500 -172.268997 +32.0309083630 +120.91508691600 +167.014008 0.000000 -32.0308971460 -120.91507587000 -177.580002 +32.0308991500 +120.91509013100 +158.218994 0.000000 -32.0308879100 -120.91507735600 -152.240005 +32.0308909680 +120.91509463700 +151.005997 0.000000 -32.0308810980 -120.91508470900 -102.825996 +32.0308825810 +120.91510033500 +147.225006 0.000000 -32.0308796330 -120.91509556100 -94.540001 +32.0308741660 +120.91510631000 +156.934006 0.000000 -32.0308790170 -120.91510617400 -84.416000 +32.0308652190 +120.91510999400 +166.878998 0.000000 -32.0308824190 -120.91511639600 -37.883999 +32.0308561900 +120.91511247100 +165.128998 0.000000 -32.0308908460 -120.91512016300 -353.354004 +32.0308470540 +120.91511526000 +164.408005 0.000000 -32.0308998390 -120.91511894700 -353.295013 +32.0308384050 +120.91511818800 +165.382996 0.000000 -32.0309090620 -120.91511812300 -358.222992 +32.0308288240 +120.91512052600 +167.072998 0.000000 -32.0309183710 -120.91511749800 -346.201996 +32.0308193630 +120.91512325900 +164.526993 0.000000 -32.0309261310 -120.91511212000 -297.071991 +32.0308099890 +120.91512646200 +160.466995 0.000000 -32.0309276550 -120.91510141900 -249.197006 +32.0308016850 +120.91513058700 +151.772003 0.000000 -32.0309219690 -120.91509306000 -200.531006 +32.0307940750 +120.91513631900 +140.869995 0.000000 -32.0309129310 -120.91509103000 -176.186005 +32.0307872200 +120.91514318900 +132.024994 +0.000000 +32.0307816190 +120.91515177200 +123.033997 +0.000000 +32.0307767850 +120.91516175300 +111.536003 +0.000000 +32.0307737970 +120.91517181200 +104.806999 +0.000000 +32.0307716670 +120.91518215100 +100.636002 +0.000000 +32.0307703680 +120.91519282400 +89.806000 +0.000000 +32.0307709200 +120.91520367800 +81.512001 +0.000000 +32.0307728420 +120.91521413600 +69.341003 +0.000000 +32.0307771010 +120.91522443200 +52.085999 +0.000000 +32.0307837600 +120.91523281900 +41.723999 +0.000000 +32.0307914160 +120.91523974900 +31.273001 +0.000000 +32.0307994650 +120.91524466500 +21.080000 +0.000000 +32.0308081020 +120.91524794900 +11.581000 +0.000000 +32.0308169840 +120.91524990900 +6.804000 +0.000000 +32.0308266650 +120.91525087500 +2.044000 +0.000000 +32.0308363640 +120.91525102500 +357.092987 +0.000000 +32.0308454740 +120.91525076200 +0.180000 +0.000000 +32.0308545400 +120.91525048300 +358.631012 +0.000000 +32.0308642580 +120.91525064500 +1.479000 +0.000000 +32.0308733660 +120.91525116000 +3.574000 +0.000000 +32.0308823780 +120.91525174100 +1.308000 +0.000000 +32.0308915670 +120.91525213700 +3.472000 +0.000000 +32.0309013400 +120.91525273600 +1.245000 +0.000000 +32.0309103910 +120.91525290600 +1.489000 +0.000000 +32.0309201180 +120.91525361800 +1.429000 +0.000000 +32.0309291640 +120.91525371800 +359.424011 +0.000000 +32.0309388660 +120.91525320500 +356.106995 +0.000000 +32.0309478980 +120.91525251700 +352.549988 +0.000000 +32.0309576240 +120.91525108400 +350.079010 +0.000000 +32.0309665940 +120.91524933800 +352.509003 +0.000000 +32.0309755100 +120.91524791200 +351.528015 +0.000000 +32.0309844990 +120.91524603700 +348.252014 +0.000000 +32.0309940620 +120.91524366200 +346.699005 +0.000000 +32.0310034720 +120.91524080400 +344.282990 +0.000000 +32.0310120850 +120.91523778100 +340.821014 +0.000000 +32.0310205650 +120.91523415800 +335.459015 +0.000000 +32.0310285570 +120.91522924400 +325.936005 +0.000000 +32.0310358980 +120.91522309900 +322.156006 +0.000000 +32.0310433430 +120.91521577300 +312.940002 +0.000000 +32.0310496090 +120.91520717900 +303.739990 +0.000000 +32.0310549300 +120.91519746200 +298.476013 +0.000000 +32.0310588260 +120.91518787300 +291.746002 +0.000000 +32.0310619800 +120.91517768500 +284.023010 +0.000000 +32.0310634770 +120.91516693600 +275.184998 +0.000000 +32.0310638860 +120.91515611400 +264.816010 +0.000000 +32.0310623280 +120.91514564900 +253.266998 +0.000000 +32.0310587730 +120.91513498100 +240.110001 +0.000000 +32.0310535320 +120.91512525600 +233.132004 +0.000000 +32.0310479220 +120.91511694700 +226.000000 +0.000000 +32.0310409290 +120.91510900500 +220.576004 +0.000000 +32.0310339060 +120.91510237400 +214.026001 +0.000000 +32.0310256190 +120.91509629900 +203.143997 +0.000000 +32.0310169390 +120.91509284600 +191.787994 +0.000000 +32.0310074340 +120.91509122200 +179.445999 +0.000000 +32.0309977060 +120.91509169800 +172.662994 +0.000000 +32.0309887870 +120.91509335300 +167.395004 +0.000000 +32.0309799010 +120.91509565100 +168.294998 +0.000000 +32.0309702280 +120.91509780900 +172.145996 +0.000000 +32.0309611820 +120.91509877900 +176.160995 +0.000000 +32.0309514570 +120.91509948100 +176.261993 +0.000000 +32.0309423130 +120.91510028200 +174.684998 0.000000 diff --git a/routes/gps_load_1767938262858.txt b/routes/gps_load_1767938262858.txt new file mode 100644 index 0000000..f886a2f --- /dev/null +++ b/routes/gps_load_1767938262858.txt @@ -0,0 +1,308 @@ +32.0309270710 +120.91508380700 +174.522003 +0.000000 +32.0309177630 +120.91508508700 +170.716995 +0.000000 +32.0309083630 +120.91508691600 +167.014008 +0.000000 +32.0308991500 +120.91509013100 +158.218994 +0.000000 +32.0308909680 +120.91509463700 +151.005997 +0.000000 +32.0308825810 +120.91510033500 +147.225006 +0.000000 +32.0308741660 +120.91510631000 +156.934006 +0.000000 +32.0308652190 +120.91510999400 +166.878998 +0.000000 +32.0308561900 +120.91511247100 +165.128998 +0.000000 +32.0308470540 +120.91511526000 +164.408005 +0.000000 +32.0308384050 +120.91511818800 +165.382996 +0.000000 +32.0308288240 +120.91512052600 +167.072998 +0.000000 +32.0308193630 +120.91512325900 +164.526993 +0.000000 +32.0308099890 +120.91512646200 +160.466995 +0.000000 +32.0308016850 +120.91513058700 +151.772003 +0.000000 +32.0307940750 +120.91513631900 +140.869995 +0.000000 +32.0307872200 +120.91514318900 +132.024994 +0.000000 +32.0307816190 +120.91515177200 +123.033997 +0.000000 +32.0307767850 +120.91516175300 +111.536003 +0.000000 +32.0307737970 +120.91517181200 +104.806999 +0.000000 +32.0307716670 +120.91518215100 +100.636002 +0.000000 +32.0307703680 +120.91519282400 +89.806000 +0.000000 +32.0307709200 +120.91520367800 +81.512001 +0.000000 +32.0307728420 +120.91521413600 +69.341003 +0.000000 +32.0307771010 +120.91522443200 +52.085999 +0.000000 +32.0307837600 +120.91523281900 +41.723999 +0.000000 +32.0307914160 +120.91523974900 +31.273001 +0.000000 +32.0307994650 +120.91524466500 +21.080000 +0.000000 +32.0308081020 +120.91524794900 +11.581000 +0.000000 +32.0308169840 +120.91524990900 +6.804000 +0.000000 +32.0308266650 +120.91525087500 +2.044000 +0.000000 +32.0308363640 +120.91525102500 +357.092987 +0.000000 +32.0308454740 +120.91525076200 +0.180000 +0.000000 +32.0308545400 +120.91525048300 +358.631012 +0.000000 +32.0308642580 +120.91525064500 +1.479000 +0.000000 +32.0308733660 +120.91525116000 +3.574000 +0.000000 +32.0308823780 +120.91525174100 +1.308000 +0.000000 +32.0308915670 +120.91525213700 +3.472000 +0.000000 +32.0309013400 +120.91525273600 +1.245000 +0.000000 +32.0309103910 +120.91525290600 +1.489000 +0.000000 +32.0309201180 +120.91525361800 +1.429000 +0.000000 +32.0309291640 +120.91525371800 +359.424011 +0.000000 +32.0309388660 +120.91525320500 +356.106995 +0.000000 +32.0309478980 +120.91525251700 +352.549988 +0.000000 +32.0309576240 +120.91525108400 +350.079010 +0.000000 +32.0309665940 +120.91524933800 +352.509003 +0.000000 +32.0309755100 +120.91524791200 +351.528015 +0.000000 +32.0309844990 +120.91524603700 +348.252014 +0.000000 +32.0309940620 +120.91524366200 +346.699005 +0.000000 +32.0310034720 +120.91524080400 +344.282990 +0.000000 +32.0310120850 +120.91523778100 +340.821014 +0.000000 +32.0310205650 +120.91523415800 +335.459015 +0.000000 +32.0310285570 +120.91522924400 +325.936005 +0.000000 +32.0310358980 +120.91522309900 +322.156006 +0.000000 +32.0310433430 +120.91521577300 +312.940002 +0.000000 +32.0310496090 +120.91520717900 +303.739990 +0.000000 +32.0310549300 +120.91519746200 +298.476013 +0.000000 +32.0310588260 +120.91518787300 +291.746002 +0.000000 +32.0310619800 +120.91517768500 +284.023010 +0.000000 +32.0310634770 +120.91516693600 +275.184998 +0.000000 +32.0310638860 +120.91515611400 +264.816010 +0.000000 +32.0310623280 +120.91514564900 +253.266998 +0.000000 +32.0310587730 +120.91513498100 +240.110001 +0.000000 +32.0310535320 +120.91512525600 +233.132004 +0.000000 +32.0310479220 +120.91511694700 +226.000000 +0.000000 +32.0310409290 +120.91510900500 +220.576004 +0.000000 +32.0310339060 +120.91510237400 +214.026001 +0.000000 +32.0310256190 +120.91509629900 +203.143997 +0.000000 +32.0310169390 +120.91509284600 +191.787994 +0.000000 +32.0310074340 +120.91509122200 +179.445999 +0.000000 +32.0309977060 +120.91509169800 +172.662994 +0.000000 +32.0309887870 +120.91509335300 +167.395004 +0.000000 +32.0309799010 +120.91509565100 +168.294998 +0.000000 +32.0309702280 +120.91509780900 +172.145996 +0.000000 +32.0309611820 +120.91509877900 +176.160995 +0.000000 +32.0309514570 +120.91509948100 +176.261993 +0.000000 +32.0309423130 +120.91510028200 +174.684998 +0.000000 diff --git a/src/autonomy/fu/config/fu_params.yaml b/src/autonomy/fu/config/fu_params.yaml index 95dfd16..bae0448 100644 --- a/src/autonomy/fu/config/fu_params.yaml +++ b/src/autonomy/fu/config/fu_params.yaml @@ -1,7 +1,7 @@ FU: ros__parameters: # 遇障停车功能 False or True - enable_obstacle_stop: False + enable_obstacle_stop: True # 绕障功能 False or True enable_obstacle_avoid: False diff --git a/src/autonomy/pl/src/pl_node.cpp b/src/autonomy/pl/src/pl_node.cpp index 954b119..b9a93f4 100644 --- a/src/autonomy/pl/src/pl_node.cpp +++ b/src/autonomy/pl/src/pl_node.cpp @@ -144,7 +144,7 @@ private: sweeper_interfaces::msg::Pl message; message.x = x; message.y = y; - + // 修改:同时判断RTK信号质量和超时情况 if (g_rtk.reliability == 0 || time_since_last > rtk_timeout) { diff --git a/src/communication/mqtt_report/config/config.json b/src/communication/mqtt_report/config/config.json index 531eb75..ea4e9f8 100644 --- a/src/communication/mqtt_report/config/config.json +++ b/src/communication/mqtt_report/config/config.json @@ -3,7 +3,7 @@ "mqtt": { "ip": "36.153.162.171", "port": 19683, - "info_topic": "/zxwl/vehicle/{vid}/info", - "fault_topic": "/zxwl/vehicle/{vid}/fault" + "info_topic": "/zxwl/sweeper/{vid}/info", + "fault_topic": "/zxwl/sweeper/{vid}/fault" } } \ No newline at end of file diff --git a/src/control/remote_ctrl/config/config.ini b/src/control/remote_ctrl/config/config.ini index e64d9eb..e77061f 100644 --- a/src/control/remote_ctrl/config/config.ini +++ b/src/control/remote_ctrl/config/config.ini @@ -3,4 +3,4 @@ host = 36.153.162.171 port = 19683 username = zxwl password = zxwl1234@ -vehicle_id = V090001 +vehicle_id = V060003