From 25d7b7a4793bb71b380a942878e50a81897547bd Mon Sep 17 00:00:00 2001
From: Erik Strand <erik.strand@cba.mit.edu>
Date: Sat, 8 Dec 2018 16:05:00 -0500
Subject: [PATCH] Combine CNC cutting pages
---
...cnc_cutting_laser.md => 02_cnc_cutting.md} | 24 ++++++++++++++++--
content/03_cnc_cutting_vinyl.md | 25 -------------------
...uction.md => 03_electronics_production.md} | 0
...scanning.md => 04_3d_printing_scanning.md} | 0
...ics_design.md => 05_electronics_design.md} | 0
...7_cnc_machining.md => 06_cnc_machining.md} | 0
...gramming.md => 07_embedded_programming.md} | 0
...d_casting.md => 08_molding_and_casting.md} | 0
...0_input_devices.md => 09_input_devices.md} | 0
...output_devices.md => 10_output_devices.md} | 0
...{12_machine_week.md => 11_machine_week.md} | 0
.../{13_interfaces.md => 12_interfaces.md} | 0
.../{14_networking.md => 13_networking.md} | 0
13 files changed, 22 insertions(+), 27 deletions(-)
rename content/{02_cnc_cutting_laser.md => 02_cnc_cutting.md} (53%)
delete mode 100644 content/03_cnc_cutting_vinyl.md
rename content/{04_electronics_production.md => 03_electronics_production.md} (100%)
rename content/{05_3d_printing_scanning.md => 04_3d_printing_scanning.md} (100%)
rename content/{06_electronics_design.md => 05_electronics_design.md} (100%)
rename content/{07_cnc_machining.md => 06_cnc_machining.md} (100%)
rename content/{08_embedded_programming.md => 07_embedded_programming.md} (100%)
rename content/{09_molding_and_casting.md => 08_molding_and_casting.md} (100%)
rename content/{10_input_devices.md => 09_input_devices.md} (100%)
rename content/{11_output_devices.md => 10_output_devices.md} (100%)
rename content/{12_machine_week.md => 11_machine_week.md} (100%)
rename content/{13_interfaces.md => 12_interfaces.md} (100%)
rename content/{14_networking.md => 13_networking.md} (100%)
diff --git a/content/02_cnc_cutting_laser.md b/content/02_cnc_cutting.md
similarity index 53%
rename from content/02_cnc_cutting_laser.md
rename to content/02_cnc_cutting.md
index c371e86..3dbbe0a 100644
--- a/content/02_cnc_cutting_laser.md
+++ b/content/02_cnc_cutting.md
@@ -1,11 +1,12 @@
+++
-title = "Laser CNC Cutting"
+title = "CNC Cutting"
date = "2018-09-13"
menu = "main"
weight = 3
+++
-## Laser Cut Construction Kit
+
+## A Laser Cut Construction Kit
Files: [pentagon.dxf](/designs/02_pentagon.dxf), [connector.dxf](/designs/02_connector.dxf)
@@ -30,3 +31,22 @@ The extra degree of freedom (from using slots instead of tabs) allows more than
+
+## A Practical Analysis of Vinyl Cutting Machines
+
+Files: [shannon.svg](/designs/03_shannon.svg)
+
+This past week we learned how to use a vinyl cutter. This is a new tool for me and I'm excited to try it out. As a small token of appreciation for formalizing digital circuit design, I decided to cut a portrait of Claude Shannon to apply to my desktop computer.
+
+Not surprisingly, there aren't many vector images of Claude Shannon online. So I edited a raster image in Photoshop until I had a nice looking two tone version. I also managed to vectorize this image in Photoshop, but whenever I tried to save the results the program got stuck. So I installed Inkscape and used it for bitmap tracing.
+
+
+
+Despite all the detail, the vinyl cutter only took a few minutes to cut my design. Weeding, however, took two hours. Finally I removed a panel from my desktop's enclosure and transferred the image.
+
+
+
+I'm quite pleased with the result! The vinyl cutter is a tool I now see myself using regularly.
+
+
+
diff --git a/content/03_cnc_cutting_vinyl.md b/content/03_cnc_cutting_vinyl.md
deleted file mode 100644
index 2d74855..0000000
--- a/content/03_cnc_cutting_vinyl.md
+++ /dev/null
@@ -1,25 +0,0 @@
-+++
-title = "Blade CNC Cutting"
-date = "2018-09-16"
-menu = "main"
-weight = 4
-+++
-
-## A Practical Analysis of Vinyl Cutting Machines
-
-Files: [shannon.svg](/designs/03_shannon.svg)
-
-This past week we learned how to use a vinyl cutter. This is a new tool for me and I'm excited to try it out. As a small token of appreciation for formalizing digital circuit design, I decided to cut a portrait of Claude Shannon to apply to my desktop computer.
-
-Not surprisingly, there aren't many vector images of Claude Shannon online. So I edited a raster image in Photoshop until I had a nice looking two tone version. I also managed to vectorize this image in Photoshop, but whenever I tried to save the results the program got stuck. So I installed Inkscape and used it for bitmap tracing.
-
-
-
-Despite all the detail, the vinyl cutter only took a few minutes to cut my design. Weeding, however, took two hours. Finally I removed a panel from my desktop's enclosure and transferred the image.
-
-
-
-I'm quite pleased with the result! The vinyl cutter is a tool I now see myself using regularly.
-
-
-
diff --git a/content/04_electronics_production.md b/content/03_electronics_production.md
similarity index 100%
rename from content/04_electronics_production.md
rename to content/03_electronics_production.md
diff --git a/content/05_3d_printing_scanning.md b/content/04_3d_printing_scanning.md
similarity index 100%
rename from content/05_3d_printing_scanning.md
rename to content/04_3d_printing_scanning.md
diff --git a/content/06_electronics_design.md b/content/05_electronics_design.md
similarity index 100%
rename from content/06_electronics_design.md
rename to content/05_electronics_design.md
diff --git a/content/07_cnc_machining.md b/content/06_cnc_machining.md
similarity index 100%
rename from content/07_cnc_machining.md
rename to content/06_cnc_machining.md
diff --git a/content/08_embedded_programming.md b/content/07_embedded_programming.md
similarity index 100%
rename from content/08_embedded_programming.md
rename to content/07_embedded_programming.md
diff --git a/content/09_molding_and_casting.md b/content/08_molding_and_casting.md
similarity index 100%
rename from content/09_molding_and_casting.md
rename to content/08_molding_and_casting.md
diff --git a/content/10_input_devices.md b/content/09_input_devices.md
similarity index 100%
rename from content/10_input_devices.md
rename to content/09_input_devices.md
diff --git a/content/11_output_devices.md b/content/10_output_devices.md
similarity index 100%
rename from content/11_output_devices.md
rename to content/10_output_devices.md
diff --git a/content/12_machine_week.md b/content/11_machine_week.md
similarity index 100%
rename from content/12_machine_week.md
rename to content/11_machine_week.md
diff --git a/content/13_interfaces.md b/content/12_interfaces.md
similarity index 100%
rename from content/13_interfaces.md
rename to content/12_interfaces.md
diff --git a/content/14_networking.md b/content/13_networking.md
similarity index 100%
rename from content/14_networking.md
rename to content/13_networking.md
--
GitLab