Merge pull request #139 from madcowswe/sam_build_config

make Firmware the toplevel directory of tup

.gitignore

@@ -63,4 +63,4 @@ target/
 
 # Tup
 .tup
-/tup.config
+tup.config

.travis.yml

@@ -30,7 +30,8 @@ install:
   - export PATH=$PATH:$TUP_DIR/usr/bin
 
 script:
-  - mkdir -p Firmware/build
+  - cd Firmware
+  - mkdir -p build
   - echo "CONFIG_BOARD_VERSION=v3.4-24V" > tup.config # TODO: build more configuration combinations
   - tup generate ./build.sh
   - bash -xe ./build.sh

Firmware/CHANGELOG.md

@@ -6,6 +6,7 @@ Please add a note of your changes below this heading if you make a Pull Request.
 
 ### Changed
 * The build is now configured using the `tup.config` file instead of editing source files. Make sure you set your board version correctly. See [here](README.md#configuring-the-build) for details.
+* The toplevel directory for tup is now `Firmware`. If you used tup before, go to `Firmware` and run `rm -rd ../.tup; rm -rd build/*; make`.
 * Update CubeMX generated STM platform code to version 1.19.0
 
 # Releases

Firmware/README.md

@@ -27,7 +27,7 @@ The project is under active development, so make sure to check the [Changelog](C
 To correctly operate the ODrive, you need to supply some parameters. Some are mandatory, and if supplied incorrectly will cause the drive to malfunction.
 In this section we will set the compile-time parameters, later we will also set the [run time parameters](#configuring-parameters).
 
-To customize the compile time parameters, copy or rename the file `tup.config.default` to `tup.config` and edit the parameters in that file:
+To customize the compile time parameters, copy or rename the file `Firmware/tup.config.default` to `Firmware/tup.config` and edit the parameters in that file:
 
 __CONFIG_BOARD_VERSION__: The board version you're using. Can be `v3.1`, `v3.2`, `v3.3`, `v3.4-24V` or `v3.4-48V`. Check for a label on the upper side of the ODrive to find out which version you have.