Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
* origin/main:
  Bump serde from 1.0.213 to 1.0.214
  remove sample period constant from py
  py: fix rate
  Refactor compile action job to phase out deprecated dependencies
  Upload artifacts after objcopy
  • Loading branch information
jordens committed Nov 5, 2024
2 parents ebcf00f + 3eec118 commit 73c640f
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 15 deletions.
21 changes: 14 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,16 +66,23 @@ jobs:
features: ''
continue-on-error: true
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
with:
toolchain: ${{ matrix.toolchain }}
target: thumbv7em-none-eabihf
override: true
- uses: actions-rs/cargo@v1
targets: thumbv7em-none-eabihf
components: llvm-tools-preview
- run: cargo build --release --features "${{ matrix.features }}"
- name: Extract Stable Binary Using cargo-binutils
if: matrix.toolchain == 'stable' && github.ref == 'refs/heads/main'
run: |
cargo install cargo-binutils
cargo objcopy --release --bin thermostat-eem -- -O binary thermostat-eem.bin
- name: Upload Artifacts
if: matrix.toolchain == 'stable' && github.ref == 'refs/heads/main'
uses: actions/[email protected]
with:
command: build
args: --release --features "${{ matrix.features }}"
path: thermostat-eem.bin

doc:
runs-on: ubuntu-latest
Expand Down
8 changes: 4 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ fugit = "0.3"
mono-clock = "0.1"
heapless = { version = "0.8", features = ["serde"] }
minimq = "0.9"
serde = { version = "1.0.210", features = ["derive"], default-features = false }
serde = { version = "1.0.214", features = ["derive"], default-features = false }
serde-json-core = "0.6"
rtt-logger = "0.2"
rtt-target = { version = "0.3", features = ["cortex-m"] }
Expand Down
3 changes: 0 additions & 3 deletions py/thermostat/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
#!/usr/bin/python3
"""Thermostat EEM utilities"""

# Sample period in seconds for all channels.
SAMPLE_PERIOD = 1 / 503.5 # ADC ODR 1007 split between two channels per ADC

0 comments on commit 73c640f

Please sign in to comment.