oreoled merge

.gitignore

@@ -1,52 +1,60 @@
-*.d
 !ROMFS/*/*.d
 !ROMFS/*/*/*.d
 !ROMFS/*/*/*/*.d
+*.d
 *.dSYM
+*.generated.h
 *.o
+*.orig
+*.pretty
 *.pyc
 *~
 .*.swp
+.DS_Store
 .context
 .cproject
-.DS_Store
 .gdbinit
 .project
+.pydevproject
+.ropeproject
 .settings
 .swp
+.tags
+.tags_sorted_by_file
+.vagrant
 .~lock.*
+/.gdbinit.fmu
+/.gdbinit.io
+/Documentation/doxy.log
+/Documentation/doxygen*objdb*tmp
+/Documentation/html/
+/nuttx-configs/px4io-v1/src/.depend
+/nuttx-configs/px4io-v1/src/Make.dep
+/nuttx-configs/px4io-v1/src/libboard.a
+/nuttx-configs/px4io-v2/src/.depend
+/nuttx-configs/px4io-v2/src/Make.dep
+/nuttx-configs/px4io-v2/src/libboard.a
 Archives/*
 Build/*
-build/*
-core
-cscope.out
 Firmware.sublime-workspace
+Firmware.zip
 Images/*.bin
 Images/*.px4
+Tools/sitl_gazebo
+build/*
+core
+cscope.out
+makefiles/config_px4fmu-v2_APM.mk
+makefiles/nuttx/config_px4fmu-v1_APM.mk
+makefiles/nuttx/config_px4fmu-v2_APM.mk
 mavlink/include/mavlink/v0.9/
-/nuttx-configs/px4io-v2/src/.depend
-/nuttx-configs/px4io-v2/src/Make.dep
-/nuttx-configs/px4io-v2/src/libboard.a
-/nuttx-configs/px4io-v1/src/.depend
-/nuttx-configs/px4io-v1/src/Make.dep
-/nuttx-configs/px4io-v1/src/libboard.a
-/Documentation/doxy.log
-/Documentation/html/
-/Documentation/doxygen*objdb*tmp
-.tags
-tags
-.tags_sorted_by_file
-.pydevproject
-.ropeproject
-*.orig
+src/lib/dspal
+src/lib/matrix
 src/modules/uORB/topics/*
 src/platforms/nuttx/px4_messages/*
+src/platforms/posix/px4_messages/
+src/platforms/qurt/px4_messages/
 src/platforms/ros/px4_messages/*
-Firmware.zip
+tags
 unittests/build
-*.generated.h
-.vagrant
-*.pretty
 xcode
-src/platforms/posix/px4_messages/
-src/platforms/qurt/px4_messages/