Merge remote-tracking branch 'github/dev' into addFeature

wu_xinjun

2022-03-24 5a4485945ba7b09f9513d9e31b60c58b5a1f61b7

 .vscode/launch.json

@@ -8,8 +8,8 @@
            "name": "test auto slam",
            "type": "python",
            "request": "launch",
            "python": "${workspaceFolder}/env/aerial_deploy/python.exe",
            "program": "${workspaceFolder}/src/auto_slam.py",
            "python": "${workspaceFolder}/.env/python.exe",
            "program": "${workspaceFolder}/scripts/slamAutoMode.py",
            "console": "integratedTerminal",
            "args": [
                "COM11",
@@ -22,17 +22,17 @@
                "192.168.2.65",
                "1000",
                "testDevice",
                "T:\\Data\\projects\\huaneng\\04_Data\\20220316test"]
                "../../04_Data/20220316test"]
        },
        {
            "name": "test_slam",
            "type": "python",
            "request": "launch",
            "python": "${workspaceFolder}/env/aerial_deploy/python.exe",
            "program": "${workspaceFolder}/src/mannul_slam.py",
            "python": "${workspaceFolder}/.env/python.exe",
            "program": "${workspaceFolder}/scripts/slamManualMode.py",
            "console": "integratedTerminal",
            "args": [
                "T:\\Data\\projects\\huaneng\\04_Data\\20220316test",
                "../../04_Data/20220316test",
                "0",
                "20",
                "auto",
@@ -44,7 +44,7 @@
            "name": "Client_test",
            "type": "python",
            "request": "launch",
            "python": "${workspaceFolder}/env/aerial_deploy/python.exe",
            "python": "${workspaceFolder}/.env/python.exe",
            "program": "${workspaceFolder}/src/Client.py",
            "args": [
                "192.168.1.14",
@@ -61,7 +61,7 @@
            "name": "Client_production",
            "type": "python",
            "request": "launch",
            "python": "${workspaceFolder}/env/aerial_deploy/python.exe",
            "python": "${workspaceFolder}/.env/python.exe",
            "program": "${workspaceFolder}/src/Client.py",
            "args": [
                "172.17.17.206",
@@ -77,7 +77,7 @@
        {
            "name": "Server_test",
            "type": "python",
            "python": "${workspaceFolder}/env/aerial_deploy/python.exe",
            "python": "${workspaceFolder}/.env/python.exe",
            "request": "launch",
            "program": "${workspaceFolder}/src/Server.py",
            "args": [
@@ -94,7 +94,7 @@
            "name": "Server_production",
            "type": "python",
            "request": "launch",
            "python": "${workspaceFolder}/env/aerial_deploy/python.exe",
            "python": "${workspaceFolder}/.env/python.exe",
            "program": "${workspaceFolder}/src/Server.py",
            "args": [
                "172.17.17.206",
@@ -110,8 +110,8 @@
            "name": "udp2bin",
            "type": "python",
            "request": "launch",
            "python": "${workspaceFolder}/env/aerial_deploy/python.exe",
            "program": "${workspaceFolder}/src/utils/udp2bin.py",
            "python": "${workspaceFolder}/.env/python.exe",
            "program": "${workspaceFolder}/scripts/udp2bin.py",
            "args": [
                "./src/microwave/demo/demoData"
            ],
@@ -121,10 +121,10 @@
            "name": "bin2ply",
            "type": "python",
            "request": "launch",
            "python": "${workspaceFolder}/env/aerial_deploy/python.exe",
            "program": "${workspaceFolder}/src/utils/bin2ply.py",
            "python": "${workspaceFolder}/.env/python.exe",
            "program": "${workspaceFolder}/scripts/bin2ply.py",
            "args": [
                "T:/Data/projects/huaneng/00_Docs/mutiFrameBin"
                "../../00_Docs/mutiFrameBin"
            ],
            "console": "integratedTerminal"
        }