Skip to content

Commit e2c4236

Browse files
darrenrahnemoonaigbee17n123xyzForever-Uselesssjjaison
authored
THE REWRITE (#23)
* finished calibrate method, with passed tests * finished sm_calibrate method, fully tested * Completed init method, however could not find a method or file to check if data is already configured, so just assumed it was not and sent it directly to configure method * deleted calibration_test and mock_test, from cargo.toml as those were previously deleted project files * wip * Strain Gauge Converter Library (#19) * add : strain measurement lib * fix: optional use of gauge factor. * Impl: half and full bridge config * fix: improper comments * Impl: gauge configs * fix: comments * Fix: var names and cargo.toml * change : name schema --------- Co-authored-by: jjaison <[email protected]> * wip * wip * wip * Add calibration * fmt + fix build. * simple ads driver * wip * Wip * wip: State machine. * Clean + sd logging. * feat: sensor rotation. * Update workflow * wip * wip * wip calibration * improvement: sd card refactor * feature: wip new ADC driver * feature: - wip ADC orchestration service - wip temperature ADC service trait improvement: - move embassy task management outside of service * fix: tweaks * fix: cargo fmt on PR and more linting rules * fix: embassy_stm32 feature mismatch * fix: cargo fmt * feature: emf to temperature conversion * fix: formatting * feature: decouple reading from the adc service and writing to the sd card * fix: cargo fmt * fix: tweak to folder structure * feature: wip uart with interrupts * chore: cleanup csv encapsulation * fix: some cleanup and dependency injection setup * fix: remove dead code --------- Co-authored-by: Ehimenose Aigbe <[email protected]> Co-authored-by: NoahSprenger <[email protected]> Co-authored-by: Joe Thozhuthumparambil <[email protected]> Co-authored-by: jjaison <[email protected]>
1 parent 6cf2c19 commit e2c4236

File tree

54 files changed

+5065
-4457
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+5065
-4457
lines changed

.cargo/config.toml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
22
# This runner needs to be parametric so we can pass in the chip name
33
runner = "probe-rs run --chip STM32H733VGTx --protocol swd"
4-
#runner = "probe-rs run --chip ATSAME51J18A --protocol swd"
5-
rustflags = [
6-
"-C", "link-arg=-Tlink.x",
7-
"-C", "link-arg=-Tdefmt.x",
8-
]
4+
rustflags = ["-C", "link-arg=-Tlink.x", "-C", "link-arg=-Tdefmt.x"]
95

106
[env]
11-
DEFMT_LOG="info"
7+
DEFMT_LOG = "debug"
128

139
[build]
14-
target = "thumbv7em-none-eabihf" # Cortex-M4F and Cortex-M7F (with FPU)
10+
target = "thumbv7em-none-eabihf" # Cortex-M4F and Cortex-M7F (with FPU)

.github/workflows/build.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SHOULD DO: dedupe these and clean them up
12
on:
23
push:
34
branches: [ master ]
@@ -7,6 +8,40 @@ name: Build
78

89

910
jobs:
11+
formatting:
12+
name: Check for formatting issues
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@v2
16+
- name: Install packages
17+
run: sudo apt update && sudo apt install -y cmake protobuf-compiler
18+
- name: Install Arm GNU Toolchain (arm-none-eabi-gcc)
19+
uses: carlosperate/arm-none-eabi-gcc-action@v1
20+
with:
21+
release: '12.2.Rel1'
22+
- uses: actions-rs/toolchain@v1
23+
with:
24+
toolchain: stable
25+
target: thumbv7em-none-eabihf
26+
- uses: actions/cache@v3
27+
with:
28+
path: |
29+
~/.cargo/bin/
30+
~/.cargo/registry/index/
31+
~/.cargo/registry/cache/
32+
~/.cargo/git/db/
33+
target/
34+
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
35+
- uses: actions-rs/cargo@v1
36+
name: "Install cargo-make"
37+
with:
38+
command: install
39+
args: --force cargo-make
40+
- uses: actions-rs/cargo@v1
41+
name: "Check formatting"
42+
with:
43+
command: fmt
44+
args: --check
1045
build_pressure:
1146
name: Build with Pressure Feature
1247
runs-on: ubuntu-latest

.vscode/settings.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
11
{
22
"rust-analyzer.cargo.target": "thumbv7em-none-eabihf",
3-
"rust-analyzer.cargo.features": ["pressure"]
3+
"rust-analyzer.cargo.features": [
4+
"pressure",
5+
"strain",
6+
"temperature"
7+
],
8+
"editor.formatOnSave": true,
9+
"[rust]": {
10+
"editor.defaultFormatter": "rust-lang.rust-analyzer"
11+
}
412
}

Cargo.lock

Lines changed: 100 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ git = "https://github.com/uorocketry/messages-prost"
2727

2828
[workspace.dependencies.panic-probe]
2929
version = "0.3"
30-
features = ["print-defmt"]
30+
features = ["print-defmt"]
3131

32-
[workspace.dependencies.defmt]
32+
[workspace.dependencies.defmt]
3333
version = "0.3.2"
3434

3535
[workspace.dependencies.defmt-rtt]

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,7 @@ uORocketry's rocket instrumentation system.
2424
## Helpful VSCode Extensions
2525
- probe-rs.probe-rs-debugger
2626
- rust-lang.rust-analyzer
27+
28+
## Useful Tools
29+
### Cargo Size
30+
`rustup component add llvm-tools-preview`

assets/ads1262.pdf

3.84 MB
Binary file not shown.

0 commit comments

Comments
 (0)