Skip to content

Commit 1f54e9d

Browse files
n-kn-k
committed
Fix formatting
1 parent 22b5226 commit 1f54e9d

File tree

4 files changed

+84
-89
lines changed

4 files changed

+84
-89
lines changed

‎build.rs

+18-18
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use std::{
2-
env,
3-
error::Error,
4-
// fmt,
5-
path::PathBuf
2+
env,
3+
error::Error,
4+
// fmt,
5+
path::PathBuf,
66
};
77

88
use cc::Build;
@@ -21,23 +21,23 @@ fn main() -> Result<(), Box<Error>> {
2121
let out_dir = PathBuf::from(env::var_os("OUT_DIR").unwrap());
2222
println!("cargo:rustc-link-search={}", out_dir.display());
2323

24-
let target: String = env::var("TARGET").unwrap();
25-
let asm_file: Option<String> = match target.as_str() {
26-
"thumbv6m-none-eabi" => Some("thumbv6m-none-eabi.s".to_string()),
27-
"thumbv7m-none-eabi" => Some("thumbv6m-none-eabi.s".to_string()),
28-
"thumbv7em-none-eabi" => Some("thumbv7em-none-eabi.s".to_string()),
29-
_ => None
30-
};
31-
if let Some(ref file) = asm_file {
32-
Build::new().file(file).compile("asm");
33-
} else {
34-
// return Result::Err(Box::new(
35-
// TargetArchError(format!("Unsupported target {}", target).into())));
36-
}
24+
let target: String = env::var("TARGET").unwrap();
25+
let asm_file: Option<String> = match target.as_str() {
26+
"thumbv6m-none-eabi" => Some("thumbv6m-none-eabi.s".to_string()),
27+
"thumbv7m-none-eabi" => Some("thumbv6m-none-eabi.s".to_string()),
28+
"thumbv7em-none-eabi" => Some("thumbv7em-none-eabi.s".to_string()),
29+
_ => None,
30+
};
31+
if let Some(ref file) = asm_file {
32+
Build::new().file(file).compile("asm");
33+
} else {
34+
// return Result::Err(Box::new(
35+
// TargetArchError(format!("Unsupported target {}", target).into())));
36+
}
3737

3838
println!("cargo:rerun-if-changed=build.rs");
3939
println!("cargo:rerun-if-changed=thumbv6m-none-eabi.s");
40-
println!("cargo:rerun-if-changed=thumbv7em-none-eabi");
40+
println!("cargo:rerun-if-changed=thumbv7em-none-eabi");
4141

4242
Ok(())
4343
}

‎example_crates/microbit/src/main.rs

+9-5
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
#![no_std]
33

44
extern crate panic_semihosting;
5+
use cortex_m_rt::entry;
56
use cortex_m_semihosting::hprintln;
6-
use cortex_m_rt::{entry};
7-
use cortexm_threads::{init, create_thread};
7+
use cortexm_threads::{create_thread, init};
88

99
extern "C" {
10-
fn SysTick();
10+
fn SysTick();
1111
}
1212

1313
#[entry]
@@ -33,7 +33,9 @@ pub fn user_task1() -> ! {
3333
for _i in 1..50000 {
3434
cortex_m::asm::nop();
3535
}
36-
unsafe {SysTick();}
36+
unsafe {
37+
SysTick();
38+
}
3739
}
3840
}
3941

@@ -44,6 +46,8 @@ pub fn user_task2() -> ! {
4446
for _i in 1..50000 {
4547
cortex_m::asm::nop();
4648
}
47-
unsafe {SysTick();}
49+
unsafe {
50+
SysTick();
51+
}
4852
}
4953
}

‎example_crates/qemu-m4/src/main.rs

+14-19
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33

44
extern crate panic_semihosting;
55
use cortex_m::peripheral::syst::SystClkSource;
6-
use cortex_m_rt::{entry};
7-
use cortex_m_semihosting::{hprintln};
8-
use cortexm_threads::{init, create_thread, create_thread_with_config, sleep};
6+
use cortex_m_rt::entry;
7+
use cortex_m_semihosting::hprintln;
8+
use cortexm_threads::{create_thread, create_thread_with_config, init, sleep};
99

1010
#[entry]
1111
fn main() -> ! {
@@ -16,25 +16,20 @@ fn main() -> ! {
1616
syst.enable_counter();
1717
syst.enable_interrupt();
1818

19-
let mut stack1 = [0xDEADBEEF; 512];
19+
let mut stack1 = [0xDEADBEEF; 512];
2020
let mut stack2 = [0xDEADBEEF; 512];
21-
let _ = create_thread(
22-
&mut stack1,
23-
|| {
24-
loop {
25-
let _ = hprintln!("in user task 1 !!");
26-
sleep(50);
27-
}
28-
});
21+
let _ = create_thread(&mut stack1, || loop {
22+
let _ = hprintln!("in user task 1 !!");
23+
sleep(50);
24+
});
2925
let _ = create_thread_with_config(
30-
&mut stack2,
31-
|| {
32-
loop {
33-
let _ = hprintln!("in user task 2 !!");
34-
sleep(30);
35-
}
26+
&mut stack2,
27+
|| loop {
28+
let _ = hprintln!("in user task 2 !!");
29+
sleep(30);
3630
},
3731
0x01,
38-
true);
32+
true,
33+
);
3934
init();
4035
}

‎example_crates/stm32f3/src/main.rs

+43-47
Original file line numberDiff line numberDiff line change
@@ -3,84 +3,80 @@
33

44
extern crate panic_halt;
55
use cortex_m::peripheral::syst::SystClkSource;
6-
use cortex_m_rt::{entry};
7-
use cortex_m_semihosting::{hprintln};
6+
use cortex_m_rt::entry;
7+
use cortex_m_semihosting::hprintln;
88

99
use f3::{
10-
hal::{
11-
i2c::I2c,
12-
prelude::*,
13-
stm32f30x
14-
},
10+
hal::{i2c::I2c, prelude::*, stm32f30x},
1511
led::Leds,
16-
Lsm303dlhc,
12+
Lsm303dlhc,
1713
};
1814

19-
use cortexm_threads::{init, create_thread_with_config, sleep};
15+
use cortexm_threads::{create_thread_with_config, init, sleep};
2016

2117
static mut LEDS: Option<Leds> = None;
2218
static mut SENSOR: Option<Lsm303dlhc> = None;
2319

2420
#[entry]
2521
fn main() -> ! {
2622
let cp = cortex_m::Peripherals::take().unwrap();
27-
let dp = stm32f30x::Peripherals::take().unwrap();
28-
29-
let mut rcc = dp.RCC.constrain();
30-
let leds = Leds::new(dp.GPIOE.split(&mut rcc.ahb));
31-
unsafe {
32-
LEDS = Some(leds);
33-
}
34-
35-
let mut gpiob = dp.GPIOB.split(&mut rcc.ahb);
23+
let dp = stm32f30x::Peripherals::take().unwrap();
24+
25+
let mut rcc = dp.RCC.constrain();
26+
let leds = Leds::new(dp.GPIOE.split(&mut rcc.ahb));
27+
unsafe {
28+
LEDS = Some(leds);
29+
}
30+
31+
let mut gpiob = dp.GPIOB.split(&mut rcc.ahb);
3632
let scl = gpiob.pb6.into_af4(&mut gpiob.moder, &mut gpiob.afrl);
3733
let sda = gpiob.pb7.into_af4(&mut gpiob.moder, &mut gpiob.afrl);
3834

39-
let mut flash = dp.FLASH.constrain();
40-
let clocks = rcc.cfgr.freeze(&mut flash.acr);
35+
let mut flash = dp.FLASH.constrain();
36+
let clocks = rcc.cfgr.freeze(&mut flash.acr);
4137
let i2c = I2c::i2c1(dp.I2C1, (scl, sda), 400.khz(), clocks, &mut rcc.apb1);
42-
unsafe {
43-
SENSOR = Some(Lsm303dlhc::new(i2c).unwrap());
44-
}
45-
46-
let mut syst = cp.SYST;
38+
unsafe {
39+
SENSOR = Some(Lsm303dlhc::new(i2c).unwrap());
40+
}
41+
42+
let mut syst = cp.SYST;
4743
// configures the system timer to trigger a SysTick exception every second
4844
syst.set_clock_source(SystClkSource::Core);
4945
// tick every 12.5ms
5046
syst.set_reload(100_000);
5147
syst.enable_counter();
5248
syst.enable_interrupt();
5349

54-
let mut stack1 = [0xDEADBEEF; 1024];
50+
let mut stack1 = [0xDEADBEEF; 1024];
5551
let mut stack2 = [0xDEADBEEF; 1024];
5652
let _ = create_thread_with_config(&mut stack1, user_task_1, 0xff, true);
5753
let _ = create_thread_with_config(&mut stack2, user_task_2, 0x00, false);
5854
init();
5955
}
6056

6157
pub fn user_task_1() -> ! {
62-
loop {
63-
if unsafe { LEDS.is_some() } {
64-
let leds = unsafe { LEDS.as_mut().unwrap() };
65-
for curr in 0..8 {
66-
let next = (curr + 1) % 8;
67-
68-
leds[next].on();
69-
sleep(4);
70-
leds[curr].off();
71-
sleep(4);
72-
}
73-
}
74-
}
58+
loop {
59+
if unsafe { LEDS.is_some() } {
60+
let leds = unsafe { LEDS.as_mut().unwrap() };
61+
for curr in 0..8 {
62+
let next = (curr + 1) % 8;
63+
64+
leds[next].on();
65+
sleep(4);
66+
leds[curr].off();
67+
sleep(4);
68+
}
69+
}
70+
}
7571
}
7672

7773
pub fn user_task_2() -> ! {
78-
loop {
79-
if unsafe { SENSOR.is_some() } {
80-
let sensor = unsafe { SENSOR.as_mut().unwrap() };
81-
let x = sensor.mag();
82-
let _ = hprintln!("{:?}", x);
83-
sleep(50);
84-
}
85-
}
74+
loop {
75+
if unsafe { SENSOR.is_some() } {
76+
let sensor = unsafe { SENSOR.as_mut().unwrap() };
77+
let x = sensor.mag();
78+
let _ = hprintln!("{:?}", x);
79+
sleep(50);
80+
}
81+
}
8682
}

0 commit comments

Comments
 (0)