From bc7b138f7c178075246f9e91ff284a4794e49b44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vl=C4=83du=C8=9B-Andrei=20CHIN=C8=9AOIU?=
<vladut.chintoiu@stud.fils.upb.ro>
Date: Fri, 7 Mar 2025 20:46:38 +0000
Subject: [PATCH 1/7] Update file slides.md
---
slides/lectures/resources/rust-embedded/slides.md | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/slides/lectures/resources/rust-embedded/slides.md b/slides/lectures/resources/rust-embedded/slides.md
index 9bfe60e..ba2ff20 100644
--- a/slides/lectures/resources/rust-embedded/slides.md
+++ b/slides/lectures/resources/rust-embedded/slides.md
@@ -89,6 +89,7 @@ This is how a Rust application would look like
#![no_main]
use cortex_m_rt::entry;
+use core::panic::PanicInfo;
#[entry]
fn main() -> ! {
@@ -126,6 +127,7 @@ This is how a Rust application would look like
use core::ptr::{read_volatile, write_volatile};
use cortex_m_rt::entry;
+use core::panic::PanicInfo;
const GPIOX_CTRL: u32 = 0x4001_4004;
const GPIO_OE_SET: *mut u32= 0xd000_0024 as *mut u32;
@@ -141,7 +143,7 @@ pub fn panic(_info: &PanicInfo) -> ! {
```rust {all}{startLine:18}
#[entry]
fn main() -> ! {
- let gpio_ctrl = GPIOX_CTRL + 8 * pin as *mut u32;
+ let gpio_ctrl = (GPIOX_CTRL + 8 * pin) as *mut u32;
unsafe {
write_volatile(gpio_ctrl, 5);
write_volatile(GPIO_OE_SET, 1 << pin);
--
GitLab
From c66a8af762f8f5d466acc4592f02ecd81ef56589 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vl=C4=83du=C8=9B-Andrei=20CHIN=C8=9AOIU?=
<vladut.chintoiu@stud.fils.upb.ro>
Date: Tue, 11 Mar 2025 20:29:56 +0000
Subject: [PATCH 2/7] Update file slides.md
---
.../resources/rust-embedded/slides.md | 26 +++++++++----------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/slides/lectures/resources/rust-embedded/slides.md b/slides/lectures/resources/rust-embedded/slides.md
index ba2ff20..2de77e8 100644
--- a/slides/lectures/resources/rust-embedded/slides.md
+++ b/slides/lectures/resources/rust-embedded/slides.md
@@ -136,25 +136,25 @@ const GPIO_OUT_CLR:*mut u32= 0xd000_0018 as *mut u32;
#[panic_handler]
pub fn panic(_info: &PanicInfo) -> ! {
- loop { }
+ loop { }
}
```
```rust {all}{startLine:18}
#[entry]
fn main() -> ! {
- let gpio_ctrl = (GPIOX_CTRL + 8 * pin) as *mut u32;
- unsafe {
- write_volatile(gpio_ctrl, 5);
- write_volatile(GPIO_OE_SET, 1 << pin);
- let reg = match value {
- 0 => GPIO_OUT_CLR,
- _ => GPIO_OUT_SET
- };
- write_volatile(reg, 1 << pin);
- };
-
- loop { }
+ let gpio_ctrl = (GPIOX_CTRL + 8 * pin) as *mut u32;
+ unsafe {
+ write_volatile(gpio_ctrl, 5);
+ write_volatile(GPIO_OE_SET, 1 << pin);
+ let reg = match value {
+ 0 => GPIO_OUT_CLR,
+ _ => GPIO_OUT_SET
+ };
+ write_volatile(reg, 1 << pin);
+ };
+
+ loop { }
}
```
--
GitLab
From 6f48ac5cf11422139e6342c1046f60cf1131bcad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vl=C4=83du=C8=9B-Andrei=20CHIN=C8=9AOIU?=
<vladut.chintoiu@stud.fils.upb.ro>
Date: Tue, 11 Mar 2025 20:32:47 +0000
Subject: [PATCH 3/7] Update file slides.md
---
slides/lectures/resources/rust-embedded/slides.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/slides/lectures/resources/rust-embedded/slides.md b/slides/lectures/resources/rust-embedded/slides.md
index 2de77e8..2963b2c 100644
--- a/slides/lectures/resources/rust-embedded/slides.md
+++ b/slides/lectures/resources/rust-embedded/slides.md
@@ -84,7 +84,7 @@ This is how a Rust application would look like
<div grid="~ cols-2 gap-4">
-```rust{all|1|2|4|6|7,11|10|13-16}
+```rust{all|1|2|4,5|6|7,11|10|13-16}
#![no_std]
#![no_main]
--
GitLab
From 042f37b0ccb44d19b0fee9caf028db6be3b4ccb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vl=C4=83du=C8=9B-Andrei=20CHIN=C8=9AOIU?=
<vladut.chintoiu@stud.fils.upb.ro>
Date: Tue, 11 Mar 2025 21:30:23 +0000
Subject: [PATCH 4/7] Update file index.mdx
---
website/lab/02/index.mdx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/website/lab/02/index.mdx b/website/lab/02/index.mdx
index fba0a1d..b166294 100644
--- a/website/lab/02/index.mdx
+++ b/website/lab/02/index.mdx
@@ -407,7 +407,7 @@ as they are connected to the lab board's debugger chip.
The board provides four single colored LEDs, red, green, blue and yellow. Each one of them
uses one pin for control. Each LED connector has one single hole on the board,
-marked with `RED`, `GREEN', `BLUE` and `YELLOW` respectively. These are located in the **Connectors**
+marked with `RED`, `GREEN`, `BLUE` and `YELLOW` respectively. These are located in the **Connectors**
section of the board.
The four switches that the lab board provides are signaled with labels
--
GitLab
From 6706a728b9b9609731dc5a4a05f136bc37a5183f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vl=C4=83du=C8=9B-Andrei=20CHIN=C8=9AOIU?=
<vladut.chintoiu@stud.fils.upb.ro>
Date: Mon, 17 Mar 2025 15:01:52 +0000
Subject: [PATCH 5/7] Apply 1 suggestion(s) to 1 file(s)
Co-authored-by: Alexandru RADOVICI <alexandru.radovici@upb.ro>
---
slides/lectures/resources/rust-embedded/slides.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/slides/lectures/resources/rust-embedded/slides.md b/slides/lectures/resources/rust-embedded/slides.md
index 2963b2c..197c7bc 100644
--- a/slides/lectures/resources/rust-embedded/slides.md
+++ b/slides/lectures/resources/rust-embedded/slides.md
@@ -84,7 +84,7 @@ This is how a Rust application would look like
<div grid="~ cols-2 gap-4">
-```rust{all|1|2|4,5|6|7,11|10|13-16}
+```rust{all|1|2|4,5|7|8,12|11|14-17}
#![no_std]
#![no_main]
--
GitLab
From 33a594f0e99d2565a0d91c83796a2b310ec298da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vl=C4=83du=C8=9B-Andrei=20CHIN=C8=9AOIU?=
<vladut.chintoiu@stud.fils.upb.ro>
Date: Wed, 19 Mar 2025 21:10:35 +0000
Subject: [PATCH 6/7] Update file index.mdx
---
website/lab/03/index.mdx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/website/lab/03/index.mdx b/website/lab/03/index.mdx
index 26ec2a2..84fe9e3 100644
--- a/website/lab/03/index.mdx
+++ b/website/lab/03/index.mdx
@@ -479,7 +479,7 @@ loop {
:::info
If you need to remember the layout of the board, check the [Lab Board](./02#the-lab-board) section from the previous lab.
-Remember that LEDs are wired so they light up on `Level::Low` and turn off on `Level::Low` and buttons return `Level::Low` when pressed and `Level::High` when not pressed.
+Remember that LEDs are wired so they light up on `Level::Low` and turn off on `Level::High` and buttons return `Level::Low` when pressed and `Level::High` when not pressed.
:::
:::danger
--
GitLab
From f51d81172818ce06febf13cd04d1e1c85acf70a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vl=C4=83du=C8=9B-Andrei=20CHIN=C8=9AOIU?=
<vladut.chintoiu@stud.fils.upb.ro>
Date: Wed, 19 Mar 2025 21:15:18 +0000
Subject: [PATCH 7/7] Update file index.mdx
---
website/lab/03/index.mdx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/website/lab/03/index.mdx b/website/lab/03/index.mdx
index 84fe9e3..5c20a5c 100644
--- a/website/lab/03/index.mdx
+++ b/website/lab/03/index.mdx
@@ -492,7 +492,7 @@ Please make sure the lab professor verifies your circuit before it is powered up
:::info
You should use the lab skeleton provided in the [Lab Repository](https://github.com/UPB-PMRust/lab-2025) as a starting point for your implementation.
-Embassy will reset all the peripherals when the `main` function exists, that means `PWM` and `ADC` will stop. Make sure the `main` function never exits so you can see how the circuit behaves.
+Embassy will reset all the peripherals when the `main` function exits, that means `PWM` and `ADC` will stop. Make sure the `main` function never exits so you can see how the circuit behaves.
:::
2. Write a program using Embassy to control the led intensity using a potentiometer. The potentiometer is connected to an ADC-capable GPIO pin. The LED should change intensity based on the potentiometer's position. (**2p**)
--
GitLab