Skip to content
Snippets Groups Projects
Commit 4d263b3c authored by dawehr's avatar dawehr
Browse files

Merge branch 'pelican' into 'master'

website: Use Pelican instead of Jekyll for convenience

Summary
----
Switch out Jekyll in favor of [Pelican](http://docs.getpelican.com/en/3.6.3/index.html).

Pelican uses python, which allows us to create a python virtual environment in this project. This allows to run the project (optimistically) everywhere, without having to worry about everyone's local environments. This also works on the iastate linux computers if people are interested in using those.

Testing and Usage
----
I've tested this out on the iastate linux, and I can do the following:
1. Clone our project.
2. The first time the repo has been cloned, in the website branch, run "make setup"
3. Make a change to something in `website/content/pages`.
4. Run `make deploy` in the `website` folder.
5. See the results live at http://may1716.sd.ece.iastate.edu/
6. And no installation required!

Please review and merge if you approve:
@dawehr 
@drahos

See merge request !1
parents 392973c9 74e0fd17
No related branches found
No related tags found
No related merge requests found
Showing
with 38 additions and 5 deletions
File moved
File moved
File moved
website/content/images/quad_pic.png

564 KiB

File moved
File moved
File moved
---
layout: default
---
Title: Controls
sortorder: 015
# Controls
The quadcopter is stabilized with on-board PID controllers. These controllers
......@@ -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">
<img src="/images/pid_diagram.png" width="700">
[1]: http://lib.dr.iastate.edu/etd/12770/
\ No newline at end of file
[1]: http://lib.dr.iastate.edu/etd/12770/
Title: Documents
date: 2016-11-21
sortorder: 005
## Project Plan
[Project Plan 1](/files/ProjectPlan1Template.docx.pdf)
## Design Document
[Design Document 1](/files/DesignDocument1.docx.pdf)
## Weekly Reports
[Weekly Report 1](/files/weeklyReports/may1716_microCART_report1.pdf)
[Weekly Report 2](/files/weeklyReports/may1716_microCART_report2.pdf)
[Weekly Report 3](/files/weeklyReports/may1716_microCART_report3.pdf)
[Weekly Report 4](/files/weeklyReports/may1716_microCART_report4.pdf)
[Weekly Report 5](/files/weeklyReports/may1716_microCART_report5.pdf)
[Weekly Report 6](/files/weeklyReports/may1716_microCART_report6.pdf)
[Weekly Report 7](/files/weeklyReports/may1716_microCART_report7.pdf)
[Weekly Report 8](/files/weeklyReports/may1716_microCART_report8.pdf)
[Weekly Report 9](/files/weeklyReports/may1716_microCART_report9.pdf)
[Weekly Report 10](/files/weeklyReports/may1716_microCART_report10.pdf)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment