Skip to content

Commit

Permalink
Merge pull request #122 from quartiq/feature/dependency-updates
Browse files Browse the repository at this point in the history
Feature/dependency updates
  • Loading branch information
jordens authored Feb 3, 2024
2 parents 86c976b + fe7edeb commit 8cd6683
Show file tree
Hide file tree
Showing 21 changed files with 786 additions and 407 deletions.
7 changes: 5 additions & 2 deletions .cargo/config
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
runner = "probe-run --chip STM32H743ZITx --speed 30000"
runner = "probe-rs run --chip STM32H743ZITx --log-file /dev/null"
# runner = "gdb-multiarch -q -x openocd.gdb"
rustflags = [
"-C", "link-arg=-Tlink.x",
"-C", "link-arg=--nmagic",
"-C", "target-cpu=cortex-m7",
"-C", "target-feature=+fp-armv8d16",
# fp-armv8d16 is unstable and not a rustc feature but accurate
# fp-armv8 is unstable and a rustc feature but incorrect
]

[build]
target = "thumbv7em-none-eabihf"
target = "thumbv7em-none-eabihf"
4 changes: 2 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: 2
updates:
- package-ecosystem: "cargo"
directory: "/" # Location of package manifests
directory: "/"
schedule:
interval: "daily"
interval: "weekly"
time: "04:00"
59 changes: 54 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
name: Continuous Integration

on:
merge_group:
push:

branches: [main]
pull_request:
branches: [main]
schedule:
# UTC
- cron: '48 4 * * *'
env:
CARGO_TERM_COLOR: always

Expand Down Expand Up @@ -33,6 +36,7 @@ jobs:
with:
command: check
args: --verbose

- uses: actions/setup-python@v1
with:
python-version: 3.8
Expand All @@ -47,17 +51,62 @@ jobs:
compile:
runs-on: ubuntu-latest
continue-on-error: ${{ matrix.continue-on-error }}
strategy:
matrix:
toolchain: [stable]
# keep MSRV in sync in ci.yaml and Cargo.toml
toolchain: [stable, '1.66.1']
features: ['']
continue-on-error: [false]
include:
- toolchain: beta
features: ''
continue-on-error: true
- toolchain: nightly
features: nightly
continue-on-error: true
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
toolchain: ${{ matrix.toolchain }}
target: thumbv7em-none-eabihf
override: true
- uses: actions-rs/cargo@v1
with:
command: build
args: --release
args: --release --features "${{ matrix.features }}"

doc:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- uses: actions-rs/toolchain@v1
with:
toolchain: stable
target: thumbv7em-none-eabihf
override: true

- uses: Swatinem/rust-cache@v1

- name: Install Deadlinks
uses: actions-rs/cargo@v1
with:
command: install
args: |
cargo-deadlinks
- name: cargo doc
uses: actions-rs/cargo@v1
with:
command: doc
args: --no-deps -p miniconf -p idsp -p thermostat-eem

- name: cargo deadlinks
uses: actions-rs/cargo@v1
with:
command: deadlinks
# We intentionally ignore fragments, as RTIC may generate fragments for various
# auto-generated code.
args: --dir target/thumbv7em-none-eabihf/doc --ignore-fragments --check-intra-doc-links
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@

# Change Log

All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased](https://github.com/quartiq/thermostat-eem/compare/v0.1.0...master)

### Changed
* A DNS name for the MQTT broker of `mqtt` is now used instead of a hard-coded IP address.
* A static IP can be assigned to Thermostat using the `STATIC_IP` environment variable at build
time. If one is not specified, DHCP is used automatically.
* Miniconf versions have been updated to v0.9.0
* Application metadata is now published to the `<prefix>/meta` topic on MQTT connections
Loading

0 comments on commit 8cd6683

Please sign in to comment.