data

aaltonewmedia · Nov 1, 2023 · fc2b9fd · fc2b9fd
1 parent ceb42fe
commit fc2b9fd
Show file tree

Hide file tree

Showing 7 changed files with 136 additions and 3 deletions.
diff --git a/...al-art-and-design/week-09/files/data.json → ...-design/week-09/lesson-01/files/data.json b/...al-art-and-design/week-09/files/data.json → ...-design/week-09/lesson-01/files/data.json
diff --git a/...ional-art-and-design/week-09/lesson-01.md → ...art-and-design/week-09/lesson-01/index.md b/...ional-art-and-design/week-09/lesson-01.md → ...art-and-design/week-09/lesson-01/index.md
@@ -30,7 +30,37 @@ We are going to jump right into reading JSON files, but I have also provided som
 
 ## Reading text files
 
-...
+<iframe src="https://openprocessing.org/sketch/2071219/embed/?plusEmbedHash=18be9346&userID=7588&plusEmbedTitle=true#sketch" width="100%" height="500"></iframe>
+
+```js
+let result;
+let sentence;
+let btn;
+function preload() {
+  result = loadStrings('shalli.txt');
+}
+function setup() {
+	createCanvas(windowWidth, windowHeight);
+	background(100);
+	textAlign(CENTER,CENTER);
+	textSize(16);
+	textFont('monospace')
+	sentence = random(result);
+	btn = createButton("Click for a new sentence");
+	btn.mousePressed(pickNew);
+	btn.size(200,50);
+	btn.position(width/2-100,100);
+}
+
+function draw() {
+	background(100);
+	text(sentence,width/2,height/2);
+}
+
+function pickNew(){
+	sentence = random(result);
+}
+```
 
 ## Reading tables (CSV files)
 
@@ -114,7 +144,7 @@ function setup() {
 {{<p5js autoplay=1 width="300" height="500">}}
 let person;
 function preload() {
-  person = loadJSON("../files/data.json");
+  person = loadJSON("/files/data.json");
 }
 function setup() {
   noCanvas();

diff --git a/content/courses/physical-computing/week-03/lecture.md b/content/courses/physical-computing/week-03/lecture.md
@@ -19,4 +19,28 @@ We have a guest talk by Leo McElroy who will talk about a tool he has developed
 - [SVG-PCB GitHub](https://github.com/leomcelroy/svg-pcb)
 - [Tutorial](https://github.com/leomcelroy/svg-pcb/blob/main/DOCS/TUTORIAL.md#svg-pcb)
 
---- 
+{{<hint info>}}
+**Optional:** This lecture is the kickoff to a workshop that happens on Wednesday. You are welcome to join it, if you want to!
+
+Workshop: SvgPcb (Design PCBs With JavaScript in Your Browser)
+
+Workshop by Leo McElroy and Aalto Fablab
+
+Part 1
+- Mon 6 Nov, 15:15-17:00
+- Otakaari 1, U135a U7 PWC
+
+Part 2
+- Wed 8 Nov, 10:00-16:00
+- Otakaari 7, Aalto Fablab
+
+[More details here.](https://dfs2023.aalto.fi/)
+{{</hint>}}
+
+--- 
+
+## Digital Fabrication Showcase 2023
+
+This lecture and the workshop is part of our collaboration with the Aalto Fab Lab. There will also be the opening of the Digital Fabrication Showcase 2023 exhibition in the Väre lobby.
+
+- [Digital Fabrication Showcase 2023 Website](https://dfs2023.aalto.fi/)
diff --git a/content/tutorials/digital-fabrication/pcb-design/_index.md b/content/tutorials/digital-fabrication/pcb-design/_index.md
@@ -0,0 +1,17 @@
+---
+title: PCB Design
+bookCollapseSection: true
+p5js-widget: false
+draft: false
+---
+
+## Software
+
+- [KiCad](https://www.kicad.org/)
+- [Fusion 360](https://www.autodesk.com/solutions/electronics-design-software)
+- [SVG-PCB](https://leomcelroy.com/svg-pcb-website/#/home)
+
+### KiCad
+
+The recommended option for our students is KiCad.
+
diff --git a/content/tutorials/digital-fabrication/pcb-production/_index.md b/content/tutorials/digital-fabrication/pcb-production/_index.md
@@ -0,0 +1,10 @@
+---
+title: PCB Production
+bookCollapseSection: true
+p5js-widget: false
+draft: false
+---
+
+---
+
+
diff --git a/content/tutorials/digital-fabrication/pcb-production/milling/index.md b/content/tutorials/digital-fabrication/pcb-production/milling/index.md
@@ -0,0 +1,48 @@
+---
+title: Milling
+bookCollapseSection: true
+p5js-widget: false
+draft: false
+---
+
+## Väre Mechatronics (G014-G015)
+
+### Workflow
+
+The general workflow for milling PCBs in room G015 goes like this:
+
+1. Design your board (see the sparate tutorials for that)
+2. Export your board files
+3. Double-check the specifications for the milling and drilling bits that we have available.
+4. Generate tool paths for the machine (.rml) for the specific bits
+5. Prepare the material (copper board)
+6. Install the milling bit
+7. Set the XYZ coordinates for the origin of the job
+8. Import the tool path and run the job
+9. Change the tool and repeat for all of the necessary passes that you need to do
+10. Clean up
+
+### Machines and Tools
+
+Currently, we have one CNC machine available for PCB Milling at Mechatronics.
+
+#### Roland iModela iM-01
+
+#### Milling Bits
+
+### Software
+
+
+
+
+
+
+---
+
+## Aalto Fab Lab
+
+Please see the [Aalto Fab Lab Wiki for up-to-date instructions and updates.](https://wiki.aalto.fi/display/AF/Aalto+Fablab+Home)
+
+- [PCB Milling with Roland MDX-40](https://wiki.aalto.fi/display/AF/PCB+Milling+with+Roland+MDX-40)
+- [PCB Milling with Roland SRM-20](https://wiki.aalto.fi/display/AF/PCB+Milling+with+Roland+SRM-20)
+
diff --git a/content/tutorials/vj-workshop/_index.md b/content/tutorials/vj-workshop/_index.md
@@ -5,6 +5,10 @@ bookCollapseSection: false
 draft: false
 ---
 
+>by [Calvin Guillot](https://calvinguillot.com/)
+
+---
+
 [![After Arts](/images/tutorials/vj/after_arts.png)](/images/tutorials/vj/after_arts.png)
 
 ---