From eea32584894b8b54cf32a84e14b345809ba695b8 Mon Sep 17 00:00:00 2001
From: Fran <hola@beachlab.org>
Date: Fri, 22 Feb 2019 20:25:44 +0100
Subject: [PATCH] updated up to 3d printing week

---
 src/3d_scanning_and_printing.yaml      |  9 ++++---
 src/applications_and_implications.yaml |  5 ++--
 src/computer-aided_design.yaml         |  5 ++--
 src/computer-controlled_cutting.yaml   | 33 ++++++++++++-------------
 src/electronics_production.yaml        | 20 +++++++--------
 src/principles_and_practices.yaml      |  4 +--
 src/project_management.yaml            | 34 ++++++++++++--------------
 7 files changed, 51 insertions(+), 59 deletions(-)

diff --git a/src/3d_scanning_and_printing.yaml b/src/3d_scanning_and_printing.yaml
index 0bb1805..7c4b1af 100644
--- a/src/3d_scanning_and_printing.yaml
+++ b/src/3d_scanning_and_printing.yaml
@@ -1,11 +1,13 @@
 unit: 3D Scanning and Printing
 unit_id: 3d_scanning_and_printing
-version: 2018
+version: 2019
 tasks:
 - name: 3D Scanning and Printing
   description: |
+    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)
   outcomes:
   - Identify the advantages and limitations of 3D printing and scanning technology
@@ -18,5 +20,4 @@ tasks:
   - Included your design files and ‘hero shot’ photos of the scan and the final object
 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.
\ No newline at end of file
+  > Answer: Your model has [undercuts](https://en.wikipedia.org/wiki/Undercut_(manufacturing)), overhangs or nested parts
diff --git a/src/applications_and_implications.yaml b/src/applications_and_implications.yaml
index 5d5155b..864c6c4 100644
--- a/src/applications_and_implications.yaml
+++ b/src/applications_and_implications.yaml
@@ -1,11 +1,10 @@
 unit: Applications and implications
 unit_id: applications_and_implications
-version: 2018
+version: 2019
 tasks:
 - name: Applications and implications
   description: |
-    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.
   outcomes:
   - Define the scope of a project
   - Develop a project plan
diff --git a/src/computer-aided_design.yaml b/src/computer-aided_design.yaml
index 13cadd1..84e6309 100644
--- a/src/computer-aided_design.yaml
+++ b/src/computer-aided_design.yaml
@@ -4,7 +4,7 @@ version: 2019
 tasks:
 - name: Computer-Aided Design
   description: |
-    * 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.
   outcomes:
   - Evaluate and select 2D and 3D software
@@ -15,5 +15,4 @@ tasks:
   - Included your original design files
 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/src/computer-controlled_cutting.yaml b/src/computer-controlled_cutting.yaml
index 52735d6..0cbd823 100644
--- a/src/computer-controlled_cutting.yaml
+++ b/src/computer-controlled_cutting.yaml
@@ -4,11 +4,11 @@ version: 2019
 tasks:
 - name: Laser Cutting
   description: |
-      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.
   outcomes:
   - Demonstrate and describe parametric 2D modelling processes
   - Identify and explain processes involved in using the laser cutter.
@@ -19,8 +19,7 @@ tasks:
   - Included your design files and photos of your finished project
 - name: Vinyl Cutting
   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 
+    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
@@ -37,14 +36,14 @@ tasks:
   - Shown how you made your vinyl project
   - Included your design files and photos of your finished project
 faq: |
-    ### What does 'characterise' mean?
-    > Answer: 
-    1. 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.
+### What does *characterise* mean?
 
-    ### Is it compulsory to design my own file in Vinyl cutting?
-    > Answer:
-    1. Yes. Or modify existing one, and acknowledge where you found it.
\ No newline at end of file
+> Answer: Describe/understand the nature and features (of your particular laser cutter)
+
+### Can I use the Inkscape clone tool for my pressfit kit?
+
+> Answer: No. The clone tool is not a real parametric software.
+
+### Is it compulsory to design my own file in Vinyl cutting?
+
+> Answer: Yes. Or modify existing one, and acknowledge where you found it.
diff --git a/src/electronics_production.yaml b/src/electronics_production.yaml
index 9ea4789..a9e1e20 100644
--- a/src/electronics_production.yaml
+++ b/src/electronics_production.yaml
@@ -4,23 +4,21 @@ version: 2019
 tasks:
 - name: Electronics Production
   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.
+    > **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.
   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
   checklist:
   - Shown how you made and programmed the board
   - Explained any problems and how you fixed them
   - Included a ‘hero shot’ of your board
 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.
-  
-  ### 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.
\ No newline at end of file
+### Does the FabISP need to work to complete the assignment?
+> 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: 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/src/principles_and_practices.yaml b/src/principles_and_practices.yaml
index 92cb9dc..d2a7684 100644
--- a/src/principles_and_practices.yaml
+++ b/src/principles_and_practices.yaml
@@ -4,11 +4,11 @@ version: 2019
 tasks:
 - name: Principles and Practices
   description: |
-    * Plan and sketch a potential semester project.
+    * Plan and sketch a potential final project.
   outcomes:
   - Communicate an initial project proposal
   checklist:
   - Sketched your final project idea/s
   - described what it will do and who will use it
 faq: |
-  no FAQ available yet
\ No newline at end of file
+  No FAQ available yet
\ No newline at end of file
diff --git a/src/project_management.yaml b/src/project_management.yaml
index 12c466b..01292c0 100644
--- a/src/project_management.yaml
+++ b/src/project_management.yaml
@@ -8,24 +8,20 @@ tasks:
     * Upload it to the class archive. 
     * Work through a git tutorial.
   outcomes:
-  - Explore and use website development tools   
-  - Identify and utilise version control protocols
+    - Explore and use website development tools   
+    - Identify and utilise version control protocols
   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)
 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.
-  
-  ### 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.
-  
-  ### What size should my website be?
-  > Answer:
-  1. In the order of tens of megabytes. Read the General Essentials, compress, resize, etc.
\ No newline at end of file
+### Is it OK to use someone else’s template to create my website?
+> Answer: Yes, if you acknowledge other people’s work. Show you understand how the template works by describing/changing parts of it.
+
+### 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: 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.
\ No newline at end of file
-- 
GitLab