Skip to content

Commit 1acf98d

Browse files
author
Aaron Roller
committed
able to find UserConfig.txt file AM-367/user-config
1 parent 261cb8b commit 1acf98d

2 files changed

Lines changed: 64 additions & 1 deletion

File tree

.vscode/settings.json

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
{
2+
"files.associations": {
3+
"cctype": "cpp",
4+
"clocale": "cpp",
5+
"cmath": "cpp",
6+
"cstdarg": "cpp",
7+
"cstddef": "cpp",
8+
"cstdio": "cpp",
9+
"cstdlib": "cpp",
10+
"cstring": "cpp",
11+
"ctime": "cpp",
12+
"cwchar": "cpp",
13+
"cwctype": "cpp",
14+
"array": "cpp",
15+
"atomic": "cpp",
16+
"strstream": "cpp",
17+
"*.tcc": "cpp",
18+
"bitset": "cpp",
19+
"chrono": "cpp",
20+
"complex": "cpp",
21+
"condition_variable": "cpp",
22+
"cstdint": "cpp",
23+
"deque": "cpp",
24+
"list": "cpp",
25+
"unordered_map": "cpp",
26+
"vector": "cpp",
27+
"exception": "cpp",
28+
"fstream": "cpp",
29+
"functional": "cpp",
30+
"initializer_list": "cpp",
31+
"iomanip": "cpp",
32+
"iosfwd": "cpp",
33+
"iostream": "cpp",
34+
"istream": "cpp",
35+
"limits": "cpp",
36+
"mutex": "cpp",
37+
"new": "cpp",
38+
"ostream": "cpp",
39+
"numeric": "cpp",
40+
"ratio": "cpp",
41+
"sstream": "cpp",
42+
"stdexcept": "cpp",
43+
"streambuf": "cpp",
44+
"system_error": "cpp",
45+
"thread": "cpp",
46+
"cfenv": "cpp",
47+
"cinttypes": "cpp",
48+
"tuple": "cpp",
49+
"type_traits": "cpp",
50+
"utility": "cpp",
51+
"typeinfo": "cpp",
52+
"algorithm": "cpp",
53+
"iterator": "cpp",
54+
"map": "cpp",
55+
"memory": "cpp",
56+
"memory_resource": "cpp",
57+
"optional": "cpp",
58+
"random": "cpp",
59+
"set": "cpp",
60+
"string": "cpp",
61+
"string_view": "cpp"
62+
}
63+
}

src/dji_sdk_obsoleted/dji_linux_environment.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ DJI_Environment::findFile(std::string file)
4848
std::string configFile = findFileInCwd(file);
4949
if(configFile.empty()){
5050
//FIXME: find a better place to declare this
51-
std::string installationDir = "/opt/ros/melodic/share/dji_sdk";
51+
std::string installationDir = "/opt/ros/melodic/share/dji_sdk/launch";
5252
configFile = findFileInDir(file,installationDir);
5353
}
5454
return configFile;

0 commit comments

Comments
 (0)