Skip to content

Commit 4890450

Browse files
committed
Fix: comments, READMEs and authorship
1 parent ff69121 commit 4890450

File tree

7 files changed

+16
-31
lines changed

7 files changed

+16
-31
lines changed

README.md

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -386,20 +386,7 @@ TODO
386386

387387
## Build Requirements
388388

389-
1. rustup and Rust
390-
- see https://www.rust-lang.org
391-
2. The `thumbv6m-none-eabi` target
392-
- run `rustup target add thumbv6m-none-eabi`
393-
3. `probe-run`
394-
- run `cargo install probe-run` from your `$HOME` dir (not this folder!)
395-
4. `flip-link`
396-
- run `cargo install flip-link` from your `$HOME` dir (not this folder!)
397-
398-
Then to build and flash, connect a probe supported by probe-rs (such as a SEGGER J-Link, or an ST-Link) and run:
399-
400-
```
401-
$ cargo run --bin neotron-bmc --release
402-
```
389+
Build requirements are available for [Neotron-BMC-pico](neotron-bmc-pico/README.md) and [Neotron-BMC-nucleo](neotron-bmc-nucleo/README.md).
403390

404391
## Licence
405392

neotron-bmc-nucleo/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
authors = ["Jonathan 'theJPster' Pallant <[email protected]>"]
2+
authors = ["Jonathan 'theJPster' Pallant <[email protected]>", "Aïssata 'Ai' Maiga <[email protected]>"]
33
name = "neotron-bmc-nucleo"
44
edition = "2018"
55
version = "0.2.0"

neotron-bmc-nucleo/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ TODO: copy here from main Readme?
2121
Then to build and flash, connect a probe supported by probe-rs (such as a SEGGER J-Link, or an ST-Link) and run:
2222

2323
```
24-
$ cargo run --bin neotron-bmc-nucleo --release
24+
$ cargo run --release
2525
```

neotron-bmc-nucleo/build.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
/// This is the build-script for the Neotron BMC.
2-
///
3-
/// It just copies the memory.x file somewhere Cargo can find it, then generates a version header.
1+
//! This is the build-script for the Neotron BMC.
2+
//!
3+
//! It just copies the memory.x file somewhere Cargo can find it, then generates a version header.
44
use std::env;
55
use std::fs::File;
66
use std::io::Write;

neotron-bmc-nucleo/src/main.rs

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ pub struct RegisterState {
7878
firmware_version: &'static str,
7979
}
8080

81-
//USB is not a name of an interrupt
8281
#[app(device = crate::pac, peripherals = true, dispatchers=[USART2])]
8382
mod app {
8483

@@ -223,25 +222,25 @@ mod app {
223222
gpioa.pa10.into_alternate(),
224223
gpioa.pa11.into_alternate(),
225224
gpioa.pa12.into_alternate(),
226-
//power led
225+
// power led
227226
gpioc.pc1.into_push_pull_output(),
228227
// status led
229228
gpioc.pc2.into_push_pull_output(),
230229
// power button
231230
gpioc.pc13.into_pull_up_input(),
232231
// reset button
233232
gpiob.pb12.into_pull_up_input(),
234-
//dc on
233+
// dc on
235234
gpioc.pc0.into_push_pull_output(),
236235
// system reset
237236
gpiob.pb15.into_push_pull_output(),
238-
//PS2_CLK0
237+
// PS2_CLK0
239238
gpioc.pc5.into_floating_input(),
240-
//PS2_CLK1
239+
// PS2_CLK1
241240
gpiob.pb0.into_floating_input(),
242-
//PS2_DAT0
241+
// PS2_DAT0
243242
gpiob.pb1.into_floating_input(),
244-
//PS2_DAT1
243+
// PS2_DAT1
245244
gpiob.pb2.into_floating_input(),
246245
)
247246
});
@@ -312,7 +311,6 @@ mod app {
312311
},
313312
kb_q_in,
314313
kb_q_out,
315-
// SEEMS GONE:
316314
ms_decoder: Ps2Decoder::new(),
317315
};
318316

neotron-bmc-pico/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ TODO: copy here from main Readme?
2121
Then to build and flash, connect a probe supported by probe-rs (such as a SEGGER J-Link, or an ST-Link) and run:
2222

2323
```
24-
$ cargo run --bin neotron-bmc --release
24+
$ cargo run --release
2525
```

neotron-bmc-pico/build.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
/// This is the build-script for the Neotron BMC.
2-
///
3-
/// It just copies the memory.x file somewhere Cargo can find it, then generates a version header.
1+
//! This is the build-script for the Neotron BMC.
2+
//!
3+
//! It just copies the memory.x file somewhere Cargo can find it, then generates a version header.
44
use std::env;
55
use std::fs::File;
66
use std::io::Write;

0 commit comments

Comments
 (0)