Merge branch 'master' of http://git.wxchen.site/wxchen/maintain into da

modified: src/maintain/scripts/test.py
deleted: src/yolov5_ros/launch/yolov5_d435.launch
2023-05-09 16:56:57 +08:00 · 2023-05-09 16:49:15 +08:00 · 2023-05-08 19:44:47 +08:00 · 2023-05-08 19:43:03 +08:00 · 2023-05-08 13:33:19 +08:00 · 2023-05-08 12:23:28 +08:00
3 changed files with 19 additions and 1 deletions
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -0,0 +1,18 @@
+{
+    "tasks": [
+        {
+            "type": "shell",
+            "command": "catkin",
+            "args": [
+                "build",
+                "-DPYTHON_EXECUTABLE=/home/da/miniconda3/envs/gsmini/bin/python",
+                //"-DPYTHON_EXECUTABLE=${HOME}/.conda/envs/gsmini/bin/python"
+            ],
+            "problemMatcher": [
+                "$catkin-gcc"
+            ],
+            "group": "build",
+            "label": "catkin: build"
+        }
+    ]
+}
--- a/src/maintain/scripts/test.py
+++ b/src/maintain/scripts/test.py
@@ -1,4 +1,4 @@
-#! /home/wxchen/.conda/envs/gsmini/bin/python
+#! /home/da/miniconda3/envs/gsmini/bin/python

 import numpy as np
 import cv2 as cv
--- a/src/vision_opencv/cv_bridge/python/cv_bridge/pycache/core.cpython-38.pyc
+++ b/src/vision_opencv/cv_bridge/python/cv_bridge/pycache/core.cpython-38.pyc
Author	SHA1	Message	Date
wxchen	f5d37a5f11	Merge branch 'master' of http://git.wxchen.site/wxchen/maintain into da	2023-05-09 16:56:57 +08:00
wxchen	d58cd68b8f	modified: src/maintain/scripts/test.py deleted: src/yolov5_ros/launch/yolov5_d435.launch	2023-05-09 16:49:15 +08:00
wxchen	80f1ece25a	modified: src/maintain/scripts/test.py	2023-05-08 19:44:47 +08:00
wxchen	0ed8cd4ee1	Merge branch 'master' of http://git.wxchen.site/wxchen/maintain into da	2023-05-08 19:43:03 +08:00
wxchen	aabf72c149	Merge branch 'master' of http://git.wxchen.site/wxchen/maintain into da	2023-05-08 13:33:19 +08:00
wxchen	b281a5caed	modified: src/maintain/scripts/test.py	2023-05-08 12:23:28 +08:00
wxchen	5aad39b7ba	Merge branch 'master' of http://git.wxchen.site/wxchen/maintain into da	2023-05-08 11:18:26 +08:00
wxchen	bda7453e51	modified: src/maintain/scripts/test.py	2023-05-08 11:11:43 +08:00
wxchen	231f5fc815	da changes modified: .gitignore modified: .vscode/tasks.json modified: src/maintain/scripts/test.py modified: src/vision_opencv/cv_bridge/python/cv_bridge/__pycache__/core.cpython-38.pyc	2023-05-08 10:03:17 +08:00