From fd661e4bae28767051d0a73fcb737aaa761e9e5c Mon Sep 17 00:00:00 2001
From: Ayush Singh <ayush@beagleboard.org>
Date: Thu, 13 Feb 2025 12:12:18 +0530
Subject: [PATCH 1/3] PocketBeagle2: blinky: Refactor imports
- Do not use multiple import syntax for now.
Signed-off-by: Ayush Singh <ayush@beagleboard.org>
---
PocketBeagle2/blinky/src/main.rs | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/PocketBeagle2/blinky/src/main.rs b/PocketBeagle2/blinky/src/main.rs
index 9642ab7..fe99bbb 100644
--- a/PocketBeagle2/blinky/src/main.rs
+++ b/PocketBeagle2/blinky/src/main.rs
@@ -1,15 +1,13 @@
-use std::{thread::sleep, time::Duration};
+use std::thread::sleep;
+use std::time::Duration;
-use linux_embedded_hal::{
- gpio_cdev::{self, Line, LineRequestFlags},
- CdevPin,
-};
+use linux_embedded_hal::gpio_cdev;
/// PIN name
const PIN: &str = "P1_20";
/// Find line by PIN Name.
-fn find_line_by_name(name: &str) -> Line {
+fn find_line_by_name(name: &str) -> gpio_cdev::Line {
let chips = gpio_cdev::chips()
.expect("Failed to get line names")
.filter_map(|x| x.ok());
@@ -28,16 +26,17 @@ fn find_line_by_name(name: &str) -> Line {
fn main() {
let line = find_line_by_name(PIN);
- let line_handle = line.request(LineRequestFlags::OUTPUT, 0, "blinky").unwrap();
- let pin = CdevPin::new(line_handle).unwrap();
+ let line_handle = line
+ .request(gpio_cdev::LineRequestFlags::OUTPUT, 0, "blinky")
+ .unwrap();
loop {
println!("ON");
- pin.set_value(1).unwrap();
+ line_handle.set_value(1).unwrap();
sleep(Duration::from_secs(1));
println!("OFF");
- pin.set_value(0).unwrap();
+ line_handle.set_value(0).unwrap();
sleep(Duration::from_secs(1));
}
}
--
GitLab
From 0928a26e9f598467e889c8bc10487ad1521eb079 Mon Sep 17 00:00:00 2001
From: Ayush Singh <ayush@beagleboard.org>
Date: Thu, 13 Feb 2025 12:13:42 +0530
Subject: [PATCH 2/3] PocketBeagle2: button: Refactor imports
- Do not group multiple imports.
Signed-off-by: Ayush Singh <ayush@beagleboard.org>
---
PocketBeagle2/button/src/main.rs | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/PocketBeagle2/button/src/main.rs b/PocketBeagle2/button/src/main.rs
index 97f5f25..beb5ba2 100644
--- a/PocketBeagle2/button/src/main.rs
+++ b/PocketBeagle2/button/src/main.rs
@@ -1,10 +1,10 @@
-use linux_embedded_hal::gpio_cdev::{self, EventRequestFlags, EventType, Line, LineRequestFlags};
+use linux_embedded_hal::gpio_cdev;
/// PIN name
const BTN: &str = "P1_20";
/// Find line by PIN Name.
-fn find_line_by_name(name: &str) -> Line {
+fn find_line_by_name(name: &str) -> gpio_cdev::Line {
let chips = gpio_cdev::chips()
.expect("Failed to get line names")
.filter_map(|x| x.ok());
@@ -25,12 +25,12 @@ fn main() {
let line = find_line_by_name(BTN);
// let line_handle = line.request(LineRequestFlags::INPUT, 0, "button").unwrap();
- let mut last_edge = EventType::RisingEdge;
+ let mut last_edge = gpio_cdev::EventType::RisingEdge;
let events = line
.events(
- LineRequestFlags::INPUT,
- EventRequestFlags::BOTH_EDGES,
+ gpio_cdev::LineRequestFlags::INPUT,
+ gpio_cdev::EventRequestFlags::BOTH_EDGES,
"button",
)
.unwrap()
@@ -38,7 +38,12 @@ fn main() {
// Iterate over events
for evt in events {
- if (last_edge, evt.event_type()) == (EventType::RisingEdge, EventType::FallingEdge) {
+ if (last_edge, evt.event_type())
+ == (
+ gpio_cdev::EventType::RisingEdge,
+ gpio_cdev::EventType::FallingEdge,
+ )
+ {
println!("Button pressed");
}
last_edge = evt.event_type();
--
GitLab
From eae62a751b82aedbcbb588984b16665113041541 Mon Sep 17 00:00:00 2001
From: Ayush Singh <ayush@beagleboard.org>
Date: Thu, 13 Feb 2025 12:16:04 +0530
Subject: [PATCH 3/3] PocketBeagle2: fade: Refactor imports
- Do not group imports
Signed-off-by: Ayush Singh <ayush@beagleboard.org>
---
PocketBeagle2/fade/src/main.rs | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/PocketBeagle2/fade/src/main.rs b/PocketBeagle2/fade/src/main.rs
index 4e10a64..5b2f807 100644
--- a/PocketBeagle2/fade/src/main.rs
+++ b/PocketBeagle2/fade/src/main.rs
@@ -1,4 +1,8 @@
-use std::{fs::OpenOptions, io::Write, path::PathBuf, thread::sleep, time::Duration};
+use std::fs::OpenOptions;
+use std::io::Write;
+use std::path::PathBuf;
+use std::thread::sleep;
+use std::time::Duration;
#[derive(Clone)]
struct Chip(PathBuf);
@@ -79,10 +83,7 @@ impl Channel {
fn write(&self, file: &str, data: &[u8]) {
let f_path = self.sysfs(file);
- let mut f = OpenOptions::new()
- .write(true)
- .open(f_path)
- .unwrap();
+ let mut f = OpenOptions::new().write(true).open(f_path).unwrap();
f.write_all(data).unwrap();
}
--
GitLab