Skip to content

Commit e9add48

Browse files
committed
Pin to Rust 1.77.0
This is needed to be able to build some of the dependencies. Signed-off-by: Petr Horacek <petr@zlosynth.com>
1 parent 84666fc commit e9add48

2 files changed

Lines changed: 22 additions & 22 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ jobs:
1919
uses: actions-rs/toolchain@v1
2020
with:
2121
target: x86_64-unknown-linux-gnu
22-
toolchain: 1.76.0
22+
toolchain: 1.77.0
2323
default: true
2424
override: true
2525
components: rustfmt, clippy
2626
- name: Install ARM Rust toolchain
2727
uses: actions-rs/toolchain@v1
2828
with:
2929
target: thumbv7em-none-eabihf
30-
toolchain: 1.76.0
30+
toolchain: 1.77.0
3131
override: true
3232
components: rustfmt, clippy
3333
- name: Install cargo-make

‎DEVELOPMENT.md‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,29 +8,29 @@ Install tooling of the embedded Rust target for Cortex-M7F. It is necessary to
88
use an older version of Rust, since newer version bloat the firmware:
99

1010
```sh
11-
rustup install 1.76.0
12-
rustup +1.76.0 target add thumbv7em-none-eabihf
11+
rustup install 1.77.0
12+
rustup +1.77.0 target add thumbv7em-none-eabihf
1313
```
1414

1515
This project utilizes [cargo make](https://github.com/sagiegurari/cargo-make):
1616

1717
```sh
18-
cargo +1.76.0 install cargo-make
18+
cargo +1.77.0 install cargo-make
1919
```
2020

2121
Furthermore, the embedded part of the project uses [flip
2222
link](https://github.com/knurling-rs/flip-link):
2323

2424
```sh
25-
cargo +1.76.0 install flip-link
25+
cargo +1.77.0 install flip-link
2626
```
2727

2828
## Formatting, linting, unit tests
2929

3030
Run formatting, linter and unit tests:
3131

3232
```sh
33-
cargo +1.76.0 make
33+
cargo +1.77.0 make
3434
```
3535

3636
## DSP benchmark
@@ -39,7 +39,7 @@ Run the benchmark:
3939

4040
``` sh
4141
cd dsp
42-
cargo +1.76.0 bench --bench bench
42+
cargo +1.77.0 bench --bench bench
4343
```
4444

4545
Use a profiler to analyze the results:
@@ -48,7 +48,7 @@ Use a profiler to analyze the results:
4848
cd dsp
4949
rm -f target/release/deps/bench-*
5050
rm -f callgrind.out.*
51-
RUSTFLAGS="-g" cargo +1.76.0 bench --bench bench --no-run
51+
RUSTFLAGS="-g" cargo +1.77.0 bench --bench bench --no-run
5252
BENCH=$(find target/release/deps -type f -executable -name 'bench-*')
5353
valgrind \
5454
--tool=callgrind \
@@ -80,20 +80,20 @@ started](https://probe.rs/docs/getting-started/probe-setup/) to learn how.
8080
Then install Rust dependencies of probe-rs:
8181

8282
```sh
83-
cargo +1.76.0 install probe-run
84-
cargo +1.76.0 install flip-link
83+
cargo +1.77.0 install probe-run
84+
cargo +1.77.0 install flip-link
8585
```
8686

8787
To flash the project, call this make target:
8888

8989
```sh
90-
cargo +1.76.0 make flash
90+
cargo +1.77.0 make flash
9191
```
9292

9393
Logging level can be set using an environment variable:
9494

9595
```sh
96-
DEFMT_LOG=info cargo +1.76.0 make flash
96+
DEFMT_LOG=info cargo +1.77.0 make flash
9797
```
9898

9999
## Flash via DFU
@@ -107,15 +107,15 @@ On Fedora, this can be done by calling:
107107

108108
```sh
109109
sudo dnf install dfu-util
110-
cargo +1.76.0 install cargo-binutils
110+
cargo +1.77.0 install cargo-binutils
111111
rustup component add llvm-tools-preview
112112
```
113113

114114
Click the RESET button while holding the BOOT button of the Daisy Patch SM to
115115
enter the bootloader. Then call this make target:
116116

117117
```sh
118-
cargo +1.76.0 make flash-dfu
118+
cargo +1.77.0 make flash-dfu
119119
```
120120

121121
## Embedded tests
@@ -128,7 +128,7 @@ given in [Flash via ST-Link](#flash-via-st-link).
128128
To run one of the integration tests kept under `firmware/tests`:
129129

130130
```sh
131-
cargo +1.76.0 make test-embedded button
131+
cargo +1.77.0 make test-embedded button
132132
```
133133

134134
## Embedded benchmark
@@ -142,7 +142,7 @@ Before running a benchmark, first make sure to go through the guidance given in
142142
To run one of the benchmarks kept under `benches/src/bin`:
143143

144144
```sh
145-
cargo +1.76.0 make bench oversampling
145+
cargo +1.77.0 make bench oversampling
146146
```
147147

148148
## Firmware size
@@ -153,16 +153,16 @@ the firmware size stays slim and no bloat gets in.
153153
Install needed tooling:
154154

155155
```sh
156-
cargo +1.76.0 install cargo-bloat
157-
cargo +1.76.0 install cargo-binutils
158-
rustup +1.76.0 component add llvm-tools-preview
156+
cargo +1.77.0 install cargo-bloat
157+
cargo +1.77.0 install cargo-binutils
158+
rustup +1.77.0 component add llvm-tools-preview
159159
```
160160

161161
Run the following command often to make sure no unnecessary heavy dependencies
162162
are brought in:
163163

164164
```sh
165-
cargo +1.76.0 make bloat
165+
cargo +1.77.0 make bloat
166166
```
167167

168168
## Manual
@@ -178,7 +178,7 @@ sudo dnf install inkscape texlive-latex texlive-ec texlive-microtype texlive-pag
178178
To build the manual:
179179

180180
```sh
181-
cargo +1.76.0 make manual
181+
cargo +1.77.0 make manual
182182
```
183183

184184
The built PDF is then available in `manual/user/manual.pdf`.

0 commit comments

Comments
 (0)