From 5e0549dd68f58002ef3c4ee2049a4fd9c1306dfd Mon Sep 17 00:00:00 2001 From: Charlotte Vandenbulcke <ch.vandenbulcke@gmail.com> Date: Thu, 21 Mar 2024 11:53:55 +0100 Subject: [PATCH] changing links of menu after schedule changes --- public/404.html | 12 +- public/about.html | 8 +- public/assignments.html | 16 +- public/assignments/week01.html | 12 +- public/assignments/week02.html | 12 +- public/assignments/week03.html | 12 +- public/assignments/week04.html | 12 +- public/assignments/week05.html | 8 +- public/assignments/week06.html | 8 +- public/assignments/week07.html | 8 +- public/assignments/week08.html | 8 +- public/assignments/week09.html | 326 +++++++++++++++++++++++++++++++++ public/final-project.html | 10 +- public/index.html | 36 ++-- 14 files changed, 407 insertions(+), 81 deletions(-) create mode 100644 public/assignments/week09.html diff --git a/public/404.html b/public/404.html index 5459626..6c5329b 100644 --- a/public/404.html +++ b/public/404.html @@ -60,13 +60,13 @@ <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. Electronics Design</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. Embedded Programming</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/week08.html">8. Electronics Design</a></li> + <li><a href="assignments/week09.html">9. Output Devices</a></li> + <li><a href="assignments/week10.html">10. Mechanical Design And Machine Design</a></li> + <li><a href="assignments/week11.html">11. Input Devices</a></li> + <li><a href="assignments/week12.html">12. Molding And Casting</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> diff --git a/public/about.html b/public/about.html index 4a414e9..3d2af3d 100644 --- a/public/about.html +++ b/public/about.html @@ -160,10 +160,10 @@ <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/week09.html">9. Output Devices</a></li> + <li><a href="assignments/week10.html">10. Mechanical Design And Machine Design</a></li> + <li><a href="assignments/week11.html">11. Input Devices</a></li> + <li><a href="assignments/week12.html">12. Molding And Casting</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> diff --git a/public/assignments.html b/public/assignments.html index 5f0beba..1e639ce 100644 --- a/public/assignments.html +++ b/public/assignments.html @@ -137,7 +137,7 @@ </article> <article> <a href="assignments/week09.html" class="image"><img src="images/pic06.jpg" alt="" /></a> - <h3>Molding And Casting</h3> + <h3>Output Devices</h3> <p>...</p> <ul class="actions"> <li><a href="assignments/week09.html" class="button">More</a></li> @@ -145,7 +145,7 @@ </article> <article> <a href="assignments/week10.html" class="image"><img src="images/pic06.jpg" alt="" /></a> - <h3>Output Devices</h3> + <h3>Mechanical Design And Machine Design</h3> <p>...</p> <ul class="actions"> <li><a href="assignments/week10.html" class="button">More</a></li> @@ -153,7 +153,7 @@ </article> <article> <a href="assignments/week11.html" class="image"><img src="images/pic06.jpg" alt="" /></a> - <h3>Mechanical Design And Machine Design</h3> + <h3>Input Devices</h3> <p>...</p> <ul class="actions"> <li><a href="assignments/week11.html" class="button">More</a></li> @@ -161,7 +161,7 @@ </article> <article> <a href="assignments/week12.html" class="image"><img src="images/pic06.jpg" alt="" /></a> - <h3>Input Devices</h3> + <h3>Molding And Casting</h3> <p>...</p> <ul class="actions"> <li><a href="assignments/week12.html" class="button">More</a></li> @@ -244,10 +244,10 @@ <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/week09.html">9. Output Devices</a></li> + <li><a href="assignments/week10.html">10. Mechanical Design And Machine Design</a></li> + <li><a href="assignments/week11.html">11. Input Devices</a></li> + <li><a href="assignments/week12.html">12. Molding And Casting</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> diff --git a/public/assignments/week01.html b/public/assignments/week01.html index aab9be7..a1f3b3a 100644 --- a/public/assignments/week01.html +++ b/public/assignments/week01.html @@ -161,13 +161,13 @@ <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. Electronics Design</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. Embedded Programming</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/week08.html">8. Electronics Design</a></li> + <li><a href="../assignments/week09.html">9. Output Devices</a></li> + <li><a href="../assignments/week10.html">10. Mechanical Design And Machine Design</a></li> + <li><a href="../assignments/week11.html">11. Input Devices</a></li> + <li><a href="../assignments/week12.html">12. Molding and Casting</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> diff --git a/public/assignments/week02.html b/public/assignments/week02.html index 90db7af..0b03059 100644 --- a/public/assignments/week02.html +++ b/public/assignments/week02.html @@ -334,13 +334,13 @@ <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. Electronics Design</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. Embedded Programming</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/week08.html">8. Electronics Design</a></li> + <li><a href="../assignments/week09.html">9. Output Devices</a></li> + <li><a href="../assignments/week10.html">10. Mechanical Design And Machine Design</a></li> + <li><a href="../assignments/week11.html">11. Input Devices</a></li> + <li><a href="../assignments/week12.html">12. Molding and Casting</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> diff --git a/public/assignments/week03.html b/public/assignments/week03.html index b620ab7..850e6d6 100644 --- a/public/assignments/week03.html +++ b/public/assignments/week03.html @@ -464,13 +464,13 @@ <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. Electronics Design</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. Embedded Programming</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/week08.html">8. Electronics Design</a></li> + <li><a href="../assignments/week09.html">9. Output Devices</a></li> + <li><a href="../assignments/week10.html">10. Mechanical Design And Machine Design</a></li> + <li><a href="../assignments/week11.html">11. Input Devices</a></li> + <li><a href="../assignments/week12.html">12. Molding and Casting</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> diff --git a/public/assignments/week04.html b/public/assignments/week04.html index 7a6afb3..ebbeb30 100644 --- a/public/assignments/week04.html +++ b/public/assignments/week04.html @@ -641,13 +641,13 @@ <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. Electronics Design</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. Embedded Programming</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/week08.html">8. Electronics Design</a></li> + <li><a href="../assignments/week09.html">9. Output Devices</a></li> + <li><a href="../assignments/week10.html">10. Mechanical Design And Machine Design</a></li> + <li><a href="../assignments/week11.html">11. Input Devices</a></li> + <li><a href="../assignments/week12.html">12. Molding and Casting</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> diff --git a/public/assignments/week05.html b/public/assignments/week05.html index 29b7f0b..28a42a3 100644 --- a/public/assignments/week05.html +++ b/public/assignments/week05.html @@ -531,10 +531,10 @@ <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/week09.html">9. Output Devices</a></li> + <li><a href="../assignments/week10.html">10. Mechanical Design And Machine Design</a></li> + <li><a href="../assignments/week11.html">11. Input Devices</a></li> + <li><a href="../assignments/week12.html">12. Molding and Casting</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> diff --git a/public/assignments/week06.html b/public/assignments/week06.html index caf5cfd..3d69196 100644 --- a/public/assignments/week06.html +++ b/public/assignments/week06.html @@ -522,10 +522,10 @@ <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/week09.html">9. Output Devices</a></li> + <li><a href="../assignments/week10.html">10. Mechanical Design And Machine Design</a></li> + <li><a href="../assignments/week11.html">11. Input Devices</a></li> + <li><a href="../assignments/week12.html">12. Molding and Casting</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> diff --git a/public/assignments/week07.html b/public/assignments/week07.html index 5334691..db33e97 100644 --- a/public/assignments/week07.html +++ b/public/assignments/week07.html @@ -304,10 +304,10 @@ <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/week09.html">9. Output Devices</a></li> + <li><a href="../assignments/week10.html">10. Mechanical Design And Machine Design</a></li> + <li><a href="../assignments/week11.html">11. Input Devices</a></li> + <li><a href="../assignments/week12.html">12. Molding and Casting</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> diff --git a/public/assignments/week08.html b/public/assignments/week08.html index 1a4185e..fa0bebc 100644 --- a/public/assignments/week08.html +++ b/public/assignments/week08.html @@ -419,10 +419,10 @@ <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/week09.html">9. Output Devices</a></li> + <li><a href="../assignments/week10.html">10. Mechanical Design And Machine Design</a></li> + <li><a href="../assignments/week11.html">11. Input Devices</a></li> + <li><a href="../assignments/week12.html">12. Molding and Casting</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> diff --git a/public/assignments/week09.html b/public/assignments/week09.html new file mode 100644 index 0000000..5a4e169 --- /dev/null +++ b/public/assignments/week09.html @@ -0,0 +1,326 @@ +<!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>9. Output Devices</h2> + </header> + + <section> + <h3>Hero shot</h3> + + <span class="image object"> + <img src="../images/current-hero-shot.jpg" alt="..." /> + </span> + + <br> + + </section> + + <hr> + + <section> + <h3>Group assignment</h3> + + <p></p> + + <h4></h4> + + <span class="image object"> + <img src="../images/...jpg" alt="..." /> + </span> + + <h5></h5> + + <table> + <tbody> + <tr> + <th scope="row">Memory</th> + <td>24 Mpts (divided by number of channels)</td> + </tr> + <tr> + <th scope="row">Sample rate</th> + <td>250 MS/s (4 channels active),<br> + 500 MS/s (2 channels active), <br> + 1 GS/s (1 channel active)</td> + </tr> + <tr> + <th scope="row">Display</th> + <td>7" TFT, 800x480 pixels 160,000 colors</td> + </tr> + <tr> + <th scope="row">Input impedance</th> + <td>1 MΩ</td> + </tr> + <tr> + <th scope="row">Number of channels</th> + <td>4</td> + </tr> + <tr> + <th scope="row">Horizontal scale (input)</th> + <td>5 ns/div - 50s/div</td> + </tr> + <tr> + <th scope="row">Vertical Sensitivity (input)</th> + <td>1 mV/div - 10 V/div</td> + </tr> + <tr> + <th scope="row">A/D converter</th> + <td>8 bits resolution</td> + </tr> + <tr> + <th scope="row">Maximum voltage</th> + <td>CAT I 300 Vrms, CAT II 100 Vrms, transient overvoltage 100Vpk</td> + </tr> + <tr> + <th scope="row">Rise Time</th> + <td>DS1104Z: 3.5 ns<br> + DS1074Z: 5 ns<br> + DS1054Z: 7 ns</td> + </tr> + <tr> + <th scope="row">Probe support</th> + <td>0.1x - 1000x</td> + </tr> + <tr> + <th scope="row">Measured noise value</th> + <td>1 mVpp (at 100ms,1mV/div, record length: 3Mpts)</td> + </tr> + <tr> + <th scope="row">Connections</th> + <td>USB 2.0 type A, USB 2.0 type B, LAN</td> + </tr> + <tr> + <th scope="row">Weight (without box)</th> + <td>3.2 Kg</td> + </tr> + <tr> + <th scope="row">Dimensions</th> + <td>313 x 161 x 122 mm</td> + </tr> + </tbody> + </table> + + <h4>Coding</h4> + + <h5>The Arduino Neopixel simple code</h5> + + <pre> + <code> + // NeoPixel Ring simple sketch (c) 2013 Shae Erisson + // Released under the GPLv3 license to match the rest of the + // Adafruit NeoPixel library + + #include <Adafruit_NeoPixel.h> + #ifdef __AVR__ + #include <avr/power.h> // Required for 16 MHz Adafruit Trinket + #endif + + // Which pin on the Arduino is connected to the NeoPixels? + #define PIN 7 // On Trinket or Gemma, suggest changing this to 1 + + // How many NeoPixels are attached to the Arduino? + #define NUMPIXELS 16 // Popular NeoPixel ring size + + // When setting up the NeoPixel library, we tell it how many pixels, + // and which pin to use to send signals. Note that for older NeoPixel + // strips you might need to change the third parameter -- see the + // strandtest example for more information on possible values. + Adafruit_NeoPixel pixels(NUMPIXELS, PIN, NEO_GRB + NEO_KHZ800); + + #define DELAYVAL 1500 // Time (in milliseconds) to pause between pixels + + void setup() { + // These lines are specifically to support the Adafruit Trinket 5V 16 MHz. + // Any other board, you can remove this part (but no harm leaving it): + #if defined(__AVR_ATtiny85__) && (F_CPU == 16000000) + clock_prescale_set(clock_div_1); + #endif + // END of Trinket-specific code. + + pixels.begin(); // INITIALIZE NeoPixel strip object (REQUIRED) + } + + void loop() { + pixels.clear(); // Set all pixel colors to 'off' + + // The first NeoPixel in a strand is #0, second is 1, all the way up + // to the count of pixels minus one. + for(int i=0; i<NUMPIXELS; i++) { // For each pixel... + + // pixels.Color() takes RGB values, from 0,0,0 up to 255,255,255 + // Here we're using a moderately bright green color: + pixels.setPixelColor(i, pixels.Color(0, 150, 0)); + + pixels.show(); // Send the updated pixel colors to the hardware. + + delay(DELAYVAL); // Pause before next pass through loop + } + } + </code> + </pre> + + <h5>The Arduino ... Code</h5> + + <pre> + <code> + ... + </code> + </pre> + + <h4></h4> + + <p></p> + + <span class="image object"> + <img src="../images/...jpg" alt="..." /> + </span> + + <br> + + <p>Link to our <a href="https://fabacademy.org/2024/labs/fabc/group-assignment/week009/" target="_blank">Group page</a></p> + + </section> + + <hr> + + <section> + <h3>Individual assignment</h3> + + <h4>Discovering</h4> + + <p></p> + + <h4></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="../files/cat-controller.kicad_pro" target="_blank">Cat-Controller Kicad-Pro file</a></li> + </ul> + + <p><strong>Resources</strong></p> + <ul> + <li><a href="https://fabacademy.org/2024/labs/fabc/" target="_blank">Our group page</a></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. Output Devices</a></li> + <li><a href="../assignments/week10.html">10. Mechanical Design And Machine Design</a></li> + <li><a href="../assignments/week11.html">11. Input Devices</a></li> + <li><a href="../assignments/week12.html">12. Molding and Casting</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/final-project.html b/public/final-project.html index e2d6d41..9e2865f 100644 --- a/public/final-project.html +++ b/public/final-project.html @@ -92,7 +92,7 @@ <section> <p>I've made a first attempt of building a box by cutting panels of 4 mm multiplex to search for the final panel sizes.</p> - <p>For that, I just generated a box on the <a href="https://www.gravini.cz/" target="_blank">Gravini</a>website and added several options like hexagone holes on one panel (to already see how I will work on that "accessories addition" part), elevation pieces (maybe later a drawer), the front hole size to get inside,...</p> + <p>For that, I just generated a box on the <a href="https://www.gravini.cz/" target="_blank">Gravini</a> website and added several options like hexagone holes on one panel (to already see how I will work on that "accessories addition" part), elevation pieces (maybe later a drawer), the front hole size to get inside,...</p> <p>It didn't result so well because the panels weren't flat so the assembling was horrible !</p> @@ -131,10 +131,10 @@ <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/week09.html">9. Output Devices</a></li> + <li><a href="assignments/week10.html">10. Mechanical Design And Machine Design</a></li> + <li><a href="assignments/week11.html">11. Input Devices</a></li> + <li><a href="assignments/week12.html">12. Molding And Casting</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> diff --git a/public/index.html b/public/index.html index 86370c5..23b7e77 100644 --- a/public/index.html +++ b/public/index.html @@ -83,9 +83,9 @@ </div> </article> <article> - <a href="assignments/week06.html"><span class="icon solid fa-code-branch"></span></a> + <a href="assignments/week06.html"><span class="icon solid fa-code"></span></a> <div class="content"> - <a href="assignments/week06.html"><h3>Electronics Design</h3></a> + <a href="assignments/week06.html"><h3>Embedded Programming</h3></a> </div> </article> <article> @@ -95,33 +95,33 @@ </div> </article> <article> - <a href="assignments/week08.html"><span class="icon solid fa-code"></span></a> + <a href="assignments/week08.html"><span class="icon solid fa-code-branch"></span></a> <div class="content"> - <a href="assignments/week08.html"><h3>Embedded Programming</h3></a> + <a href="assignments/week08.html"><h3>Electronics Design</h3></a> </div> </article> <article> - <a href="assignments/week09.html"><span class="icon solid fa-ring"></span></a> + <a href="assignments/week09.html"><span class="icon solid fa-right-from-bracket"></span></a> <div class="content"> - <a href="assignments/week09.html"><h3>Molding And Casting</h3></a> + <a href="assignments/week09.html"><h3>Output Devices</h3></a> </div> </article> <article> - <a href="assignments/week10.html"><span class="icon solid fa-right-from-bracket"></span></a> + <a href="assignments/week10.html"><span class="icon solid fa-gears"></span></a> <div class="content"> - <a href="assignments/week10.html"><h3>Output Devices</h3></a> + <a href="assignments/week10.html"><h3>Mechanical Design And Machine Design</h3></a> </div> </article> <article> - <a href="assignments/week11.html"><span class="icon solid fa-gears"></span></a> + <a href="assignments/week11.html"><span class="icon solid fa-right-to-bracket"></span></a> <div class="content"> - <a href="assignments/week11.html"><h3>Mechanical Design And Machine Design</h3></a> + <a href="assignments/week11.html"><h3>Input Devices</h3></a> </div> </article> <article> - <a href="assignments/week12.html"><span class="icon solid fa-right-to-bracket"></span></a> + <a href="assignments/week12.html"><span class="icon solid fa-ring"></span></a> <div class="content"> - <a href="assignments/week12.html"><h3>Input Devices</h3></a> + <a href="assignments/week12.html"><h3>Molding And Casting</h3></a> </div> </article> <article> @@ -194,13 +194,13 @@ <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. Electronics Design</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. Embedded Programming</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/week08.html">8. Electronics Design</a></li> + <li><a href="assignments/week09.html">9. Output Devices</a></li> + <li><a href="assignments/week10.html">10. Mechanical Design And Machine Design</a></li> + <li><a href="assignments/week11.html">11. Input Devices</a></li> + <li><a href="assignments/week12.html">12. Molding And Casting</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> -- GitLab