Skip to content
Browse files

ArduPlane cmake build working.

  • Loading branch information...
1 parent 65b3b44 commit 3c78da608318f99b38a7b7c024b4bee2cc78a5da @jgoppert jgoppert committed Oct 31, 2011
Showing with 5 additions and 6 deletions.
  1. +0 −1 .project
  2. +4 −4 CMakeLists.txt
  3. +1 −1 libraries/AP_GPS/AP_GPS_IMU.cpp
View
1 .project
@@ -3,7 +3,6 @@
<name>ArduPilotMega-Source@ardupilotone</name>
<comment></comment>
<projects>
- <project>ArduPilotMega@ardupilotone-unix</project>
</projects>
<buildSpec>
</buildSpec>
View
8 CMakeLists.txt
@@ -124,16 +124,16 @@ macro(add_sketch SKETCH_NAME BOARD PORT)
foreach(PDE ${PDE_SOURCES})
message(STATUS "pde: ${PDE}")
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})
message(STATUS "\tprototype: ${PROTOTYPE};")
- file(APPEND ${SKETCH_CPP} "${PROTOTYPE};\n")
+ file(APPEND ${SKETCH_CPP} "${PROTOTYPE};")
endforeach()
endforeach()
# write source
- file(APPEND ${SKETCH_CPP} "${FILE_BODY}")
+ file(APPEND ${SKETCH_CPP} "\n${FILE_BODY}")
list(REMOVE_ITEM PDE_SOURCES ${SKETCH_PDE})
list(SORT PDE_SOURCES)
foreach (PDE ${PDE_SOURCES})
@@ -157,5 +157,5 @@ endmacro()
add_sketch(apo ${BOARD} ${PORT})
add_sketch(ArduRover ${BOARD} ${PORT})
add_sketch(ArduBoat ${BOARD} ${PORT})
-#add_sketch(ArduPlane ${BOARD} ${PORT})
+add_sketch(ArduPlane ${BOARD} ${PORT})
#add_sketch(ArduCopter ${BOARD} ${PORT})
View
2 libraries/AP_GPS/AP_GPS_IMU.cpp
@@ -220,7 +220,7 @@ void AP_GPS_IMU::GPS_join_data(void)
*
****************************************************************/
// checksum algorithm
-void AP_GPS_IMU::checksum(byte data)
+void AP_GPS_IMU::checksum(unsigned char data)
{
ck_a += data;
ck_b += ck_a;

0 comments on commit 3c78da6

Please sign in to comment.
Something went wrong with that request. Please try again.