Merge remote-tracking branch 'origin/next' into sambas/diffnext

Conflicts:
	make/common-defs.mk

HISTORY.txt

@@ -1,4 +1,4 @@
-Short summary of changes.  For a complete list see the git log.
+Short summary of changes.  For a complete list see the git log.
 
 2012-11-17
 Advanced camera stabilization features.

Makefile

@@ -187,12 +187,11 @@ uavobjects_clean:
 
 # Define some pointers to the various important pieces of the flight code
 # to prevent these being repeated in every sub makefile
-export PIOS          := $(ROOT_DIR)/flight/PiOS
-export FLIGHTLIB     := $(ROOT_DIR)/flight/Libraries
-export OPMODULEDIR   := $(ROOT_DIR)/flight/Modules
+export PIOS          := $(ROOT_DIR)/flight/pios
+export FLIGHTLIB     := $(ROOT_DIR)/flight/libraries
+export OPMODULEDIR   := $(ROOT_DIR)/flight/modules
 export OPUAVOBJ      := $(ROOT_DIR)/flight/uavobjects
 export OPUAVTALK     := $(ROOT_DIR)/flight/uavtalk
-export DOXYGENDIR    := $(ROOT_DIR)/flight/Doc/Doxygen
 export OPUAVSYNTHDIR := $(BUILD_DIR)/uavobject-synthetics/flight
 export OPGCSSYNTHDIR := $(BUILD_DIR)/openpilotgcs-synthetics
 
@@ -792,7 +791,7 @@ define UNCRUSTIFY_TEMPLATE
 .PHONY: uncrustify_$(1)
 uncrustify_$(1):
 	@$(ECHO) "Auto-formatting $(1) source code"
-	$(V1) UNCRUSTIFY_CONFIG="make/templates/uncrustify.cfg" $(SHELL) make/scripts/uncrustify.sh $(call toprel, $(2))
+	$(V1) UNCRUSTIFY_CONFIG="$(ROOT_DIR)/make/uncrustify/uncrustify.cfg" $(SHELL) make/scripts/uncrustify.sh $(call toprel, $(2))
 endef
 
 $(eval $(call UNCRUSTIFY_TEMPLATE,flight,$(ROOT_DIR)/flight))
@@ -815,6 +814,18 @@ build-info:
 		--template="make/templates/$@.txt" \
 		--outfile="$(BUILD_DIR)/$@.txt"
 
+##############################
+#
+# Doxygen documentation
+# FIXME: currently is not not used and should be updated
+#
+##############################
+
+# Generate Doxygen documentation
+.PHONY: docs
+docs:
+	$(DOXYGEN) $(ROOT_DIR)/make/doxygen/doxygen.cfg
+
 ##############################
 #
 # Help message, the default Makefile goal

README.txt

@@ -1 +1,44 @@
-Check the wiki: http://wiki.openpilot.org/display/Doc/OpenPilot+Developer+Manual
+What is OpenPilot all about?
+----------------------------
+
+The project aims at implementing the best features of all existing similar systems developed by
+enthusiasts and combines them into a single, easy-to-use software/hardware package. The ease-of-use
+in this case does not imply functional simplicity or compromises. There are no rigidly defined
+constraints and settings, but a full-fledged programming language configuration loaded via a
+Ground Control Station and other advanced features. OpenPilot is developed as a powerful platform
+for all types of vehicles.
+
+This is a non-profit project of the OpenPilot Foundation
+--------------------------------------------------------
+
+This is a project using only volunteer personnel who have donated enormous amounts of time, money
+and effort. Please respect the people that are part of the project and their generosity. OpenPilot
+is funded entirely at the expense of those who spend their time and money in the development of the
+public project which helps it grow. Giving complete and correct references to all their work is not
+only a legal requirement of the CC-BY-SA license, but also simple respect for their work. The people
+who create this project, really deserve it for their very hard work.
+
+The OpenPilot project web sites
+-------------------------------
+
+The project provides feature-rich development and collaboration environment using advanced tools such
+as GCC compilers, git, Atlassian JIRA, Confluence, FishEye, Crucible, Bamboo, Crowd, forums and blogs.
+
+Main project web site:	http://www.openpilot.org/
+Project forums:		http://forums.openpilot.org/
+Wiki, docs and manuals:	http://wiki.openpilot.org/
+Bug and issue tracker:	http://progress.openpilot.org/
+Source code repository:	http://git.openpilot.org/
+Crucible code reviews:	http://reviews.openpilot.org/cru
+Project build server:	http://bamboo.openpilot.org/
+Community blogs:	http://forums.openpilot.org/blogs/
+Software downloads:	http://wiki.openpilot.org/display/BUILDS/OpenPilot+Software+Downloads
+
+How to build from source?
+-------------------------
+
+make all_sdk_install
+make all
+
+The project supports Windows, Linux and Mac OS X platforms as well as Android.
+Check the wiki for more details: http://wiki.openpilot.org/display/Doc/OpenPilot+Developer+Manual

flight/Doc/Architecture/stm32_i2c_fsm.dot

@@ -1,172 +0,0 @@
-// Regenerate using graphviz/dotty with this command
-//   dot -Tjpg ./flight/Doc/Architecture/stm32_i2c_fsm.dot > ./flight/Doc/Architecture/stm32_i2c_fsm.jpg
-
-digraph stm32_i2c_fsm {
-  label="STM32 I2C FSM"
-  labelloc=t
-  labeljust = l
-
-  {
-    node [ style=filled,color=lightgray ]
-
-    stopped [ shape="doublecircle" ]
-  }
-
-  node [ style=filled,color=blue ]
-
-  {
-    rank=same
-    stopped
-    stopping
-    starting
-  }
-
-  // start addr/w[A] data[A] stop
-  //     SB       ADDR     BTF
-  //      ADDR     DR
-  //                STOP
-  //
-  // start addr/w[A] data[A] data[A] stop
-  //     SB       ADDR     BTF     BTF
-  //      ADDR     DR       DR
-  //                         STOP
-  //
-  // start addr/w[A] data[A] data[A] data[A] stop
-  //     SB       ADDR     BTF     BTF     BTF
-  //      ADDR     DR       DR      DR
-  //                                 STOP
-  //
-  subgraph cluster_w_last_txn {
-    label="Final Write Txn"
-    w_last_txn_addr
-    w_last_txn_middle
-    w_last_txn_last
-  }
-
-  // start addr/w[A] data[A] start
-  //     SB       ADDR     BTF
-  //      ADDR     DR
-  //                START
-  //
-  // start addr/w[A] data[A] data[A] start
-  //     SB       ADDR     BTF     BTF
-  //      ADDR     DR       DR
-  //                         START
-  //
-  // start addr/w[A] data[A] data[A] data[A] stop
-  //     SB       ADDR     BTF     BTF     BTF
-  //      ADDR     DR       DR      DR
-  //                                 START
-  //
-  subgraph cluster_w_more_txn {
-    label="Write Txn with Restart"
-    w_more_txn_addr
-    w_more_txn_middle
-    w_more_txn_last
-  }
-
-  // start addr/r[A] [data] N stop
-  //     SB       ADDR     RXNE
-  //      ADDR     STOP    DR
-  //               NAK
-  //
-  // start addr/r[A] [data] A [data] N stop
-  //     SB       ADDR     RXNE     RXNE
-  //      ADDR             DR       DR
-  //               ACK      NAK
-  //                        STOP
-  //
-  // start addr/r[A] [data] A [data] A [data] N stop
-  //     SB       ADDR     RXNE     RXNE     RXNE
-  //      ADDR             DR       DR       DR
-  //               ACK      ACK      NAK
-  //                                 STOP
-  //
-  subgraph cluster_r_last_txn {
-    label="Final Read Txn"
-    r_last_txn_addr
-    r_last_txn_pre_one
-    r_last_txn_pre_first
-    r_last_txn_pre_middle
-    r_last_txn_pre_last
-    r_last_txn_post_last
-  }
-
-  // start addr/r[A] [data] N start
-  //     SB       ADDR     RXNE
-  //      ADDR     START   DR
-  //               NAK
-  //
-  // start addr/r[A] [data] A [data] N start
-  //     SB       ADDR     RXNE     RXNE
-  //      ADDR             DR       DR
-  //               ACK      NAK
-  //                        START
-  //
-  // start addr/r[A] [data] A [data] A [data] N start
-  //     SB       ADDR     RXNE     RXNE     RXNE
-  //      ADDR             DR       DR       DR
-  //               ACK      ACK      NAK
-  //                                 START
-  subgraph cluster_r_more_txn {
-    label="Read Txn with Restart"
-    r_more_txn_addr
-    r_more_txn_pre_one
-    r_more_txn_pre_first
-    r_more_txn_pre_middle
-    r_more_txn_pre_last
-    r_more_txn_post_last
-  }
-
-  stopping -> stopped [ label="auto" ]
-  stopped -> starting [ label="start" ]
-
-  starting -> w_last_txn_addr [ label="SB\nop=write\nlast txn" ]
-  starting -> w_more_txn_addr [ label="SB\nop=write\nmore txn" ]
-
-  starting -> r_last_txn_addr [ label="SB\nop=read\nlast txn" ]
-  starting -> r_more_txn_addr [ label="SB\nop=read\nmore txn" ]
-
-  w_last_txn_addr -> w_last_txn_last [ label="ADDR\nlen==1" ]
-  w_more_txn_addr -> w_more_txn_last [ label="ADDR\nlen==1" ]
-
-  w_last_txn_addr -> w_last_txn_middle [ label="ADDR\nlen>1" ]
-  w_more_txn_addr -> w_more_txn_middle [ label="ADDR\nlen>1" ]
-
-  w_last_txn_middle -> w_last_txn_middle [ label="BTF\nlen>1" ]
-  w_more_txn_middle -> w_more_txn_middle [ label="BTF\nlen>1" ]
-
-  w_last_txn_middle -> w_last_txn_last [ label="BTF\nlen==1" ]
-  w_more_txn_middle -> w_more_txn_last [ label="BTF\nlen==1" ]
-
-  w_last_txn_last -> stopped [ label="BTF\nlen==0" ]
-  w_more_txn_last -> starting [ label="BTF\nlen==0" ]
-
-
-  r_last_txn_addr -> r_last_txn_pre_one [ label="ADDR\nlen==1" ]
-  r_more_txn_addr -> r_more_txn_pre_one [ label="ADDR\nlen==1" ]
-
-  r_last_txn_addr -> r_last_txn_pre_first [ label="ADDR\nlen>=2" ]
-  r_more_txn_addr -> r_more_txn_pre_first [ label="ADDR\nlen>=2" ]
-
-  r_last_txn_pre_one -> r_last_txn_post_last [ label="BTF\nlen==1" ]
-  r_more_txn_pre_one -> r_more_txn_post_last [ label="BTF\nlen==1" ]
-
-  r_last_txn_pre_first -> r_last_txn_pre_last [ label="BTF\nlen==2" ]
-  r_more_txn_pre_first -> r_more_txn_pre_last [ label="BTF\nlen==2" ]
-
-  r_last_txn_pre_first -> r_last_txn_pre_middle [ label="BTF\nlen>2" ]
-  r_more_txn_pre_first -> r_more_txn_pre_middle [ label="BTF\nlen>2" ]
-
-  r_last_txn_pre_middle -> r_last_txn_pre_middle [ label="BTF\nlen>2" ]
-  r_more_txn_pre_middle -> r_more_txn_pre_middle [ label="BTF\nlen>2" ]
-
-  r_last_txn_pre_middle -> r_last_txn_pre_last [ label="BTF\nlen==2" ]
-  r_more_txn_pre_middle -> r_more_txn_pre_last [ label="BTF\nlen==2" ]
-
-  r_last_txn_pre_last -> r_last_txn_post_last [ label="BTF\nlen==1" ]
-  r_more_txn_pre_last -> r_more_txn_post_last [ label="BTF\nlen==1" ]
-
-  r_last_txn_post_last -> stopping [ label="auto" ]
-  r_more_txn_post_last -> starting [ label="auto" ]
-}