Permalink
Browse files

Consolidated developement info into Development.md

  • Loading branch information...
1 parent 006e39c commit 4f4f678f8871595e1e3af21cf17345c38178be53 Steveis committed May 5, 2015
Showing with 70 additions and 67 deletions.
  1. +1 −36 CONTRIBUTING.md
  2. +2 −12 README.md
  3. +67 −19 docs/development/Development.md
View
@@ -10,41 +10,6 @@ Please search for existing issues *before* creating new ones.
# Developers
-Please see the Contributing section of the README.md
+Please refer to the development section in the `docs/development` folder.
-Please see the docs/developers folder for other notes.
-Ensure you understand the github workflow: https://guides.github.com/introduction/flow/index.html
-
-Please keep pull requests focused on one thing only, since this makes it easier to merge and test in a timely manner.
-
-If you need help with pull requests there are guides on github here:
-
-https://help.github.com/articles/creating-a-pull-request/
-
-The main flow for a contributing is as follows:
-
-1. Login to github, goto the cleanflight repository and press `fork`.
-2. Then using the command line/terminal on your computer: `git clone <url to YOUR fork>`
-3. `cd cleanflight`
-4. `git checkout master`
-5. `git checkout -b my-new-code`
-6. Make changes
-7. `git add <files that have changed>`
-8. `git commit`
-9. `git push origin my-new-code`
-10. Create pull request using github UI to merge your changes from your new branch into `cleanflight/master`
-11. Repeat from step 4 for new other changes.
-
-The primary thing to remember is that separate pull requests should be created for separate branches. Never create a pull request from your `master` branch.
-
-Later, you can get the changes from the cleanflight repo into your `master` branch by adding cleanflight as a git remote and merging from it as follows:
-
-1. `git remote add cleanflight https://github.com/cleanflight/cleanflight.git`
-2. `git checkout master`
-3. `git fetch cleanflight`
-4. `git merge cleanflight/master`
-
-
-You can also perform the git commands using the git client inside Eclipse. Refer to the Eclipse git manual.
-
View
@@ -104,19 +104,9 @@ Before creating new issues please check to see if there is an existing one, sear
## Developers
-There is a developers section in the `docs/development` folder.
+Please refer to the development section in the `docs/development` folder.
-Before making any code contributions, take a note of the https://github.com/multiwii/baseflight/wiki/CodingStyle
-
-For this fork it is also advised to read about clean code, here are some useful links:
-
-* http://cleancoders.com/
-* http://en.wikipedia.org/wiki/SOLID_%28object-oriented_design%29
-* http://en.wikipedia.org/wiki/Code_smell
-* http://en.wikipedia.org/wiki/Code_refactoring
-* http://www.amazon.co.uk/Working-Effectively-Legacy-Robert-Martin/dp/0131177052
-
-TravisCI is also used to run automatic builds
+TravisCI is used to run automatic builds
https://travis-ci.org/cleanflight/cleanflight
@@ -1,24 +1,8 @@
-#Development
+# Development
This document is primarily for developers only.
-##Unit testing
-
-Ideally, there should be tests for any new code. However, since this is a legacy codebase which was not designed to be tested this might be a bit difficult.
-
-If you want to make changes and want to make sure it's tested then focus on the minimal set of changes required to add a test.
-
-Tests currently live in the `test` folder and they use the google test framework.
-The tests are compiled and run natively on your development machine and not on the target platform.
-This allows you to develop tests and code and actually execute it to make sure it works without needing a development board or simulator.
-
-This project could really do with some functional tests which test the behaviour of the application.
-
-All pull requests to add/improve the testability of the code or testing methods are highly sought!
-
-Note: Tests are written in C++ and linked with with firmware's C code.
-
-##General principals
+## General principals
1. Name everything well.
2. Strike a balance between simplicity and not-repeating code.
@@ -34,7 +18,33 @@ Note: Tests are written in C++ and linked with with firmware's C code.
12. Be professional - attempts at humor or slating existing code in the codebase itself is not helpful when you have to change/fix it.
13. Know that there's always more than one way to do something and that code is never final - but it does have to work.
-###Running the tests.
+Before making any code contributions, take a note of the https://github.com/multiwii/baseflight/wiki/CodingStyle
+
+It is also advised to read about clean code, here are some useful links:
+
+* http://cleancoders.com/
+* http://en.wikipedia.org/wiki/SOLID_%28object-oriented_design%29
+* http://en.wikipedia.org/wiki/Code_smell
+* http://en.wikipedia.org/wiki/Code_refactoring
+* http://www.amazon.co.uk/Working-Effectively-Legacy-Robert-Martin/dp/0131177052
+
+## Unit testing
+
+Ideally, there should be tests for any new code. However, since this is a legacy codebase which was not designed to be tested this might be a bit difficult.
+
+If you want to make changes and want to make sure it's tested then focus on the minimal set of changes required to add a test.
+
+Tests currently live in the `test` folder and they use the google test framework.
+The tests are compiled and run natively on your development machine and not on the target platform.
+This allows you to develop tests and code and actually execute it to make sure it works without needing a development board or simulator.
+
+This project could really do with some functional tests which test the behaviour of the application.
+
+All pull requests to add/improve the testability of the code or testing methods are highly sought!
+
+Note: Tests are written in C++ and linked with with firmware's C code.
+
+### Running the tests.
The tests and test build system is very simple and based of the googletest example files, it will be improved in due course.
@@ -50,3 +60,41 @@ You can run them on the command line to execute the tests and to see the test re
You can also step-debug the tests in eclipse and you can use the GoogleTest test runner to make building and re-running the tests simple.
The tests are currently always compiled with debugging information enabled, there may be additional warnings, if you see any warnings please attempt to fix them and submit pull requests with the fixes.
+
+## Using git and github
+
+Ensure you understand the github workflow: https://guides.github.com/introduction/flow/index.html
+
+Please keep pull requests focused on one thing only, since this makes it easier to merge and test in a timely manner.
+
+If you need help with pull requests there are guides on github here:
+
+https://help.github.com/articles/creating-a-pull-request/
+
+The main flow for a contributing is as follows:
+
+1. Login to github, goto the cleanflight repository and press `fork`.
+2. Then using the command line/terminal on your computer: `git clone <url to YOUR fork>`
+3. `cd cleanflight`
+4. `git checkout master`
+5. `git checkout -b my-new-code`
+6. Make changes
+7. `git add <files that have changed>`
+8. `git commit`
+9. `git push origin my-new-code`
+10. Create pull request using github UI to merge your changes from your new branch into `cleanflight/master`
+11. Repeat from step 4 for new other changes.
+
+The primary thing to remember is that separate pull requests should be created for separate branches. Never create a pull request from your `master` branch.
+
+Later, you can get the changes from the cleanflight repo into your `master` branch by adding cleanflight as a git remote and merging from it as follows:
+
+1. `git remote add cleanflight https://github.com/cleanflight/cleanflight.git`
+2. `git checkout master`
+3. `git fetch cleanflight`
+4. `git merge cleanflight/master`
+
+
+You can also perform the git commands using the git client inside Eclipse. Refer to the Eclipse git manual.
+
+

0 comments on commit 4f4f678

Please sign in to comment.