From 661251fc3b289836772cda1f12f752886e09cb0f Mon Sep 17 00:00:00 2001
From: Fran <hola@beachlab.org>
Date: Sat, 4 May 2019 12:27:30 +0200
Subject: [PATCH] machine design nueval rules updated for 2019
---
gitbook/machine_unit.md | 13 +++++++++----
json/machine_unit.json | 6 +++---
src/machine_unit.yaml | 16 +++++++++++-----
3 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/gitbook/machine_unit.md b/gitbook/machine_unit.md
index fef5010..43a4adc 100644
--- a/gitbook/machine_unit.md
+++ b/gitbook/machine_unit.md
@@ -2,8 +2,14 @@
## Mechanical Design, Machine Design
-Design a machine (mechanism + actuation + automation), including the end effector, build the passive parts and operate it manually.
-Plan and make a machine.Document the group project and your individual contribution.
+Group Assignment:
+* Design a machine (mechanism + actuation + automation)
+* build the mechanical parts and operate it manually.
+* Actuate and automate your [machine](http://academy.cba.mit.edu/classes/mechanical_design/index.html).
+* Document the group project and your individual contribution.
+
+Individual Assignment:
+* Document your individual contribution.
### Learning outcomes
@@ -24,5 +30,4 @@ Plan and make a machine.Document the group project and your individual contribut
## FAQ
### Do we have to design new boards for this?
-> Answers:
-1. No. You can use the gestalt or other existing commercial boards.
+Answer: No. You can use the gestalt or other existing commercial boards.
diff --git a/json/machine_unit.json b/json/machine_unit.json
index 6113296..ebab79c 100644
--- a/json/machine_unit.json
+++ b/json/machine_unit.json
@@ -1,5 +1,5 @@
{
- "faq": "### Do we have to design new boards for this?\n> Answers:\n1. No. You can use the gestalt or other existing commercial boards.",
+ "faq": "### Do we have to design new boards for this?\nAnswer: No. You can use the gestalt or other existing commercial boards.",
"tasks": [
{
"checklist": [
@@ -10,7 +10,7 @@
"Included your design files,",
"(optional) 1 min video (1920x1080 HTML5 MP4) + slide (1920x1080 PNG) (Group page)"
],
- "description": "Design a machine (mechanism + actuation + automation), including the end effector, build the passive parts and operate it manually.\nPlan and make a machine.Document the group project and your individual contribution.\n",
+ "description": "Group Assignment:\n* Design a machine (mechanism + actuation + automation) \n* build the mechanical parts and operate it manually.\n* Actuate and automate your [machine](http://academy.cba.mit.edu/classes/mechanical_design/index.html).\n* Document the group project and your individual contribution.\n\nIndividual Assignment:\n* Document your individual contribution.\n",
"name": "Mechanical Design, Machine Design",
"outcomes": [
"Work and communicate effectively in a team and independently",
@@ -20,7 +20,7 @@
]
}
],
- "version": 2018,
+ "version": 2019,
"unit": "Mechanical Design, Machine Design",
"unit_id": "machine_unit"
}
\ No newline at end of file
diff --git a/src/machine_unit.yaml b/src/machine_unit.yaml
index d5c8323..5bc66c5 100644
--- a/src/machine_unit.yaml
+++ b/src/machine_unit.yaml
@@ -1,11 +1,18 @@
unit: Mechanical Design, Machine Design
unit_id: machine_unit
-version: 2018
+version: 2019
tasks:
- name: Mechanical Design, Machine Design
description: |
- Design a machine (mechanism + actuation + automation), including the end effector, build the passive parts and operate it manually.
- Plan and make a machine.Document the group project and your individual contribution.
+ Group Assignment:
+ * Design a machine (mechanism + actuation + automation)
+ * build the mechanical parts and operate it manually.
+ * Actuate and automate your [machine](http://academy.cba.mit.edu/classes/mechanical_design/index.html).
+ * Document the group project and your individual contribution.
+
+ Individual Assignment:
+ * Document your individual contribution.
+
outcomes:
- Work and communicate effectively in a team and independently
- Design, plan and build a system
@@ -20,5 +27,4 @@ tasks:
- (optional) 1 min video (1920x1080 HTML5 MP4) + slide (1920x1080 PNG) (Group page)
faq: |
### Do we have to design new boards for this?
- > Answers:
- 1. No. You can use the gestalt or other existing commercial boards.
\ No newline at end of file
+ Answer: No. You can use the gestalt or other existing commercial boards.
\ No newline at end of file
--
GitLab