diff --git a/wobsite/.gitignore b/wobsite/.gitignore index 2622867e88d960d96e90f2118c3b485df2ee7341..70355aacfc0edec357c54124801c4cfe64b377d6 100644 --- a/wobsite/.gitignore +++ b/wobsite/.gitignore @@ -113,4 +113,5 @@ crashlytics-build.properties .bundle vendor -Gemfile.lock \ No newline at end of file +Gemfile.lock +PASSWORD \ No newline at end of file diff --git a/wobsite/_config.yml b/wobsite/_config.yml index 29af91756de2f991d3ec363c2b8ab5f97010ce1c..0b287b914ab70ee3e1278a2e60474ff82e60da96 100644 --- a/wobsite/_config.yml +++ b/wobsite/_config.yml @@ -53,4 +53,5 @@ exclude: - Makefile - README.md - LICENSE - - deploy \ No newline at end of file + - deploy + - PASSWORD \ No newline at end of file diff --git a/wobsite/controls.md b/wobsite/controls.md index fb84b1dbdf17c8a760810922bafdec5039cea506..d630bbff780df769d255e49602dba95ecdae3784 100644 --- a/wobsite/controls.md +++ b/wobsite/controls.md @@ -20,6 +20,6 @@ The model we are developing follows the methods developed by our advising graduate student Matt Rich in his thesis [Model development, system identification, and control of a quadrotor helicopter][1]. - +<img src="images/pid_diagram.png" width="700"> [1]: http://lib.dr.iastate.edu/etd/12770/ \ No newline at end of file diff --git a/wobsite/deploy b/wobsite/deploy index e47333bbd7e14bbdd1486591aaa5ee56f0d2e62e..a15fa0e47389c94b383c42fb3f8d582e5ae5e850 100644 --- a/wobsite/deploy +++ b/wobsite/deploy @@ -2,7 +2,11 @@ HOST=may1716.sd.ece.iastate.edu USERNAME=may1716 -PASSWORD=6peprikt +[ -e PASSWORD ] || echo "ERROR: File PASSWORD is missing. +Create a file called PASSWORD, and put the sftp password in that file. +No spaces. No newlines." +[ -e PASSWORD ] || exit 1 +PASSWORD=$(cat PASSWORD) cd _site || exit 1 @@ -13,3 +17,5 @@ cd www mirror -R exit END_SCRIPT + +echo "Website updated." \ No newline at end of file diff --git a/wobsite/images/pid_diagram.png b/wobsite/images/pid_diagram.png new file mode 100644 index 0000000000000000000000000000000000000000..bfe5ce5a2ee538c8a5fd24c0e8562d6e43d5e883 Binary files /dev/null and b/wobsite/images/pid_diagram.png differ