diff --git a/.DS_Store b/.DS_Store
index 06fa32d44052ad6e5075d8c82a9ff78abb15f76a..bfe7bf1ee8bcf96912c1b7376f89cf9f4a47b5a3 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/public/.DS_Store b/public/.DS_Store
index 5c9920bc09d6e405281cf56d69ef4cf8784cb8c0..0756b21dab9540c3e18e92d42f97901cdc393eb5 100644
Binary files a/public/.DS_Store and b/public/.DS_Store differ
diff --git a/public/404.html b/public/404.html
index f1d6bfcf9e8218f62aec7d6d426593adcf6bdc04..6c8da4113f0fd991a59c70fda3bcdd1bef059c03 100644
--- a/public/404.html
+++ b/public/404.html
@@ -7,15 +7,15 @@
         
         <meta name="author" content="Sosuke Kanegae">
         
-        <link rel="shortcut icon" href="/img/favicon.ico">
+        <link rel="shortcut icon" href="/2023/labs/kitakagaya/students/sosuke-kanegae/img/favicon.ico">
         <title>Sosuke Kanegae Fab Academy</title>
-        <link href="/css/bootstrap.min.css" rel="stylesheet">
-        <link href="/css/font-awesome.min.css" rel="stylesheet">
-        <link href="/css/base.css" rel="stylesheet">
+        <link href="/2023/labs/kitakagaya/students/sosuke-kanegae/css/bootstrap.min.css" rel="stylesheet">
+        <link href="/2023/labs/kitakagaya/students/sosuke-kanegae/css/font-awesome.min.css" rel="stylesheet">
+        <link href="/2023/labs/kitakagaya/students/sosuke-kanegae/css/base.css" rel="stylesheet">
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.5.0/styles/color-brewer.min.css">
 
-        <script src="/js/jquery-1.10.2.min.js" defer></script>
-        <script src="/js/bootstrap.min.js" defer></script>
+        <script src="/2023/labs/kitakagaya/students/sosuke-kanegae/js/jquery-1.10.2.min.js" defer></script>
+        <script src="/2023/labs/kitakagaya/students/sosuke-kanegae/js/bootstrap.min.js" defer></script>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.5.0/highlight.min.js"></script>
         <script>hljs.initHighlightingOnLoad();</script> 
     </head>
@@ -23,7 +23,7 @@
     <body>
         <div class="navbar fixed-top navbar-expand-lg navbar-dark bg-primary">
             <div class="container">
-                <a class="navbar-brand" href="/.">Sosuke Kanegae Fab Academy</a>
+                <a class="navbar-brand" href="/2023/labs/kitakagaya/students/sosuke-kanegae/.">Sosuke Kanegae Fab Academy</a>
                 <!-- Expander button -->
                 <button type="button" class="navbar-toggler" data-toggle="collapse" data-target="#navbar-collapse">
                     <span class="navbar-toggler-icon"></span>
@@ -34,30 +34,94 @@
                         <!-- Main navigation -->
                         <ul class="nav navbar-nav">
                             <li class="navitem">
-                                <a href="/." class="nav-link">Home</a>
+                                <a href="/2023/labs/kitakagaya/students/sosuke-kanegae/." class="nav-link">Home</a>
                             </li>
                             <li class="navitem">
-                                <a href="/about/" class="nav-link">About me</a>
+                                <a href="/2023/labs/kitakagaya/students/sosuke-kanegae/about/" class="nav-link">About</a>
                             </li>
                             <li class="navitem">
-                                <a href="/agreements/" class="nav-link">Agreements</a>
-                            </li>
-                            <li class="navitem">
-                                <a href="/final-project/" class="nav-link">Final Project</a>
+                                <a href="/2023/labs/kitakagaya/students/sosuke-kanegae/final-project/" class="nav-link">Final Project</a>
                             </li>
                             <li class="dropdown">
-                                <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown">Assignments <b class="caret"></b></a>
+                                <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown">assignments <b class="caret"></b></a>
                                 <ul class="dropdown-menu">
                                     
 <li>
-    <a href="/assignments/week01/" class="dropdown-item">Week 01. Principles and Practices / Project Management</a>
+    <a href="/2023/labs/kitakagaya/students/sosuke-kanegae/assignments/week01/" class="dropdown-item">Week01. Principles and Practices / Project Management</a>
+</li>
+                                    
+<li>
+    <a href="/2023/labs/kitakagaya/students/sosuke-kanegae/assignments/week02/" class="dropdown-item">Week02. Computer Aided design</a>
+</li>
+                                    
+<li>
+    <a href="/2023/labs/kitakagaya/students/sosuke-kanegae/assignments/week03.md" class="dropdown-item">Week03. Computer controlled cutting</a>
+</li>
+                                    
+<li>
+    <a href="/2023/labs/kitakagaya/students/sosuke-kanegae/assignments/week04.md" class="dropdown-item">Week04. Embedded programming</a>
+</li>
+                                    
+<li>
+    <a href="/2023/labs/kitakagaya/students/sosuke-kanegae/assignments/week05.md" class="dropdown-item">Week05. 3D Scanning and printing</a>
+</li>
+                                    
+<li>
+    <a href="/2023/labs/kitakagaya/students/sosuke-kanegae/assignments/week06.md" class="dropdown-item">Week06. Electronics design</a>
+</li>
+                                    
+<li>
+    <a href="/2023/labs/kitakagaya/students/sosuke-kanegae/assignments/week07.md" class="dropdown-item">Week07. Computer controlled machining</a>
+</li>
+                                    
+<li>
+    <a href="/2023/labs/kitakagaya/students/sosuke-kanegae/assignments/week08.md" class="dropdown-item">Week08. Electronics production</a>
+</li>
+                                    
+<li>
+    <a href="/2023/labs/kitakagaya/students/sosuke-kanegae/assignments/week09.md" class="dropdown-item">Week09. Molding and casting</a>
 </li>
                                     
 <li>
-    <a href="/assignments/week02/" class="dropdown-item">Week 02. Computer Aided Design</a>
+    <a href="/2023/labs/kitakagaya/students/sosuke-kanegae/assignments/week10.md" class="dropdown-item">Week10. Output devices</a>
+</li>
+                                    
+<li>
+    <a href="/2023/labs/kitakagaya/students/sosuke-kanegae/assignments/week11.md" class="dropdown-item">Week11. Mechanical design & machine design</a>
+</li>
+                                    
+<li>
+    <a href="/2023/labs/kitakagaya/students/sosuke-kanegae/assignments/week12.md" class="dropdown-item">Week12. Input devices</a>
+</li>
+                                    
+<li>
+    <a href="/2023/labs/kitakagaya/students/sosuke-kanegae/assignments/week13.md" class="dropdown-item">Week13. Networking and communications</a>
+</li>
+                                    
+<li>
+    <a href="/2023/labs/kitakagaya/students/sosuke-kanegae/assignments/week14.md" class="dropdown-item">Week14. Interface and application programming</a>
+</li>
+                                    
+<li>
+    <a href="/2023/labs/kitakagaya/students/sosuke-kanegae/assignments/week15.md" class="dropdown-item">Week15. Wildcard week</a>
+</li>
+                                    
+<li>
+    <a href="/2023/labs/kitakagaya/students/sosuke-kanegae/assignments/week16.md" class="dropdown-item">Week16. Applications and implications</a>
+</li>
+                                    
+<li>
+    <a href="/2023/labs/kitakagaya/students/sosuke-kanegae/assignments/week17.md" class="dropdown-item">Week17. Invention, intellectual property and income</a>
+</li>
+                                    
+<li>
+    <a href="/2023/labs/kitakagaya/students/sosuke-kanegae/assignments/week18.md" class="dropdown-item">Week18. Project development</a>
 </li>
                                 </ul>
                             </li>
+                            <li class="navitem">
+                                <a href="/2023/labs/kitakagaya/students/sosuke-kanegae/agreements/" class="nav-link">Agreements</a>
+                            </li>
                         </ul>
 
                     <ul class="nav navbar-nav ml-auto">
@@ -94,11 +158,11 @@
             <p>Documentation built with <a href="https://www.mkdocs.org/">MkDocs</a>.</p>
         </footer>
         <script>
-            var base_url = "/",
+            var base_url = "/2023/labs/kitakagaya/students/sosuke-kanegae/",
                 shortcuts = {"help": 191, "next": 78, "previous": 80, "search": 83};
         </script>
-        <script src="/js/base.js" defer></script>
-        <script src="/search/main.js" defer></script>
+        <script src="/2023/labs/kitakagaya/students/sosuke-kanegae/js/base.js" defer></script>
+        <script src="/2023/labs/kitakagaya/students/sosuke-kanegae/search/main.js" defer></script>
 
         <div class="modal" id="mkdocs_search_modal" tabindex="-1" role="dialog" aria-labelledby="searchModalLabel" aria-hidden="true">
     <div class="modal-dialog modal-lg">
diff --git a/public/about/index.html b/public/about/index.html
index a0ab6e747f8462eb71c3d11d32f062488a235dcc..bd451ec8bb9926b075b54b0cbead21b4aa2b5355 100644
--- a/public/about/index.html
+++ b/public/about/index.html
@@ -6,9 +6,9 @@
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         
         <meta name="author" content="Sosuke Kanegae">
-        
+        <link rel="canonical" href="https://fabacademy.org/2023/labs/kitakagaya/students/sosuke-kanegae/about/">
         <link rel="shortcut icon" href="../img/favicon.ico">
-        <title>About me - Sosuke Kanegae Fab Academy</title>
+        <title>About - Sosuke Kanegae Fab Academy</title>
         <link href="../css/bootstrap.min.css" rel="stylesheet">
         <link href="../css/font-awesome.min.css" rel="stylesheet">
         <link href="../css/base.css" rel="stylesheet">
@@ -37,27 +37,91 @@
                                 <a href=".." class="nav-link">Home</a>
                             </li>
                             <li class="navitem active">
-                                <a href="./" class="nav-link">About me</a>
-                            </li>
-                            <li class="navitem">
-                                <a href="../agreements/" class="nav-link">Agreements</a>
+                                <a href="./" class="nav-link">About</a>
                             </li>
                             <li class="navitem">
                                 <a href="../final-project/" class="nav-link">Final Project</a>
                             </li>
                             <li class="dropdown">
-                                <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown">Assignments <b class="caret"></b></a>
+                                <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown">assignments <b class="caret"></b></a>
                                 <ul class="dropdown-menu">
                                     
 <li>
-    <a href="../assignments/week01/" class="dropdown-item">Week 01. Principles and Practices / Project Management</a>
+    <a href="../assignments/week01/" class="dropdown-item">Week01. Principles and Practices / Project Management</a>
+</li>
+                                    
+<li>
+    <a href="../assignments/week02/" class="dropdown-item">Week02. Computer Aided design</a>
+</li>
+                                    
+<li>
+    <a href="../assignments/week03.md" class="dropdown-item">Week03. Computer controlled cutting</a>
+</li>
+                                    
+<li>
+    <a href="../assignments/week04.md" class="dropdown-item">Week04. Embedded programming</a>
+</li>
+                                    
+<li>
+    <a href="../assignments/week05.md" class="dropdown-item">Week05. 3D Scanning and printing</a>
+</li>
+                                    
+<li>
+    <a href="../assignments/week06.md" class="dropdown-item">Week06. Electronics design</a>
+</li>
+                                    
+<li>
+    <a href="../assignments/week07.md" class="dropdown-item">Week07. Computer controlled machining</a>
+</li>
+                                    
+<li>
+    <a href="../assignments/week08.md" class="dropdown-item">Week08. Electronics production</a>
+</li>
+                                    
+<li>
+    <a href="../assignments/week09.md" class="dropdown-item">Week09. Molding and casting</a>
 </li>
                                     
 <li>
-    <a href="../assignments/week02/" class="dropdown-item">Week 02. Computer Aided Design</a>
+    <a href="../assignments/week10.md" class="dropdown-item">Week10. Output devices</a>
+</li>
+                                    
+<li>
+    <a href="../assignments/week11.md" class="dropdown-item">Week11. Mechanical design & machine design</a>
+</li>
+                                    
+<li>
+    <a href="../assignments/week12.md" class="dropdown-item">Week12. Input devices</a>
+</li>
+                                    
+<li>
+    <a href="../assignments/week13.md" class="dropdown-item">Week13. Networking and communications</a>
+</li>
+                                    
+<li>
+    <a href="../assignments/week14.md" class="dropdown-item">Week14. Interface and application programming</a>
+</li>
+                                    
+<li>
+    <a href="../assignments/week15.md" class="dropdown-item">Week15. Wildcard week</a>
+</li>
+                                    
+<li>
+    <a href="../assignments/week16.md" class="dropdown-item">Week16. Applications and implications</a>
+</li>
+                                    
+<li>
+    <a href="../assignments/week17.md" class="dropdown-item">Week17. Invention, intellectual property and income</a>
+</li>
+                                    
+<li>
+    <a href="../assignments/week18.md" class="dropdown-item">Week18. Project development</a>
 </li>
                                 </ul>
                             </li>
+                            <li class="navitem">
+                                <a href="../agreements/" class="nav-link">Agreements</a>
+                            </li>
                         </ul>
 
                     <ul class="nav navbar-nav ml-auto">
@@ -72,7 +136,7 @@
                                 </a>
                             </li>
                             <li class="nav-item">
-                                <a rel="next" href="../agreements/" class="nav-link">
+                                <a rel="next" href="../final-project/" class="nav-link">
                                     Next <i class="fa fa-arrow-right"></i>
                                 </a>
                             </li>
diff --git a/public/agreements/index.html b/public/agreements/index.html
index 37375db8dac76a002c5131b5fb433628dcd13f9c..8667618d6e80d68057ebe7f68438061b45ea0ece 100644
--- a/public/agreements/index.html
+++ b/public/agreements/index.html
@@ -6,7 +6,7 @@
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         
         <meta name="author" content="Sosuke Kanegae">
-        
+        <link rel="canonical" href="https://fabacademy.org/2023/labs/kitakagaya/students/sosuke-kanegae/agreements/">
         <link rel="shortcut icon" href="../img/favicon.ico">
         <title>Agreements - Sosuke Kanegae Fab Academy</title>
         <link href="../css/bootstrap.min.css" rel="stylesheet">
@@ -37,27 +37,91 @@
                                 <a href=".." class="nav-link">Home</a>
                             </li>
                             <li class="navitem">
-                                <a href="../about/" class="nav-link">About me</a>
-                            </li>
-                            <li class="navitem active">
-                                <a href="./" class="nav-link">Agreements</a>
+                                <a href="../about/" class="nav-link">About</a>
                             </li>
                             <li class="navitem">
                                 <a href="../final-project/" class="nav-link">Final Project</a>
                             </li>
                             <li class="dropdown">
-                                <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown">Assignments <b class="caret"></b></a>
+                                <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown">assignments <b class="caret"></b></a>
                                 <ul class="dropdown-menu">
                                     
 <li>
-    <a href="../assignments/week01/" class="dropdown-item">Week 01. Principles and Practices / Project Management</a>
+    <a href="../assignments/week01/" class="dropdown-item">Week01. Principles and Practices / Project Management</a>
+</li>
+                                    
+<li>
+    <a href="../assignments/week02/" class="dropdown-item">Week02. Computer Aided design</a>
+</li>
+                                    
+<li>
+    <a href="../assignments/week03.md" class="dropdown-item">Week03. Computer controlled cutting</a>
+</li>
+                                    
+<li>
+    <a href="../assignments/week04.md" class="dropdown-item">Week04. Embedded programming</a>
+</li>
+                                    
+<li>
+    <a href="../assignments/week05.md" class="dropdown-item">Week05. 3D Scanning and printing</a>
+</li>
+                                    
+<li>
+    <a href="../assignments/week06.md" class="dropdown-item">Week06. Electronics design</a>
+</li>
+                                    
+<li>
+    <a href="../assignments/week07.md" class="dropdown-item">Week07. Computer controlled machining</a>
+</li>
+                                    
+<li>
+    <a href="../assignments/week08.md" class="dropdown-item">Week08. Electronics production</a>
+</li>
+                                    
+<li>
+    <a href="../assignments/week09.md" class="dropdown-item">Week09. Molding and casting</a>
 </li>
                                     
 <li>
-    <a href="../assignments/week02/" class="dropdown-item">Week 02. Computer Aided Design</a>
+    <a href="../assignments/week10.md" class="dropdown-item">Week10. Output devices</a>
+</li>
+                                    
+<li>
+    <a href="../assignments/week11.md" class="dropdown-item">Week11. Mechanical design & machine design</a>
+</li>
+                                    
+<li>
+    <a href="../assignments/week12.md" class="dropdown-item">Week12. Input devices</a>
+</li>
+                                    
+<li>
+    <a href="../assignments/week13.md" class="dropdown-item">Week13. Networking and communications</a>
+</li>
+                                    
+<li>
+    <a href="../assignments/week14.md" class="dropdown-item">Week14. Interface and application programming</a>
+</li>
+                                    
+<li>
+    <a href="../assignments/week15.md" class="dropdown-item">Week15. Wildcard week</a>
+</li>
+                                    
+<li>
+    <a href="../assignments/week16.md" class="dropdown-item">Week16. Applications and implications</a>
+</li>
+                                    
+<li>
+    <a href="../assignments/week17.md" class="dropdown-item">Week17. Invention, intellectual property and income</a>
+</li>
+                                    
+<li>
+    <a href="../assignments/week18.md" class="dropdown-item">Week18. Project development</a>
 </li>
                                 </ul>
                             </li>
+                            <li class="navitem active">
+                                <a href="./" class="nav-link">Agreements</a>
+                            </li>
                         </ul>
 
                     <ul class="nav navbar-nav ml-auto">
@@ -67,12 +131,12 @@
                             </a>
                         </li>
                             <li class="nav-item">
-                                <a rel="prev" href="../about/" class="nav-link">
+                                <a rel="prev" href="../assignments/week02/" class="nav-link">
                                     <i class="fa fa-arrow-left"></i> Previous
                                 </a>
                             </li>
                             <li class="nav-item">
-                                <a rel="next" href="../final-project/" class="nav-link">
+                                <a rel="next" class="nav-link disabled">
                                     Next <i class="fa fa-arrow-right"></i>
                                 </a>
                             </li>
diff --git a/public/assignments/week01/index.html b/public/assignments/week01/index.html
index 1d7d567f81d9c4f6fa72d11b84832949e1c40186..c2a8e3be9d0151c2fa7cbd1e73414fa0d57d11cc 100644
--- a/public/assignments/week01/index.html
+++ b/public/assignments/week01/index.html
@@ -6,9 +6,9 @@
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         
         <meta name="author" content="Sosuke Kanegae">
-        
+        <link rel="canonical" href="https://fabacademy.org/2023/labs/kitakagaya/students/sosuke-kanegae/assignments/week01/">
         <link rel="shortcut icon" href="../../img/favicon.ico">
-        <title>Week 01. Principles and Practices / Project Management - Sosuke Kanegae Fab Academy</title>
+        <title>Week01. Principles and Practices / Project Management - Sosuke Kanegae Fab Academy</title>
         <link href="../../css/bootstrap.min.css" rel="stylesheet">
         <link href="../../css/font-awesome.min.css" rel="stylesheet">
         <link href="../../css/base.css" rel="stylesheet">
@@ -37,27 +37,91 @@
                                 <a href="../.." class="nav-link">Home</a>
                             </li>
                             <li class="navitem">
-                                <a href="../../about/" class="nav-link">About me</a>
-                            </li>
-                            <li class="navitem">
-                                <a href="../../agreements/" class="nav-link">Agreements</a>
+                                <a href="../../about/" class="nav-link">About</a>
                             </li>
                             <li class="navitem">
                                 <a href="../../final-project/" class="nav-link">Final Project</a>
                             </li>
                             <li class="dropdown active">
-                                <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown">Assignments <b class="caret"></b></a>
+                                <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown">assignments <b class="caret"></b></a>
                                 <ul class="dropdown-menu">
                                     
 <li>
-    <a href="./" class="dropdown-item active">Week 01. Principles and Practices / Project Management</a>
+    <a href="./" class="dropdown-item active">Week01. Principles and Practices / Project Management</a>
+</li>
+                                    
+<li>
+    <a href="../week02/" class="dropdown-item">Week02. Computer Aided design</a>
+</li>
+                                    
+<li>
+    <a href="../week03.md" class="dropdown-item">Week03. Computer controlled cutting</a>
+</li>
+                                    
+<li>
+    <a href="../week04.md" class="dropdown-item">Week04. Embedded programming</a>
+</li>
+                                    
+<li>
+    <a href="../week05.md" class="dropdown-item">Week05. 3D Scanning and printing</a>
+</li>
+                                    
+<li>
+    <a href="../week06.md" class="dropdown-item">Week06. Electronics design</a>
+</li>
+                                    
+<li>
+    <a href="../week07.md" class="dropdown-item">Week07. Computer controlled machining</a>
+</li>
+                                    
+<li>
+    <a href="../week08.md" class="dropdown-item">Week08. Electronics production</a>
+</li>
+                                    
+<li>
+    <a href="../week09.md" class="dropdown-item">Week09. Molding and casting</a>
 </li>
                                     
 <li>
-    <a href="../week02/" class="dropdown-item">Week 02. Computer Aided Design</a>
+    <a href="../week10.md" class="dropdown-item">Week10. Output devices</a>
+</li>
+                                    
+<li>
+    <a href="../week11.md" class="dropdown-item">Week11. Mechanical design & machine design</a>
+</li>
+                                    
+<li>
+    <a href="../week12.md" class="dropdown-item">Week12. Input devices</a>
+</li>
+                                    
+<li>
+    <a href="../week13.md" class="dropdown-item">Week13. Networking and communications</a>
+</li>
+                                    
+<li>
+    <a href="../week14.md" class="dropdown-item">Week14. Interface and application programming</a>
+</li>
+                                    
+<li>
+    <a href="../week15.md" class="dropdown-item">Week15. Wildcard week</a>
+</li>
+                                    
+<li>
+    <a href="../week16.md" class="dropdown-item">Week16. Applications and implications</a>
+</li>
+                                    
+<li>
+    <a href="../week17.md" class="dropdown-item">Week17. Invention, intellectual property and income</a>
+</li>
+                                    
+<li>
+    <a href="../week18.md" class="dropdown-item">Week18. Project development</a>
 </li>
                                 </ul>
                             </li>
+                            <li class="navitem">
+                                <a href="../../agreements/" class="nav-link">Agreements</a>
+                            </li>
                         </ul>
 
                     <ul class="nav navbar-nav ml-auto">
@@ -241,10 +305,10 @@ Click the tab and you will see a blue "Commit" button.
 Underneath the button, you can check the changes you made from last time.
 If you're good with the changes you can just simply press the "Commit" button.
 Or, you can select "Commit &amp; Push" in the option of the "Commit" button.</p>
-<p><img alt="commit in VScode" src="../../images/commit_in_VScode.jpg" /></p>
+<p><img alt="commit in VScode" src="../../images/week01/commit_in_VScode.jpg" /></p>
 <p>When everything is up to date in your local repo, the blue button will turn into a sync button. The number written on the button indicates how many times you commit since you last push git.
 To push you can simply press the sync button.</p>
-<p><img alt="push in VScode" src="../../images/push_in_VScode.jpg" /></p>
+<p><img alt="push in VScode" src="../../images/week01/push_in_VScode.jpg" /></p>
 <p>Finally, when you have pushed and everything is up to date, the blue button will return into "Commit" and will be deativated</p>
 <h2 id="2-create-my-website">2. Create my website</h2>
 <h3 id="choose-a-style">Choose a style</h3>
@@ -291,47 +355,47 @@ I want to make <strong>a bedroom lamp that glows and flicker like a candle</stro
 <p>The first thing I made is a 3D model of the outline of my lamp.
 I modeled a lamp that is shaped like a large snowdome.
 I inserted a lightbulb in the lamp.</p>
-<p><img alt="lamp_sketch1" src="../../images/lamp_sketch1.jpg" />
-<img alt="lamp_sketch2" src="../../images/lamp_sketch2.jpg" /></p>
+<p><img alt="lamp_sketch1" src="../../images/week01/lamp_sketch1.jpg" />
+<img alt="lamp_sketch2" src="../../images/week01/lamp_sketch2.jpg" /></p>
 <p>Then I changed the appearance of each part as follewed:</p>
 <ul>
 <li>lampshade: Fabric(White)</li>
 <li>base: Oak</li>
 <li>lightbulb: A Type Bulb - Frosted - 1500lm</li>
 </ul>
-<p><img alt="lamp_sketch3" src="../../images/lamp_sketch3.jpg" />
-<img alt="lamp_sketch4" src="../../images/lamp_sketch4.jpg" /></p>
+<p><img alt="lamp_sketch3" src="../../images/week01/lamp_sketch3.jpg" />
+<img alt="lamp_sketch4" src="../../images/week01/lamp_sketch4.jpg" /></p>
 <h4 id="step-2-render-materials-for-the-concept-image"><strong>Step 2.</strong> Render materials for the concept image</h4>
 <p>Rendered several materials with several light conditions. Rendered images as PNG files with transparent background.</p>
 <p>material1: Whole lamp with lightbulb off</p>
-<p><img alt="lamp_material1" src="../../images/lamp_view2/lamp_1.jpg" /></p>
+<p><img alt="lamp_material1" src="../../images/week01/lamp_view2/lamp_1.jpg" /></p>
 <p>material2: lamp without lampshade (lightbulb on)</p>
-<p><img alt="lamp_material2" src="../../images/lamp_view2/lamp_2.jpg" /></p>
+<p><img alt="lamp_material2" src="../../images/week01/lamp_view2/lamp_2.jpg" /></p>
 <p>material3: lampshade with enviroment light from front</p>
-<p><img alt="lamp_material4" src="../../images/lamp_view2/lamp_4.jpg" /></p>
+<p><img alt="lamp_material4" src="../../images/week01/lamp_view2/lamp_4.jpg" /></p>
 <p>material4: lampshade with enviroment light from back</p>
-<p><img alt="lamp_material6" src="../../images/lamp_view2/lamp_6.jpg" /></p>
+<p><img alt="lamp_material6" src="../../images/week01/lamp_view2/lamp_6.jpg" /></p>
 <p>material5: base only</p>
-<p><img alt="lamp_material7" src="../../images/lamp_view2/lamp_7.jpg" /></p>
+<p><img alt="lamp_material7" src="../../images/week01/lamp_view2/lamp_7.jpg" /></p>
 <p>material6: lampshade with bird silhouettes</p>
-<p><img alt="lamp_material9" src="../../images/lamp_view2/lamp_9.jpg" /></p>
+<p><img alt="lamp_material9" src="../../images/week01/lamp_view2/lamp_9.jpg" /></p>
 <h4 id="step-3-generate-background-with-ai"><strong>Step 3.</strong> Generate background with AI</h4>
 <p>I used an iPhone app, <a href="https://apps.apple.com/jp/app/wonder-ai-art-generator/id1621278575">wonder</a>, to generate backgraound image.</p>
 <p>In this app, you can select the style of image. And, I selected "3D Render"</p>
 <p>Set the aspect ratio to 3:2.</p>
 <p>Set the keyword as "coworking space"</p>
 <p>This is what I got:</p>
-<p><img alt="coworking space" src="../../images/IMG_1E8E90206256-1.jpeg" /></p>
+<p><img alt="coworking space" src="../../images/week01/IMG_1E8E90206256-1.jpeg" /></p>
 <p>I used this table as the background:</p>
-<p><img alt="lamp background" src="../../images/lamp_background.jpg" /></p>
+<p><img alt="lamp background" src="../../images/week01/lamp_background.jpg" /></p>
 <h4 id="step-4-edit-images"><strong>Step 4.</strong> Edit images</h4>
 <p>If you put the lamp on a table it will look like this:</p>
-<p><img alt="Final Project Sketch" src="../../images/lamp_off.jpg" /></p>
+<p><img alt="Final Project Sketch" src="../../images/week01/lamp_off.jpg" /></p>
 <h3 id="the-lamp-in-each-situation-would-look-like-this">the lamp in each situation would look like this:</h3>
 <p><strong>Daytime</strong>: projecting silhouettes on the lamp shade
-<img alt="lamp in daytime" src="../../images/lamp_bird.jpg" /></p>
+<img alt="lamp in daytime" src="../../images/week01/lamp_bird.jpg" /></p>
 <p><strong>Nighttime</strong>: glows and flickers like a candle
-<img alt="lamp in night time" src="../../images/lamp_candle.jpg" /></p></div>
+<img alt="lamp in night time" src="../../images/week01/lamp_candle.jpg" /></p></div>
             </div>
         </div>
 
diff --git a/public/assignments/week02/index.html b/public/assignments/week02/index.html
index 24ad8f5d6c874eb836181eb8d6bf9085659a6e5c..bcca64aca67d4621ddc10918496212e5ba20a5a4 100644
--- a/public/assignments/week02/index.html
+++ b/public/assignments/week02/index.html
@@ -6,9 +6,9 @@
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         
         <meta name="author" content="Sosuke Kanegae">
-        
+        <link rel="canonical" href="https://fabacademy.org/2023/labs/kitakagaya/students/sosuke-kanegae/assignments/week02/">
         <link rel="shortcut icon" href="../../img/favicon.ico">
-        <title>Week 02. Computer Aided Design - Sosuke Kanegae Fab Academy</title>
+        <title>Week02. Computer Aided design - Sosuke Kanegae Fab Academy</title>
         <link href="../../css/bootstrap.min.css" rel="stylesheet">
         <link href="../../css/font-awesome.min.css" rel="stylesheet">
         <link href="../../css/base.css" rel="stylesheet">
@@ -37,27 +37,91 @@
                                 <a href="../.." class="nav-link">Home</a>
                             </li>
                             <li class="navitem">
-                                <a href="../../about/" class="nav-link">About me</a>
-                            </li>
-                            <li class="navitem">
-                                <a href="../../agreements/" class="nav-link">Agreements</a>
+                                <a href="../../about/" class="nav-link">About</a>
                             </li>
                             <li class="navitem">
                                 <a href="../../final-project/" class="nav-link">Final Project</a>
                             </li>
                             <li class="dropdown active">
-                                <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown">Assignments <b class="caret"></b></a>
+                                <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown">assignments <b class="caret"></b></a>
                                 <ul class="dropdown-menu">
                                     
 <li>
-    <a href="../week01/" class="dropdown-item">Week 01. Principles and Practices / Project Management</a>
+    <a href="../week01/" class="dropdown-item">Week01. Principles and Practices / Project Management</a>
+</li>
+                                    
+<li>
+    <a href="./" class="dropdown-item active">Week02. Computer Aided design</a>
+</li>
+                                    
+<li>
+    <a href="../week03.md" class="dropdown-item">Week03. Computer controlled cutting</a>
+</li>
+                                    
+<li>
+    <a href="../week04.md" class="dropdown-item">Week04. Embedded programming</a>
+</li>
+                                    
+<li>
+    <a href="../week05.md" class="dropdown-item">Week05. 3D Scanning and printing</a>
+</li>
+                                    
+<li>
+    <a href="../week06.md" class="dropdown-item">Week06. Electronics design</a>
+</li>
+                                    
+<li>
+    <a href="../week07.md" class="dropdown-item">Week07. Computer controlled machining</a>
 </li>
                                     
 <li>
-    <a href="./" class="dropdown-item active">Week 02. Computer Aided Design</a>
+    <a href="../week08.md" class="dropdown-item">Week08. Electronics production</a>
+</li>
+                                    
+<li>
+    <a href="../week09.md" class="dropdown-item">Week09. Molding and casting</a>
+</li>
+                                    
+<li>
+    <a href="../week10.md" class="dropdown-item">Week10. Output devices</a>
+</li>
+                                    
+<li>
+    <a href="../week11.md" class="dropdown-item">Week11. Mechanical design & machine design</a>
+</li>
+                                    
+<li>
+    <a href="../week12.md" class="dropdown-item">Week12. Input devices</a>
+</li>
+                                    
+<li>
+    <a href="../week13.md" class="dropdown-item">Week13. Networking and communications</a>
+</li>
+                                    
+<li>
+    <a href="../week14.md" class="dropdown-item">Week14. Interface and application programming</a>
+</li>
+                                    
+<li>
+    <a href="../week15.md" class="dropdown-item">Week15. Wildcard week</a>
+</li>
+                                    
+<li>
+    <a href="../week16.md" class="dropdown-item">Week16. Applications and implications</a>
+</li>
+                                    
+<li>
+    <a href="../week17.md" class="dropdown-item">Week17. Invention, intellectual property and income</a>
+</li>
+                                    
+<li>
+    <a href="../week18.md" class="dropdown-item">Week18. Project development</a>
 </li>
                                 </ul>
                             </li>
+                            <li class="navitem">
+                                <a href="../../agreements/" class="nav-link">Agreements</a>
+                            </li>
                         </ul>
 
                     <ul class="nav navbar-nav ml-auto">
@@ -72,7 +136,7 @@
                                 </a>
                             </li>
                             <li class="nav-item">
-                                <a rel="next" class="nav-link disabled">
+                                <a rel="next" href="../../agreements/" class="nav-link">
                                     Next <i class="fa fa-arrow-right"></i>
                                 </a>
                             </li>
@@ -110,6 +174,14 @@
             <li class="nav-item" data-level="2"><a href="#1-draw-a-2d-model-of-the-silhouettes" class="nav-link">1. Draw a 2D model of the silhouettes</a>
               <ul class="nav flex-column">
               </ul>
+            </li>
+            <li class="nav-item" data-level="2"><a href="#2-model-a-structure-to-express-the-glowing-and-flickering-of-candles" class="nav-link">2. Model a structure to express the glowing and flickering of candles</a>
+              <ul class="nav flex-column">
+              </ul>
+            </li>
+            <li class="nav-item" data-level="2"><a href="#links" class="nav-link">Links</a>
+              <ul class="nav flex-column">
+              </ul>
             </li>
               </ul>
             </li>
@@ -131,18 +203,22 @@
 <li>Draw a 2D model of the silhouettes<ul>
 <li>generator an image of a bird with AI</li>
 <li>make a silhouette of a bird</li>
-<li></li>
 </ul>
 </li>
 <li>Model a structure to express the glowing and flickering of candles<ul>
-<li></li>
+<li>overlapping lattices</li>
+<li>overlapping lattice shell structures</li>
+<li>animation of the moving shells</li>
 </ul>
 </li>
-<li>Model structrures that make silhouettes of birds flapping their wings<ul>
+<li>Using Rhino<ul>
 <li></li>
 </ul>
 </li>
 </ol>
+<!-- 3. Model structrures that make silhouettes of birds flapping their wings
+    *  -->
+
 <h2 id="1-draw-a-2d-model-of-the-silhouettes">1. Draw a 2D model of the silhouettes</h2>
 <p>The first thing I did this week is to <strong>Draw the 2D model for silhouettes on my lamp</strong></p>
 <h3 id="generator-an-image-of-a-bird-with-ai">generator an image of a bird with AI</h3>
@@ -153,8 +229,8 @@
 <p>Set the aspect ratio to 3:2.</p>
 <p>Set the keyword as "bird flying"</p>
 <p>This is what I got:</p>
-<p><img alt="img from wonder 1" src="../../images/IMG_6909.JPG" /></p>
-<p><img alt="img from wonder 2" src="../../images/IMG_6910.JPG" /></p>
+<p><img alt="img from wonder 1" src="../../images/week02/IMG_6909.JPG" /></p>
+<p><img alt="img from wonder 2" src="../../images/week02/IMG_6910.JPG" /></p>
 <h4 id="stable-diffusion"><a href="https://replicate.com/stability-ai/stable-diffusion">Stable Diffusion</a></h4>
 <p>The next AI art generator I tried was <a href="https://replicate.com/stability-ai/stable-diffusion">Stable Diffusion</a>
 I entered each options as followed:</p>
@@ -199,26 +275,231 @@ I converted the images to JPG file.</p>
 <a id="__codelineno-0-6" name="__codelineno-0-6" href="#__codelineno-0-6"></a><span class="k">done</span>
 </code></pre></div>
 <p>To use this bash file, run the following command in cammoand line.</p>
-<div class="highlight"><pre><span></span><code>bash png2jpg.sh pngs(directory with PNG files)
+<div class="highlight"><pre><span></span><code><a id="__codelineno-1-1" name="__codelineno-1-1" href="#__codelineno-1-1"></a>bash<span class="w"> </span>png2jpg.sh<span class="w"> </span>pngs<span class="w"> </span><span class="c1">#directory with PNG files</span>
 </code></pre></div>
-<p><img alt="png2jpg" src="../../images/png2jpg.jpg" /></p>
+<p><img alt="png2jpg" src="../../images/week02/png2jpg.jpg" /></p>
 <p>This is what I got:</p>
-<p><img alt="img from sd0" src="../../images/out-0.jpg" /></p>
-<p><img alt="img from sd1" src="../../images/out-1.jpg" /></p>
-<p><img alt="img from sd2" src="../../images/out-2.jpg" /></p>
-<p><img alt="img from sd3" src="../../images/out-3.jpg" /></p>
+<p><img alt="img from sd0" src="../../images/week02/out-0.jpg" /></p>
+<p><img alt="img from sd1" src="../../images/week02/out-1.jpg" /></p>
+<p><img alt="img from sd2" src="../../images/week02/out-2.jpg" /></p>
+<p><img alt="img from sd3" src="../../images/week02/out-3.jpg" /></p>
 <h3 id="make-a-silhouette-of-a-bird">make a silhouette of a bird</h3>
 <p>I chose this picture as an example.</p>
-<p><img alt="img from wonder 2" src="../../images/IMG_6910.JPG" /></p>
+<p><img alt="img from wonder 2" src="../../images/week02/IMG_6910.JPG" /></p>
 <p>I imported the picture into <a href="https://affinity.serif.com/en-us/designer/">Affinity Designer</a></p>
 <p>Then I traced the outline of the bird.</p>
-<p><img alt="silhouette_trace1" src="../../images/silhouette_trace1.jpg" /></p>
+<p><img alt="silhouette_trace1" src="../../images/week02/silhouette_trace1.jpg" /></p>
 <p>Filled the line with black.</p>
-<p><img alt="silhouette_trace2" src="../../images/silhouette_trace2.jpg" /></p>
-<p><img alt="silhouette_trace3" src="../../images/silhouette_trace3.jpg" /></p>
+<p><img alt="silhouette_trace2" src="../../images/week02/silhouette_trace2.jpg" /></p>
+<p><img alt="silhouette_trace3" src="../../images/week02/silhouette_trace3.jpg" /></p>
 <p>Edited the silhouetted to change the angle of the bird.</p>
-<p><img alt="silhouette_trace4" src="../../images/silhouette_trace4.jpg" /></p>
-<p><img alt="silhouette_trace5" src="../../images/silhouette_trace5.jpg" /></p></div>
+<p><img alt="silhouette_trace4" src="../../images/week02/silhouette_trace4.jpg" /></p>
+<p><img alt="silhouette_trace5" src="../../images/week02/silhouette_trace5.jpg" /></p>
+<h2 id="2-model-a-structure-to-express-the-glowing-and-flickering-of-candles">2. Model a structure to express the glowing and flickering of candles</h2>
+<p>Last week, I modeled the outline of the lamp I plan to make for my final project.</p>
+<p>This week, I will model structure inside the lampshade. The structures will move and create shadow on the shade. the shadow will be a pattern that decorates the lamp.</p>
+<p>For the candle mode, I will use lattice shells to express the glowing and flickering of candels.</p>
+<h3 id="overlapping-lattices">overlapping lattices</h3>
+<p>I will first draw an 2D example of lattices expressing candles flickering.</p>
+<p>To draw the lattices, I use python.
+Here are the python libraries I used.</p>
+<table>
+<thead>
+<tr>
+<th>library</th>
+<th>version</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>matplotlib</td>
+<td>3.6.3</td>
+</tr>
+<tr>
+<td>numpy</td>
+<td>1.23.4</td>
+</tr>
+<tr>
+<td>opencv</td>
+<td>4.6.0.66</td>
+</tr>
+</tbody>
+</table>
+<p>These were installed by followings:</p>
+<div class="highlight"><pre><span></span><code><a id="__codelineno-2-1" name="__codelineno-2-1" href="#__codelineno-2-1"></a>pip install matplotlib
+<a id="__codelineno-2-2" name="__codelineno-2-2" href="#__codelineno-2-2"></a>pip install numpy
+<a id="__codelineno-2-3" name="__codelineno-2-3" href="#__codelineno-2-3"></a>pip instell opencv-python
+</code></pre></div>
+<div class="admonition caution">
+<p class="admonition-title">Caution</p>
+<p>I failed to successfully create a mp4 files with opencv.
+A file was exported, but I could not open it.
+Insted of using opencv, I used ffmpeg.</p>
+</div>
+<h4 id="step-1-import-libraries"><strong>Step 1.</strong> Import libraries</h4>
+<div class="highlight"><pre><span></span><code><a id="__codelineno-3-1" name="__codelineno-3-1" href="#__codelineno-3-1"></a><span class="kn">import</span> <span class="nn">cv2</span>
+<a id="__codelineno-3-2" name="__codelineno-3-2" href="#__codelineno-3-2"></a><span class="kn">import</span> <span class="nn">matplotlib.pyplot</span> <span class="k">as</span> <span class="nn">plt</span>
+<a id="__codelineno-3-3" name="__codelineno-3-3" href="#__codelineno-3-3"></a><span class="kn">import</span> <span class="nn">numpy</span> <span class="k">as</span> <span class="nn">np</span>
+<a id="__codelineno-3-4" name="__codelineno-3-4" href="#__codelineno-3-4"></a><span class="kn">import</span> <span class="nn">os</span>
+<a id="__codelineno-3-5" name="__codelineno-3-5" href="#__codelineno-3-5"></a><span class="kn">import</span> <span class="nn">shutil</span>
+<a id="__codelineno-3-6" name="__codelineno-3-6" href="#__codelineno-3-6"></a><span class="kn">import</span> <span class="nn">sys</span>
+<a id="__codelineno-3-7" name="__codelineno-3-7" href="#__codelineno-3-7"></a>
+<a id="__codelineno-3-8" name="__codelineno-3-8" href="#__codelineno-3-8"></a><span class="o">%</span><span class="n">matplotlib</span> <span class="n">inline</span>
+</code></pre></div>
+<h4 id="step-2-set-the-area-to-plot-curves"><strong>Step 2.</strong> Set the area to plot curves</h4>
+<div class="highlight"><pre><span></span><code><a id="__codelineno-4-1" name="__codelineno-4-1" href="#__codelineno-4-1"></a><span class="n">fig</span> <span class="o">=</span> <span class="n">plt</span><span class="o">.</span><span class="n">figure</span><span class="p">()</span>
+<a id="__codelineno-4-2" name="__codelineno-4-2" href="#__codelineno-4-2"></a><span class="n">ax</span> <span class="o">=</span> <span class="n">fig</span><span class="o">.</span><span class="n">add_subplot</span><span class="p">(</span><span class="mi">111</span><span class="p">,</span> <span class="n">polar</span><span class="o">=</span><span class="kc">True</span><span class="p">)</span>
+<a id="__codelineno-4-3" name="__codelineno-4-3" href="#__codelineno-4-3"></a>
+<a id="__codelineno-4-4" name="__codelineno-4-4" href="#__codelineno-4-4"></a><span class="n">ax</span><span class="o">.</span><span class="n">grid</span><span class="p">(</span><span class="kc">False</span><span class="p">)</span>
+<a id="__codelineno-4-5" name="__codelineno-4-5" href="#__codelineno-4-5"></a><span class="n">ax</span><span class="o">.</span><span class="n">set_yticklabels</span><span class="p">([])</span>
+<a id="__codelineno-4-6" name="__codelineno-4-6" href="#__codelineno-4-6"></a><span class="n">ax</span><span class="o">.</span><span class="n">set_xticklabels</span><span class="p">([])</span>
+</code></pre></div>
+<p><img alt="py_step2" src="../../images/week02/py_step2.jpg" /></p>
+<h4 id="step-3-draw-a-curve-in-polar-coordinates"><strong>Step 3.</strong> Draw a curve in polar coordinates</h4>
+<div class="highlight"><pre><span></span><code><a id="__codelineno-5-1" name="__codelineno-5-1" href="#__codelineno-5-1"></a><span class="n">ax</span> <span class="o">=</span> <span class="n">plt</span><span class="o">.</span><span class="n">subplot</span><span class="p">(</span><span class="mi">111</span><span class="p">,</span> <span class="n">polar</span><span class="o">=</span><span class="kc">True</span><span class="p">)</span>
+<a id="__codelineno-5-2" name="__codelineno-5-2" href="#__codelineno-5-2"></a>
+<a id="__codelineno-5-3" name="__codelineno-5-3" href="#__codelineno-5-3"></a><span class="n">ax</span><span class="o">.</span><span class="n">grid</span><span class="p">(</span><span class="kc">False</span><span class="p">)</span>
+<a id="__codelineno-5-4" name="__codelineno-5-4" href="#__codelineno-5-4"></a><span class="n">ax</span><span class="o">.</span><span class="n">set_yticklabels</span><span class="p">([])</span>
+<a id="__codelineno-5-5" name="__codelineno-5-5" href="#__codelineno-5-5"></a><span class="n">ax</span><span class="o">.</span><span class="n">set_xticklabels</span><span class="p">([])</span>
+<a id="__codelineno-5-6" name="__codelineno-5-6" href="#__codelineno-5-6"></a>
+<a id="__codelineno-5-7" name="__codelineno-5-7" href="#__codelineno-5-7"></a><span class="n">x</span> <span class="o">=</span> <span class="n">np</span><span class="o">.</span><span class="n">linspace</span><span class="p">(</span><span class="mi">0</span><span class="p">,</span><span class="n">np</span><span class="o">.</span><span class="n">pi</span><span class="o">/</span><span class="mi">3</span><span class="p">)</span>
+<a id="__codelineno-5-8" name="__codelineno-5-8" href="#__codelineno-5-8"></a><span class="n">y</span> <span class="o">=</span> <span class="n">x</span><span class="o">/</span><span class="n">np</span><span class="o">.</span><span class="n">pi</span>
+<a id="__codelineno-5-9" name="__codelineno-5-9" href="#__codelineno-5-9"></a>
+<a id="__codelineno-5-10" name="__codelineno-5-10" href="#__codelineno-5-10"></a><span class="n">ax</span><span class="o">.</span><span class="n">plot</span><span class="p">(</span><span class="n">x</span><span class="p">,</span><span class="n">y</span><span class="p">,</span><span class="n">c</span><span class="o">=</span><span class="s1">&#39;k&#39;</span><span class="p">)</span>
+</code></pre></div>
+<p><img alt="py_step3" src="../../images/week02/py_step3.jpg" /></p>
+<h4 id="step-4-multipy-curves-in-a-circular-pattern"><strong>Step 4.</strong> Multipy curves in a circular pattern</h4>
+<div class="highlight"><pre><span></span><code><a id="__codelineno-6-1" name="__codelineno-6-1" href="#__codelineno-6-1"></a><span class="k">def</span> <span class="nf">multipy</span><span class="p">(</span><span class="n">ax</span><span class="p">,</span> <span class="n">num</span><span class="p">,</span> <span class="n">B</span><span class="p">,</span> <span class="n">color</span><span class="p">):</span>
+<a id="__codelineno-6-2" name="__codelineno-6-2" href="#__codelineno-6-2"></a>    <span class="k">for</span> <span class="n">i</span> <span class="ow">in</span> <span class="nb">range</span><span class="p">(</span><span class="n">num</span><span class="p">):</span>
+<a id="__codelineno-6-3" name="__codelineno-6-3" href="#__codelineno-6-3"></a>        <span class="n">a</span> <span class="o">=</span> <span class="n">i</span> <span class="o">*</span> <span class="mi">2</span><span class="o">*</span><span class="n">np</span><span class="o">.</span><span class="n">pi</span> <span class="o">/</span> <span class="n">num</span>
+<a id="__codelineno-6-4" name="__codelineno-6-4" href="#__codelineno-6-4"></a>
+<a id="__codelineno-6-5" name="__codelineno-6-5" href="#__codelineno-6-5"></a>        <span class="n">x0</span> <span class="o">=</span> <span class="n">B</span><span class="o">*</span><span class="n">x</span><span class="o">+</span><span class="n">a</span>
+<a id="__codelineno-6-6" name="__codelineno-6-6" href="#__codelineno-6-6"></a>        <span class="n">y0</span> <span class="o">=</span> <span class="n">x</span><span class="o">/</span><span class="n">np</span><span class="o">.</span><span class="n">pi</span>
+<a id="__codelineno-6-7" name="__codelineno-6-7" href="#__codelineno-6-7"></a>
+<a id="__codelineno-6-8" name="__codelineno-6-8" href="#__codelineno-6-8"></a>        <span class="n">ax</span><span class="o">.</span><span class="n">plot</span><span class="p">(</span><span class="n">x0</span><span class="p">,</span><span class="n">y0</span><span class="p">,</span><span class="n">c</span><span class="o">=</span><span class="n">color</span><span class="p">)</span>
+</code></pre></div>
+<div class="highlight"><pre><span></span><code><a id="__codelineno-7-1" name="__codelineno-7-1" href="#__codelineno-7-1"></a><span class="n">fig</span> <span class="o">=</span> <span class="n">plt</span><span class="o">.</span><span class="n">figure</span><span class="p">()</span>
+<a id="__codelineno-7-2" name="__codelineno-7-2" href="#__codelineno-7-2"></a><span class="n">ax</span> <span class="o">=</span> <span class="n">fig</span><span class="o">.</span><span class="n">add_subplot</span><span class="p">(</span><span class="mi">111</span><span class="p">,</span> <span class="n">polar</span><span class="o">=</span><span class="kc">True</span><span class="p">)</span>
+<a id="__codelineno-7-3" name="__codelineno-7-3" href="#__codelineno-7-3"></a>
+<a id="__codelineno-7-4" name="__codelineno-7-4" href="#__codelineno-7-4"></a><span class="n">ax</span><span class="o">.</span><span class="n">grid</span><span class="p">(</span><span class="kc">False</span><span class="p">)</span>
+<a id="__codelineno-7-5" name="__codelineno-7-5" href="#__codelineno-7-5"></a><span class="n">ax</span><span class="o">.</span><span class="n">set_yticklabels</span><span class="p">([])</span>
+<a id="__codelineno-7-6" name="__codelineno-7-6" href="#__codelineno-7-6"></a><span class="n">ax</span><span class="o">.</span><span class="n">set_xticklabels</span><span class="p">([])</span>
+<a id="__codelineno-7-7" name="__codelineno-7-7" href="#__codelineno-7-7"></a>
+<a id="__codelineno-7-8" name="__codelineno-7-8" href="#__codelineno-7-8"></a><span class="n">x</span> <span class="o">=</span> <span class="n">np</span><span class="o">.</span><span class="n">linspace</span><span class="p">(</span><span class="mi">0</span><span class="p">,</span><span class="n">np</span><span class="o">.</span><span class="n">pi</span><span class="o">/</span><span class="mi">3</span><span class="p">)</span>
+<a id="__codelineno-7-9" name="__codelineno-7-9" href="#__codelineno-7-9"></a>
+<a id="__codelineno-7-10" name="__codelineno-7-10" href="#__codelineno-7-10"></a><span class="n">multipy</span><span class="p">(</span><span class="n">ax</span><span class="p">,</span> <span class="mi">8</span><span class="p">,</span> <span class="mi">1</span><span class="p">,</span> <span class="s1">&#39;k&#39;</span><span class="p">)</span>
+</code></pre></div>
+<p><img alt="py_step4" src="../../images/week02/py_step4.jpg" /></p>
+<h4 id="step-5-create-curves-bent-in-the-oppsite-direction"><strong>Step 5.</strong> Create curves bent in the oppsite direction</h4>
+<div class="highlight"><pre><span></span><code><a id="__codelineno-8-1" name="__codelineno-8-1" href="#__codelineno-8-1"></a><span class="n">fig</span> <span class="o">=</span> <span class="n">plt</span><span class="o">.</span><span class="n">figure</span><span class="p">()</span>
+<a id="__codelineno-8-2" name="__codelineno-8-2" href="#__codelineno-8-2"></a><span class="n">ax</span> <span class="o">=</span> <span class="n">fig</span><span class="o">.</span><span class="n">add_subplot</span><span class="p">(</span><span class="mi">111</span><span class="p">,</span> <span class="n">polar</span><span class="o">=</span><span class="kc">True</span><span class="p">)</span>
+<a id="__codelineno-8-3" name="__codelineno-8-3" href="#__codelineno-8-3"></a>
+<a id="__codelineno-8-4" name="__codelineno-8-4" href="#__codelineno-8-4"></a><span class="n">ax</span><span class="o">.</span><span class="n">grid</span><span class="p">(</span><span class="kc">False</span><span class="p">)</span>
+<a id="__codelineno-8-5" name="__codelineno-8-5" href="#__codelineno-8-5"></a><span class="n">ax</span><span class="o">.</span><span class="n">set_yticklabels</span><span class="p">([])</span>
+<a id="__codelineno-8-6" name="__codelineno-8-6" href="#__codelineno-8-6"></a><span class="n">ax</span><span class="o">.</span><span class="n">set_xticklabels</span><span class="p">([])</span>
+<a id="__codelineno-8-7" name="__codelineno-8-7" href="#__codelineno-8-7"></a>
+<a id="__codelineno-8-8" name="__codelineno-8-8" href="#__codelineno-8-8"></a><span class="n">x</span> <span class="o">=</span> <span class="n">np</span><span class="o">.</span><span class="n">linspace</span><span class="p">(</span><span class="mi">0</span><span class="p">,</span><span class="n">np</span><span class="o">.</span><span class="n">pi</span><span class="o">/</span><span class="mi">2</span><span class="p">)</span>
+<a id="__codelineno-8-9" name="__codelineno-8-9" href="#__codelineno-8-9"></a>
+<a id="__codelineno-8-10" name="__codelineno-8-10" href="#__codelineno-8-10"></a><span class="n">multipy</span><span class="p">(</span><span class="n">ax</span><span class="p">,</span> <span class="mi">12</span><span class="p">,</span> <span class="mi">1</span><span class="p">,</span> <span class="s1">&#39;k&#39;</span><span class="p">)</span>
+<a id="__codelineno-8-11" name="__codelineno-8-11" href="#__codelineno-8-11"></a><span class="n">multipy</span><span class="p">(</span><span class="n">ax</span><span class="p">,</span> <span class="mi">10</span><span class="p">,</span> <span class="o">-</span><span class="mi">1</span><span class="o">/</span><span class="mi">2</span><span class="p">,</span> <span class="s1">&#39;k&#39;</span><span class="p">)</span>
+</code></pre></div>
+<p><img alt="pystep5" src="../../images/week02/py_step5.jpg" /></p>
+<h4 id="step-6-make-frame-of-two-lattices-rotating"><strong>Step 6.</strong> Make frame of two lattices rotating</h4>
+<div class="highlight"><pre><span></span><code><a id="__codelineno-9-1" name="__codelineno-9-1" href="#__codelineno-9-1"></a><span class="k">def</span> <span class="nf">rotate</span><span class="p">(</span><span class="n">ax</span><span class="p">,</span> <span class="n">num</span><span class="p">,</span> <span class="n">B</span><span class="p">,</span> <span class="n">d</span><span class="p">,</span> <span class="n">color</span><span class="p">):</span>
+<a id="__codelineno-9-2" name="__codelineno-9-2" href="#__codelineno-9-2"></a>    <span class="k">for</span> <span class="n">i</span> <span class="ow">in</span> <span class="nb">range</span><span class="p">(</span><span class="n">num</span><span class="p">):</span>
+<a id="__codelineno-9-3" name="__codelineno-9-3" href="#__codelineno-9-3"></a>        <span class="n">a</span> <span class="o">=</span> <span class="n">i</span> <span class="o">*</span> <span class="mi">2</span><span class="o">*</span><span class="n">np</span><span class="o">.</span><span class="n">pi</span> <span class="o">/</span> <span class="n">num</span>
+<a id="__codelineno-9-4" name="__codelineno-9-4" href="#__codelineno-9-4"></a>
+<a id="__codelineno-9-5" name="__codelineno-9-5" href="#__codelineno-9-5"></a>        <span class="n">x0</span> <span class="o">=</span> <span class="n">B</span><span class="o">*</span><span class="n">x</span><span class="o">+</span><span class="n">a</span> <span class="o">+</span> <span class="n">d</span>
+<a id="__codelineno-9-6" name="__codelineno-9-6" href="#__codelineno-9-6"></a>        <span class="n">y0</span> <span class="o">=</span> <span class="n">x</span><span class="o">/</span><span class="n">np</span><span class="o">.</span><span class="n">pi</span>
+<a id="__codelineno-9-7" name="__codelineno-9-7" href="#__codelineno-9-7"></a>
+<a id="__codelineno-9-8" name="__codelineno-9-8" href="#__codelineno-9-8"></a>        <span class="n">ax</span><span class="o">.</span><span class="n">plot</span><span class="p">(</span><span class="n">x0</span><span class="p">,</span><span class="n">y0</span><span class="p">,</span><span class="n">c</span><span class="o">=</span><span class="n">color</span><span class="p">)</span>
+</code></pre></div>
+<div class="highlight"><pre><span></span><code><a id="__codelineno-10-1" name="__codelineno-10-1" href="#__codelineno-10-1"></a><span class="k">if</span> <span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">exists</span><span class="p">(</span><span class="s1">&#39;frames&#39;</span><span class="p">):</span>
+<a id="__codelineno-10-2" name="__codelineno-10-2" href="#__codelineno-10-2"></a>    <span class="n">shutil</span><span class="o">.</span><span class="n">rmtree</span><span class="p">(</span><span class="s1">&#39;frames&#39;</span><span class="p">)</span>
+<a id="__codelineno-10-3" name="__codelineno-10-3" href="#__codelineno-10-3"></a><span class="n">os</span><span class="o">.</span><span class="n">mkdir</span><span class="p">(</span><span class="s1">&#39;frames&#39;</span><span class="p">)</span>
+<a id="__codelineno-10-4" name="__codelineno-10-4" href="#__codelineno-10-4"></a>
+<a id="__codelineno-10-5" name="__codelineno-10-5" href="#__codelineno-10-5"></a><span class="n">frame</span> <span class="o">=</span> <span class="mi">200</span>
+<a id="__codelineno-10-6" name="__codelineno-10-6" href="#__codelineno-10-6"></a><span class="k">for</span> <span class="n">j</span> <span class="ow">in</span> <span class="nb">range</span><span class="p">(</span><span class="n">frame</span><span class="p">):</span>
+<a id="__codelineno-10-7" name="__codelineno-10-7" href="#__codelineno-10-7"></a>    <span class="n">fig</span> <span class="o">=</span> <span class="n">plt</span><span class="o">.</span><span class="n">figure</span><span class="p">()</span>
+<a id="__codelineno-10-8" name="__codelineno-10-8" href="#__codelineno-10-8"></a>    <span class="n">ax</span> <span class="o">=</span> <span class="n">fig</span><span class="o">.</span><span class="n">add_subplot</span><span class="p">(</span><span class="mi">111</span><span class="p">,</span> <span class="n">polar</span><span class="o">=</span><span class="kc">True</span><span class="p">)</span>
+<a id="__codelineno-10-9" name="__codelineno-10-9" href="#__codelineno-10-9"></a>
+<a id="__codelineno-10-10" name="__codelineno-10-10" href="#__codelineno-10-10"></a>    <span class="n">ax</span><span class="o">.</span><span class="n">grid</span><span class="p">(</span><span class="kc">False</span><span class="p">)</span>
+<a id="__codelineno-10-11" name="__codelineno-10-11" href="#__codelineno-10-11"></a>    <span class="n">ax</span><span class="o">.</span><span class="n">set_yticklabels</span><span class="p">([])</span>
+<a id="__codelineno-10-12" name="__codelineno-10-12" href="#__codelineno-10-12"></a>    <span class="n">ax</span><span class="o">.</span><span class="n">set_xticklabels</span><span class="p">([])</span>
+<a id="__codelineno-10-13" name="__codelineno-10-13" href="#__codelineno-10-13"></a>
+<a id="__codelineno-10-14" name="__codelineno-10-14" href="#__codelineno-10-14"></a>    <span class="n">x</span> <span class="o">=</span> <span class="n">np</span><span class="o">.</span><span class="n">linspace</span><span class="p">(</span><span class="mi">0</span><span class="p">,</span><span class="n">np</span><span class="o">.</span><span class="n">pi</span><span class="o">/</span><span class="mi">2</span><span class="p">)</span>
+<a id="__codelineno-10-15" name="__codelineno-10-15" href="#__codelineno-10-15"></a>
+<a id="__codelineno-10-16" name="__codelineno-10-16" href="#__codelineno-10-16"></a>    <span class="n">multipy</span><span class="p">(</span><span class="n">ax</span><span class="p">,</span> <span class="mi">12</span><span class="p">,</span> <span class="mi">1</span><span class="p">,</span> <span class="s1">&#39;k&#39;</span><span class="p">)</span>
+<a id="__codelineno-10-17" name="__codelineno-10-17" href="#__codelineno-10-17"></a>    <span class="n">multipy</span><span class="p">(</span><span class="n">ax</span><span class="p">,</span> <span class="mi">10</span><span class="p">,</span> <span class="o">-</span><span class="mi">1</span><span class="o">/</span><span class="mi">2</span><span class="p">,</span> <span class="s1">&#39;k&#39;</span><span class="p">)</span>
+<a id="__codelineno-10-18" name="__codelineno-10-18" href="#__codelineno-10-18"></a>
+<a id="__codelineno-10-19" name="__codelineno-10-19" href="#__codelineno-10-19"></a>    <span class="n">d</span> <span class="o">=</span> <span class="n">j</span> <span class="o">*</span> <span class="mi">2</span><span class="o">*</span><span class="n">np</span><span class="o">.</span><span class="n">pi</span> <span class="o">/</span> <span class="n">frame</span>
+<a id="__codelineno-10-20" name="__codelineno-10-20" href="#__codelineno-10-20"></a>
+<a id="__codelineno-10-21" name="__codelineno-10-21" href="#__codelineno-10-21"></a>    <span class="n">rotate</span><span class="p">(</span><span class="n">ax</span><span class="p">,</span> <span class="mi">12</span><span class="p">,</span> <span class="mi">1</span><span class="p">,</span> <span class="n">d</span><span class="p">,</span> <span class="s1">&#39;k&#39;</span><span class="p">)</span>
+<a id="__codelineno-10-22" name="__codelineno-10-22" href="#__codelineno-10-22"></a>    <span class="n">rotate</span><span class="p">(</span><span class="n">ax</span><span class="p">,</span> <span class="mi">10</span><span class="p">,</span> <span class="o">-</span><span class="mi">1</span><span class="o">/</span><span class="mi">2</span><span class="p">,</span> <span class="n">d</span><span class="p">,</span> <span class="s1">&#39;k&#39;</span><span class="p">)</span>
+<a id="__codelineno-10-23" name="__codelineno-10-23" href="#__codelineno-10-23"></a>
+<a id="__codelineno-10-24" name="__codelineno-10-24" href="#__codelineno-10-24"></a>    <span class="n">fig</span><span class="o">.</span><span class="n">savefig</span><span class="p">(</span><span class="sa">f</span><span class="s1">&#39;./frames/pic_</span><span class="si">{</span><span class="n">j</span><span class="si">:</span><span class="s1">02</span><span class="si">}</span><span class="s1">.jpg&#39;</span><span class="p">)</span>
+<a id="__codelineno-10-25" name="__codelineno-10-25" href="#__codelineno-10-25"></a>
+<a id="__codelineno-10-26" name="__codelineno-10-26" href="#__codelineno-10-26"></a>    <span class="n">plt</span><span class="o">.</span><span class="n">clf</span><span class="p">()</span>
+<a id="__codelineno-10-27" name="__codelineno-10-27" href="#__codelineno-10-27"></a>    <span class="n">plt</span><span class="o">.</span><span class="n">close</span><span class="p">()</span>
+</code></pre></div>
+<h4 id="step-7-make-video-file"><strong>Step 7.</strong> Make video file</h4>
+<p>First I tried opencv</p>
+<div class="highlight"><pre><span></span><code><a id="__codelineno-11-1" name="__codelineno-11-1" href="#__codelineno-11-1"></a><span class="n">fourcc</span> <span class="o">=</span> <span class="n">cv2</span><span class="o">.</span><span class="n">VideoWriter_fourcc</span><span class="p">(</span><span class="o">*</span><span class="s1">&#39;mp4v&#39;</span><span class="p">)</span>
+<a id="__codelineno-11-2" name="__codelineno-11-2" href="#__codelineno-11-2"></a><span class="n">video</span> <span class="o">=</span> <span class="n">cv2</span><span class="o">.</span><span class="n">VideoWriter</span><span class="p">(</span><span class="s1">&#39;lattice_rotate.mp4&#39;</span><span class="p">,</span> <span class="n">fourcc</span><span class="p">,</span> <span class="mf">20.0</span><span class="p">,</span> <span class="p">(</span><span class="mi">100</span><span class="p">,</span><span class="mi">100</span><span class="p">))</span>
+<a id="__codelineno-11-3" name="__codelineno-11-3" href="#__codelineno-11-3"></a>
+<a id="__codelineno-11-4" name="__codelineno-11-4" href="#__codelineno-11-4"></a><span class="k">if</span> <span class="ow">not</span> <span class="n">video</span><span class="o">.</span><span class="n">isOpened</span><span class="p">():</span>
+<a id="__codelineno-11-5" name="__codelineno-11-5" href="#__codelineno-11-5"></a>    <span class="nb">print</span><span class="p">(</span><span class="s2">&quot;can&#39;t be opened&quot;</span><span class="p">)</span>
+<a id="__codelineno-11-6" name="__codelineno-11-6" href="#__codelineno-11-6"></a>    <span class="n">sys</span><span class="o">.</span><span class="n">exit</span><span class="p">()</span>
+<a id="__codelineno-11-7" name="__codelineno-11-7" href="#__codelineno-11-7"></a>
+<a id="__codelineno-11-8" name="__codelineno-11-8" href="#__codelineno-11-8"></a><span class="k">for</span> <span class="n">i</span> <span class="ow">in</span> <span class="nb">range</span><span class="p">(</span><span class="n">frame</span><span class="p">):</span>
+<a id="__codelineno-11-9" name="__codelineno-11-9" href="#__codelineno-11-9"></a>    <span class="n">img</span> <span class="o">=</span> <span class="n">cv2</span><span class="o">.</span><span class="n">imread</span><span class="p">(</span><span class="sa">f</span><span class="s1">&#39;./frames/pic_</span><span class="si">{</span><span class="n">j</span><span class="si">:</span><span class="s1">02</span><span class="si">}</span><span class="s1">.jpg&#39;</span><span class="p">)</span>
+<a id="__codelineno-11-10" name="__codelineno-11-10" href="#__codelineno-11-10"></a>
+<a id="__codelineno-11-11" name="__codelineno-11-11" href="#__codelineno-11-11"></a>    <span class="k">if</span> <span class="n">img</span> <span class="ow">is</span> <span class="kc">None</span><span class="p">:</span>
+<a id="__codelineno-11-12" name="__codelineno-11-12" href="#__codelineno-11-12"></a>        <span class="nb">print</span><span class="p">(</span><span class="s2">&quot;can&#39;t read&quot;</span><span class="p">)</span>
+<a id="__codelineno-11-13" name="__codelineno-11-13" href="#__codelineno-11-13"></a>        <span class="k">break</span>
+<a id="__codelineno-11-14" name="__codelineno-11-14" href="#__codelineno-11-14"></a>
+<a id="__codelineno-11-15" name="__codelineno-11-15" href="#__codelineno-11-15"></a>    <span class="n">video</span><span class="o">.</span><span class="n">write</span><span class="p">(</span><span class="n">img</span><span class="p">)</span>
+<a id="__codelineno-11-16" name="__codelineno-11-16" href="#__codelineno-11-16"></a>
+<a id="__codelineno-11-17" name="__codelineno-11-17" href="#__codelineno-11-17"></a><span class="n">video</span><span class="o">.</span><span class="n">release</span><span class="p">()</span>
+<a id="__codelineno-11-18" name="__codelineno-11-18" href="#__codelineno-11-18"></a><span class="nb">print</span><span class="p">(</span><span class="s1">&#39;written&#39;</span><span class="p">)</span>
+</code></pre></div>
+<p>'lattice_rotate.mp4' was exported. However, I couldn't open it in my PC.</p>
+<p>So, I tried ffmpeg, and got this:</p>
+<div class="highlight"><pre><span></span><code><a id="__codelineno-12-1" name="__codelineno-12-1" href="#__codelineno-12-1"></a>ffmpeg<span class="w"> </span>-r<span class="w"> </span><span class="m">20</span><span class="w"> </span>-i<span class="w"> </span>./frames/pic_%02d.jpg<span class="w"> </span>rotate.mp4
+</code></pre></div>
+<video width="100%" controls>
+    <source src="../../images/week02/rotate.mp4" type="video/mp4">
+</video>
+
+<h3 id="overlapping-lattice-shell-structures">overlapping lattice shell structures</h3>
+<p>Next, I modeled a 3D structure that make shadow like the video above.</p>
+<h4 id="step-1-design-the-curve-on-lampshade"><strong>Step 1.</strong> Design the curve on lampshade</h4>
+<p>Draw two curves (in purple) that corespond to Step 3 in the 2D lattice. Black lines are support line from the lightsource to points on the curves.</p>
+<p><img alt="cad01" src="../../images/week02/cad01.jpg" /></p>
+<h4 id="step-2-loft-the-black-lines-to-two-curved-surfaces"><strong>Step 2.</strong> Loft the black lines to two curved surfaces</h4>
+<p><img alt="cad02" src="../../images/week02/cad02.jpg" /></p>
+<h4 id="step-3-thicken-the-surfaces"><strong>Step 3.</strong> Thicken the surfaces</h4>
+<p><img alt="cad03" src="../../images/week02/cad03.jpg" /></p>
+<h4 id="step-4-create-the-base-shell-model-of-the-lattice-shell"><strong>Step 4.</strong> Create the base shell model of the lattice shell</h4>
+<p><img alt="cad04" src="../../images/week02/cad04.jpg" /></p>
+<h4 id="step-5-intersect-the-base-shell-and-curved-surface"><strong>Step 5.</strong> Intersect the base shell and curved surface</h4>
+<p><img alt="cad05" src="../../images/week02/cad05.jpg" /></p>
+<h4 id="step-6-multiply-the-intersections-by-cilrcular-pattern-and-union-all-to-get-a-llattice-shell"><strong>Step 6.</strong> Multiply the intersections by cilrcular pattern and Union all to get a llattice shell</h4>
+<p><img alt="cad06" src="../../images/week02/cad06.jpg" /></p>
+<h4 id="step-7-make-an-inner-lattice-shell"><strong>Step 7.</strong> Make an inner lattice shell</h4>
+<p><img alt="cad07" src="../../images/week02/cad07.jpg" /></p>
+<h4 id="step-8-make-a-movie-of-lattice-shells-rotating"><strong>Step 8.</strong> Make a movie of lattice shells rotating</h4>
+<video width="100%" controls>
+    <source src="../../images/week02/lattice_shell_rotating.mp4" type="video/mp4">
+</video>
+
+<p>Shadow on shade will look like this:</p>
+<video width="100%" controls>
+    <source src="../../images/week02/shade_rotate.mp4" type="video/mp4">
+</video>
+
+<p>The next problem will be how to fix the lattice shells on the base, and how to make the lattice shells to rotate.</p>
+<h2 id="links">Links</h2></div>
             </div>
         </div>
 
diff --git a/public/final-project/index.html b/public/final-project/index.html
index 0ebb682f35376d45c1cebf7f8c24baa392226f4b..8b0082acec1ed5636921f830670b401e98fffb51 100644
--- a/public/final-project/index.html
+++ b/public/final-project/index.html
@@ -6,7 +6,7 @@
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         
         <meta name="author" content="Sosuke Kanegae">
-        
+        <link rel="canonical" href="https://fabacademy.org/2023/labs/kitakagaya/students/sosuke-kanegae/final-project/">
         <link rel="shortcut icon" href="../img/favicon.ico">
         <title>Final Project - Sosuke Kanegae Fab Academy</title>
         <link href="../css/bootstrap.min.css" rel="stylesheet">
@@ -37,27 +37,91 @@
                                 <a href=".." class="nav-link">Home</a>
                             </li>
                             <li class="navitem">
-                                <a href="../about/" class="nav-link">About me</a>
-                            </li>
-                            <li class="navitem">
-                                <a href="../agreements/" class="nav-link">Agreements</a>
+                                <a href="../about/" class="nav-link">About</a>
                             </li>
                             <li class="navitem active">
                                 <a href="./" class="nav-link">Final Project</a>
                             </li>
                             <li class="dropdown">
-                                <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown">Assignments <b class="caret"></b></a>
+                                <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown">assignments <b class="caret"></b></a>
                                 <ul class="dropdown-menu">
                                     
 <li>
-    <a href="../assignments/week01/" class="dropdown-item">Week 01. Principles and Practices / Project Management</a>
+    <a href="../assignments/week01/" class="dropdown-item">Week01. Principles and Practices / Project Management</a>
+</li>
+                                    
+<li>
+    <a href="../assignments/week02/" class="dropdown-item">Week02. Computer Aided design</a>
+</li>
+                                    
+<li>
+    <a href="../assignments/week03.md" class="dropdown-item">Week03. Computer controlled cutting</a>
+</li>
+                                    
+<li>
+    <a href="../assignments/week04.md" class="dropdown-item">Week04. Embedded programming</a>
+</li>
+                                    
+<li>
+    <a href="../assignments/week05.md" class="dropdown-item">Week05. 3D Scanning and printing</a>
+</li>
+                                    
+<li>
+    <a href="../assignments/week06.md" class="dropdown-item">Week06. Electronics design</a>
+</li>
+                                    
+<li>
+    <a href="../assignments/week07.md" class="dropdown-item">Week07. Computer controlled machining</a>
+</li>
+                                    
+<li>
+    <a href="../assignments/week08.md" class="dropdown-item">Week08. Electronics production</a>
+</li>
+                                    
+<li>
+    <a href="../assignments/week09.md" class="dropdown-item">Week09. Molding and casting</a>
 </li>
                                     
 <li>
-    <a href="../assignments/week02/" class="dropdown-item">Week 02. Computer Aided Design</a>
+    <a href="../assignments/week10.md" class="dropdown-item">Week10. Output devices</a>
+</li>
+                                    
+<li>
+    <a href="../assignments/week11.md" class="dropdown-item">Week11. Mechanical design & machine design</a>
+</li>
+                                    
+<li>
+    <a href="../assignments/week12.md" class="dropdown-item">Week12. Input devices</a>
+</li>
+                                    
+<li>
+    <a href="../assignments/week13.md" class="dropdown-item">Week13. Networking and communications</a>
+</li>
+                                    
+<li>
+    <a href="../assignments/week14.md" class="dropdown-item">Week14. Interface and application programming</a>
+</li>
+                                    
+<li>
+    <a href="../assignments/week15.md" class="dropdown-item">Week15. Wildcard week</a>
+</li>
+                                    
+<li>
+    <a href="../assignments/week16.md" class="dropdown-item">Week16. Applications and implications</a>
+</li>
+                                    
+<li>
+    <a href="../assignments/week17.md" class="dropdown-item">Week17. Invention, intellectual property and income</a>
+</li>
+                                    
+<li>
+    <a href="../assignments/week18.md" class="dropdown-item">Week18. Project development</a>
 </li>
                                 </ul>
                             </li>
+                            <li class="navitem">
+                                <a href="../agreements/" class="nav-link">Agreements</a>
+                            </li>
                         </ul>
 
                     <ul class="nav navbar-nav ml-auto">
@@ -67,7 +131,7 @@
                             </a>
                         </li>
                             <li class="nav-item">
-                                <a rel="prev" href="../agreements/" class="nav-link">
+                                <a rel="prev" href="../about/" class="nav-link">
                                     <i class="fa fa-arrow-left"></i> Previous
                                 </a>
                             </li>
@@ -113,7 +177,7 @@
 <h1 id="final-project">Final Project</h1>
 <h2 id="plans-and-sketches-of-my-final-project">Plans and Sketches of my final project</h2>
 <p>Here I describe my final project idea.</p>
-<p><img alt="Final Project Sketch" src="../images/lamp_off.jpg" /></p>
+<p><img alt="Final Project Sketch" src="./images/lamp_off.jpg" /></p>
 <p>For my final project I would like to make a lamp that creates several different mood depending on the situation.</p>
 <p>Just putting a lamp in a room changes the atmosphere of the room. Every lighting equipment has its own mood.</p>
 <p>In the daytime, my favorite lighting equipment is a projector with streaming devices. Streaming devices like AppleTV and Chromecast show pictues and landscape movies when they are at screensaver mode. I love the way pictures and landscape moving slowly on my wall.
@@ -131,9 +195,9 @@ I want to make <strong>a bedroom lamp that glows and flicker like a candle</stro
 </ol>
 <h3 id="a-lamp-that-changes-mood-depending-on-sunlight">A lamp that changes mood depending on sunlight</h3>
 <p>Daytime: projecting silhouettes on the lamp shade
-<img alt="lamp in daytime" src="../images/lamp_bird.jpg" /></p>
+<img alt="lamp in daytime" src="./images/lamp_bird.jpg" /></p>
 <p>Nighttime: glows and flickers like a candle
-<img alt="lamp in night time" src="../images/lamp_candle.jpg" /></p></div>
+<img alt="lamp in night time" src="./images/lamp_candle.jpg" /></p></div>
             </div>
         </div>
 
diff --git a/public/images/discard/silhouette_trace1.jpg b/public/images/discard/silhouette_trace1.jpg
deleted file mode 100644
index 527efae8045a0c84444de02f1fffda68257ebe8e..0000000000000000000000000000000000000000
Binary files a/public/images/discard/silhouette_trace1.jpg and /dev/null differ
diff --git a/public/images/discard/silhouette_trace2.jpg b/public/images/discard/silhouette_trace2.jpg
deleted file mode 100644
index 1de7e7d2d14ca03fd4810a258bf8efd361292d1d..0000000000000000000000000000000000000000
Binary files a/public/images/discard/silhouette_trace2.jpg and /dev/null differ
diff --git a/public/images/discard/silhouette_trace4.jpg b/public/images/discard/silhouette_trace4.jpg
deleted file mode 100644
index a6cf6c33630ddc2188f7f42e97b562c25c3882b8..0000000000000000000000000000000000000000
Binary files a/public/images/discard/silhouette_trace4.jpg and /dev/null differ
diff --git a/public/images/lamp_view2/lamp_1.png b/public/images/lamp_view2/lamp_1.png
deleted file mode 100644
index 13ed249c53bed0a6fa06ee99d464075bace6ce84..0000000000000000000000000000000000000000
Binary files a/public/images/lamp_view2/lamp_1.png and /dev/null differ
diff --git a/public/images/lamp_view2/lamp_2.png b/public/images/lamp_view2/lamp_2.png
deleted file mode 100644
index 756ad40ffc08a7650f9514939936834ad5c3e6f8..0000000000000000000000000000000000000000
Binary files a/public/images/lamp_view2/lamp_2.png and /dev/null differ
diff --git a/public/images/lamp_view2/lamp_3.png b/public/images/lamp_view2/lamp_3.png
deleted file mode 100644
index fb3ceb051a11a36cfe33aef4476fa8616c87883c..0000000000000000000000000000000000000000
Binary files a/public/images/lamp_view2/lamp_3.png and /dev/null differ
diff --git a/public/images/lamp_view2/lamp_4.png b/public/images/lamp_view2/lamp_4.png
deleted file mode 100644
index 6479df3f445d4d1265902dc60afb09b4035ea3e3..0000000000000000000000000000000000000000
Binary files a/public/images/lamp_view2/lamp_4.png and /dev/null differ
diff --git a/public/images/lamp_view2/lamp_5.png b/public/images/lamp_view2/lamp_5.png
deleted file mode 100644
index 1c91d1c5a2ad9d61511eba71322de9c28fbfc1d0..0000000000000000000000000000000000000000
Binary files a/public/images/lamp_view2/lamp_5.png and /dev/null differ
diff --git a/public/images/lamp_view2/lamp_6.png b/public/images/lamp_view2/lamp_6.png
deleted file mode 100644
index 3a5c2d678d72d1861654201c6f11cc1e7d640097..0000000000000000000000000000000000000000
Binary files a/public/images/lamp_view2/lamp_6.png and /dev/null differ
diff --git a/public/images/lamp_view2/lamp_7.png b/public/images/lamp_view2/lamp_7.png
deleted file mode 100644
index 53ab1b3fad346de512bc5068f45f38262972c401..0000000000000000000000000000000000000000
Binary files a/public/images/lamp_view2/lamp_7.png and /dev/null differ
diff --git a/public/images/lamp_view2/lamp_8.png b/public/images/lamp_view2/lamp_8.png
deleted file mode 100644
index 151a43ced37fef592983e04993f91e8b19b3d7ae..0000000000000000000000000000000000000000
Binary files a/public/images/lamp_view2/lamp_8.png and /dev/null differ
diff --git a/public/images/lamp_view2/lamp_9.png b/public/images/lamp_view2/lamp_9.png
deleted file mode 100644
index e98b76389bfc9decbdd6bd33822afc721453aa33..0000000000000000000000000000000000000000
Binary files a/public/images/lamp_view2/lamp_9.png and /dev/null differ
diff --git a/public/images/pngs/out-0.png b/public/images/pngs/out-0.png
deleted file mode 100644
index bd2785f72e6aa3db0a9f2cbe3fb74c93aaec9da8..0000000000000000000000000000000000000000
Binary files a/public/images/pngs/out-0.png and /dev/null differ
diff --git a/public/images/pngs/out-1.png b/public/images/pngs/out-1.png
deleted file mode 100644
index 35cb4a389e978d613b1eee3e5c675adcef1ee13d..0000000000000000000000000000000000000000
Binary files a/public/images/pngs/out-1.png and /dev/null differ
diff --git a/public/images/pngs/out-2.png b/public/images/pngs/out-2.png
deleted file mode 100644
index 76a4db6a2de2736cb0fb7cb5fe4f0bac3a82d2a1..0000000000000000000000000000000000000000
Binary files a/public/images/pngs/out-2.png and /dev/null differ
diff --git a/public/images/pngs/out-3.png b/public/images/pngs/out-3.png
deleted file mode 100644
index cdc5290579650dc57e7c92f5d76bc4fe4497576f..0000000000000000000000000000000000000000
Binary files a/public/images/pngs/out-3.png and /dev/null differ
diff --git a/public/images/silhouette_trace1.jpg b/public/images/silhouette_trace1.jpg
deleted file mode 100644
index f5fe1e64e9d110ae3d22b2dc737d52ed4b7b098c..0000000000000000000000000000000000000000
Binary files a/public/images/silhouette_trace1.jpg and /dev/null differ
diff --git a/public/images/silhouette_trace2.jpg b/public/images/silhouette_trace2.jpg
deleted file mode 100644
index f06848395b55f2b1d05f5861341b17fe3ac8d0e7..0000000000000000000000000000000000000000
Binary files a/public/images/silhouette_trace2.jpg and /dev/null differ
diff --git a/public/images/silhouette_trace3.jpg b/public/images/silhouette_trace3.jpg
deleted file mode 100644
index 30fe5a6c9f333d27e65f3450f0e99fa878fadfe3..0000000000000000000000000000000000000000
Binary files a/public/images/silhouette_trace3.jpg and /dev/null differ
diff --git a/public/images/silhouette_trace4.jpg b/public/images/silhouette_trace4.jpg
deleted file mode 100644
index 2ceea540dfcf67acd7369d730bc79cbfcc2f6335..0000000000000000000000000000000000000000
Binary files a/public/images/silhouette_trace4.jpg and /dev/null differ
diff --git a/public/images/silhouette_trace5.jpg b/public/images/silhouette_trace5.jpg
deleted file mode 100644
index d3a5a6dacb0798a48621742846f4a90e61401ba6..0000000000000000000000000000000000000000
Binary files a/public/images/silhouette_trace5.jpg and /dev/null differ
diff --git a/public/images/IMG_1E8E90206256-1.jpeg b/public/images/week01/IMG_1E8E90206256-1.jpeg
similarity index 100%
rename from public/images/IMG_1E8E90206256-1.jpeg
rename to public/images/week01/IMG_1E8E90206256-1.jpeg
diff --git a/public/images/commit_in_VScode.jpg b/public/images/week01/commit_in_VScode.jpg
similarity index 100%
rename from public/images/commit_in_VScode.jpg
rename to public/images/week01/commit_in_VScode.jpg
diff --git a/public/images/lamp_background.jpg b/public/images/week01/lamp_background.jpg
similarity index 100%
rename from public/images/lamp_background.jpg
rename to public/images/week01/lamp_background.jpg
diff --git a/public/images/lamp_bird.jpg b/public/images/week01/lamp_bird.jpg
similarity index 100%
rename from public/images/lamp_bird.jpg
rename to public/images/week01/lamp_bird.jpg
diff --git a/public/images/lamp_candle.jpg b/public/images/week01/lamp_candle.jpg
similarity index 100%
rename from public/images/lamp_candle.jpg
rename to public/images/week01/lamp_candle.jpg
diff --git a/public/images/lamp_off.jpg b/public/images/week01/lamp_off.jpg
similarity index 100%
rename from public/images/lamp_off.jpg
rename to public/images/week01/lamp_off.jpg
diff --git a/public/images/lamp_sketch1.jpg b/public/images/week01/lamp_sketch1.jpg
similarity index 100%
rename from public/images/lamp_sketch1.jpg
rename to public/images/week01/lamp_sketch1.jpg
diff --git a/public/images/lamp_sketch2.jpg b/public/images/week01/lamp_sketch2.jpg
similarity index 100%
rename from public/images/lamp_sketch2.jpg
rename to public/images/week01/lamp_sketch2.jpg
diff --git a/public/images/lamp_sketch3.jpg b/public/images/week01/lamp_sketch3.jpg
similarity index 100%
rename from public/images/lamp_sketch3.jpg
rename to public/images/week01/lamp_sketch3.jpg
diff --git a/public/images/lamp_sketch4.jpg b/public/images/week01/lamp_sketch4.jpg
similarity index 100%
rename from public/images/lamp_sketch4.jpg
rename to public/images/week01/lamp_sketch4.jpg
diff --git a/public/images/lamp_view2/lamp_1.jpg b/public/images/week01/lamp_view2/lamp_1.jpg
similarity index 100%
rename from public/images/lamp_view2/lamp_1.jpg
rename to public/images/week01/lamp_view2/lamp_1.jpg
diff --git a/public/images/lamp_view2/lamp_2.jpg b/public/images/week01/lamp_view2/lamp_2.jpg
similarity index 100%
rename from public/images/lamp_view2/lamp_2.jpg
rename to public/images/week01/lamp_view2/lamp_2.jpg
diff --git a/public/images/lamp_view2/lamp_3.jpg b/public/images/week01/lamp_view2/lamp_3.jpg
similarity index 100%
rename from public/images/lamp_view2/lamp_3.jpg
rename to public/images/week01/lamp_view2/lamp_3.jpg
diff --git a/public/images/lamp_view2/lamp_4.jpg b/public/images/week01/lamp_view2/lamp_4.jpg
similarity index 100%
rename from public/images/lamp_view2/lamp_4.jpg
rename to public/images/week01/lamp_view2/lamp_4.jpg
diff --git a/public/images/lamp_view2/lamp_5.jpg b/public/images/week01/lamp_view2/lamp_5.jpg
similarity index 100%
rename from public/images/lamp_view2/lamp_5.jpg
rename to public/images/week01/lamp_view2/lamp_5.jpg
diff --git a/public/images/lamp_view2/lamp_6.jpg b/public/images/week01/lamp_view2/lamp_6.jpg
similarity index 100%
rename from public/images/lamp_view2/lamp_6.jpg
rename to public/images/week01/lamp_view2/lamp_6.jpg
diff --git a/public/images/lamp_view2/lamp_7.jpg b/public/images/week01/lamp_view2/lamp_7.jpg
similarity index 100%
rename from public/images/lamp_view2/lamp_7.jpg
rename to public/images/week01/lamp_view2/lamp_7.jpg
diff --git a/public/images/lamp_view2/lamp_8.jpg b/public/images/week01/lamp_view2/lamp_8.jpg
similarity index 100%
rename from public/images/lamp_view2/lamp_8.jpg
rename to public/images/week01/lamp_view2/lamp_8.jpg
diff --git a/public/images/lamp_view2/lamp_9.jpg b/public/images/week01/lamp_view2/lamp_9.jpg
similarity index 100%
rename from public/images/lamp_view2/lamp_9.jpg
rename to public/images/week01/lamp_view2/lamp_9.jpg
diff --git a/public/images/push_in_VScode.jpg b/public/images/week01/push_in_VScode.jpg
similarity index 100%
rename from public/images/push_in_VScode.jpg
rename to public/images/week01/push_in_VScode.jpg
diff --git a/public/images/IMG_6909.JPG b/public/images/week02/IMG_6909.JPG
similarity index 100%
rename from public/images/IMG_6909.JPG
rename to public/images/week02/IMG_6909.JPG
diff --git a/public/images/IMG_6910.JPG b/public/images/week02/IMG_6910.JPG
similarity index 100%
rename from public/images/IMG_6910.JPG
rename to public/images/week02/IMG_6910.JPG
diff --git a/public/images/week02/cad01.jpg b/public/images/week02/cad01.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..575a9e85293524c2d1b6afe9c2f28a2b1aa7a60d
Binary files /dev/null and b/public/images/week02/cad01.jpg differ
diff --git a/public/images/week02/cad02.jpg b/public/images/week02/cad02.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..97e80aaeee38a501006dccc3404b9c5e0e29178f
Binary files /dev/null and b/public/images/week02/cad02.jpg differ
diff --git a/public/images/week02/cad03.jpg b/public/images/week02/cad03.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..825556d577c059565be15c9266d07764f458a581
Binary files /dev/null and b/public/images/week02/cad03.jpg differ
diff --git a/public/images/week02/cad04.jpg b/public/images/week02/cad04.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..9468b8c2b21958e4857dac3455daaf709a8be47c
Binary files /dev/null and b/public/images/week02/cad04.jpg differ
diff --git a/public/images/week02/cad05.jpg b/public/images/week02/cad05.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..712d69563bf07cf3acc96c70f5b37dca1a040234
Binary files /dev/null and b/public/images/week02/cad05.jpg differ
diff --git a/public/images/week02/cad06.jpg b/public/images/week02/cad06.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..61338fc09614908c472b0e4d2ce46591076ec8f3
Binary files /dev/null and b/public/images/week02/cad06.jpg differ
diff --git a/public/images/week02/cad07.jpg b/public/images/week02/cad07.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..8384d51e0193753b1d2b5a91c9794fc05ea77d17
Binary files /dev/null and b/public/images/week02/cad07.jpg differ
diff --git a/public/images/out-0.jpg b/public/images/week02/out-0.jpg
similarity index 100%
rename from public/images/out-0.jpg
rename to public/images/week02/out-0.jpg
diff --git a/public/images/out-1.jpg b/public/images/week02/out-1.jpg
similarity index 100%
rename from public/images/out-1.jpg
rename to public/images/week02/out-1.jpg
diff --git a/public/images/out-2.jpg b/public/images/week02/out-2.jpg
similarity index 100%
rename from public/images/out-2.jpg
rename to public/images/week02/out-2.jpg
diff --git a/public/images/out-3.jpg b/public/images/week02/out-3.jpg
similarity index 100%
rename from public/images/out-3.jpg
rename to public/images/week02/out-3.jpg
diff --git a/public/images/png2jpg.jpg b/public/images/week02/png2jpg.jpg
similarity index 100%
rename from public/images/png2jpg.jpg
rename to public/images/week02/png2jpg.jpg
diff --git a/public/images/png2jpg.sh b/public/images/week02/png2jpg.sh
similarity index 100%
rename from public/images/png2jpg.sh
rename to public/images/week02/png2jpg.sh
diff --git a/public/images/week02/py_step2.jpg b/public/images/week02/py_step2.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..daef6fb9f83f852c315a43e39524398ee0b7fad4
Binary files /dev/null and b/public/images/week02/py_step2.jpg differ
diff --git a/public/images/week02/py_step3.jpg b/public/images/week02/py_step3.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..506c924b0f28f2a66fed7e312deb113eba3a0d06
Binary files /dev/null and b/public/images/week02/py_step3.jpg differ
diff --git a/public/images/week02/py_step4.jpg b/public/images/week02/py_step4.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..b037383aea1d1922d62e20fcc3221b975ce241bd
Binary files /dev/null and b/public/images/week02/py_step4.jpg differ
diff --git a/public/images/week02/py_step5.jpg b/public/images/week02/py_step5.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..1d4b1110ccd7f85b5d5fca2ae5b1eb07d3b74c9b
Binary files /dev/null and b/public/images/week02/py_step5.jpg differ
diff --git a/public/images/week02/silhouette_trace1.jpg b/public/images/week02/silhouette_trace1.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..cf7eea0256b6701e0cb7e18c489d47edb603974e
Binary files /dev/null and b/public/images/week02/silhouette_trace1.jpg differ
diff --git a/public/images/week02/silhouette_trace2.jpg b/public/images/week02/silhouette_trace2.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..2ec19f66e395d2b1890fc9cf8ea7fc0f30ad70a7
Binary files /dev/null and b/public/images/week02/silhouette_trace2.jpg differ
diff --git a/public/images/week02/silhouette_trace3.jpg b/public/images/week02/silhouette_trace3.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..d19d3c6b43a362dafce7c51948a9ac8fef878681
Binary files /dev/null and b/public/images/week02/silhouette_trace3.jpg differ
diff --git a/public/images/week02/silhouette_trace4.jpg b/public/images/week02/silhouette_trace4.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..6b7428093dbfee9ef47502af7a1a85fa6ff2b83e
Binary files /dev/null and b/public/images/week02/silhouette_trace4.jpg differ
diff --git a/public/images/week02/silhouette_trace5.jpg b/public/images/week02/silhouette_trace5.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..8a1eba1b90558b0b68e832cfd6c3e403bdbaf81a
Binary files /dev/null and b/public/images/week02/silhouette_trace5.jpg differ
diff --git a/public/index.html b/public/index.html
index 063f5d10f068eb7eb9765fa0f1c9a8e25eebd133..0faf2b776e3a03ca215e6126ad50ea949462baa5 100644
--- a/public/index.html
+++ b/public/index.html
@@ -6,7 +6,7 @@
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <meta name="description" content="None">
         <meta name="author" content="Sosuke Kanegae">
-        
+        <link rel="canonical" href="https://fabacademy.org/2023/labs/kitakagaya/students/sosuke-kanegae/">
         <link rel="shortcut icon" href="img/favicon.ico">
         <title>Sosuke Kanegae Fab Academy</title>
         <link href="css/bootstrap.min.css" rel="stylesheet">
@@ -37,27 +37,91 @@
                                 <a href="." class="nav-link">Home</a>
                             </li>
                             <li class="navitem">
-                                <a href="about/" class="nav-link">About me</a>
-                            </li>
-                            <li class="navitem">
-                                <a href="agreements/" class="nav-link">Agreements</a>
+                                <a href="about/" class="nav-link">About</a>
                             </li>
                             <li class="navitem">
                                 <a href="final-project/" class="nav-link">Final Project</a>
                             </li>
                             <li class="dropdown">
-                                <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown">Assignments <b class="caret"></b></a>
+                                <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown">assignments <b class="caret"></b></a>
                                 <ul class="dropdown-menu">
                                     
 <li>
-    <a href="assignments/week01/" class="dropdown-item">Week 01. Principles and Practices / Project Management</a>
+    <a href="assignments/week01/" class="dropdown-item">Week01. Principles and Practices / Project Management</a>
+</li>
+                                    
+<li>
+    <a href="assignments/week02/" class="dropdown-item">Week02. Computer Aided design</a>
+</li>
+                                    
+<li>
+    <a href="assignments/week03.md" class="dropdown-item">Week03. Computer controlled cutting</a>
+</li>
+                                    
+<li>
+    <a href="assignments/week04.md" class="dropdown-item">Week04. Embedded programming</a>
+</li>
+                                    
+<li>
+    <a href="assignments/week05.md" class="dropdown-item">Week05. 3D Scanning and printing</a>
+</li>
+                                    
+<li>
+    <a href="assignments/week06.md" class="dropdown-item">Week06. Electronics design</a>
+</li>
+                                    
+<li>
+    <a href="assignments/week07.md" class="dropdown-item">Week07. Computer controlled machining</a>
+</li>
+                                    
+<li>
+    <a href="assignments/week08.md" class="dropdown-item">Week08. Electronics production</a>
+</li>
+                                    
+<li>
+    <a href="assignments/week09.md" class="dropdown-item">Week09. Molding and casting</a>
 </li>
                                     
 <li>
-    <a href="assignments/week02/" class="dropdown-item">Week 02. Computer Aided Design</a>
+    <a href="assignments/week10.md" class="dropdown-item">Week10. Output devices</a>
+</li>
+                                    
+<li>
+    <a href="assignments/week11.md" class="dropdown-item">Week11. Mechanical design & machine design</a>
+</li>
+                                    
+<li>
+    <a href="assignments/week12.md" class="dropdown-item">Week12. Input devices</a>
+</li>
+                                    
+<li>
+    <a href="assignments/week13.md" class="dropdown-item">Week13. Networking and communications</a>
+</li>
+                                    
+<li>
+    <a href="assignments/week14.md" class="dropdown-item">Week14. Interface and application programming</a>
+</li>
+                                    
+<li>
+    <a href="assignments/week15.md" class="dropdown-item">Week15. Wildcard week</a>
+</li>
+                                    
+<li>
+    <a href="assignments/week16.md" class="dropdown-item">Week16. Applications and implications</a>
+</li>
+                                    
+<li>
+    <a href="assignments/week17.md" class="dropdown-item">Week17. Invention, intellectual property and income</a>
+</li>
+                                    
+<li>
+    <a href="assignments/week18.md" class="dropdown-item">Week18. Project development</a>
 </li>
                                 </ul>
                             </li>
+                            <li class="navitem">
+                                <a href="agreements/" class="nav-link">Agreements</a>
+                            </li>
                         </ul>
 
                     <ul class="nav navbar-nav ml-auto">
@@ -219,5 +283,5 @@
 
 <!--
 MkDocs version : 1.4.2
-Build Date UTC : 2023-02-05 03:40:06.251981+00:00
+Build Date UTC : 2023-02-08 06:14:08.928483+00:00
 -->
diff --git a/public/search/search_index.json b/public/search/search_index.json
index 4726e2fc272d3b392408ac3cf7336fa21f2bf50b..e111ac8d8a51409af442f5adeb23bfc374b4a019 100644
--- a/public/search/search_index.json
+++ b/public/search/search_index.json
@@ -1 +1 @@
-{"config":{"indexing":"full","lang":["en"],"min_search_length":3,"prebuild_index":false,"separator":"[\\s\\-]+"},"docs":[{"location":"","text":"Welcome to Sosuke Kanegae Fab Academy site! My name is Sosuke and this is my Fab Academy documentation website. Final Project Weekly assignments week 1. Principles and Practices / Project Management week 2. Computer Aided design week 3. Computer controlled cutting week 4. Embedded programming week 5. 3D Scanning and printing week 6. Electronics design week 7. Computer controlled machining week 8. Electronics production week 9. Molding and casting week 10. Output devices week 11. Mechanical design & machine design week 12. Input devices week 13. Networking and communications week 14. Interface and application programming week 15. Wildcard week week 16. Applications and implications week 17. Invention, intellectual property and income week 18. Project development","title":"Home"},{"location":"#welcome-to-sosuke-kanegae-fab-academy-site","text":"My name is Sosuke and this is my Fab Academy documentation website.","title":"Welcome to Sosuke Kanegae Fab Academy site!"},{"location":"#final-project","text":"","title":"Final Project"},{"location":"#weekly-assignments","text":"week 1. Principles and Practices / Project Management week 2. Computer Aided design week 3. Computer controlled cutting week 4. Embedded programming week 5. 3D Scanning and printing week 6. Electronics design week 7. Computer controlled machining week 8. Electronics production week 9. Molding and casting week 10. Output devices week 11. Mechanical design & machine design week 12. Input devices week 13. Networking and communications week 14. Interface and application programming week 15. Wildcard week week 16. Applications and implications week 17. Invention, intellectual property and income week 18. Project development","title":"Weekly assignments"},{"location":"about/","text":"Hi! I am Sosuke Kanegae. I am a PhD student in Osaka University, Japan. I was born Shiga, Japan but when I was one and a half year old, my parents went to work in Michigan, USA. We lived there until I was 10 and came back to Shiga, Japan. I am now studying about mechanical metamaterial at Osaka university.","title":"About me"},{"location":"about/#hi-i-am-sosuke-kanegae","text":"","title":"Hi! I am Sosuke Kanegae."},{"location":"about/#i-am-a-phd-student-in-osaka-university-japan","text":"I was born Shiga, Japan but when I was one and a half year old, my parents went to work in Michigan, USA. We lived there until I was 10 and came back to Shiga, Japan. I am now studying about mechanical metamaterial at Osaka university.","title":"I am a PhD student in Osaka University, Japan."},{"location":"agreements/","text":"Fab Academy Student Agreement The Fab Academy is responsible for: Teaching principles and practices of digital fabrication Arranging lectures, recitations, meetings, and events for the class Evaluating and providing feedback on student work Offering clear standards for completing assignments Certifying and archiving student progress Supervising class preparation Reviewing prospective students, instructors, and labs Providing central staff and infrastructure for students, instructors, and labs Fund-raising for costs not covered by student tuition Managing and reporting on the program's finances, results, and impacts Publicizing the program Promoting a respectful environment free of harassment and discrimination Encourage a diverse, accessible, and equitable community I am a Fab Academy student, responsible for: Attending class lectures and participating in reviews Developing and documenting projects assigned to introduce and demonstrate skills Allowing the Fab Academy to share my work (with attribution) in the class for purposes compatible with its mission Honestly reporting on my work, and appropriately attributing the work of others (both human and machine) Working safely Leaving workspaces in the same (or better) condition than I found them Participating in the upkeep of my lab Ensuring that my tuition for local and central class costs is covered Following locally applicable health and safety guidance Promoting a respectful environment free of harassment and discrimination Signed by committing this file in my repository, Sosuke Kanegae","title":"Agreements"},{"location":"agreements/#fab-academy-student-agreement","text":"The Fab Academy is responsible for: Teaching principles and practices of digital fabrication Arranging lectures, recitations, meetings, and events for the class Evaluating and providing feedback on student work Offering clear standards for completing assignments Certifying and archiving student progress Supervising class preparation Reviewing prospective students, instructors, and labs Providing central staff and infrastructure for students, instructors, and labs Fund-raising for costs not covered by student tuition Managing and reporting on the program's finances, results, and impacts Publicizing the program Promoting a respectful environment free of harassment and discrimination Encourage a diverse, accessible, and equitable community I am a Fab Academy student, responsible for: Attending class lectures and participating in reviews Developing and documenting projects assigned to introduce and demonstrate skills Allowing the Fab Academy to share my work (with attribution) in the class for purposes compatible with its mission Honestly reporting on my work, and appropriately attributing the work of others (both human and machine) Working safely Leaving workspaces in the same (or better) condition than I found them Participating in the upkeep of my lab Ensuring that my tuition for local and central class costs is covered Following locally applicable health and safety guidance Promoting a respectful environment free of harassment and discrimination Signed by committing this file in my repository, Sosuke Kanegae","title":"Fab Academy Student Agreement"},{"location":"final-project/","text":"Final Project Plans and Sketches of my final project Here I describe my final project idea. For my final project I would like to make a lamp that creates several different mood depending on the situation. Just putting a lamp in a room changes the atmosphere of the room. Every lighting equipment has its own mood. In the daytime, my favorite lighting equipment is a projector with streaming devices. Streaming devices like AppleTV and Chromecast show pictues and landscape movies when they are at screensaver mode. I love the way pictures and landscape moving slowly on my wall. So, I want to make a lamp with silhouettes moving around the lamp shade . I love watching candles before bedtime. It makes me relax and feel calm. But, fire is dangerous. especially if you fell asleep with your candels on. I want to make a bedroom lamp that glows and flicker like a candle . These two are the concept of the lamp I want to make. It's not just I want to make both type of lamps, but I want to make a lamp that switches between the two . The lamp will change mode like: Turns ON with sunlight silhouettes (birds, butterflies and flowers) moving around the lampshade. (Senses enviormantal light) Changes to candle mode at bedtime. (Senses enviormantal light going low) Turns OFF when everybody is asleep. (Timer or acoustic sensor) A lamp that changes mood depending on sunlight Daytime: projecting silhouettes on the lamp shade Nighttime: glows and flickers like a candle","title":"Final Project"},{"location":"final-project/#final-project","text":"","title":"Final Project"},{"location":"final-project/#plans-and-sketches-of-my-final-project","text":"Here I describe my final project idea. For my final project I would like to make a lamp that creates several different mood depending on the situation. Just putting a lamp in a room changes the atmosphere of the room. Every lighting equipment has its own mood. In the daytime, my favorite lighting equipment is a projector with streaming devices. Streaming devices like AppleTV and Chromecast show pictues and landscape movies when they are at screensaver mode. I love the way pictures and landscape moving slowly on my wall. So, I want to make a lamp with silhouettes moving around the lamp shade . I love watching candles before bedtime. It makes me relax and feel calm. But, fire is dangerous. especially if you fell asleep with your candels on. I want to make a bedroom lamp that glows and flicker like a candle . These two are the concept of the lamp I want to make. It's not just I want to make both type of lamps, but I want to make a lamp that switches between the two . The lamp will change mode like: Turns ON with sunlight silhouettes (birds, butterflies and flowers) moving around the lampshade. (Senses enviormantal light) Changes to candle mode at bedtime. (Senses enviormantal light going low) Turns OFF when everybody is asleep. (Timer or acoustic sensor)","title":"Plans and Sketches of my final project"},{"location":"final-project/#a-lamp-that-changes-mood-depending-on-sunlight","text":"Daytime: projecting silhouettes on the lamp shade Nighttime: glows and flickers like a candle","title":"A lamp that changes mood depending on sunlight"},{"location":"assignments/week01/","text":"Week 01. Principles and Practices / Project Management The first week of Fab Academy! I did a sketch of my project and added it to the Final Project page. Assignments for this week plan and sketch a potential final project work through a git tutorial build a personal site in the class archive describing you and your final project What I've done this week Setting up PC enviroments Visual Studio Code (VScode) Git MkDocs Create a website Choose a style Customize website Plan a final project I want to make somethng to do with lights! Making images of my lamp How it would look like 1. Setting up PC enviroments The First thing I did this week was Setting up my PC enviroment . Here are the version of tools I use. MacBook Air (M1, 2020) macOS Monterey 12.3.1 VSCode 1.74.3 zsh 5.8 (x86_64-apple-darwin21.0) Homebrew 3.6.20 python 3.10.8 / pip 22.3.1 git 2.39.1 mkdocs 1.4.2 I changed my mac screenshot setting from the default(PNG) to JPG with the following command. defaults write com.apple.screencapture type jpg hoose Text Editor Tex Editors are software where you write your codes in. I chose VScode for my text editor. VScode has wide range of extensions that help you code, debug and visualise your work. Here are the extensions I installed for Fab Academy: Git History HTML CSS Support Markdown All in One Getting started with Git I followed this tutorial of Git. Step 1. Download Git brew install git Step 2. Identify user git config --global user.name \"sosuke\" git config --global user.email \"sosuke.kanegae@mat.eng.osaka-u.ac.jp\" Step 3. Check if there is any SSH-Key existing (check) cat ~/.ssh/id_rsa.pub If not generate SSH-Key. (generate) ssh-keygen -t rsa -C \"sosuke.kaneage@mat.eng.osaka-u.ac.jp\" Step 4. Check the public key you just created cat ~/.ssh/id_rsa.pub Clone my repository from GitLab to a local workspace Now so that I got Git ready, I prepaired a new directory to store everything I do with Fab Academy. cd ~/FabAcademy/ mkdir workspace In new workspace, I first cloned my repo on GitLab git clone https://gitlab.fabcloud.org/academany/fabacademy/2023/labs/kitakagaya/students/sosuke-kanegae.git Now, I have a newly cloned directory \"sosuke-kaneage\" in my workspace. And, I am ready to edit my website. Setting up MkDocs Using MkDocs, you can easily create documentatoin websites. You will have to code in HTML, CSS and JavaScript to create a website. However, in MkDocs all you have to edit is Markdowns, which is easy to use. Step 1. Install MkDocs pip install mkdocs Step 2. Create new Mkdocs project in workspace cd ~/FabAcademy/workspace mkdocs new fabacademy-docs Step 3. Launch test server mkdocs serve Now, I have a MkDocs project with the default settings in ~/FabAcademy/workspace/fabacademy-docs. And, I can check how the website will look in my browser( http://127.0.0.1:8000/ ). Build, Commit and Push After editing MkDocs project, I have to convert the markdowns to HTML files. cd ~/FabAcademy/workspace/fabacademy-docs mkdocs build The build commmand creates HTML files in ~/FabAcademy/workspace/fabacademy-docs/site/ To build directly into the git directory, add the following line to ~/FabAcademy/workspace/fabacademy-docs/mkdocs.yml % mkdocs.yml site_dir: ../sosuke-kanegae/public/ Finaly commit changes in local git repo and push to remote GitLab repo. git commit -a -m 'Comments about changes' git push Instead of commit and push in the command line, you can also commit and push from the Git tab in VScode. You can find the Git tab in the left column of the window. Click the tab and you will see a blue \"Commit\" button. Underneath the button, you can check the changes you made from last time. If you're good with the changes you can just simply press the \"Commit\" button. Or, you can select \"Commit & Push\" in the option of the \"Commit\" button. When everything is up to date in your local repo, the blue button will turn into a sync button. The number written on the button indicates how many times you commit since you last push git. To push you can simply press the sync button. Finally, when you have pushed and everything is up to date, the blue button will return into \"Commit\" and will be deativated 2. Create my website Choose a style There are several optional styles available for MkDocs. third party themes I chose Bootswatch Theme , because the menu interface was very useful. You can access to every page on my website easily. There is a content on every page, so you can jump to any h2 tag. Customize website I customize my website by editting: ~/FabAcademy/workspace/fabacademy-docs/mkdocs.yml I add Copyrights by adding the following line. copyright: Copyright 2023 Sosuke Kanegae - Creative Commons Attribution Non Commercial I made a link to the source code in GitLab by adding: repo_url: https://gitlab.fabcloud.org/academany/fabacademy/2023/labs/kitakagaya/students/sosuke-kanegae 3. Plan a final project I want to make something to do with lights! I'd like to make a lamp that changes its appearance depending on the situation for my final project. Just putting a lamp in a room changes the atmosphere of the room. Every lighting equipment has its own mood. Among lighting equipments used n the daytime, my favorite is a projector with streaming devices. Streaming devices like AppleTV and Chromecast show pictues and landscape movies when they are at screensaver mode. I love the way pictures and landscape moving slowly on my wall. So, I want to make a lamp with silhouettes moving around the lamp shade . I love watching candles before bedtime. It makes me relax and feel calm. But, fire is dangerous. especially if you fell asleep with your candels on. I want to make a bedroom lamp that glows and flicker like a candle . These two are the concept of the lamp I want to make. It's not just I want to make both type of lamps, but I want to make a lamp that switches between the two . The lamp will change mode like: Turns ON with sunlight silhouettes (birds, butterflies and flowers) moving around the lampshade. (Senses enviormantal light) Changes to candle mode at bedtime. (Senses enviormantal light going low) Turns OFF when everybody is asleep. (Timer or acoustic sensor) Making images of my lamp I visualized the concept above using 3D CAD, graphic editor and AI art generator. 3D CAD: Fusion360 graphic editor: Affinity Designer AI art generator: wonder Step 1. Modeling the outline of my lamp The first thing I made is a 3D model of the outline of my lamp. I modeled a lamp that is shaped like a large snowdome. I inserted a lightbulb in the lamp. Then I changed the appearance of each part as follewed: lampshade: Fabric(White) base: Oak lightbulb: A Type Bulb - Frosted - 1500lm Step 2. Render materials for the concept image Rendered several materials with several light conditions. Rendered images as PNG files with transparent background. material1: Whole lamp with lightbulb off material2: lamp without lampshade (lightbulb on) material3: lampshade with enviroment light from front material4: lampshade with enviroment light from back material5: base only material6: lampshade with bird silhouettes Step 3. Generate background with AI I used an iPhone app, wonder , to generate backgraound image. In this app, you can select the style of image. And, I selected \"3D Render\" Set the aspect ratio to 3:2. Set the keyword as \"coworking space\" This is what I got: I used this table as the background: Step 4. Edit images If you put the lamp on a table it will look like this: the lamp in each situation would look like this: Daytime : projecting silhouettes on the lamp shade Nighttime : glows and flickers like a candle","title":"Week 01. Principles and Practices / Project Management"},{"location":"assignments/week01/#week-01-principles-and-practices-project-management","text":"The first week of Fab Academy! I did a sketch of my project and added it to the Final Project page.","title":"Week 01. Principles and Practices / Project Management"},{"location":"assignments/week01/#assignments-for-this-week","text":"plan and sketch a potential final project work through a git tutorial build a personal site in the class archive describing you and your final project","title":"Assignments for this week"},{"location":"assignments/week01/#what-ive-done-this-week","text":"Setting up PC enviroments Visual Studio Code (VScode) Git MkDocs Create a website Choose a style Customize website Plan a final project I want to make somethng to do with lights! Making images of my lamp How it would look like","title":"What I've done this week"},{"location":"assignments/week01/#1-setting-up-pc-enviroments","text":"The First thing I did this week was Setting up my PC enviroment . Here are the version of tools I use. MacBook Air (M1, 2020) macOS Monterey 12.3.1 VSCode 1.74.3 zsh 5.8 (x86_64-apple-darwin21.0) Homebrew 3.6.20 python 3.10.8 / pip 22.3.1 git 2.39.1 mkdocs 1.4.2 I changed my mac screenshot setting from the default(PNG) to JPG with the following command. defaults write com.apple.screencapture type jpg","title":"1. Setting up PC enviroments"},{"location":"assignments/week01/#hoose-text-editor","text":"Tex Editors are software where you write your codes in. I chose VScode for my text editor. VScode has wide range of extensions that help you code, debug and visualise your work. Here are the extensions I installed for Fab Academy: Git History HTML CSS Support Markdown All in One","title":"hoose Text Editor"},{"location":"assignments/week01/#getting-started-with-git","text":"I followed this tutorial of Git. Step 1. Download Git brew install git Step 2. Identify user git config --global user.name \"sosuke\" git config --global user.email \"sosuke.kanegae@mat.eng.osaka-u.ac.jp\" Step 3. Check if there is any SSH-Key existing (check) cat ~/.ssh/id_rsa.pub If not generate SSH-Key. (generate) ssh-keygen -t rsa -C \"sosuke.kaneage@mat.eng.osaka-u.ac.jp\" Step 4. Check the public key you just created cat ~/.ssh/id_rsa.pub","title":"Getting started with Git"},{"location":"assignments/week01/#clone-my-repository-from-gitlab-to-a-local-workspace","text":"Now so that I got Git ready, I prepaired a new directory to store everything I do with Fab Academy. cd ~/FabAcademy/ mkdir workspace In new workspace, I first cloned my repo on GitLab git clone https://gitlab.fabcloud.org/academany/fabacademy/2023/labs/kitakagaya/students/sosuke-kanegae.git Now, I have a newly cloned directory \"sosuke-kaneage\" in my workspace. And, I am ready to edit my website.","title":"Clone my repository from GitLab to a local workspace"},{"location":"assignments/week01/#setting-up-mkdocs","text":"Using MkDocs, you can easily create documentatoin websites. You will have to code in HTML, CSS and JavaScript to create a website. However, in MkDocs all you have to edit is Markdowns, which is easy to use. Step 1. Install MkDocs pip install mkdocs Step 2. Create new Mkdocs project in workspace cd ~/FabAcademy/workspace mkdocs new fabacademy-docs Step 3. Launch test server mkdocs serve Now, I have a MkDocs project with the default settings in ~/FabAcademy/workspace/fabacademy-docs. And, I can check how the website will look in my browser( http://127.0.0.1:8000/ ).","title":"Setting up MkDocs"},{"location":"assignments/week01/#build-commit-and-push","text":"After editing MkDocs project, I have to convert the markdowns to HTML files. cd ~/FabAcademy/workspace/fabacademy-docs mkdocs build The build commmand creates HTML files in ~/FabAcademy/workspace/fabacademy-docs/site/ To build directly into the git directory, add the following line to ~/FabAcademy/workspace/fabacademy-docs/mkdocs.yml % mkdocs.yml site_dir: ../sosuke-kanegae/public/ Finaly commit changes in local git repo and push to remote GitLab repo. git commit -a -m 'Comments about changes' git push Instead of commit and push in the command line, you can also commit and push from the Git tab in VScode. You can find the Git tab in the left column of the window. Click the tab and you will see a blue \"Commit\" button. Underneath the button, you can check the changes you made from last time. If you're good with the changes you can just simply press the \"Commit\" button. Or, you can select \"Commit & Push\" in the option of the \"Commit\" button. When everything is up to date in your local repo, the blue button will turn into a sync button. The number written on the button indicates how many times you commit since you last push git. To push you can simply press the sync button. Finally, when you have pushed and everything is up to date, the blue button will return into \"Commit\" and will be deativated","title":"Build, Commit and Push"},{"location":"assignments/week01/#2-create-my-website","text":"","title":"2. Create my website"},{"location":"assignments/week01/#choose-a-style","text":"There are several optional styles available for MkDocs. third party themes I chose Bootswatch Theme , because the menu interface was very useful. You can access to every page on my website easily. There is a content on every page, so you can jump to any h2 tag.","title":"Choose a style"},{"location":"assignments/week01/#customize-website","text":"I customize my website by editting: ~/FabAcademy/workspace/fabacademy-docs/mkdocs.yml I add Copyrights by adding the following line. copyright: Copyright 2023 Sosuke Kanegae - Creative Commons Attribution Non Commercial I made a link to the source code in GitLab by adding: repo_url: https://gitlab.fabcloud.org/academany/fabacademy/2023/labs/kitakagaya/students/sosuke-kanegae","title":"Customize website"},{"location":"assignments/week01/#3-plan-a-final-project","text":"","title":"3. Plan a final project"},{"location":"assignments/week01/#i-want-to-make-something-to-do-with-lights","text":"I'd like to make a lamp that changes its appearance depending on the situation for my final project. Just putting a lamp in a room changes the atmosphere of the room. Every lighting equipment has its own mood. Among lighting equipments used n the daytime, my favorite is a projector with streaming devices. Streaming devices like AppleTV and Chromecast show pictues and landscape movies when they are at screensaver mode. I love the way pictures and landscape moving slowly on my wall. So, I want to make a lamp with silhouettes moving around the lamp shade . I love watching candles before bedtime. It makes me relax and feel calm. But, fire is dangerous. especially if you fell asleep with your candels on. I want to make a bedroom lamp that glows and flicker like a candle . These two are the concept of the lamp I want to make. It's not just I want to make both type of lamps, but I want to make a lamp that switches between the two . The lamp will change mode like: Turns ON with sunlight silhouettes (birds, butterflies and flowers) moving around the lampshade. (Senses enviormantal light) Changes to candle mode at bedtime. (Senses enviormantal light going low) Turns OFF when everybody is asleep. (Timer or acoustic sensor)","title":"I want to make something to do with lights!"},{"location":"assignments/week01/#making-images-of-my-lamp","text":"I visualized the concept above using 3D CAD, graphic editor and AI art generator. 3D CAD: Fusion360 graphic editor: Affinity Designer AI art generator: wonder","title":"Making images of my lamp"},{"location":"assignments/week01/#step-1-modeling-the-outline-of-my-lamp","text":"The first thing I made is a 3D model of the outline of my lamp. I modeled a lamp that is shaped like a large snowdome. I inserted a lightbulb in the lamp. Then I changed the appearance of each part as follewed: lampshade: Fabric(White) base: Oak lightbulb: A Type Bulb - Frosted - 1500lm","title":"Step 1. Modeling the outline of my lamp"},{"location":"assignments/week01/#step-2-render-materials-for-the-concept-image","text":"Rendered several materials with several light conditions. Rendered images as PNG files with transparent background. material1: Whole lamp with lightbulb off material2: lamp without lampshade (lightbulb on) material3: lampshade with enviroment light from front material4: lampshade with enviroment light from back material5: base only material6: lampshade with bird silhouettes","title":"Step 2. Render materials for the concept image"},{"location":"assignments/week01/#step-3-generate-background-with-ai","text":"I used an iPhone app, wonder , to generate backgraound image. In this app, you can select the style of image. And, I selected \"3D Render\" Set the aspect ratio to 3:2. Set the keyword as \"coworking space\" This is what I got: I used this table as the background:","title":"Step 3. Generate background with AI"},{"location":"assignments/week01/#step-4-edit-images","text":"If you put the lamp on a table it will look like this:","title":"Step 4. Edit images"},{"location":"assignments/week01/#the-lamp-in-each-situation-would-look-like-this","text":"Daytime : projecting silhouettes on the lamp shade Nighttime : glows and flickers like a candle","title":"the lamp in each situation would look like this:"},{"location":"assignments/week02/","text":"Week 02. Computer Aided Design The second week of Fab Academy! I did a sketch of my project and added it to the Final Project page. Assignments for this week model a possible final project compress my images and videos post a description with your design files on my class pages What I've done this week Draw a 2D model of the silhouettes generator an image of a bird with AI make a silhouette of a bird Model a structure to express the glowing and flickering of candles Model structrures that make silhouettes of birds flapping their wings 1. Draw a 2D model of the silhouettes The first thing I did this week is to Draw the 2D model for silhouettes on my lamp generator an image of a bird with AI First, I used some AI art genorators to make some references of flying birds. wonder First, I used the same iPhone app as last week, wonder , to generate images of birds. This time I didn't select any style. Set the aspect ratio to 3:2. Set the keyword as \"bird flying\" This is what I got: Stable Diffusion The next AI art generator I tried was Stable Diffusion I entered each options as followed: option value prompt bird flying negative_prompt - width 768 height 512 num_outputs 4 The outputs were PNG files. I converted the images to JPG file. I made a bash file to convert every PNG file in a designated directory to JPG. png2jpg.sh for f in $1 /*.png ; do g = $( basename ${ f %.* } ) if [ ! -e $g .jpg ] ; then convert $f $g .jpg fi done To use this bash file, run the following command in cammoand line. bash png2jpg.sh pngs(directory with PNG files) This is what I got: make a silhouette of a bird I chose this picture as an example. I imported the picture into Affinity Designer Then I traced the outline of the bird. Filled the line with black. Edited the silhouetted to change the angle of the bird.","title":"Week 02. Computer Aided Design"},{"location":"assignments/week02/#week-02-computer-aided-design","text":"The second week of Fab Academy! I did a sketch of my project and added it to the Final Project page.","title":"Week 02. Computer Aided Design"},{"location":"assignments/week02/#assignments-for-this-week","text":"model a possible final project compress my images and videos post a description with your design files on my class pages","title":"Assignments for this week"},{"location":"assignments/week02/#what-ive-done-this-week","text":"Draw a 2D model of the silhouettes generator an image of a bird with AI make a silhouette of a bird Model a structure to express the glowing and flickering of candles Model structrures that make silhouettes of birds flapping their wings","title":"What I've done this week"},{"location":"assignments/week02/#1-draw-a-2d-model-of-the-silhouettes","text":"The first thing I did this week is to Draw the 2D model for silhouettes on my lamp","title":"1. Draw a 2D model of the silhouettes"},{"location":"assignments/week02/#generator-an-image-of-a-bird-with-ai","text":"First, I used some AI art genorators to make some references of flying birds.","title":"generator an image of a bird with AI"},{"location":"assignments/week02/#wonder","text":"First, I used the same iPhone app as last week, wonder , to generate images of birds. This time I didn't select any style. Set the aspect ratio to 3:2. Set the keyword as \"bird flying\" This is what I got:","title":"wonder"},{"location":"assignments/week02/#stable-diffusion","text":"The next AI art generator I tried was Stable Diffusion I entered each options as followed: option value prompt bird flying negative_prompt - width 768 height 512 num_outputs 4 The outputs were PNG files. I converted the images to JPG file. I made a bash file to convert every PNG file in a designated directory to JPG. png2jpg.sh for f in $1 /*.png ; do g = $( basename ${ f %.* } ) if [ ! -e $g .jpg ] ; then convert $f $g .jpg fi done To use this bash file, run the following command in cammoand line. bash png2jpg.sh pngs(directory with PNG files) This is what I got:","title":"Stable Diffusion"},{"location":"assignments/week02/#make-a-silhouette-of-a-bird","text":"I chose this picture as an example. I imported the picture into Affinity Designer Then I traced the outline of the bird. Filled the line with black. Edited the silhouetted to change the angle of the bird.","title":"make a silhouette of a bird"}]}
\ No newline at end of file
+{"config":{"indexing":"full","lang":["en"],"min_search_length":3,"prebuild_index":false,"separator":"[\\s\\-]+"},"docs":[{"location":"","text":"Welcome to Sosuke Kanegae Fab Academy site! My name is Sosuke and this is my Fab Academy documentation website. Final Project Weekly assignments week 1. Principles and Practices / Project Management week 2. Computer Aided design week 3. Computer controlled cutting week 4. Embedded programming week 5. 3D Scanning and printing week 6. Electronics design week 7. Computer controlled machining week 8. Electronics production week 9. Molding and casting week 10. Output devices week 11. Mechanical design & machine design week 12. Input devices week 13. Networking and communications week 14. Interface and application programming week 15. Wildcard week week 16. Applications and implications week 17. Invention, intellectual property and income week 18. Project development","title":"Home"},{"location":"#welcome-to-sosuke-kanegae-fab-academy-site","text":"My name is Sosuke and this is my Fab Academy documentation website.","title":"Welcome to Sosuke Kanegae Fab Academy site!"},{"location":"#final-project","text":"","title":"Final Project"},{"location":"#weekly-assignments","text":"week 1. Principles and Practices / Project Management week 2. Computer Aided design week 3. Computer controlled cutting week 4. Embedded programming week 5. 3D Scanning and printing week 6. Electronics design week 7. Computer controlled machining week 8. Electronics production week 9. Molding and casting week 10. Output devices week 11. Mechanical design & machine design week 12. Input devices week 13. Networking and communications week 14. Interface and application programming week 15. Wildcard week week 16. Applications and implications week 17. Invention, intellectual property and income week 18. Project development","title":"Weekly assignments"},{"location":"about/","text":"Hi! I am Sosuke Kanegae. I am a PhD student in Osaka University, Japan. I was born Shiga, Japan but when I was one and a half year old, my parents went to work in Michigan, USA. We lived there until I was 10 and came back to Shiga, Japan. I am now studying about mechanical metamaterial at Osaka university.","title":"About"},{"location":"about/#hi-i-am-sosuke-kanegae","text":"","title":"Hi! I am Sosuke Kanegae."},{"location":"about/#i-am-a-phd-student-in-osaka-university-japan","text":"I was born Shiga, Japan but when I was one and a half year old, my parents went to work in Michigan, USA. We lived there until I was 10 and came back to Shiga, Japan. I am now studying about mechanical metamaterial at Osaka university.","title":"I am a PhD student in Osaka University, Japan."},{"location":"agreements/","text":"Fab Academy Student Agreement The Fab Academy is responsible for: Teaching principles and practices of digital fabrication Arranging lectures, recitations, meetings, and events for the class Evaluating and providing feedback on student work Offering clear standards for completing assignments Certifying and archiving student progress Supervising class preparation Reviewing prospective students, instructors, and labs Providing central staff and infrastructure for students, instructors, and labs Fund-raising for costs not covered by student tuition Managing and reporting on the program's finances, results, and impacts Publicizing the program Promoting a respectful environment free of harassment and discrimination Encourage a diverse, accessible, and equitable community I am a Fab Academy student, responsible for: Attending class lectures and participating in reviews Developing and documenting projects assigned to introduce and demonstrate skills Allowing the Fab Academy to share my work (with attribution) in the class for purposes compatible with its mission Honestly reporting on my work, and appropriately attributing the work of others (both human and machine) Working safely Leaving workspaces in the same (or better) condition than I found them Participating in the upkeep of my lab Ensuring that my tuition for local and central class costs is covered Following locally applicable health and safety guidance Promoting a respectful environment free of harassment and discrimination Signed by committing this file in my repository, Sosuke Kanegae","title":"Agreements"},{"location":"agreements/#fab-academy-student-agreement","text":"The Fab Academy is responsible for: Teaching principles and practices of digital fabrication Arranging lectures, recitations, meetings, and events for the class Evaluating and providing feedback on student work Offering clear standards for completing assignments Certifying and archiving student progress Supervising class preparation Reviewing prospective students, instructors, and labs Providing central staff and infrastructure for students, instructors, and labs Fund-raising for costs not covered by student tuition Managing and reporting on the program's finances, results, and impacts Publicizing the program Promoting a respectful environment free of harassment and discrimination Encourage a diverse, accessible, and equitable community I am a Fab Academy student, responsible for: Attending class lectures and participating in reviews Developing and documenting projects assigned to introduce and demonstrate skills Allowing the Fab Academy to share my work (with attribution) in the class for purposes compatible with its mission Honestly reporting on my work, and appropriately attributing the work of others (both human and machine) Working safely Leaving workspaces in the same (or better) condition than I found them Participating in the upkeep of my lab Ensuring that my tuition for local and central class costs is covered Following locally applicable health and safety guidance Promoting a respectful environment free of harassment and discrimination Signed by committing this file in my repository, Sosuke Kanegae","title":"Fab Academy Student Agreement"},{"location":"final-project/","text":"Final Project Plans and Sketches of my final project Here I describe my final project idea. For my final project I would like to make a lamp that creates several different mood depending on the situation. Just putting a lamp in a room changes the atmosphere of the room. Every lighting equipment has its own mood. In the daytime, my favorite lighting equipment is a projector with streaming devices. Streaming devices like AppleTV and Chromecast show pictues and landscape movies when they are at screensaver mode. I love the way pictures and landscape moving slowly on my wall. So, I want to make a lamp with silhouettes moving around the lamp shade . I love watching candles before bedtime. It makes me relax and feel calm. But, fire is dangerous. especially if you fell asleep with your candels on. I want to make a bedroom lamp that glows and flicker like a candle . These two are the concept of the lamp I want to make. It's not just I want to make both type of lamps, but I want to make a lamp that switches between the two . The lamp will change mode like: Turns ON with sunlight silhouettes (birds, butterflies and flowers) moving around the lampshade. (Senses enviormantal light) Changes to candle mode at bedtime. (Senses enviormantal light going low) Turns OFF when everybody is asleep. (Timer or acoustic sensor) A lamp that changes mood depending on sunlight Daytime: projecting silhouettes on the lamp shade Nighttime: glows and flickers like a candle","title":"Final Project"},{"location":"final-project/#final-project","text":"","title":"Final Project"},{"location":"final-project/#plans-and-sketches-of-my-final-project","text":"Here I describe my final project idea. For my final project I would like to make a lamp that creates several different mood depending on the situation. Just putting a lamp in a room changes the atmosphere of the room. Every lighting equipment has its own mood. In the daytime, my favorite lighting equipment is a projector with streaming devices. Streaming devices like AppleTV and Chromecast show pictues and landscape movies when they are at screensaver mode. I love the way pictures and landscape moving slowly on my wall. So, I want to make a lamp with silhouettes moving around the lamp shade . I love watching candles before bedtime. It makes me relax and feel calm. But, fire is dangerous. especially if you fell asleep with your candels on. I want to make a bedroom lamp that glows and flicker like a candle . These two are the concept of the lamp I want to make. It's not just I want to make both type of lamps, but I want to make a lamp that switches between the two . The lamp will change mode like: Turns ON with sunlight silhouettes (birds, butterflies and flowers) moving around the lampshade. (Senses enviormantal light) Changes to candle mode at bedtime. (Senses enviormantal light going low) Turns OFF when everybody is asleep. (Timer or acoustic sensor)","title":"Plans and Sketches of my final project"},{"location":"final-project/#a-lamp-that-changes-mood-depending-on-sunlight","text":"Daytime: projecting silhouettes on the lamp shade Nighttime: glows and flickers like a candle","title":"A lamp that changes mood depending on sunlight"},{"location":"assignments/week01/","text":"Week 01. Principles and Practices / Project Management The first week of Fab Academy! I did a sketch of my project and added it to the Final Project page. Assignments for this week plan and sketch a potential final project work through a git tutorial build a personal site in the class archive describing you and your final project What I've done this week Setting up PC enviroments Visual Studio Code (VScode) Git MkDocs Create a website Choose a style Customize website Plan a final project I want to make somethng to do with lights! Making images of my lamp How it would look like 1. Setting up PC enviroments The First thing I did this week was Setting up my PC enviroment . Here are the version of tools I use. MacBook Air (M1, 2020) macOS Monterey 12.3.1 VSCode 1.74.3 zsh 5.8 (x86_64-apple-darwin21.0) Homebrew 3.6.20 python 3.10.8 / pip 22.3.1 git 2.39.1 mkdocs 1.4.2 I changed my mac screenshot setting from the default(PNG) to JPG with the following command. defaults write com.apple.screencapture type jpg hoose Text Editor Tex Editors are software where you write your codes in. I chose VScode for my text editor. VScode has wide range of extensions that help you code, debug and visualise your work. Here are the extensions I installed for Fab Academy: Git History HTML CSS Support Markdown All in One Getting started with Git I followed this tutorial of Git. Step 1. Download Git brew install git Step 2. Identify user git config --global user.name \"sosuke\" git config --global user.email \"sosuke.kanegae@mat.eng.osaka-u.ac.jp\" Step 3. Check if there is any SSH-Key existing (check) cat ~/.ssh/id_rsa.pub If not generate SSH-Key. (generate) ssh-keygen -t rsa -C \"sosuke.kaneage@mat.eng.osaka-u.ac.jp\" Step 4. Check the public key you just created cat ~/.ssh/id_rsa.pub Clone my repository from GitLab to a local workspace Now so that I got Git ready, I prepaired a new directory to store everything I do with Fab Academy. cd ~/FabAcademy/ mkdir workspace In new workspace, I first cloned my repo on GitLab git clone https://gitlab.fabcloud.org/academany/fabacademy/2023/labs/kitakagaya/students/sosuke-kanegae.git Now, I have a newly cloned directory \"sosuke-kaneage\" in my workspace. And, I am ready to edit my website. Setting up MkDocs Using MkDocs, you can easily create documentatoin websites. You will have to code in HTML, CSS and JavaScript to create a website. However, in MkDocs all you have to edit is Markdowns, which is easy to use. Step 1. Install MkDocs pip install mkdocs Step 2. Create new Mkdocs project in workspace cd ~/FabAcademy/workspace mkdocs new fabacademy-docs Step 3. Launch test server mkdocs serve Now, I have a MkDocs project with the default settings in ~/FabAcademy/workspace/fabacademy-docs. And, I can check how the website will look in my browser( http://127.0.0.1:8000/ ). Build, Commit and Push After editing MkDocs project, I have to convert the markdowns to HTML files. cd ~/FabAcademy/workspace/fabacademy-docs mkdocs build The build commmand creates HTML files in ~/FabAcademy/workspace/fabacademy-docs/site/ To build directly into the git directory, add the following line to ~/FabAcademy/workspace/fabacademy-docs/mkdocs.yml % mkdocs.yml site_dir: ../sosuke-kanegae/public/ Finaly commit changes in local git repo and push to remote GitLab repo. git commit -a -m 'Comments about changes' git push Instead of commit and push in the command line, you can also commit and push from the Git tab in VScode. You can find the Git tab in the left column of the window. Click the tab and you will see a blue \"Commit\" button. Underneath the button, you can check the changes you made from last time. If you're good with the changes you can just simply press the \"Commit\" button. Or, you can select \"Commit & Push\" in the option of the \"Commit\" button. When everything is up to date in your local repo, the blue button will turn into a sync button. The number written on the button indicates how many times you commit since you last push git. To push you can simply press the sync button. Finally, when you have pushed and everything is up to date, the blue button will return into \"Commit\" and will be deativated 2. Create my website Choose a style There are several optional styles available for MkDocs. third party themes I chose Bootswatch Theme , because the menu interface was very useful. You can access to every page on my website easily. There is a content on every page, so you can jump to any h2 tag. Customize website I customize my website by editting: ~/FabAcademy/workspace/fabacademy-docs/mkdocs.yml I add Copyrights by adding the following line. copyright: Copyright 2023 Sosuke Kanegae - Creative Commons Attribution Non Commercial I made a link to the source code in GitLab by adding: repo_url: https://gitlab.fabcloud.org/academany/fabacademy/2023/labs/kitakagaya/students/sosuke-kanegae 3. Plan a final project I want to make something to do with lights! I'd like to make a lamp that changes its appearance depending on the situation for my final project. Just putting a lamp in a room changes the atmosphere of the room. Every lighting equipment has its own mood. Among lighting equipments used n the daytime, my favorite is a projector with streaming devices. Streaming devices like AppleTV and Chromecast show pictues and landscape movies when they are at screensaver mode. I love the way pictures and landscape moving slowly on my wall. So, I want to make a lamp with silhouettes moving around the lamp shade . I love watching candles before bedtime. It makes me relax and feel calm. But, fire is dangerous. especially if you fell asleep with your candels on. I want to make a bedroom lamp that glows and flicker like a candle . These two are the concept of the lamp I want to make. It's not just I want to make both type of lamps, but I want to make a lamp that switches between the two . The lamp will change mode like: Turns ON with sunlight silhouettes (birds, butterflies and flowers) moving around the lampshade. (Senses enviormantal light) Changes to candle mode at bedtime. (Senses enviormantal light going low) Turns OFF when everybody is asleep. (Timer or acoustic sensor) Making images of my lamp I visualized the concept above using 3D CAD, graphic editor and AI art generator. 3D CAD: Fusion360 graphic editor: Affinity Designer AI art generator: wonder Step 1. Modeling the outline of my lamp The first thing I made is a 3D model of the outline of my lamp. I modeled a lamp that is shaped like a large snowdome. I inserted a lightbulb in the lamp. Then I changed the appearance of each part as follewed: lampshade: Fabric(White) base: Oak lightbulb: A Type Bulb - Frosted - 1500lm Step 2. Render materials for the concept image Rendered several materials with several light conditions. Rendered images as PNG files with transparent background. material1: Whole lamp with lightbulb off material2: lamp without lampshade (lightbulb on) material3: lampshade with enviroment light from front material4: lampshade with enviroment light from back material5: base only material6: lampshade with bird silhouettes Step 3. Generate background with AI I used an iPhone app, wonder , to generate backgraound image. In this app, you can select the style of image. And, I selected \"3D Render\" Set the aspect ratio to 3:2. Set the keyword as \"coworking space\" This is what I got: I used this table as the background: Step 4. Edit images If you put the lamp on a table it will look like this: the lamp in each situation would look like this: Daytime : projecting silhouettes on the lamp shade Nighttime : glows and flickers like a candle","title":"Week01. Principles and Practices / Project Management"},{"location":"assignments/week01/#week-01-principles-and-practices-project-management","text":"The first week of Fab Academy! I did a sketch of my project and added it to the Final Project page.","title":"Week 01. Principles and Practices / Project Management"},{"location":"assignments/week01/#assignments-for-this-week","text":"plan and sketch a potential final project work through a git tutorial build a personal site in the class archive describing you and your final project","title":"Assignments for this week"},{"location":"assignments/week01/#what-ive-done-this-week","text":"Setting up PC enviroments Visual Studio Code (VScode) Git MkDocs Create a website Choose a style Customize website Plan a final project I want to make somethng to do with lights! Making images of my lamp How it would look like","title":"What I've done this week"},{"location":"assignments/week01/#1-setting-up-pc-enviroments","text":"The First thing I did this week was Setting up my PC enviroment . Here are the version of tools I use. MacBook Air (M1, 2020) macOS Monterey 12.3.1 VSCode 1.74.3 zsh 5.8 (x86_64-apple-darwin21.0) Homebrew 3.6.20 python 3.10.8 / pip 22.3.1 git 2.39.1 mkdocs 1.4.2 I changed my mac screenshot setting from the default(PNG) to JPG with the following command. defaults write com.apple.screencapture type jpg","title":"1. Setting up PC enviroments"},{"location":"assignments/week01/#hoose-text-editor","text":"Tex Editors are software where you write your codes in. I chose VScode for my text editor. VScode has wide range of extensions that help you code, debug and visualise your work. Here are the extensions I installed for Fab Academy: Git History HTML CSS Support Markdown All in One","title":"hoose Text Editor"},{"location":"assignments/week01/#getting-started-with-git","text":"I followed this tutorial of Git. Step 1. Download Git brew install git Step 2. Identify user git config --global user.name \"sosuke\" git config --global user.email \"sosuke.kanegae@mat.eng.osaka-u.ac.jp\" Step 3. Check if there is any SSH-Key existing (check) cat ~/.ssh/id_rsa.pub If not generate SSH-Key. (generate) ssh-keygen -t rsa -C \"sosuke.kaneage@mat.eng.osaka-u.ac.jp\" Step 4. Check the public key you just created cat ~/.ssh/id_rsa.pub","title":"Getting started with Git"},{"location":"assignments/week01/#clone-my-repository-from-gitlab-to-a-local-workspace","text":"Now so that I got Git ready, I prepaired a new directory to store everything I do with Fab Academy. cd ~/FabAcademy/ mkdir workspace In new workspace, I first cloned my repo on GitLab git clone https://gitlab.fabcloud.org/academany/fabacademy/2023/labs/kitakagaya/students/sosuke-kanegae.git Now, I have a newly cloned directory \"sosuke-kaneage\" in my workspace. And, I am ready to edit my website.","title":"Clone my repository from GitLab to a local workspace"},{"location":"assignments/week01/#setting-up-mkdocs","text":"Using MkDocs, you can easily create documentatoin websites. You will have to code in HTML, CSS and JavaScript to create a website. However, in MkDocs all you have to edit is Markdowns, which is easy to use. Step 1. Install MkDocs pip install mkdocs Step 2. Create new Mkdocs project in workspace cd ~/FabAcademy/workspace mkdocs new fabacademy-docs Step 3. Launch test server mkdocs serve Now, I have a MkDocs project with the default settings in ~/FabAcademy/workspace/fabacademy-docs. And, I can check how the website will look in my browser( http://127.0.0.1:8000/ ).","title":"Setting up MkDocs"},{"location":"assignments/week01/#build-commit-and-push","text":"After editing MkDocs project, I have to convert the markdowns to HTML files. cd ~/FabAcademy/workspace/fabacademy-docs mkdocs build The build commmand creates HTML files in ~/FabAcademy/workspace/fabacademy-docs/site/ To build directly into the git directory, add the following line to ~/FabAcademy/workspace/fabacademy-docs/mkdocs.yml % mkdocs.yml site_dir: ../sosuke-kanegae/public/ Finaly commit changes in local git repo and push to remote GitLab repo. git commit -a -m 'Comments about changes' git push Instead of commit and push in the command line, you can also commit and push from the Git tab in VScode. You can find the Git tab in the left column of the window. Click the tab and you will see a blue \"Commit\" button. Underneath the button, you can check the changes you made from last time. If you're good with the changes you can just simply press the \"Commit\" button. Or, you can select \"Commit & Push\" in the option of the \"Commit\" button. When everything is up to date in your local repo, the blue button will turn into a sync button. The number written on the button indicates how many times you commit since you last push git. To push you can simply press the sync button. Finally, when you have pushed and everything is up to date, the blue button will return into \"Commit\" and will be deativated","title":"Build, Commit and Push"},{"location":"assignments/week01/#2-create-my-website","text":"","title":"2. Create my website"},{"location":"assignments/week01/#choose-a-style","text":"There are several optional styles available for MkDocs. third party themes I chose Bootswatch Theme , because the menu interface was very useful. You can access to every page on my website easily. There is a content on every page, so you can jump to any h2 tag.","title":"Choose a style"},{"location":"assignments/week01/#customize-website","text":"I customize my website by editting: ~/FabAcademy/workspace/fabacademy-docs/mkdocs.yml I add Copyrights by adding the following line. copyright: Copyright 2023 Sosuke Kanegae - Creative Commons Attribution Non Commercial I made a link to the source code in GitLab by adding: repo_url: https://gitlab.fabcloud.org/academany/fabacademy/2023/labs/kitakagaya/students/sosuke-kanegae","title":"Customize website"},{"location":"assignments/week01/#3-plan-a-final-project","text":"","title":"3. Plan a final project"},{"location":"assignments/week01/#i-want-to-make-something-to-do-with-lights","text":"I'd like to make a lamp that changes its appearance depending on the situation for my final project. Just putting a lamp in a room changes the atmosphere of the room. Every lighting equipment has its own mood. Among lighting equipments used n the daytime, my favorite is a projector with streaming devices. Streaming devices like AppleTV and Chromecast show pictues and landscape movies when they are at screensaver mode. I love the way pictures and landscape moving slowly on my wall. So, I want to make a lamp with silhouettes moving around the lamp shade . I love watching candles before bedtime. It makes me relax and feel calm. But, fire is dangerous. especially if you fell asleep with your candels on. I want to make a bedroom lamp that glows and flicker like a candle . These two are the concept of the lamp I want to make. It's not just I want to make both type of lamps, but I want to make a lamp that switches between the two . The lamp will change mode like: Turns ON with sunlight silhouettes (birds, butterflies and flowers) moving around the lampshade. (Senses enviormantal light) Changes to candle mode at bedtime. (Senses enviormantal light going low) Turns OFF when everybody is asleep. (Timer or acoustic sensor)","title":"I want to make something to do with lights!"},{"location":"assignments/week01/#making-images-of-my-lamp","text":"I visualized the concept above using 3D CAD, graphic editor and AI art generator. 3D CAD: Fusion360 graphic editor: Affinity Designer AI art generator: wonder","title":"Making images of my lamp"},{"location":"assignments/week01/#step-1-modeling-the-outline-of-my-lamp","text":"The first thing I made is a 3D model of the outline of my lamp. I modeled a lamp that is shaped like a large snowdome. I inserted a lightbulb in the lamp. Then I changed the appearance of each part as follewed: lampshade: Fabric(White) base: Oak lightbulb: A Type Bulb - Frosted - 1500lm","title":"Step 1. Modeling the outline of my lamp"},{"location":"assignments/week01/#step-2-render-materials-for-the-concept-image","text":"Rendered several materials with several light conditions. Rendered images as PNG files with transparent background. material1: Whole lamp with lightbulb off material2: lamp without lampshade (lightbulb on) material3: lampshade with enviroment light from front material4: lampshade with enviroment light from back material5: base only material6: lampshade with bird silhouettes","title":"Step 2. Render materials for the concept image"},{"location":"assignments/week01/#step-3-generate-background-with-ai","text":"I used an iPhone app, wonder , to generate backgraound image. In this app, you can select the style of image. And, I selected \"3D Render\" Set the aspect ratio to 3:2. Set the keyword as \"coworking space\" This is what I got: I used this table as the background:","title":"Step 3. Generate background with AI"},{"location":"assignments/week01/#step-4-edit-images","text":"If you put the lamp on a table it will look like this:","title":"Step 4. Edit images"},{"location":"assignments/week01/#the-lamp-in-each-situation-would-look-like-this","text":"Daytime : projecting silhouettes on the lamp shade Nighttime : glows and flickers like a candle","title":"the lamp in each situation would look like this:"},{"location":"assignments/week02/","text":"Week 02. Computer Aided Design The second week of Fab Academy! I did a sketch of my project and added it to the Final Project page. Assignments for this week model a possible final project compress my images and videos post a description with your design files on my class pages What I've done this week Draw a 2D model of the silhouettes generator an image of a bird with AI make a silhouette of a bird Model a structure to express the glowing and flickering of candles overlapping lattices overlapping lattice shell structures animation of the moving shells Using Rhino 1. Draw a 2D model of the silhouettes The first thing I did this week is to Draw the 2D model for silhouettes on my lamp generator an image of a bird with AI First, I used some AI art genorators to make some references of flying birds. wonder First, I used the same iPhone app as last week, wonder , to generate images of birds. This time I didn't select any style. Set the aspect ratio to 3:2. Set the keyword as \"bird flying\" This is what I got: Stable Diffusion The next AI art generator I tried was Stable Diffusion I entered each options as followed: option value prompt bird flying negative_prompt - width 768 height 512 num_outputs 4 The outputs were PNG files. I converted the images to JPG file. I made a bash file to convert every PNG file in a designated directory to JPG. png2jpg.sh for f in $1 /*.png ; do g = $( basename ${ f %.* } ) if [ ! -e $g .jpg ] ; then convert $f $g .jpg fi done To use this bash file, run the following command in cammoand line. bash png2jpg.sh pngs #directory with PNG files This is what I got: make a silhouette of a bird I chose this picture as an example. I imported the picture into Affinity Designer Then I traced the outline of the bird. Filled the line with black. Edited the silhouetted to change the angle of the bird. 2. Model a structure to express the glowing and flickering of candles Last week, I modeled the outline of the lamp I plan to make for my final project. This week, I will model structure inside the lampshade. The structures will move and create shadow on the shade. the shadow will be a pattern that decorates the lamp. For the candle mode, I will use lattice shells to express the glowing and flickering of candels. overlapping lattices I will first draw an 2D example of lattices expressing candles flickering. To draw the lattices, I use python. Here are the python libraries I used. library version matplotlib 3.6.3 numpy 1.23.4 opencv 4.6.0.66 These were installed by followings: pip install matplotlib pip install numpy pip instell opencv-python Caution I failed to successfully create a mp4 files with opencv. A file was exported, but I could not open it. Insted of using opencv, I used ffmpeg. Step 1. Import libraries import cv2 import matplotlib.pyplot as plt import numpy as np import os import shutil import sys % matplotlib inline Step 2. Set the area to plot curves fig = plt . figure () ax = fig . add_subplot ( 111 , polar = True ) ax . grid ( False ) ax . set_yticklabels ([]) ax . set_xticklabels ([]) Step 3. Draw a curve in polar coordinates ax = plt . subplot ( 111 , polar = True ) ax . grid ( False ) ax . set_yticklabels ([]) ax . set_xticklabels ([]) x = np . linspace ( 0 , np . pi / 3 ) y = x / np . pi ax . plot ( x , y , c = 'k' ) Step 4. Multipy curves in a circular pattern def multipy ( ax , num , B , color ): for i in range ( num ): a = i * 2 * np . pi / num x0 = B * x + a y0 = x / np . pi ax . plot ( x0 , y0 , c = color ) fig = plt . figure () ax = fig . add_subplot ( 111 , polar = True ) ax . grid ( False ) ax . set_yticklabels ([]) ax . set_xticklabels ([]) x = np . linspace ( 0 , np . pi / 3 ) multipy ( ax , 8 , 1 , 'k' ) Step 5. Create curves bent in the oppsite direction fig = plt . figure () ax = fig . add_subplot ( 111 , polar = True ) ax . grid ( False ) ax . set_yticklabels ([]) ax . set_xticklabels ([]) x = np . linspace ( 0 , np . pi / 2 ) multipy ( ax , 12 , 1 , 'k' ) multipy ( ax , 10 , - 1 / 2 , 'k' ) Step 6. Make frame of two lattices rotating def rotate ( ax , num , B , d , color ): for i in range ( num ): a = i * 2 * np . pi / num x0 = B * x + a + d y0 = x / np . pi ax . plot ( x0 , y0 , c = color ) if os . path . exists ( 'frames' ): shutil . rmtree ( 'frames' ) os . mkdir ( 'frames' ) frame = 200 for j in range ( frame ): fig = plt . figure () ax = fig . add_subplot ( 111 , polar = True ) ax . grid ( False ) ax . set_yticklabels ([]) ax . set_xticklabels ([]) x = np . linspace ( 0 , np . pi / 2 ) multipy ( ax , 12 , 1 , 'k' ) multipy ( ax , 10 , - 1 / 2 , 'k' ) d = j * 2 * np . pi / frame rotate ( ax , 12 , 1 , d , 'k' ) rotate ( ax , 10 , - 1 / 2 , d , 'k' ) fig . savefig ( f './frames/pic_ { j : 02 } .jpg' ) plt . clf () plt . close () Step 7. Make video file First I tried opencv fourcc = cv2 . VideoWriter_fourcc ( * 'mp4v' ) video = cv2 . VideoWriter ( 'lattice_rotate.mp4' , fourcc , 20.0 , ( 100 , 100 )) if not video . isOpened (): print ( \"can't be opened\" ) sys . exit () for i in range ( frame ): img = cv2 . imread ( f './frames/pic_ { j : 02 } .jpg' ) if img is None : print ( \"can't read\" ) break video . write ( img ) video . release () print ( 'written' ) 'lattice_rotate.mp4' was exported. However, I couldn't open it in my PC. So, I tried ffmpeg, and got this: ffmpeg -r 20 -i ./frames/pic_%02d.jpg rotate.mp4 overlapping lattice shell structures Next, I modeled a 3D structure that make shadow like the video above. Step 1. Design the curve on lampshade Draw two curves (in purple) that corespond to Step 3 in the 2D lattice. Black lines are support line from the lightsource to points on the curves. Step 2. Loft the black lines to two curved surfaces Step 3. Thicken the surfaces Step 4. Create the base shell model of the lattice shell Step 5. Intersect the base shell and curved surface Step 6. Multiply the intersections by cilrcular pattern and Union all to get a llattice shell Step 7. Make an inner lattice shell Step 8. Make a movie of lattice shells rotating Shadow on shade will look like this: The next problem will be how to fix the lattice shells on the base, and how to make the lattice shells to rotate. Links","title":"Week02. Computer Aided design"},{"location":"assignments/week02/#week-02-computer-aided-design","text":"The second week of Fab Academy! I did a sketch of my project and added it to the Final Project page.","title":"Week 02. Computer Aided Design"},{"location":"assignments/week02/#assignments-for-this-week","text":"model a possible final project compress my images and videos post a description with your design files on my class pages","title":"Assignments for this week"},{"location":"assignments/week02/#what-ive-done-this-week","text":"Draw a 2D model of the silhouettes generator an image of a bird with AI make a silhouette of a bird Model a structure to express the glowing and flickering of candles overlapping lattices overlapping lattice shell structures animation of the moving shells Using Rhino","title":"What I've done this week"},{"location":"assignments/week02/#1-draw-a-2d-model-of-the-silhouettes","text":"The first thing I did this week is to Draw the 2D model for silhouettes on my lamp","title":"1. Draw a 2D model of the silhouettes"},{"location":"assignments/week02/#generator-an-image-of-a-bird-with-ai","text":"First, I used some AI art genorators to make some references of flying birds.","title":"generator an image of a bird with AI"},{"location":"assignments/week02/#wonder","text":"First, I used the same iPhone app as last week, wonder , to generate images of birds. This time I didn't select any style. Set the aspect ratio to 3:2. Set the keyword as \"bird flying\" This is what I got:","title":"wonder"},{"location":"assignments/week02/#stable-diffusion","text":"The next AI art generator I tried was Stable Diffusion I entered each options as followed: option value prompt bird flying negative_prompt - width 768 height 512 num_outputs 4 The outputs were PNG files. I converted the images to JPG file. I made a bash file to convert every PNG file in a designated directory to JPG. png2jpg.sh for f in $1 /*.png ; do g = $( basename ${ f %.* } ) if [ ! -e $g .jpg ] ; then convert $f $g .jpg fi done To use this bash file, run the following command in cammoand line. bash png2jpg.sh pngs #directory with PNG files This is what I got:","title":"Stable Diffusion"},{"location":"assignments/week02/#make-a-silhouette-of-a-bird","text":"I chose this picture as an example. I imported the picture into Affinity Designer Then I traced the outline of the bird. Filled the line with black. Edited the silhouetted to change the angle of the bird.","title":"make a silhouette of a bird"},{"location":"assignments/week02/#2-model-a-structure-to-express-the-glowing-and-flickering-of-candles","text":"Last week, I modeled the outline of the lamp I plan to make for my final project. This week, I will model structure inside the lampshade. The structures will move and create shadow on the shade. the shadow will be a pattern that decorates the lamp. For the candle mode, I will use lattice shells to express the glowing and flickering of candels.","title":"2. Model a structure to express the glowing and flickering of candles"},{"location":"assignments/week02/#overlapping-lattices","text":"I will first draw an 2D example of lattices expressing candles flickering. To draw the lattices, I use python. Here are the python libraries I used. library version matplotlib 3.6.3 numpy 1.23.4 opencv 4.6.0.66 These were installed by followings: pip install matplotlib pip install numpy pip instell opencv-python Caution I failed to successfully create a mp4 files with opencv. A file was exported, but I could not open it. Insted of using opencv, I used ffmpeg.","title":"overlapping lattices"},{"location":"assignments/week02/#step-1-import-libraries","text":"import cv2 import matplotlib.pyplot as plt import numpy as np import os import shutil import sys % matplotlib inline","title":"Step 1. Import libraries"},{"location":"assignments/week02/#step-2-set-the-area-to-plot-curves","text":"fig = plt . figure () ax = fig . add_subplot ( 111 , polar = True ) ax . grid ( False ) ax . set_yticklabels ([]) ax . set_xticklabels ([])","title":"Step 2. Set the area to plot curves"},{"location":"assignments/week02/#step-3-draw-a-curve-in-polar-coordinates","text":"ax = plt . subplot ( 111 , polar = True ) ax . grid ( False ) ax . set_yticklabels ([]) ax . set_xticklabels ([]) x = np . linspace ( 0 , np . pi / 3 ) y = x / np . pi ax . plot ( x , y , c = 'k' )","title":"Step 3. Draw a curve in polar coordinates"},{"location":"assignments/week02/#step-4-multipy-curves-in-a-circular-pattern","text":"def multipy ( ax , num , B , color ): for i in range ( num ): a = i * 2 * np . pi / num x0 = B * x + a y0 = x / np . pi ax . plot ( x0 , y0 , c = color ) fig = plt . figure () ax = fig . add_subplot ( 111 , polar = True ) ax . grid ( False ) ax . set_yticklabels ([]) ax . set_xticklabels ([]) x = np . linspace ( 0 , np . pi / 3 ) multipy ( ax , 8 , 1 , 'k' )","title":"Step 4. Multipy curves in a circular pattern"},{"location":"assignments/week02/#step-5-create-curves-bent-in-the-oppsite-direction","text":"fig = plt . figure () ax = fig . add_subplot ( 111 , polar = True ) ax . grid ( False ) ax . set_yticklabels ([]) ax . set_xticklabels ([]) x = np . linspace ( 0 , np . pi / 2 ) multipy ( ax , 12 , 1 , 'k' ) multipy ( ax , 10 , - 1 / 2 , 'k' )","title":"Step 5. Create curves bent in the oppsite direction"},{"location":"assignments/week02/#step-6-make-frame-of-two-lattices-rotating","text":"def rotate ( ax , num , B , d , color ): for i in range ( num ): a = i * 2 * np . pi / num x0 = B * x + a + d y0 = x / np . pi ax . plot ( x0 , y0 , c = color ) if os . path . exists ( 'frames' ): shutil . rmtree ( 'frames' ) os . mkdir ( 'frames' ) frame = 200 for j in range ( frame ): fig = plt . figure () ax = fig . add_subplot ( 111 , polar = True ) ax . grid ( False ) ax . set_yticklabels ([]) ax . set_xticklabels ([]) x = np . linspace ( 0 , np . pi / 2 ) multipy ( ax , 12 , 1 , 'k' ) multipy ( ax , 10 , - 1 / 2 , 'k' ) d = j * 2 * np . pi / frame rotate ( ax , 12 , 1 , d , 'k' ) rotate ( ax , 10 , - 1 / 2 , d , 'k' ) fig . savefig ( f './frames/pic_ { j : 02 } .jpg' ) plt . clf () plt . close ()","title":"Step 6. Make frame of two lattices rotating"},{"location":"assignments/week02/#step-7-make-video-file","text":"First I tried opencv fourcc = cv2 . VideoWriter_fourcc ( * 'mp4v' ) video = cv2 . VideoWriter ( 'lattice_rotate.mp4' , fourcc , 20.0 , ( 100 , 100 )) if not video . isOpened (): print ( \"can't be opened\" ) sys . exit () for i in range ( frame ): img = cv2 . imread ( f './frames/pic_ { j : 02 } .jpg' ) if img is None : print ( \"can't read\" ) break video . write ( img ) video . release () print ( 'written' ) 'lattice_rotate.mp4' was exported. However, I couldn't open it in my PC. So, I tried ffmpeg, and got this: ffmpeg -r 20 -i ./frames/pic_%02d.jpg rotate.mp4","title":"Step 7. Make video file"},{"location":"assignments/week02/#overlapping-lattice-shell-structures","text":"Next, I modeled a 3D structure that make shadow like the video above.","title":"overlapping lattice shell structures"},{"location":"assignments/week02/#step-1-design-the-curve-on-lampshade","text":"Draw two curves (in purple) that corespond to Step 3 in the 2D lattice. Black lines are support line from the lightsource to points on the curves.","title":"Step 1. Design the curve on lampshade"},{"location":"assignments/week02/#step-2-loft-the-black-lines-to-two-curved-surfaces","text":"","title":"Step 2. Loft the black lines to two curved surfaces"},{"location":"assignments/week02/#step-3-thicken-the-surfaces","text":"","title":"Step 3. Thicken the surfaces"},{"location":"assignments/week02/#step-4-create-the-base-shell-model-of-the-lattice-shell","text":"","title":"Step 4. Create the base shell model of the lattice shell"},{"location":"assignments/week02/#step-5-intersect-the-base-shell-and-curved-surface","text":"","title":"Step 5. Intersect the base shell and curved surface"},{"location":"assignments/week02/#step-6-multiply-the-intersections-by-cilrcular-pattern-and-union-all-to-get-a-llattice-shell","text":"","title":"Step 6. Multiply the intersections by cilrcular pattern and Union all to get a llattice shell"},{"location":"assignments/week02/#step-7-make-an-inner-lattice-shell","text":"","title":"Step 7. Make an inner lattice shell"},{"location":"assignments/week02/#step-8-make-a-movie-of-lattice-shells-rotating","text":"Shadow on shade will look like this: The next problem will be how to fix the lattice shells on the base, and how to make the lattice shells to rotate.","title":"Step 8. Make a movie of lattice shells rotating"},{"location":"assignments/week02/#links","text":"","title":"Links"}]}
\ No newline at end of file
diff --git a/public/sitemap.xml b/public/sitemap.xml
index b3a0d52c2ba6db9a463e0cabe4b22be55877a5b2..6b300be776910e556b66ea3680e6daebc951fc8e 100644
--- a/public/sitemap.xml
+++ b/public/sitemap.xml
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
     <url>
-         <loc>None</loc>
-         <lastmod>2023-02-05</lastmod>
+         <loc>https://fabacademy.org/2023/labs/kitakagaya/students/sosuke-kanegae/</loc>
+         <lastmod>2023-02-08</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
-         <loc>None</loc>
-         <lastmod>2023-02-05</lastmod>
+         <loc>https://fabacademy.org/2023/labs/kitakagaya/students/sosuke-kanegae/about/</loc>
+         <lastmod>2023-02-08</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
-         <loc>None</loc>
-         <lastmod>2023-02-05</lastmod>
+         <loc>https://fabacademy.org/2023/labs/kitakagaya/students/sosuke-kanegae/agreements/</loc>
+         <lastmod>2023-02-08</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
-         <loc>None</loc>
-         <lastmod>2023-02-05</lastmod>
+         <loc>https://fabacademy.org/2023/labs/kitakagaya/students/sosuke-kanegae/final-project/</loc>
+         <lastmod>2023-02-08</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
-         <loc>None</loc>
-         <lastmod>2023-02-05</lastmod>
+         <loc>https://fabacademy.org/2023/labs/kitakagaya/students/sosuke-kanegae/assignments/week01/</loc>
+         <lastmod>2023-02-08</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
-         <loc>None</loc>
-         <lastmod>2023-02-05</lastmod>
+         <loc>https://fabacademy.org/2023/labs/kitakagaya/students/sosuke-kanegae/assignments/week02/</loc>
+         <lastmod>2023-02-08</lastmod>
          <changefreq>daily</changefreq>
     </url>
 </urlset>
\ No newline at end of file
diff --git a/public/sitemap.xml.gz b/public/sitemap.xml.gz
index 4e5fede03a44601ffbda0e32697010212d9c901d..1f8601cc042b22c581fd8734111d168539c9c01a 100644
Binary files a/public/sitemap.xml.gz and b/public/sitemap.xml.gz differ