Merge dev commit '28668532ed2f97a3883be7e68bced252bd1f99bf' into addFeature

wu_xinjun

2022-03-23 563f7741ad28a6a578b56c98c27f92b3677958bd

 .vscode/launch.json

@@ -5,6 +5,42 @@
    "version": "0.2.0",
    "configurations": [
        {
            "name": "test auto slam",
            "type": "python",
            "request": "launch",
            "python": "${workspaceFolder}/env/aerial_deploy/python.exe",
            "program": "${workspaceFolder}/src/auto_slam.py",
            "console": "integratedTerminal",
            "args": [
                "COM11",
                "100",
                "5",
                "5",
                "0",
                "20",
                "auto",
                "192.168.2.65",
                "1000",
                "testDevice",
                "T:\\Data\\projects\\huaneng\\04_Data\\20220316test"]
        },
        {
            "name": "test_slam",
            "type": "python",
            "request": "launch",
            "python": "${workspaceFolder}/env/aerial_deploy/python.exe",
            "program": "${workspaceFolder}/src/mannul_slam.py",
            "console": "integratedTerminal",
            "args": [
                "T:\\Data\\projects\\huaneng\\04_Data\\20220316test",
                "0",
                "20",
                "auto",
                "test60120"
            ],
            "justMyCode": true
        },
        {
            "name": "Client_test",
            "type": "python",
            "request": "launch",
@@ -77,7 +113,7 @@
            "python": "${workspaceFolder}/env/aerial_deploy/python.exe",
            "program": "${workspaceFolder}/src/utils/udp2bin.py",
            "args": [
                "./Manual_Microwave/pod1-2022-02-21-15-34-45/"
                "./src/microwave/demo/demoData"
            ],
            "console": "integratedTerminal"
        },
@@ -88,7 +124,7 @@
            "python": "${workspaceFolder}/env/aerial_deploy/python.exe",
            "program": "${workspaceFolder}/src/utils/bin2ply.py",
            "args": [
                "./Manual_Microwave/pod1-2022-02-21-15-34-45/"
                "T:/Data/projects/huaneng/00_Docs/mutiFrameBin"
            ],
            "console": "integratedTerminal"
        }