Skip to content

merge new filestructure #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
S1ink merged 3 commits into from
Jun 17, 2022
Merged

merge new filestructure #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
506a53f
?
S1ink Jun 17, 2022
087b01b
VisionServer 2.0.0 initial
S1ink Jun 17, 2022
0c252f6
fix the readme
S1ink Jun 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
17 changes: 6 additions & 11 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
[submodule "references/neon_vision"]
path = references/neon_vision
url = https://github.com/JaciBrunning/neon_vision/

[submodule "references/tools"]
path = references/tools
url = https://github.com/S1ink/Cpp-Tools/

[submodule "robot-impl/submodule"]
path = robot-impl/submodule
url = https://github.com/S1ink/VisionServer-Robot/
[submodule "lib-vs/additions/cpp-tools"]
path = lib-vs/additions/cpp-tools
url = https://github.com/S1ink/Cpp-Tools
[submodule "roborio-vs"]
path = roborio-vs
url = https://github.com/S1ink/VisionServer-Robot
4 changes: 0 additions & 4 deletions .vscode/arduino.json
View file
Open in desktop

This file was deleted.

18 changes: 9 additions & 9 deletions .vscode/c_cpp_properties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"name": "CC-ARM-DESKTOP-8GI6FFU", // my desktop computer
"includePath": [
"${workspaceFolder}/**",
"${workspaceFolder}/include",
"${workspaceFolder}/references",
"${workspaceFolder}/include/opencv4"
"${workspaceFolder}/lib-vs/include",
"${workspaceFolder}/lib-vs/additions",
"${workspaceFolder}/lib-vs/include/opencv4"
],
"defines": [
"UNICODE",
Expand All @@ -23,9 +23,9 @@
"name": "CC-ARM-DESKTOP-R6IKQEI", // my laptop
"includePath": [
"${workspaceFolder}/**",
"${workspaceFolder}/include",
"${workspaceFolder}/references",
"${workspaceFolder}/include/opencv4"
"${workspaceFolder}/lib-vs/include",
"${workspaceFolder}/lib-vs/additions",
"${workspaceFolder}/lib-vs/include/opencv4"
],
"defines": [
"UNICODE",
Expand All @@ -42,9 +42,9 @@
"name": "CC-ARM-ROBOTICS-1", // OG robotics desktop
"includePath": [
"${workspaceFolder}/**",
"${workspaceFolder}/include",
"${workspaceFolder}/references",
"${workspaceFolder}/include/opencv4"
"${workspaceFolder}/lib-vs/include",
"${workspaceFolder}/lib-vs/additions",
"${workspaceFolder}/lib-vs/include/opencv4"
],
"defines": [
"UNICODE",
Expand Down
1,176 changes: 0 additions & 1,176 deletions VisionTesting.vcxproj
View file
Open in desktop

This file was deleted.

Loading