completing week07

public/assignments/week07.html

@@ -49,9 +49,13 @@
                     <section>
                       <h3>Group assignment</h3>
 
-                      <p>It's time to get to know the CNC</p>
+                      <p>It's time to get to know the CNC. We have a <a href="https://www.mekanika.io/" target="_blank">Mekanika</a> model.</p>
 
-                      <p>In order to do that, we created a simple square part using the machine's various cutting and engraving options:</p>
+                      <span class="image object">
+                      <img src="../images/mekanika-CNC.jpg" alt="..." />
+                      </span>
+
+                      <p>In order to do that, we've created a simple square part using the machine's various cutting and engraving options:</p>
 
                       <ul>
                         <li>a round hole</li>
@@ -117,14 +121,14 @@
 
                       <p>Once the object has been created, we need to prepare the file so that we can start working on the CNC.</p>
 
-                      <p>To do this, we must first register the various milling cutters and their parameters.</p>
-
-                      <h4>Safety training</h4>
+                      <p>To do this, we must first register the various mills and their parameters.</p>
                       
                       <span class="image object">
-                      <img src="../images/...jpg" alt="..." />
+                      <img src="../images/cnc-mills.jpg" alt="..." />
                       </span>
                       
+                      <h4>Safety</h4>
+                      
                       <h5>...</h5>
 
                       <p>
@@ -141,15 +145,15 @@
 
                       <p></p>
 
-                      <h4>Tests</h4>
-
-                      <h5>Object design in Freecad</h5>
+                      <h5>Object cut with the CNC</h5>
 
                       <p></p>
 
-                      <h5>Object cut with CNC</h5>
-
-                      <p></p>
+                      <span class="object">
+                      <video width="600" height="300" controls>
+                      <source src="../images/cutting-in-progress.mp4" type="video/mp4">
+                      </video>
+                      </span>
 
                       <h6>Parameters</h6>
 
@@ -184,11 +188,7 @@
 
                       <p></p>                
                       
-                      <span class="object">
-                      <video width="600" height="300" controls>
-                      <source src="../images/...mp4" type="video/mp4">
-                      </video>
-                      </span>
+                      
 
                       </section>