diff --git a/website/content/images/dark.png b/website/content/images/dark.png new file mode 100644 index 0000000000000000000000000000000000000000..99ef97e5750811102fdf4fea1ec3417d16c715a7 Binary files /dev/null and b/website/content/images/dark.png differ diff --git a/website/content/images/markdown.png b/website/content/images/markdown.png new file mode 100644 index 0000000000000000000000000000000000000000..1b34d946cd1fb95e6f12303c3d2aad8fb9e8373e Binary files /dev/null and b/website/content/images/markdown.png differ diff --git a/website/content/images/quad_pic.jpg b/website/content/images/quad_pic.jpg new file mode 100644 index 0000000000000000000000000000000000000000..b4bebf6518dd05ba62ba455a2411cab5f8653208 Binary files /dev/null and b/website/content/images/quad_pic.jpg differ diff --git a/website/content/images/standard.png b/website/content/images/standard.png new file mode 100644 index 0000000000000000000000000000000000000000..43215f06f205e204f2f9ee6d54082b2b1ab19c70 Binary files /dev/null and b/website/content/images/standard.png differ diff --git a/website/content/images/zybo_pic.jpg b/website/content/images/zybo_pic.jpg new file mode 100644 index 0000000000000000000000000000000000000000..6fe7c1565f4397c1a445d2b057ef7b0fa895a253 Binary files /dev/null and b/website/content/images/zybo_pic.jpg differ diff --git a/website/content/pages/controls.md b/website/content/pages/controls.md new file mode 100644 index 0000000000000000000000000000000000000000..88d5db9b704ea50bb0769f8c7955f8dca833b83a --- /dev/null +++ b/website/content/pages/controls.md @@ -0,0 +1,25 @@ +Title: Controls +sortorder: 015 + +# Controls + +The quadcopter is stabilized with on-board PID controllers. These controllers +use pitch, roll, and yaw data from on-board sensors and positional data from the +infrared tracking system to determine appropriate actuator signals necessary +to keep the quadcopter stable during flight. + +The classical PID controller is characterized by 3 coefficients that specify +how the controller functions. A PID controller can be configured through +iterative determination of the PID coefficients, but we expect to obtain a more +accurate control system by first developing a robust mathematical model of the +quadcopter system. Once we establish this model, we can use numerical +characteristics of the quadcopter to calculate the appropriate PID coefficients +for our controllers. + +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/ diff --git a/website/content/pages/documents.md b/website/content/pages/documents.md index 75e7d6d4b4542cc88d81c7f1eeb3ac6b030194c8..a759c77f7dec892c82aed4269517c83950ef1d0c 100644 --- a/website/content/pages/documents.md +++ b/website/content/pages/documents.md @@ -1,5 +1,6 @@ Title: Documents date: 2016-11-21 +sortorder: 005 ## Project Plan diff --git a/website/content/pages/ground.md b/website/content/pages/ground.md new file mode 100644 index 0000000000000000000000000000000000000000..9b734d0cb3b6590188f4aa2e6d3699a4ce85c5ca --- /dev/null +++ b/website/content/pages/ground.md @@ -0,0 +1,7 @@ +Title: Ground Station +sortorder: 020 + +# Ground Station + +TODO +Gotta get this done diff --git a/website/content/pages/home.md b/website/content/pages/home.md index 2ae447635a24cb679d1bd4f7b46f3998e39141cb..dca80adc01430c39651866301c5ca368a3265850 100644 --- a/website/content/pages/home.md +++ b/website/content/pages/home.md @@ -2,7 +2,7 @@ Title: MicroCART url: save_as: index.html date: 2016-11-19 - +sortorder: 001 ## Microprocessor Controlled Aerial Robot Team **Senior Design Group**: may1716 diff --git a/website/content/pages/members.md b/website/content/pages/members.md index e6eb785829d3b3ea4be17aa167568c30153b8d8d..3631304bf9995886a020bf98cb7638088b36bea8 100644 --- a/website/content/pages/members.md +++ b/website/content/pages/members.md @@ -1,5 +1,6 @@ Title: Team Members date: 2016-11-20 +sortorder: 010 ## David Wehr **Team Leader** diff --git a/website/content/pages/quad.md b/website/content/pages/quad.md new file mode 100644 index 0000000000000000000000000000000000000000..9df032d87e793641cf95dc706d3946c4ad0db7d0 --- /dev/null +++ b/website/content/pages/quad.md @@ -0,0 +1,6 @@ +Title: Quadcopter Software +sortorder: 025 + +# Quadcopter + +Quad software things diff --git a/website/pelicanconf.py b/website/pelicanconf.py index 3bd18f5743946982596001af1a664928fc8b7391..2f1bef455158462c8f3265b21b2eb6c43521604b 100644 --- a/website/pelicanconf.py +++ b/website/pelicanconf.py @@ -43,4 +43,4 @@ THEME = 'themes/notmyidea' STATIC_PATHS = ['images', 'files'] # Page Order -PAGE_ORDER_BY = 'date' +PAGE_ORDER_BY = 'sortorder' diff --git a/website/themes/notmyidea/static/css/main.css b/website/themes/notmyidea/static/css/main.css index 9938cf611993871f7f73449809dcc5681341b6bf..ac849f99bf14080f11be7eb8f4b9ed698b0b38b4 100644 --- a/website/themes/notmyidea/static/css/main.css +++ b/website/themes/notmyidea/static/css/main.css @@ -25,7 +25,7 @@ body { text-align: left; width: 90%; display: inline-block; - max-width: 50em; + max-width: 80em; } * { @@ -46,7 +46,7 @@ h1, h2, h3, h4, h5, h6 { font-weight: 400; line-height: 1.1; margin-bottom: .2em; - font-family: 'Yanone Kaffeesatz', arial, serif; + font-family: 'Calibri', arial, serif; } h3, h4, h5, h6 { margin-top: .8em; } @@ -509,4 +509,4 @@ footer { padding: 0 2em; text-align: center; } -} \ No newline at end of file +}