Skip to content

Commit 2dd6959

Browse files
authored
Merge pull request #66 from Neotron-Compute/release-pico
Update to 0.5.3.
2 parents 649aa93 + 0b18591 commit 2dd6959

File tree

6 files changed

+36
-17
lines changed

6 files changed

+36
-17
lines changed

.github/workflows/build_and_release.yml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,29 @@ jobs:
2626
- name: Build/Test neotron-bmc-protocol
2727
run: cd neotron-bmc-protocol && cargo test
2828

29+
- name: Build/Test neotron-bmc-commands
30+
run: cd neotron-bmc-commands && cargo test
31+
2932
- name: Build neotron-bmc-pico
3033
run: cd neotron-bmc-pico && DEFMT_LOG=info cargo build --release --verbose --target=thumbv6m-none-eabi
3134

3235
- name: Build neotron-bmc-nucleo
3336
run: cd neotron-bmc-nucleo && DEFMT_LOG=info cargo build --release --verbose --target=thumbv7em-none-eabihf
3437

3538
- name: Upload files to Release
36-
if: github.event_name == 'push' && startswith(github.ref, 'refs/tags/')
39+
if: github.event_name == 'push' && startswith(github.ref, 'refs/tags/pico-')
3740
uses: softprops/action-gh-release@v1
3841
with:
3942
files: |
4043
neotron-bmc-pico/target/thumbv6m-none-eabi/release/neotron-bmc-pico
41-
neotron-bmc-nucleo/target/thumbv7em-none-eabihf/release/neotron-bmc-nucleo
44+
env:
45+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
46+
47+
- name: Upload files to Release
48+
if: github.event_name == 'push' && startswith(github.ref, 'refs/tags/nucleo-')
49+
uses: softprops/action-gh-release@v1
50+
with:
51+
files: |
52+
neotron-bmc-nucleo/target/thumbv6m-none-eabi/release/neotron-bmc-nucleo
4253
env:
4354
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/format.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,5 @@ jobs:
1515
run: cd neotron-bmc-nucleo && cargo fmt -- --check
1616
- name: Check format neotron-bmc-protocol
1717
run: cd neotron-bmc-protocol && cargo fmt -- --check
18+
- name: Check format neotron-bmc-commands
19+
run: cd neotron-bmc-commands && cargo fmt -- --check

neotron-bmc-commands/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#![doc = include_str!("../README.md")]
2-
32
#![no_std]
43

54
#[derive(Debug, Copy, Clone, num_enum::IntoPrimitive, num_enum::TryFromPrimitive)]

neotron-bmc-pico/Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

neotron-bmc-pico/Cargo.toml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
[package]
22
authors = ["Jonathan 'theJPster' Pallant <[email protected]>"]
3-
name = "neotron-bmc-pico"
3+
description = "Neotron BMC firmware to run on the STM32F030 on the Neotron Pico"
44
edition = "2018"
5-
version = "0.5.2"
5+
license = "GPL-3.0-or-later"
6+
name = "neotron-bmc-pico"
7+
readme = "README.md"
8+
version = "0.5.3"
69

710
[dependencies]
811
cortex-m = { version = "0.7.5", features = ["inline-asm", "critical-section-single-core"] }

neotron-bmc-pico/README.md

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ The MCU has:
1212
* 4 KiB SRAM
1313
* LQFP-32 package (0.8mm pitch)
1414

15-
1615
| Pin | Name | Signal | Function |
1716
| :--- | :--- | :---------- | :------------------------------------------- |
1817
| 02 | PF0 | BUTTON_nPWR | Power Button Input (active low) |
@@ -41,7 +40,7 @@ The MCU has:
4140
| 29 | PB6 | I2C1_SCL | I²C Clock |
4241
| 30 | PB7 | I2C1_SDA | I²C Data |
4342

44-
Note that in the above table, the UART signals are wired as _Data Terminal Equipment (DTE)_ (i.e. like a PC, not like a Modem). Connect the NMBC *UART Transmit Output* pin to the *Input* pin of something like an FTDI TTL-232R-3V3 cable.
43+
Note that in the above table, the UART signals are wired as *Data Terminal Equipment (DTE)* (i.e. like a PC, not like a Modem). Connect the NMBC *UART Transmit Output* pin to the *Input* pin of something like an FTDI TTL-232R-3V3 cable.
4544

4645
This design should also be pin-compatible with the following SoCs (although this firmware may need changes):
4746

@@ -63,28 +62,33 @@ The SPI interface runs in SPI mode 0 (clock line idles low, data sampled on risi
6362
## Build Requirements
6463

6564
1. `rustup` and Rust
66-
- see https://www.rust-lang.org
65+
* see https://www.rust-lang.org
6766
2. The `thumbv6m-none-eabi` target
68-
- run `rustup target add thumbv6m-none-eabi`
67+
* run `rustup target add thumbv6m-none-eabi`
6968
3. `probe-run`
70-
- run `cargo install probe-run`
69+
* run `cargo install probe-run`
7170
4. `flip-link`
72-
- run `cargo install flip-link`
71+
* run `cargo install flip-link`
7372

7473
Then to build and flash for an STM32F031K6T6, connect a probe supported by probe-rs (such as a SEGGER J-Link, or an ST-Link) and run:
7574

76-
```
77-
$ DEFMT_LOG=info cargo run --release
75+
```console
76+
DEFMT_LOG=info cargo run --release
7877
```
7978

8079
You should see logging messages from the board on your terminal. To increase the logging level, try:
8180

8281
Then to build and flash, connect a probe supported by probe-rs (such as a SEGGER J-Link, or an ST-Link) and run:
8382

84-
```
85-
$ DEFMT_LOG=debug cargo run --release
83+
```console
84+
DEFMT_LOG=debug cargo run --release
8685
```
8786

8887
## Licence
8988

90-
This source code as a whole is licensed under the GPL v3. Third-party crates are covered by their respective licences.
89+
This crate as a whole is licenced under the GNU Public Licence version 3. See:
90+
91+
* [The LICENSE file](../LICENSE)
92+
* [The GPL Website](http://www.gnu.org/licenses/gpl-3.0.html)
93+
94+
The [top level README file](../README.md) has more information about this choice of license.

0 commit comments

Comments
 (0)