diff --git a/public/about.html b/public/about.html
index 4efd3ed28490aa899ef94a518979b1d578a1c816..4a414e9d39f15d1fbcd772e41871e06a7ff9a54e 100644
--- a/public/about.html
+++ b/public/about.html
@@ -74,7 +74,7 @@
<p>But most of all <strong>I LOVE CATS</strong> ! And mine at first !</p>
<span class="image object">
- <img class="about" src="images/croq.jpg" alt="Picture of Charlotte Vandenbulcke's lovely perfect tabby cat !" />
+ <img class="about" src="images/my-beauty-cat.jpg" alt="Picture of Charlotte Vandenbulcke's lovely perfect tabby cat !" />
</span>
</section>
<section>
@@ -98,7 +98,6 @@
<p>I've chosen "My Sweet Neko" as brand name, "Neko" meaning "Cat" in Japanese.</p>
- <p>My heart is filled with love for pets, that's why my Fab Academy project would obviously be for them ! ;)</p>
</section>
<section>
<h2>Agreement</h2>
@@ -158,9 +157,9 @@
<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/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>
diff --git a/public/assignments/week06.html b/public/assignments/week06.html
index 24ec1ab0c096640577b8c889c28412509883e832..4b607ca7af31e011dc603e53ee476d775b54d6d1 100644
--- a/public/assignments/week06.html
+++ b/public/assignments/week06.html
@@ -132,6 +132,10 @@
</tbody>
</table>
+ <p>In this state, the Seeed Studio has 11 pins free to be used and an in- and/or output.</p>
+
+ <p>When we use it in the Quentorres, only 4 pins are left available and the in- and/or output.</p>
+
<p>Link to our <a href="https://fabacademy.org/2024/labs/fabc/group-assignment/week006/" target="_blank">Group page</a></p>
</section>
@@ -141,12 +145,300 @@
<section>
<h3>Individual assignment</h3>
- <h4>title</h4>
+ <h4>Quentorres programming</h4>
- <p></p>
+ <p>We've already programmed the led to blink by pushing the button on the Quentorres on week04.</p>
<span class="image object">
- <img src="../images/...jpg" alt="..." />
+ <img src="../images/quentorres-programming.jpg" alt="..." />
+ </span>
+
+ <p>This week we went a little further !</p>
+ <p>First we programmed the 3 leds to blink all at ones every second with Arduino.</p>
+
+ <pre>
+ <code>
+
+ //read leds on pin 26, 0 and 1(correspondance seeed studio component)
+ const int ledPin0 = 26;
+ const int ledPin1 = 0;
+ const int ledPin2 = 1;
+ // the setup function runs once when you press reset or power the board
+ void setup() {
+ // initialize digital pins as an output.
+ pinMode(ledPin0, OUTPUT);
+ pinMode(ledPin1, OUTPUT);
+ pinMode(ledPin2, OUTPUT);
+ }
+
+ // the loop function runs over and over again forever
+ void loop() {
+ digitalWrite(ledPin0, HIGH); // turn the LEDs on (HIGH is the voltage level)
+ digitalWrite(ledPin1, HIGH);
+ digitalWrite(ledPin2, HIGH);
+ delay(1000); // wait for a second
+ digitalWrite(ledPin0, LOW); // turn the LEDs off (LOW is the voltage level)
+ digitalWrite(ledPin1, LOW);
+ digitalWrite(ledPin2, LOW);
+ delay(1000); // wait for a second
+ }
+
+ </code>
+ </pre>
+
+ <span class="image object">
+ <img src="../images/3-leds-blinking.mp4" alt="..." />
+ </span>
+
+ <p>The next step was to use the button again and turn the 3 leds on all at ones by pushing it.</p>
+
+ <pre>
+ <code>
+ // Defining the pins
+ const int boutonPin = 27;
+ const int ledPin0 = 26;
+ const int ledPin1 = 0;
+ const int ledPin2 = 1;
+
+ void setup() {
+ // Configure the button as INPUT
+ pinMode(boutonPin, INPUT);
+
+ // Configure the LEDs as OUTPUT
+ pinMode(ledPin0, OUTPUT);
+ pinMode(ledPin1, OUTPUT);
+ pinMode(ledPin2, OUTPUT);
+
+ // Starting with the LEDs turned off
+ digitalWrite(ledPin0, LOW);
+ digitalWrite(ledPin1, LOW);
+ digitalWrite(ledPin2, LOW);
+ }
+
+ void loop() {
+ // Reading the button's state
+ int etatBouton = digitalRead(boutonPin);
+
+ // If the button is pushed
+ if (etatBouton == HIGH) {
+ // Turn on the LEDs
+ digitalWrite(ledPin0, HIGH);
+ digitalWrite(ledPin1, HIGH);
+ digitalWrite(ledPin2, HIGH);
+ } else {
+ // Turn off the LEDs
+ digitalWrite(ledPin0, LOW);
+ digitalWrite(ledPin1, LOW);
+ digitalWrite(ledPin2, LOW);
+ }
+ }
+ </code>
+ </pre>
+
+ <span class="image object">
+ <img src="../images/3-leds-blinking-button.mp4" alt="..." />
+ </span>
+
+ <p>Last step, I used the Arduino Serial Monitor to turn on and off the LEDs separately.</p>
+ <p>For this program, I asked <a href="https://gemini.google.com/app/" target="_blank">Gemini</a> (Google's ChatGPT) for some help (because I'm no good at programming!) and it gave me this code :</p>
+
+ <pre>
+ <code>
+ // Defining LEDs pins
+ #define LED_26 26
+ #define LED_1 1
+ #define LED_0 0
+
+ void setup() {
+ // Initialize LEDs pins as OUTPUT
+ pinMode(LED_26, OUTPUT);
+ pinMode(LED_1, OUTPUT);
+ pinMode(LED_0, OUTPUT);
+
+ // Starting Serial Monitor
+ Serial.begin(9600);
+ }
+
+ void loop() {
+ // Declaring the variable that will stock the received character
+ char c;
+
+ // Waiting to receive the character
+ while (!Serial.available());
+
+ // Reading the received character
+ c = Serial.read();
+
+ // The LED that corresponds to the received character lights up
+ switch (c) {
+ case '1':
+ digitalWrite(LED_26, HIGH);
+ digitalWrite(LED_1, LOW);
+ digitalWrite(LED_0, LOW);
+ break;
+ case '2':
+ digitalWrite(LED_26, LOW);
+ digitalWrite(LED_1, HIGH);
+ digitalWrite(LED_0, LOW);
+ break;
+ case '3':
+ digitalWrite(LED_26, LOW);
+ digitalWrite(LED_1, LOW);
+ digitalWrite(LED_0, HIGH);
+ break;
+ case '0':
+ digitalWrite(LED_26, LOW);
+ digitalWrite(LED_1, LOW);
+ digitalWrite(LED_0, LOW);
+ break;
+ }
+ }
+ </code>
+ </pre>
+
+ <p>It results on :
+
+ <ul>
+ <li>turning on LED 26 by writing "1" in the serial monitor,</li>
+ <li>turning on LED 1 by writing "2" in the serial monitor,</li>
+ <li>turning on LED 0 by writing "3" in the serial monitor,</li>
+ <li>turning all LEDs off by writing "0" in the serial monitor.</li>
+ </ul>
+
+ </p>
+
+ <p>Here is the prompt I used in Gemini to get the code :
+ <blockquote>
+ code arduino serial monitor seeed rp2040 led pin 26, led pin1 and led pin0. When "1" is written in the serial monitor, led pin 26 lights up. When "2" is written in the serial monitor, led pin 1 lights up. When "3" is written in the serial monitor, led pin 0 lights up. When "0" is written in the serial monitor, all 3 leds go out.
+ </blockquote>
+ </p>
+
+ <span class="image object">
+ <img src="../images/gemini-prog-test.jpg" alt="..." />
+ </span>
+
+ <span class="image object">
+ <img src="../images/gemini-prog-test.mp4" alt="..." />
+ </span>
+
+ <p>As little extra, I installed and tried out <a href="https://thonny.org/" target="_blank">Thonny</a> to code in MicroPython.</p>
+ <p>For that, I followed all the steps of the <a href="https://wiki.seeedstudio.com/XIAO-RP2040-with-MicroPython/" target="_blank">Seeed Studio wiki page MicroPython language</a> to get the RGB LED to blink in "Beautiful colors".</p>
+
+ <p>So, after installing the Thonny Editor and connecting the Seeed Studio, it is asked to download the <a href="../files/ws2812.py" target="_blank">ws2812.py</a> library, open it in the Editor and save it on the "Raspberry Pi Pico".</p>
+
+ <p>Here is the ws2812.py library content :</p>
+ <pre>
+ <code>
+ import array, time
+ from machine import Pin
+ import rp2
+
+ # Configure the number of WS2812 LEDs.
+ #brightness = 0.2
+ @rp2.asm_pio(sideset_init=rp2.PIO.OUT_LOW, out_shiftdir=rp2.PIO.SHIFT_LEFT, autopull=True,pull_thresh=24)
+ def ws2812():
+ T1 = 2
+ T2 = 5
+ T3 = 3
+ wrap_target()
+ label("bitloop")
+ out(x, 1) .side(0) [T3 - 1]
+ jmp(not_x, "do_zero") .side(1) [T1 - 1]
+ jmp("bitloop") .side(1) [T2 - 1]
+ label("do_zero")
+ nop() .side(0) [T2 - 1]
+ wrap()
+ class WS2812():
+ def __init__(self, pin_num, led_count, brightness = 0.5):
+ self.Pin = Pin
+ self.led_count = led_count
+ self.brightness = brightness
+ self.sm = rp2.StateMachine(0, ws2812, freq=8_000_000, sideset_base=Pin(pin_num))
+ self.sm.active(1)
+ self.ar = array.array("I", [0 for _ in range(led_count)])
+
+ def pixels_show(self):
+ dimmer_ar = array.array("I", [0 for _ in range(self.led_count)])
+ for i,c in enumerate(self.ar):
+ r = int(((c >> 8) & 0xFF) * self.brightness)
+ g = int(((c >> 16) & 0xFF) * self.brightness)
+ b = int((c & 0xFF) * self.brightness)
+ dimmer_ar[i] = (g<<16) + (r<<8) + b
+ self.sm.put(dimmer_ar, 8)
+ time.sleep_ms(10)
+
+ def pixels_set(self, i, color):
+ self.ar[i] = (color[1]<<16) + (color[0]<<8) + color[2]
+
+ def pixels_fill(self, color):
+ for i in range(len(self.ar)):
+ self.pixels_set(i, color)
+
+ def color_chase(self,color, wait):
+ for i in range(self.led_count):
+ self.pixels_set(i, color)
+ time.sleep(wait)
+ self.pixels_show()
+ time.sleep(0.2)
+ def wheel(self, pos):
+ # Input a value 0 to 255 to get a color value.
+ # The colours are a transition r - g - b - back to r.
+ if pos < 0 or pos > 255:
+ return (0, 0, 0)
+ if pos < 85:
+ return (255 - pos * 3, pos * 3, 0)
+ if pos < 170:
+ pos -= 85
+ return (0, 255 - pos * 3, pos * 3)
+ pos -= 170
+ return (pos * 3, 0, 255 - pos * 3)
+
+
+ def rainbow_cycle(self, wait):
+ for j in range(255):
+ for i in range(self.led_count):
+ rc_index = (i * 256 // self.led_count) + j
+ self.pixels_set(i, self.wheel(rc_index & 255))
+ self.pixels_show()
+ time.sleep(wait)
+ </code>
+ </pre>
+ <p>Then I had to open a new file and paste this code in it :</p>
+
+ <pre>
+ <code>
+ from ws2812 import WS2812
+ import utime
+ import machine
+ power = machine.Pin(11,machine.Pin.OUT)
+ power.value(1)
+ BLACK = (0, 0, 0)
+ RED = (255, 0, 0)
+ YELLOW = (255, 150, 0)
+ GREEN = (0, 255, 0)
+ CYAN = (0, 255, 255)
+ BLUE = (0, 0, 255)
+ PURPLE = (180, 0, 255)
+ WHITE = (255, 255, 255)
+ COLORS = (BLACK, RED, YELLOW, GREEN, CYAN, BLUE, PURPLE, WHITE)
+
+ led = WS2812(12,1)#WS2812(pin_num,led_count)
+
+ while True:
+ print("Beautiful color")
+ for color in COLORS:
+ led.pixels_fill(color)
+ led.pixels_show()
+ utime.sleep(0.2)
+ </code>
+ </pre>
+
+ <p>Finally, this code has to be uploaded by clicking the "Run current script" button. The location where it will be saved is not important. Both locations are fine.</p>
+
+ <p>If it works well, you will see the RGB LED light convert and flash the lights. And the output of the text "Beautiful Color" will as well be displayed in the Shell.</p>
+
+ <span class="image object">
+ <img src="../images/RGB-led-beautiful-colors.mp4" alt="..." />
</span>
</section>
@@ -171,13 +463,18 @@
<p><strong>My files</strong></p>
<ul>
- <li><a href="..." target="_blank">file</a></li>
+ <li><a href="../files/Blink-3-leds.ino" target="_blank">Arduino file 3 leds blinking</a></li>
+ <li><a href="../files/blink-button-3-leds.ino" target="_blank">Arduino file 3 leds blinking with button pushed</a></li>
+ <li><a href="../files/3_leds_changing_serial_monitor.ino" target="_blank">Arduino file leds on/off with serial monitor</a></li>
+ <li><a href="../files/ws2812.py" target="_blank">ws2812.py library for Thonny Editor</a></li>
</ul>
<p><strong>Resources</strong></p>
<ul>
- <li><a href="https://fabacademy.org/2024/labs/fabc/">Our group page</li>
-
+ <li><a href="https://wiki.seeedstudio.com" target="_blank">Seeed Studio wiki page</a></li>
+ <li><a href="https://gemini.google.com/app/" target="_blank">Gemini website</a></li>
+ <li><a href="https://thonny.org/" target="_blank">Thonny Editor Website</a></li>
+ <li><a href="https://fabacademy.org/2024/labs/fabc/" target="_blank">Our group page</a></li>
</ul>
</section>
</div>
diff --git a/public/files/3_leds_changing_serial_monitor.ino b/public/files/3_leds_changing_serial_monitor.ino
new file mode 100644
index 0000000000000000000000000000000000000000..27b562c4a208835d1c56c8a9d9bd93e6cb4d000f
--- /dev/null
+++ b/public/files/3_leds_changing_serial_monitor.ino
@@ -0,0 +1,40 @@
+// Defining the pins
+const int ledPin0 = 26;
+const int ledPin1 = 0;
+const int ledPin2 = 1;
+
+void setup() {
+ // Input button configuration
+ Serial.begin(9600);
+
+ // Output leds configuration
+ pinMode(ledPin0, OUTPUT);
+ pinMode(ledPin1, OUTPUT);
+ pinMode(ledPin2, OUTPUT);
+
+ // Starting with leds turned off
+ digitalWrite(ledPin0, LOW);
+ digitalWrite(ledPin1, LOW);
+ digitalWrite(ledPin2, LOW);
+}
+
+void loop() {
+ // If the monitor shows 1
+ if (Serial.read("1")) {
+ // Turn on LED 26
+ digitalWrite(ledPin0, HIGH);
+ } else if (Serial.read("2")){
+ // Turn on LED 1
+ digitalWrite(ledPin1, HIGH);
+ } else if (Serial.read("3")){
+ // Turn on LED 2
+ digitalWrite(ledPin2, HIGH);
+ }
+
+ else (Serial.read("0")){
+ // Turn off the 3 LEDS
+ digitalWrite(ledPin0, LOW);
+ digitalWrite(ledPin1, LOW);
+ digitalWrite(ledPin2, LOW);
+ }
+}
diff --git a/public/files/Blink-3-leds.ino b/public/files/Blink-3-leds.ino
new file mode 100644
index 0000000000000000000000000000000000000000..dab4637cfcb96d7ad0aafb761ffc32318bd0e42b
--- /dev/null
+++ b/public/files/Blink-3-leds.ino
@@ -0,0 +1,24 @@
+
+//read leds on pin 26, 0 and 1(correspondance seeed studio component)
+const int ledPin0 = 26;
+const int ledPin1 = 0;
+const int ledPin2 = 1;
+// the setup function runs once when you press reset or power the board
+void setup() {
+ // initialize digital pins as an output.
+ pinMode(ledPin0, OUTPUT);
+ pinMode(ledPin1, OUTPUT);
+ pinMode(ledPin2, OUTPUT);
+}
+
+// the loop function runs over and over again forever
+void loop() {
+ digitalWrite(ledPin0, HIGH); // turn the LEDs on (HIGH is the voltage level)
+ digitalWrite(ledPin1, HIGH);
+ digitalWrite(ledPin2, HIGH);
+ delay(1000); // wait for a second
+ digitalWrite(ledPin0, LOW); // turn the LEDs off (LOW is the voltage level)
+ digitalWrite(ledPin1, LOW);
+ digitalWrite(ledPin2, LOW);
+ delay(1000); // wait for a second
+}
diff --git a/public/files/blink-button-3-leds.ino b/public/files/blink-button-3-leds.ino
new file mode 100644
index 0000000000000000000000000000000000000000..27b562c4a208835d1c56c8a9d9bd93e6cb4d000f
--- /dev/null
+++ b/public/files/blink-button-3-leds.ino
@@ -0,0 +1,40 @@
+// Defining the pins
+const int ledPin0 = 26;
+const int ledPin1 = 0;
+const int ledPin2 = 1;
+
+void setup() {
+ // Input button configuration
+ Serial.begin(9600);
+
+ // Output leds configuration
+ pinMode(ledPin0, OUTPUT);
+ pinMode(ledPin1, OUTPUT);
+ pinMode(ledPin2, OUTPUT);
+
+ // Starting with leds turned off
+ digitalWrite(ledPin0, LOW);
+ digitalWrite(ledPin1, LOW);
+ digitalWrite(ledPin2, LOW);
+}
+
+void loop() {
+ // If the monitor shows 1
+ if (Serial.read("1")) {
+ // Turn on LED 26
+ digitalWrite(ledPin0, HIGH);
+ } else if (Serial.read("2")){
+ // Turn on LED 1
+ digitalWrite(ledPin1, HIGH);
+ } else if (Serial.read("3")){
+ // Turn on LED 2
+ digitalWrite(ledPin2, HIGH);
+ }
+
+ else (Serial.read("0")){
+ // Turn off the 3 LEDS
+ digitalWrite(ledPin0, LOW);
+ digitalWrite(ledPin1, LOW);
+ digitalWrite(ledPin2, LOW);
+ }
+}
diff --git a/public/files/ws2812.py b/public/files/ws2812.py
new file mode 100644
index 0000000000000000000000000000000000000000..aa0e543f0b44fb5749d3fdae41cde53ac7d7f8f7
--- /dev/null
+++ b/public/files/ws2812.py
@@ -0,0 +1,73 @@
+import array, time
+from machine import Pin
+import rp2
+
+# Configure the number of WS2812 LEDs.
+#brightness = 0.2
+@rp2.asm_pio(sideset_init=rp2.PIO.OUT_LOW, out_shiftdir=rp2.PIO.SHIFT_LEFT, autopull=True,pull_thresh=24)
+def ws2812():
+ T1 = 2
+ T2 = 5
+ T3 = 3
+ wrap_target()
+ label("bitloop")
+ out(x, 1) .side(0) [T3 - 1]
+ jmp(not_x, "do_zero") .side(1) [T1 - 1]
+ jmp("bitloop") .side(1) [T2 - 1]
+ label("do_zero")
+ nop() .side(0) [T2 - 1]
+ wrap()
+class WS2812():
+ def __init__(self, pin_num, led_count, brightness = 0.5):
+ self.Pin = Pin
+ self.led_count = led_count
+ self.brightness = brightness
+ self.sm = rp2.StateMachine(0, ws2812, freq=8_000_000, sideset_base=Pin(pin_num))
+ self.sm.active(1)
+ self.ar = array.array("I", [0 for _ in range(led_count)])
+
+ def pixels_show(self):
+ dimmer_ar = array.array("I", [0 for _ in range(self.led_count)])
+ for i,c in enumerate(self.ar):
+ r = int(((c >> 8) & 0xFF) * self.brightness)
+ g = int(((c >> 16) & 0xFF) * self.brightness)
+ b = int((c & 0xFF) * self.brightness)
+ dimmer_ar[i] = (g<<16) + (r<<8) + b
+ self.sm.put(dimmer_ar, 8)
+ time.sleep_ms(10)
+
+ def pixels_set(self, i, color):
+ self.ar[i] = (color[1]<<16) + (color[0]<<8) + color[2]
+
+ def pixels_fill(self, color):
+ for i in range(len(self.ar)):
+ self.pixels_set(i, color)
+
+ def color_chase(self,color, wait):
+ for i in range(self.led_count):
+ self.pixels_set(i, color)
+ time.sleep(wait)
+ self.pixels_show()
+ time.sleep(0.2)
+ def wheel(self, pos):
+ # Input a value 0 to 255 to get a color value.
+ # The colours are a transition r - g - b - back to r.
+ if pos < 0 or pos > 255:
+ return (0, 0, 0)
+ if pos < 85:
+ return (255 - pos * 3, pos * 3, 0)
+ if pos < 170:
+ pos -= 85
+ return (0, 255 - pos * 3, pos * 3)
+ pos -= 170
+ return (pos * 3, 0, 255 - pos * 3)
+
+
+ def rainbow_cycle(self, wait):
+ for j in range(255):
+ for i in range(self.led_count):
+ rc_index = (i * 256 // self.led_count) + j
+ self.pixels_set(i, self.wheel(rc_index & 255))
+ self.pixels_show()
+ time.sleep(wait)
+
diff --git a/public/images/my-beauty-cat.jpg b/public/images/my-beauty-cat.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..64c0e2d36b2df4386ffeae6e5c098b0084166771
Binary files /dev/null and b/public/images/my-beauty-cat.jpg differ
diff --git a/public/images/quentorres-programming.jpg b/public/images/quentorres-programming.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..98bf31deaa5e427e16f890f586f4992f938728c3
Binary files /dev/null and b/public/images/quentorres-programming.jpg differ