From f452fc6c212bd9c073a443eecf5453ab32c45832 Mon Sep 17 00:00:00 2001
From: Fran <hola@beachlab.org>
Date: Sat, 13 Apr 2019 11:00:04 +0200
Subject: [PATCH] updated until break
---
README.md | 2 +-
gitbook/applications_and_implications.md | 11 +++++------
gitbook/input_devices.md | 2 +-
gitbook/output_devices.md | 4 +++-
json/applications_and_implications.json | 13 ++++++-------
json/input_devices.json | 2 +-
json/output_devices.json | 4 ++--
src/applications_and_implications.yaml | 11 +++++------
src/input_devices.yaml | 2 +-
src/output_devices.yaml | 6 ++++--
10 files changed, 29 insertions(+), 28 deletions(-)
diff --git a/README.md b/README.md
index 4b892c9..258218e 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,7 @@ This will generate a `json` folder containing the JSON formatted files.
## Try it yourself
-To be able to run build.py you need to intsall the packages in requirements.txt
+To be able to run build.py you need to install the packages in requirements.txt
`pip install -r requirements.txt`
diff --git a/gitbook/applications_and_implications.md b/gitbook/applications_and_implications.md
index 911b3e4..3d3c26a 100644
--- a/gitbook/applications_and_implications.md
+++ b/gitbook/applications_and_implications.md
@@ -13,19 +13,18 @@ Propose a final project that integrates the range of units covered. See the [Fin
* what will it do?
* who has done what beforehand?
-* what materials and components will be required?
+* What will you design?
+* what materials and components will be used?
* where will they come from?
-* how much will it cost?
+* how much will they cost?
* what parts and systems will be made?
* what processes will be used?
-* what tasks need to be completed?
-* what is the schedule?
+* what questions need to be answered?
* how will it be evaluated?
-* what other questions need to be asked and answered?
## FAQ
### Do I have to answer these questions and why?
> Answer:
-1. These are questions to help you *plan your final project*. Answer these and any other questions you think will help you do this.
+1. These are questions to help you -plan your final project-. Answer these and any other questions you think will help you do this.
diff --git a/gitbook/input_devices.md b/gitbook/input_devices.md
index fd1383d..dbb5655 100644
--- a/gitbook/input_devices.md
+++ b/gitbook/input_devices.md
@@ -5,7 +5,7 @@
Group assignment:
* Probe an input device's analog levels and digital signals
Individual assignment:
-* Measure something: add a sensor to a microcontroller board that you have designed and read it.
+* Measure something. add a sensor to a microcontroller board that you have designed and read it.
### Learning outcomes
diff --git a/gitbook/output_devices.md b/gitbook/output_devices.md
index a4271bb..733af24 100644
--- a/gitbook/output_devices.md
+++ b/gitbook/output_devices.md
@@ -2,7 +2,9 @@
## Output Devices
-* Measure the power consumption of an output device (group proejct)
+Group assignment:
+* Measure the power consumption of an output device
+Individual assignment:
* Add an output device to a microcontroller board you've designed and program it to do something
### Learning outcomes
diff --git a/json/applications_and_implications.json b/json/applications_and_implications.json
index 381d1e7..91b43e6 100644
--- a/json/applications_and_implications.json
+++ b/json/applications_and_implications.json
@@ -1,19 +1,18 @@
{
- "faq": "### Do I have to answer these questions and why?\n> Answer:\n1. These are questions to help you *plan your final project*. Answer these and any other questions you think will help you do this. \n",
+ "faq": "### Do I have to answer these questions and why?\n> Answer:\n1. These are questions to help you -plan your final project-. Answer these and any other questions you think will help you do this. \n",
"tasks": [
{
"checklist": [
"what will it do?",
"who has done what beforehand?",
- "what materials and components will be required?",
+ "What will you design?",
+ "what materials and components will be used?",
"where will they come from?",
- "how much will it cost?",
+ "how much will they cost?",
"what parts and systems will be made?",
"what processes will be used?",
- "what tasks need to be completed?",
- "what is the schedule?",
- "how will it be evaluated?",
- "what other questions need to be asked and answered?"
+ "what questions need to be answered?",
+ "how will it be evaluated?"
],
"description": "Propose a final project that integrates the range of units covered. See the [Final Project Requirements](http://fabacademy.org/2019/docs/FabAcademy-Assessment/project_requirements.html) for a complete list of requirements you must fulfil.\n",
"name": "Applications and implications",
diff --git a/json/input_devices.json b/json/input_devices.json
index 11d6cbd..38d8680 100644
--- a/json/input_devices.json
+++ b/json/input_devices.json
@@ -8,7 +8,7 @@
"Explained problems and how you fixed them",
"Included original design files and code"
],
- "description": "Group assignment:\n* Probe an input device's analog levels and digital signals\nIndividual assignment:\n* Measure something: add a sensor to a microcontroller board that you have designed and read it.\n",
+ "description": "Group assignment:\n* Probe an input device's analog levels and digital signals\nIndividual assignment:\n* Measure something. add a sensor to a microcontroller board that you have designed and read it.\n",
"name": "Input Devices",
"outcomes": [
"Demonstrate workflows used in circuit board design and fabrication",
diff --git a/json/output_devices.json b/json/output_devices.json
index 8943382..95b4c33 100644
--- a/json/output_devices.json
+++ b/json/output_devices.json
@@ -8,7 +8,7 @@
"Outlined problems and how you fixed them",
"Included original design files and code"
],
- "description": "* Measure the power consumption of an output device (group proejct)\n* Add an output device to a microcontroller board you've designed and program it to do something\n",
+ "description": "Group assignment:\n* Measure the power consumption of an output device\nIndividual assignment:\n* Add an output device to a microcontroller board you've designed and program it to do something\n",
"name": "Output Devices",
"outcomes": [
"Demonstrate workflows used in circuit board design and fabrication",
@@ -16,7 +16,7 @@
]
}
],
- "version": 2018,
+ "version": 2019,
"unit": "Output Devices",
"unit_id": "output_devices"
}
\ No newline at end of file
diff --git a/src/applications_and_implications.yaml b/src/applications_and_implications.yaml
index 864c6c4..494f2a2 100644
--- a/src/applications_and_implications.yaml
+++ b/src/applications_and_implications.yaml
@@ -11,17 +11,16 @@ tasks:
checklist:
- what will it do?
- who has done what beforehand?
- - what materials and components will be required?
+ - What will you design?
+ - what materials and components will be used?
- where will they come from?
- - how much will it cost?
+ - how much will they cost?
- what parts and systems will be made?
- what processes will be used?
- - what tasks need to be completed?
- - what is the schedule?
+ - what questions need to be answered?
- how will it be evaluated?
- - what other questions need to be asked and answered?
faq: |
### Do I have to answer these questions and why?
> Answer:
- 1. These are questions to help you *plan your final project*. Answer these and any other questions you think will help you do this.
+ 1. These are questions to help you -plan your final project-. Answer these and any other questions you think will help you do this.
diff --git a/src/input_devices.yaml b/src/input_devices.yaml
index 76e2217..3149a22 100644
--- a/src/input_devices.yaml
+++ b/src/input_devices.yaml
@@ -7,7 +7,7 @@ tasks:
Group assignment:
* Probe an input device's analog levels and digital signals
Individual assignment:
- * Measure something: add a sensor to a microcontroller board that you have designed and read it.
+ * Measure something. add a sensor to a microcontroller board that you have designed and read it.
outcomes:
- Demonstrate workflows used in circuit board design and fabrication
- Implement and interpret programming protocols
diff --git a/src/output_devices.yaml b/src/output_devices.yaml
index 182a556..95cf8d7 100644
--- a/src/output_devices.yaml
+++ b/src/output_devices.yaml
@@ -1,10 +1,12 @@
unit: Output Devices
unit_id: output_devices
-version: 2018
+version: 2019
tasks:
- name: Output Devices
description: |
- * Measure the power consumption of an output device (group proejct)
+ Group assignment:
+ * Measure the power consumption of an output device
+ Individual assignment:
* Add an output device to a microcontroller board you've designed and program it to do something
outcomes:
- Demonstrate workflows used in circuit board design and fabrication
--
GitLab