diff --git a/gitbook/3d_scanning_and_printing.md b/gitbook/3d_scanning_and_printing.md
index 079ffb295d79ab009fd9adf2f500199a98c3a05d..7c44dafb67c504a92f6a95e9ed737fa7b7c2747d 100644
--- a/gitbook/3d_scanning_and_printing.md
+++ b/gitbook/3d_scanning_and_printing.md
@@ -2,8 +2,10 @@
## 3D Scanning and Printing
+Group assignment:
* Test the design rules for your printer(s) (group project)
-* Design and 3D print an object (small, few cm) that could not be made subtractively
+Individual assignment:
+* Design and 3D print an object (small, few cm3) that could not be made subtractively
* 3D scan an object (and optionally print it)
### Learning outcomes
@@ -22,5 +24,5 @@
## FAQ
### Define ‘cannot be made subtractively’
-> Answer:
-1. That cannot be fabricated with 3 axis limitations OR even if it’s possible to make it, it is too complicated.
+> Answer: Your model has [undercuts](https://en.wikipedia.org/wiki/Undercut_(manufacturing)), overhangs or nested parts
+
diff --git a/gitbook/applications_and_implications.md b/gitbook/applications_and_implications.md
index 210f8674db6e5b5ddd1251214928223ad790d725..911b3e4fe211ab33e9eec364ed8f570c7b7e8596 100644
--- a/gitbook/applications_and_implications.md
+++ b/gitbook/applications_and_implications.md
@@ -2,8 +2,7 @@
## Applications and implications
-Propose a final project masterpiece that integrates the range of units covered, answering the questions below.
-> See the Final Project Requirements page for a complete list of requirements you must fulfil.
+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.
### Learning outcomes
diff --git a/gitbook/computer-aided_design.md b/gitbook/computer-aided_design.md
index dad3149282ba5147f0381ad6ae8f1b7098accfc6..4802b5426658e02dfcc9f1c73054d4b50d19ba16 100644
--- a/gitbook/computer-aided_design.md
+++ b/gitbook/computer-aided_design.md
@@ -2,7 +2,7 @@
## Computer-Aided Design
-* Model (raster, vector, 2D, 3D, render, animate, simulate, ...) a possible [final project](http://fab.cba.mit.edu/classes/863.14/people/),
+* Model (raster, vector, 2D, 3D, render, animate, simulate, ...) a possible [final project](https://cse.google.com/cse/publicurl?cx=005180655622273248137:bjgkhj-m09c),
and post it on your class page.
### Learning outcomes
@@ -19,6 +19,5 @@
## FAQ
### Is it compulsory to do parametric design this week?
-> Answer:
-1. No, but it is next week. So it is a good idea to start learning now.
+> Answer: No, but it is in computer controlled cutting. So it is a good idea to start learning now.
diff --git a/gitbook/computer-controlled_cutting.md b/gitbook/computer-controlled_cutting.md
index 86e87881deb5ddd7807143ed3de8ad594187d337..1b126efe5129159c7cdef7c2df3dacb08c81f60e 100644
--- a/gitbook/computer-controlled_cutting.md
+++ b/gitbook/computer-controlled_cutting.md
@@ -2,11 +2,11 @@
## Laser Cutting
-Group assignment
-* characterise you lasercutter, making lasercutter test part(s) that vary cutting settings and dimensions. (group project)
-Individual assignment
-* design, make, and document a parametric press-fit construction kit, accounting for the lasercutter kerf, which can be assembled in multiple ways (individual)
-* For extra credit include elements that aren't flat.
+Group assignment:
+* characterize your lasercutter's focus, power, speed, rate, kerf, and joint clearance
+Individual assignment:
+* Design, lasercut, and document a **parametric press-fit construction kit**, which can be assembled in multiple ways. Account for the lasercutter kerf.
+* For **extra credit** include elements that aren't flat.
### Learning outcomes
@@ -22,8 +22,7 @@ Individual assignment
## Vinyl Cutting
-There is no specific project that is focussed on this very useful tool.
-There are a range of ways you might utilise it throughout the programme, or your local
+There is no specific project that is focussed on this very useful tool. There are a range of ways you might utilise it throughout the programme, or your local
instructor may set a specific project. You might make:
* stickers
@@ -46,14 +45,12 @@ Ensure that you have used it in some way during this time and met the objectives
## FAQ
-### What does 'characterise' mean?
-> Answer:
-1. describe/understand the nature and features (of your particular laser cutter)
+### What does *characterise* mean?
+> Answer: Describe/understand the nature and features (of your particular laser cutter)
### Can I use the Inkscape clone tool for my pressfit kit?
-> Answer:
-1. No. The clone tool is not a real parametric software.
+> Answer: No. The clone tool is not a real parametric software.
### Is it compulsory to design my own file in Vinyl cutting?
-> Answer:
-1. Yes. Or modify existing one, and acknowledge where you found it.
+> Answer: Yes. Or modify existing one, and acknowledge where you found it.
+
diff --git a/gitbook/electronics_production.md b/gitbook/electronics_production.md
index 1e1f72dc9e587992b30d010709ec3da6e337b837..4a268ed6409715a1e3bb2b5a4a0add10aef0b919 100644
--- a/gitbook/electronics_production.md
+++ b/gitbook/electronics_production.md
@@ -2,15 +2,15 @@
## Electronics Production
-> As outlined in the Commercial Boards policy, fabbing your own boards is an important part of Fab Academy. The 'fabbest' way to do this, is by milling your FR1 boards via Fab Modules or Mods.
+> **Important note:** As outlined in the [Commercial Boards policy](http://fabacademy.org/2019/docs/FabAcademy-Assessment/commercial_board_policy.html), fabbing your own boards is an important part of Fab Academy. The 'fabbest' way to do this, is by milling your FR1 boards via Fab Modules or Mods.
Group assignment:
-* Characterise the specifications of your PCB production process
+* Characterize the **design rules** for your PCB production process
Individual assignment:
-* Make an in-circuit programmer by milling the PCB (program it, so that you can use it to program your board in Electronics Design week, and in other weeks), then optionally, trying other processes.
+* Make an in-circuit programmer by **milling** the PCB, program it, then optionally, trying other processes.
### Learning outcomes
-* Describe the process of milling, stuffing, de-bugging and programming
+* Described the process of milling, stuffing, de-bugging and programming
* Demonstrate correct workflows and identify areas for improvement if required
### Have you?
@@ -22,9 +22,8 @@ Individual assignment:
## FAQ
### Does the FabISP need to work to complete the assignment?
-> Answer:
-1. Yes, by the end of Embedded Programming week because you will program your board from Electronics Design week with it. It is highly recommended that you attempt it this week and explain ALL the debugging that you did to try to find out problems.
+> Answer: Yes. By, the end of Embedded Programming week. Because you will program your board from Electronics Design week with it. It is highly recommended that you attempt it this week and explain ALL the debugging that you did to try to find out problems.
### Can we use the locally compiled version of Fab modules to mill PCBs and moulds?
-> Answer:
-1. There are no requirements for what you use for CAD and CAM, and certainly not to use mods.Having said that, the mods algorithms are more efficient than the older fab modules, so something's wrong if they're taking more time for you. And mods is easier to configure, and shows the internals of the algorithms, so Neil recommends getting set up to use them.
+> Answer: There are no requirements for what you use for CAD and CAM, and certainly not to use mods. Having said that, the mods algorithms are more efficient than the older fab modules, so something's wrong if they're taking more time for you. And mods is easier to configure, and shows the internals of the algorithms, so Neil recommends getting set up to use them.
+
diff --git a/gitbook/principles_and_practices.md b/gitbook/principles_and_practices.md
index 2f84d219f458a4a716e76319fdcf9a8b5d4344eb..9c75e92dec1db31043604cde5cc359cacc3c2378 100644
--- a/gitbook/principles_and_practices.md
+++ b/gitbook/principles_and_practices.md
@@ -2,7 +2,7 @@
## Principles and Practices
-* Plan and sketch a potential semester project.
+* Plan and sketch a potential final project.
### Learning outcomes
@@ -15,4 +15,4 @@
## FAQ
-no FAQ available yet
+No FAQ available yet
diff --git a/gitbook/project_management.md b/gitbook/project_management.md
index 360d9d279cff902546cac0937bb3f8d20ca7dc05..b38db8edab45a0be3ae232a2be0c5283c7ed85bd 100644
--- a/gitbook/project_management.md
+++ b/gitbook/project_management.md
@@ -13,23 +13,19 @@
### Have you?
-* made a website and described how you did it
-* introduced yourself
-* documented steps for uploading files to archive
-* pushed to the class archive
-* signed and uploaded [Student Agreement](https://gitlab.fabcloud.org/academany/fabacademy/2019/site/blob/master/doc/students.md)
+* Made a website and described how you did it
+* Introduced yourself
+* Documented steps for uploading files to archive
+* Pushed to the class archive
+* Signed and uploaded [Student Agreement](https://gitlab.fabcloud.org/academany/fabacademy/2019/site/blob/master/doc/students.md)
## FAQ
### Is it OK to use someone else’s template to create my website?
-> Answer:
-1. Yes - acknowledge other people’s work. Show you understand how the template works by describing/changing parts of it.
+> Answer: Yes, if you acknowledge other people’s work. Show you understand how the template works by describing/changing parts of it.
-### Can I store photos and files off the archive?
-> Answer:
-1. No. Photos should be resized and compressed and stored in the archive. See the [General Essentials](http://fabacademy.org/2019/docs/FabAcademy-Assessment/general_essentials.html) section of the Assessment Doc.
-2. The Global Evaluation team should be able to pull and then assess your work offline.
+### Can I host photos and files outside the archive?
+> Answer: No. Photos should be resized, compressed and stored in the archive. Large files can be hosted externally, but they should not be essential to evaluate your work. See [General Essentials](http://fabacademy.org/2019/docs/FabAcademy-Assessment/general_essentials.html). Remember that The Global Evaluation team should be able to pull and then assess your work offline.
### What size should my website be?
-> Answer:
-1. In the order of tens of megabytes. Read the General Essentials, compress, resize, etc.
+> Answer: In the order of tens of megabytes. Ideally growing at an average rate of 1-2 Mb per week. Read the [General Essentials](http://fabacademy.org/2019/docs/FabAcademy-Assessment/general_essentials.html). Compress, resize, etc.
diff --git a/json/3d_scanning_and_printing.json b/json/3d_scanning_and_printing.json
index 5ef7a14fec26af62ef79cdcefca88a6b79df27d9..cb69f41b41a2122bc1fdebe3822c11dc34256a8f 100644
--- a/json/3d_scanning_and_printing.json
+++ b/json/3d_scanning_and_printing.json
@@ -1,5 +1,5 @@
{
- "faq": "### Define \u2018cannot be made subtractively\u2019\n> Answer:\n1. That cannot be fabricated with 3 axis limitations OR even if it\u2019s possible to make it, it is too complicated.",
+ "faq": "### Define \u2018cannot be made subtractively\u2019\n> Answer: Your model has [undercuts](https://en.wikipedia.org/wiki/Undercut_(manufacturing)), overhangs or nested parts\n",
"tasks": [
{
"checklist": [
@@ -9,7 +9,7 @@
"Outlined problems and how you fixed them",
"Included your design files and \u2018hero shot\u2019 photos of the scan and the final object"
],
- "description": "* Test the design rules for your printer(s) (group project)\n* Design and 3D print an object (small, few cm) that could not be made subtractively\n* 3D scan an object (and optionally print it)\n",
+ "description": "Group assignment:\n* Test the design rules for your printer(s) (group project)\nIndividual assignment:\n* Design and 3D print an object (small, few cm3) that could not be made subtractively\n* 3D scan an object (and optionally print it)\n",
"name": "3D Scanning and Printing",
"outcomes": [
"Identify the advantages and limitations of 3D printing and scanning technology",
@@ -17,7 +17,7 @@
]
}
],
- "version": 2018,
+ "version": 2019,
"unit": "3D Scanning and Printing",
"unit_id": "3d_scanning_and_printing"
}
\ No newline at end of file
diff --git a/json/applications_and_implications.json b/json/applications_and_implications.json
index 80701ae96997803e3491559d6ec7daf96e79420d..381d1e7267a7563f5fe9dadfd9269ab712ace017 100644
--- a/json/applications_and_implications.json
+++ b/json/applications_and_implications.json
@@ -15,7 +15,7 @@
"how will it be evaluated?",
"what other questions need to be asked and answered?"
],
- "description": "Propose a final project masterpiece that integrates the range of units covered, answering the questions below.\n> See the Final Project Requirements page for a complete list of requirements you must fulfil. \n",
+ "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",
"outcomes": [
"Define the scope of a project",
@@ -23,7 +23,7 @@
]
}
],
- "version": 2018,
+ "version": 2019,
"unit": "Applications and implications",
"unit_id": "applications_and_implications"
}
\ No newline at end of file
diff --git a/json/computer-aided_design.json b/json/computer-aided_design.json
index 6716be048126d0792a72720290836c6f193acae0..6a3887e9ac9d09adcd02a6b678787efd3bd99d91 100644
--- a/json/computer-aided_design.json
+++ b/json/computer-aided_design.json
@@ -1,5 +1,5 @@
{
- "faq": "### Is it compulsory to do parametric design this week?\n> Answer:\n1. No, but it is next week. So it is a good idea to start learning now.\n",
+ "faq": "### Is it compulsory to do parametric design this week?\n> Answer: No, but it is in computer controlled cutting. So it is a good idea to start learning now.\n",
"tasks": [
{
"checklist": [
@@ -7,7 +7,7 @@
"Shown how you did it with words/images/screenshots",
"Included your original design files"
],
- "description": "* Model (raster, vector, 2D, 3D, render, animate, simulate, ...) a possible [final project](http://fab.cba.mit.edu/classes/863.14/people/), \n and post it on your class page.\n",
+ "description": "* Model (raster, vector, 2D, 3D, render, animate, simulate, ...) a possible [final project](https://cse.google.com/cse/publicurl?cx=005180655622273248137:bjgkhj-m09c), \n and post it on your class page.\n",
"name": "Computer-Aided Design",
"outcomes": [
"Evaluate and select 2D and 3D software",
diff --git a/json/computer-controlled_cutting.json b/json/computer-controlled_cutting.json
index 6e3de608b38f8726a5b3c5b3fd70f18ccb21d47b..bf3cf78846305536648b2f2f61c035c357097659 100644
--- a/json/computer-controlled_cutting.json
+++ b/json/computer-controlled_cutting.json
@@ -1,5 +1,5 @@
{
- "faq": "### What does 'characterise' mean?\n> Answer: \n1. describe/understand the nature and features (of your particular laser cutter)\n\n### Can I use the Inkscape clone tool for my pressfit kit?\n> Answer:\n1. No. The clone tool is not a real parametric software.\n\n### Is it compulsory to design my own file in Vinyl cutting?\n> Answer:\n1. Yes. Or modify existing one, and acknowledge where you found it.",
+ "faq": "### What does *characterise* mean?\n> Answer: Describe/understand the nature and features (of your particular laser cutter)\n\n### Can I use the Inkscape clone tool for my pressfit kit?\n> Answer: No. The clone tool is not a real parametric software.\n\n### Is it compulsory to design my own file in Vinyl cutting?\n> Answer: Yes. Or modify existing one, and acknowledge where you found it.\n",
"tasks": [
{
"checklist": [
@@ -7,7 +7,7 @@
"Shown how you made your press-fit kit",
"Included your design files and photos of your finished project"
],
- "description": "Group assignment\n* characterise you lasercutter, making lasercutter test part(s) that vary cutting settings and dimensions. (group project)\nIndividual assignment\n* design, make, and document a parametric press-fit construction kit, accounting for the lasercutter kerf, which can be assembled in multiple ways (individual)\n* For extra credit include elements that aren't flat.\n",
+ "description": "Group assignment:\n* characterize your lasercutter's focus, power, speed, rate, kerf, and joint clearance\nIndividual assignment:\n* Design, lasercut, and document a **parametric press-fit construction kit**, which can be assembled in multiple ways. Account for the lasercutter kerf.\n* For **extra credit** include elements that aren't flat.\n",
"name": "Laser Cutting",
"outcomes": [
"Demonstrate and describe parametric 2D modelling processes",
@@ -21,7 +21,7 @@
"Shown how you made your vinyl project",
"Included your design files and photos of your finished project"
],
- "description": "There is no specific project that is focussed on this very useful tool. \nThere are a range of ways you might utilise it throughout the programme, or your local \ninstructor may set a specific project. You might make:\n\n* stickers\n* flexible circuit boards\n* a textured surface/relief pattern\n* screenprint resists/stencils\n\nEnsure that you have used it in some way during this time and met the objectives below.\n",
+ "description": "There is no specific project that is focussed on this very useful tool. There are a range of ways you might utilise it throughout the programme, or your local \ninstructor may set a specific project. You might make:\n\n* stickers\n* flexible circuit boards\n* a textured surface/relief pattern\n* screenprint resists/stencils\n\nEnsure that you have used it in some way during this time and met the objectives below.\n",
"name": "Vinyl Cutting",
"outcomes": [
"Identify and explain processes involved in using this machine.",
diff --git a/json/electronics_production.json b/json/electronics_production.json
index 2eb71466cc7ff9d5f570f173963a415a64a9165f..9430d3eb227f1359715ff3857240ab052d869d29 100644
--- a/json/electronics_production.json
+++ b/json/electronics_production.json
@@ -1,5 +1,5 @@
{
- "faq": "### Does the FabISP need to work to complete the assignment?\n> Answer:\n1. Yes, by the end of Embedded Programming week because you will program your board from Electronics Design week with it. It is highly recommended that you attempt it this week and explain ALL the debugging that you did to try to find out problems.\n\n### Can we use the locally compiled version of Fab modules to mill PCBs and moulds?\n> Answer:\n1. There are no requirements for what you use for CAD and CAM, and certainly not to use mods.Having said that, the mods algorithms are more efficient than the older fab modules, so something's wrong if they're taking more time for you. And mods is easier to configure, and shows the internals of the algorithms, so Neil recommends getting set up to use them.",
+ "faq": "### Does the FabISP need to work to complete the assignment?\n> Answer: Yes. By, the end of Embedded Programming week. Because you will program your board from Electronics Design week with it. It is highly recommended that you attempt it this week and explain ALL the debugging that you did to try to find out problems.\n\n### Can we use the locally compiled version of Fab modules to mill PCBs and moulds?\n> Answer: There are no requirements for what you use for CAD and CAM, and certainly not to use mods. Having said that, the mods algorithms are more efficient than the older fab modules, so something's wrong if they're taking more time for you. And mods is easier to configure, and shows the internals of the algorithms, so Neil recommends getting set up to use them.\n",
"tasks": [
{
"checklist": [
@@ -7,10 +7,10 @@
"Explained any problems and how you fixed them",
"Included a \u2018hero shot\u2019 of your board"
],
- "description": "> As outlined in the Commercial Boards policy, fabbing your own boards is an important part of Fab Academy. The 'fabbest' way to do this, is by milling your FR1 boards via Fab Modules or Mods.\nGroup assignment:\n* Characterise the specifications of your PCB production process\nIndividual assignment: \n* Make an in-circuit programmer by milling the PCB (program it, so that you can use it to program your board in Electronics Design week, and in other weeks), then optionally, trying other processes.\n",
+ "description": "> **Important note:** As outlined in the [Commercial Boards policy](http://fabacademy.org/2019/docs/FabAcademy-Assessment/commercial_board_policy.html), fabbing your own boards is an important part of Fab Academy. The 'fabbest' way to do this, is by milling your FR1 boards via Fab Modules or Mods.\nGroup assignment:\n* Characterize the **design rules** for your PCB production process\nIndividual assignment: \n* Make an in-circuit programmer by **milling** the PCB, program it, then optionally, trying other processes.\n",
"name": "Electronics Production",
"outcomes": [
- "Describe the process of milling, stuffing, de-bugging and programming",
+ "Described the process of milling, stuffing, de-bugging and programming",
"Demonstrate correct workflows and identify areas for improvement if required"
]
}
diff --git a/json/principles_and_practices.json b/json/principles_and_practices.json
index ec7e1a012f0ab61199af71105e21b332941369da..724f66a98e68da79f162038e5f182bdfd457242f 100644
--- a/json/principles_and_practices.json
+++ b/json/principles_and_practices.json
@@ -1,12 +1,12 @@
{
- "faq": "no FAQ available yet",
+ "faq": "No FAQ available yet",
"tasks": [
{
"checklist": [
"Sketched your final project idea/s",
"described what it will do and who will use it"
],
- "description": "* Plan and sketch a potential semester project.\n",
+ "description": "* Plan and sketch a potential final project.\n",
"name": "Principles and Practices",
"outcomes": [
"Communicate an initial project proposal"
diff --git a/json/project_management.json b/json/project_management.json
index 1e1186ae04b2af964ba8ef58a004dda03833796e..e49b5dd6de5bcafe60d3e17ae3f8af0152e798a3 100644
--- a/json/project_management.json
+++ b/json/project_management.json
@@ -1,13 +1,13 @@
{
- "faq": "### Is it OK to use someone else\u2019s template to create my website?\n> Answer:\n1. Yes - acknowledge other people\u2019s work. Show you understand how the template works by describing/changing parts of it.\n\n### Can I store photos and files off the archive?\n> Answer:\n1. No. Photos should be resized and compressed and stored in the archive. See the [General Essentials](http://fabacademy.org/2019/docs/FabAcademy-Assessment/general_essentials.html) section of the Assessment Doc.\n2. The Global Evaluation team should be able to pull and then assess your work offline.\n\n### What size should my website be?\n> Answer:\n1. In the order of tens of megabytes. Read the General Essentials, compress, resize, etc.",
+ "faq": "### Is it OK to use someone else\u2019s template to create my website?\n> Answer: Yes, if you acknowledge other people\u2019s work. Show you understand how the template works by describing/changing parts of it.\n\n### Can I host photos and files outside the archive?\n> Answer: No. Photos should be resized, compressed and stored in the archive. Large files can be hosted externally, but they should not be essential to evaluate your work. See [General Essentials](http://fabacademy.org/2019/docs/FabAcademy-Assessment/general_essentials.html). Remember that The Global Evaluation team should be able to pull and then assess your work offline.\n\n### What size should my website be?\n> Answer: In the order of tens of megabytes. Ideally growing at an average rate of 1-2 Mb per week. Read the [General Essentials](http://fabacademy.org/2019/docs/FabAcademy-Assessment/general_essentials.html). Compress, resize, etc.",
"tasks": [
{
"checklist": [
- "made a website and described how you did it",
- "introduced yourself",
- "documented steps for uploading files to archive",
- "pushed to the class archive",
- "signed and uploaded [Student Agreement](https://gitlab.fabcloud.org/academany/fabacademy/2019/site/blob/master/doc/students.md)"
+ "Made a website and described how you did it",
+ "Introduced yourself",
+ "Documented steps for uploading files to archive",
+ "Pushed to the class archive",
+ "Signed and uploaded [Student Agreement](https://gitlab.fabcloud.org/academany/fabacademy/2019/site/blob/master/doc/students.md)"
],
"description": "* Build a personal site describing you and your final project.\n* Upload it to the class archive. \n* Work through a git tutorial.\n",
"name": "Project Management",