Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ArduPlane cmake build working.

This commit is contained in:
James Goppert 2011-10-31 13:18:48 -04:00
parent c76846dfa6
commit ed0722e298
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.project
View File

@ -3,7 +3,6 @@
<name>ArduPilotMega-Source@ardupilotone</name> <name>ArduPilotMega-Source@ardupilotone</name>
<comment></comment> <comment></comment>
<projects> <projects>
<project>ArduPilotMega@ardupilotone-unix</project>
</projects> </projects>
<buildSpec> <buildSpec>
</buildSpec> </buildSpec>

8
CMakeLists.txt
View File

@ -124,16 +124,16 @@ macro(add_sketch SKETCH_NAME BOARD PORT)
foreach(PDE ${PDE_SOURCES}) foreach(PDE ${PDE_SOURCES})
message(STATUS "pde: ${PDE}") message(STATUS "pde: ${PDE}")
file(READ ${PDE} FILE) file(READ ${PDE} FILE)
string(REGEX MATCHALL "([a-zA-Z]+[ ]+)*[ ]*[a-zA-Z0-9]+[ ]+[_a-zA-Z0-9]+[(][^)]*[)]" PROTOTYPES ${FILE}) string(REGEX MATCHALL "[\n]([a-zA-Z]+[ ])*[_a-zA-Z0-9]+([ ]*[\n][\t]*|[ ])[_a-zA-Z0-9]+[ ]?[\n]?[\t]*[ ]*[(]([\t]*[ ]*[*]?[ ]?[a-zA-Z0-9_][,]?[ ]*[\n]?)*[)]" PROTOTYPES ${FILE})
foreach(PROTOTYPE ${PROTOTYPES}) foreach(PROTOTYPE ${PROTOTYPES})
message(STATUS "\tprototype: ${PROTOTYPE};") message(STATUS "\tprototype: ${PROTOTYPE};")
file(APPEND ${SKETCH_CPP} "${PROTOTYPE};\n") file(APPEND ${SKETCH_CPP} "${PROTOTYPE};")
endforeach() endforeach()
endforeach() endforeach()
# write source # write source
file(APPEND ${SKETCH_CPP} "${FILE_BODY}") file(APPEND ${SKETCH_CPP} "\n${FILE_BODY}")
list(REMOVE_ITEM PDE_SOURCES ${SKETCH_PDE}) list(REMOVE_ITEM PDE_SOURCES ${SKETCH_PDE})
list(SORT PDE_SOURCES) list(SORT PDE_SOURCES)
foreach (PDE ${PDE_SOURCES}) foreach (PDE ${PDE_SOURCES})
@ -157,5 +157,5 @@ endmacro()
add_sketch(apo ${BOARD} ${PORT}) add_sketch(apo ${BOARD} ${PORT})
add_sketch(ArduRover ${BOARD} ${PORT}) add_sketch(ArduRover ${BOARD} ${PORT})
add_sketch(ArduBoat ${BOARD} ${PORT}) add_sketch(ArduBoat ${BOARD} ${PORT})
#add_sketch(ArduPlane ${BOARD} ${PORT}) add_sketch(ArduPlane ${BOARD} ${PORT})
#add_sketch(ArduCopter ${BOARD} ${PORT}) #add_sketch(ArduCopter ${BOARD} ${PORT})

2
libraries/AP_GPS/AP_GPS_IMU.cpp
View File

@ -220,7 +220,7 @@ void AP_GPS_IMU::GPS_join_data(void)
* *
****************************************************************/ ****************************************************************/
// checksum algorithm // checksum algorithm
void AP_GPS_IMU::checksum(byte data) void AP_GPS_IMU::checksum(unsigned char data)
{ {
ck_a += data; ck_a += data;
ck_b += ck_a; ck_b += ck_a;