diff --git a/public/assignments/week05.html b/public/assignments/week05.html
index 22ea67a6d3a5b5561709a4347c4cffbd8311f7ab..1a3a916c6a2ab7b59ecc9a3753ef565c49e79cec 100644
--- a/public/assignments/week05.html
+++ b/public/assignments/week05.html
@@ -406,7 +406,7 @@
<p>I haven't changed the files yet because I'm not sure I will be able to reuse them. If it's the case, I'll document on it ! ;)</p>
<span class="image object">
- <img src="../images/...jpg" alt="..." />
+ <img src="../images/video-issue-firefox.jpg" alt="..." />
</span>
<p>We had trouble with the 3D scanner as told above and it took a lot of time to finally start with it. We quickly went through it so I will try it again later.</p>
@@ -421,6 +421,10 @@
<p>Last issue that made me learn something new is that I pushed my files on the cloud forgetting to delete the "test videos" files from my "video problem resolving" and this push was OF COURSE rejected because of the file sizes.</p>
+ <span class="image object">
+ <img src="../images/push error.jpg" alt="..." />
+ </span>
+
<p>I thought I would just have to delete them and push the website again but it didn't work !</p>
<p>Even though my big video files weren't in the folder anymore, the pushed size still was big, as if the files were still there...</p>
@@ -438,17 +442,37 @@
<p>SOLUTION :</p>
<ul>
<li>Enter the right folder with CMD (in my case : C:\Users\fab-c\fabacademy\site2ok\charlotte-vandenbulcke\public>)</li>
- <li>Add : git log --oneline --graph</li>
- <li>Check which commit was the last before uploading the big file in the list generated and count the place in this list (in my case it was the 4th commit in the list)</li>
- <li>Add : git reset --soft HEAD~4 (4=the place of the last commit)</li>
- <li>Check with a git log --oneline --graph again if you're in the right place</li>
- <li>Make a small change in one of your html file before checking the git status (we didn't the first time we tried and started the pushing steps right away. That's why nothing changed and we thought it wasn't working)</li>
- <li>Start again the pushing steps with "git status", "git add -A", "git commit -m" and "git push"</li>
+ <li>Add : git log --oneline --graph
+ <span class="image object">
+ <img src="../images/log-oneline-graph.jpg" alt="..." />
+ </span>
+ </li>
+ <li>Check which commit was the last before uploading the big file in the list generated and count the place in this list (in my case it was the 4th commit in the list)
+ <span class="image object">
+ <img src="../images/counting-lines-graph.jpg" alt="..." />
+ </span>
+ </li>
+ <li>Add : git reset --soft HEAD~4 (4=the place of the last commit)
+ <span class="image object">
+ <img src="../images/reset-head-4.jpg" alt="..." />
+ </span>
+ </li>
+ <li>Check with a git log --oneline --graph again if you're in the right place
+ <span class="image object">
+ <img src="../images/back-to-origin.jpg" alt="..." />
+ </span>
+ </li>
+ <li>IMPORTANT : Make a small change in one of your html file before checking the git status (we didn't the first time we tried and started the pushing steps right away. That's why nothing changed and we thought it wasn't working)</li>
+ <li>Start again the pushing steps with "git status", "git add -A", "git commit -m" and "git push"
+ <span class="image object">
+ <img src="../images/push-resolved.jpg" alt="..." />
+ </span>
+ </li>
</ul>
<p>If you followw these steps, it should go back to normal ! ;)</p>
- <p>If not, do not hesitate to contact me to check together ! :)</p>
+ <p>If not, do not hesitate to contact me so we can check together ! :)</p>
</section>
@@ -460,6 +484,7 @@
<p><strong>My files</strong></p>
<ul>
<li><a href="https://www.dropbox.com/scl/fi/8bgoc638oj1dzw5c50jhz/voronoidSphere.stl?rlkey=thfjl2tjoqilw19ku51uq7v2l&dl=0" target="_blank">Voronoid Sphere Design</a></li>
+ <li><a href="https://www.dropbox.com/scl/fi/zodezq2iz6f6eo36vjiof/owl.stl?rlkey=21h4cf635xo91whkradc3zgl0&dl=0" target="_blank">Owl scan file</a></li>
</ul>
<p><strong>Resources</strong></p>
diff --git a/public/assignments/week06.html b/public/assignments/week06.html
new file mode 100644
index 0000000000000000000000000000000000000000..5a131364c620561f34165c5cb7a0208fa811617e
--- /dev/null
+++ b/public/assignments/week06.html
@@ -0,0 +1,169 @@
+<!DOCTYPE html>
+<html lang="en-us">
+ <head>
+ <meta charset="UTF-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <meta name="generator" content="GitLab Pages">
+ <meta name="description" content="Fab Academy documentation site for Charlotte Fab-C">
+ <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
+ <link rel="stylesheet" href="../assets/css/main.css" />
+ <title>Charlotte Fab-C - Fab Academy</title>
+
+ </head>
+ <body class="is-preload">
+ <!-- Wrapper -->
+ <div id="wrapper">
+
+ <!-- Main -->
+ <div id="main">
+ <div class="inner">
+
+ <!-- Header -->
+ <header id="header">
+ <a href="../index.html" class="logo"><strong>Charlotte - FabLab de Charleroi</strong> Fab Academy website</a>
+ <ul class="icons">
+ <li><a href="https://www.facebook.com/littlebelge" class="icon brands fa-facebook-f" target="_blank"><span class="label">Facebook</span></a></li>
+ <li><a href="https://www.instagram.com/little.belge/" class="icon brands fa-instagram" target="_blank"><span class="label">Instagram</span></a></li>
+ <li><a href="https://gitlab.fabcloud.org/charlotte-vandenbulcke" class="icon brands fa-gitlab" target="_blank"><span class="label">Gitlab</span></a></li>
+ </ul>
+ </header>
+
+ <!-- Section -->
+ <section id="banner">
+ <div class="content">
+
+ <header class="main">
+ <h2>6. Embedded Programming</h2>
+ </header>
+
+ <section>
+ <p></p>
+ </section>
+
+ <hr>
+
+ <section>
+ <h3>Group assignment</h3>
+ <p></p>
+
+ <h4>title</h4>
+
+ <p></p>
+
+ <span class="image object">
+ <img src="../images/...jpg" alt="..." />
+ </span>
+
+ <p>Link to our <a href="https://fabacademy.org/2024/labs/fabc/group-assignment/week006/" target="_blank">Group page</a></p>
+
+ </section>
+
+ <hr>
+
+ <section>
+ <h3>Individual assignment</h3>
+
+ <h4>title</h4>
+
+ <p></p>
+
+ <span class="image object">
+ <img src="../images/...jpg" alt="..." />
+ </span>
+
+ </section>
+
+ <hr>
+
+ <section>
+ <h3>My journey</h3>
+
+ <p></p>
+
+ <span class="image object">
+ <img src="../images/...jpg" alt="..." />
+ </span>
+
+ </section>
+
+ <hr>
+
+ <section>
+ <h3>Files and resources</h3>
+
+ <p><strong>My files</strong></p>
+ <ul>
+ <li><a href="..." target="_blank">file</a></li>
+ </ul>
+
+ <p><strong>Resources</strong></p>
+ <ul>
+ <li><a href="https://fabacademy.org/2024/labs/fabc/">Our group page</li>
+
+ </ul>
+ </section>
+ </div>
+ </section>
+
+ </div>
+ </div>
+
+ <!-- Sidebar -->
+ <div id="sidebar">
+ <div class="inner">
+
+ <!-- Menu -->
+ <nav id="menu">
+ <header class="major">
+ <h2>Menu</h2>
+ </header>
+ <ul>
+ <li><a href="../index.html">Homepage</a></li>
+ <li><a href="../assignments.html">Assignments</a></li>
+ <li>
+ <span class="opener">Week per week</span>
+ <ul>
+ <li><a href="../assignments/week01.html">1. Project Management</a></li>
+ <li><a href="../assignments/week02.html">2. Computer Aided Design</a></li>
+ <li><a href="../assignments/week03.html">3. Computer Controlled Cutting</a></li>
+ <li><a href="../assignments/week04.html">4. Electronics Production</a></li>
+ <li><a href="../assignments/week05.html">5. 3D Scanning And Printing</a></li>
+ <li><a href="../assignments/week06.html">6. Embedded Programming</a></li>
+ <li><a href="../assignments/week07.html">7. Computer Controlled Machining</a></li>
+ <li><a href="../assignments/week08.html">8. Electronics Design</a></li>
+ <li><a href="../assignments/week09.html">9. Molding And Casting</a></li>
+ <li><a href="../assignments/week10.html">10. Output Devices</a></li>
+ <li><a href="../assignments/week11.html">11. Mechanical Design And Machine Design</a></li>
+ <li><a href="../assignments/week12.html">12. Input Devices</a></li>
+ <li><a href="../assignments/week13.html">13. Networking And Communications</a></li>
+ <li><a href="../assignments/week14.html">14. Interface And Application Programming</a></li>
+ <li><a href="../assignments/week15.html">15. Wildcard Week</a></li>
+ <li><a href="../assignments/week16.html">16. Applications And Implications</a></li>
+ <li><a href="../assignments/week17.html">17. Invention, Intellectual Property And Income</a></li>
+ <li><a href="../assignments/week18.html">18. Project Development</a></li>
+ </ul>
+ </li>
+ <li><a href="../final-project.html">Final Project</a></li>
+
+ <li><a href="../about.html">About Me</a></li>
+ </nav>
+
+ <!-- Footer -->
+ <footer id="footer">
+ <p class="copyright">© Charlotte - FabLab de Charleroi. Fab Academy 2024. All rights reserved. Design: <a href="https://html5up.net">HTML5 UP</a>.</p>
+ </footer>
+
+ </div>
+ </div>
+
+ </div>
+
+ <!-- Scripts -->
+ <script src="../assets/js/jquery.min.js"></script>
+ <script src="../assets/js/browser.min.js"></script>
+ <script src="../assets/js/breakpoints.min.js"></script>
+ <script src="../assets/js/util.js"></script>
+ <script src="../assets/js/main.js"></script>
+
+ </body>
+</html>
diff --git a/public/images/back-to-origin.jpg b/public/images/back-to-origin.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..d2dd189a9af71d9164f6b52294e32ef3a0aea141
Binary files /dev/null and b/public/images/back-to-origin.jpg differ
diff --git a/public/images/counting-lines-graph.jpg b/public/images/counting-lines-graph.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..13943420d7e8b2bf6313c26ace4de4957b827364
Binary files /dev/null and b/public/images/counting-lines-graph.jpg differ
diff --git a/public/images/log-oneline-graph.jpg b/public/images/log-oneline-graph.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..237a683d0a367c2949275c2f57cf93c458a23780
Binary files /dev/null and b/public/images/log-oneline-graph.jpg differ
diff --git a/public/images/push error.jpg b/public/images/push error.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..1ed37df6e19ba1bba9bd61198bf4bf481fd2ae0a
Binary files /dev/null and b/public/images/push error.jpg differ
diff --git a/public/images/push-resolved.jpg b/public/images/push-resolved.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..ccd8c7b2e037f3b2825ef7b84d6c85d90d374e27
Binary files /dev/null and b/public/images/push-resolved.jpg differ
diff --git a/public/images/reset-head-4.jpg b/public/images/reset-head-4.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..c21f52ca2fae71675483b414e1f54b7eb5656874
Binary files /dev/null and b/public/images/reset-head-4.jpg differ
diff --git a/public/images/video-issue-firefox.jpg b/public/images/video-issue-firefox.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..dcb921ea34e47250c3fca2331d78990fb976d046
Binary files /dev/null and b/public/images/video-issue-firefox.jpg differ