Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-30 11:37:06 +08:00
Code Issues Actions 26 Packages Projects Releases Wiki Activity

Fixes #2194

Browse Source
This commit is contained in:
Michal Podhradsky
2017-11-27 15:47:33 -08:00
parent 88e773e54c
commit 061c389811
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/modules/gps_piksi.xml
+3 -3
View File
@@ -23,9 +23,9 @@
<configure name="PIKSI_GPS_BAUD" default="B115200"/> <configure name="PIKSI_GPS_BAUD" default="B115200"/>
<file name="gps_piksi.c" dir="subsystems/gps"/> <file name="gps_piksi.c" dir="subsystems/gps"/>
<include name="$(PAPARAZZI_SRC)/sw/ext/libsbp/c/include"/> <include name="../ext/libsbp/c/include"/>
<file name="sbp.c" dir="$(PAPARAZZI_SRC)/sw/ext/libsbp/c/src"/> <file name="sbp.c" dir="../ext/libsbp/c/src"/>
<file name="edc.c" dir="$(PAPARAZZI_SRC)/sw/ext/libsbp/c/src"/> <file name="edc.c" dir="../ext/libsbp/c/src"/>
<define name="USE_$(PIKSI_GPS_PORT_UPPER)"/> <define name="USE_$(PIKSI_GPS_PORT_UPPER)"/>
<define name="PIKSI_GPS_LINK" value="$(PIKSI_GPS_PORT_LOWER)"/> <define name="PIKSI_GPS_LINK" value="$(PIKSI_GPS_PORT_LOWER)"/>
sw/tools/find_vpaths.py
+5 -2
View File
@@ -56,14 +56,17 @@ with open(sys.argv[2]) as fp:
found = 0 found = 0
for vpath in vpaths: for vpath in vpaths:
if os.path.isfile(path.join(vpath, f)) : if os.path.isfile(path.join(vpath, f)) :
cmd = cmd + path.join(vpath, f) + ' ' if found == 0:
found = found +1 # add file in the path only once
cmd = cmd + path.join(vpath, f) + ' '
found = found +1
# break # break
if found == 0: if found == 0:
tmps = "ERROR: could not find src: " + f tmps = "ERROR: could not find src: " + f
cmd = cmd + tmps #hack to make the error known cmd = cmd + tmps #hack to make the error known
print(tmps) print(tmps)
if found > 1: if found > 1:
# NOTE: this will never happen
tmps = "ERROR: found src more than once: " + f tmps = "ERROR: found src more than once: " + f
cmd = cmd + tmps #hack to make the error known cmd = cmd + tmps #hack to make the error known
print(tmps) print(tmps)