Skip to content

Commit

Permalink
Merge pull request #202 from quartiq/full-pid-no-py
Browse files Browse the repository at this point in the history
full pid, remove python tools
  • Loading branch information
jordens authored Feb 5, 2025
2 parents 92a5d99 + bc3d846 commit bcd71f7
Show file tree
Hide file tree
Showing 11 changed files with 19 additions and 219 deletions.
12 changes: 0 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,18 +37,6 @@ jobs:
command: check
args: --verbose

- uses: actions/setup-python@v1
with:
python-version: 3.12
- name: Install Python Dependencies
run: |
python -m pip install --upgrade pip
pip install -e py
pip install pylint
- name: Run Pylint
run: |
pylint py/thermostat
compile:
runs-on: ubuntu-latest
continue-on-error: ${{ matrix.continue-on-error }}
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
/target
/py/build
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

* Swept sine signal generator for transfer function and distortion measurements
* Comprehensive unified generic biquad representations for standard filters from `idsp`
* Support for I² and D² controllers
* Support for other sensor transfer functions (linear, DT-670)
* Supoprt for runtime sensor calibration/parameter changes
* Support for any combinations of differential/single ended sensors
* Removed python utilities as there is little added value now

### Changed

Expand Down
6 changes: 3 additions & 3 deletions Cargo.lock

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

1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ bytemuck = { version = "1.21.0", features = [
"derive",
"zeroable_maybe_uninit",
], default-features = false }
# Note: Keep in-sync with `py/setup.py`
miniconf = { version = "0.18", features = ["json-core", "derive", "postcard"] }
miniconf_mqtt = { version = "0.18" }
strum = { version = "0.26.1", default-features = false, features = ["derive"] }
Expand Down
16 changes: 14 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,22 @@
![download](https://user-images.githubusercontent.com/17088194/202482347-8327558f-0a0e-4e09-905c-88c8c808cbae.png)


# Thermostat-EEM

Embedded software for the [Thermostat-EEM](https://github.com/sinara-hw/Thermostat_EEM) multichannel temperature controller.

- using [STM32H7 hal](https://github.com/stm32-rs/stm32h7xx-hal)
- using [STM32H7 hal](https://github.com/stm32-rs/stm32h7xx-hal)
- [RTIC](https://github.com/rtic-rs/cortex-m-rtic) based task scheduling
- [MQTT](https://mqtt.org/) networking using the [smoltcp](https://github.com/smoltcp-rs/smoltcp) tcp/ip stack, [minimq](https://github.com/quartiq/minimq) for embedded MQTT and [miniconf](https://github.com/quartiq/miniconf) for settings
- signal processing and control based on biquad IIR filters from [idsp](https://github.com/quartiq/idsp)

## Usage

`pip install miniconf-mqtt@git+https://github.com/quartiq/[email protected]#subdirectory=py/miniconf-mqtt`

```sh
python -m miniconf -d dt/sinara/thermostat-eem/+ \
/output/2/weights=[[0,0,0,0],[0,0,0,0],[0,0,0,0],[1,0,0,0]] \
'/output/2/typ="Pid"' \
/output/2/biquad/Pid/min=-0.1 max=0.1 gain/i=0.5 gain/p=0.5 setpoint=26.2 \
'/output/2/state="On"'
```
2 changes: 0 additions & 2 deletions py/.gitignore

This file was deleted.

9 changes: 0 additions & 9 deletions py/README.md

This file was deleted.

24 changes: 0 additions & 24 deletions py/pyproject.toml

This file was deleted.

2 changes: 0 additions & 2 deletions py/thermostat/__init__.py

This file was deleted.

163 changes: 0 additions & 163 deletions py/thermostat/__main__.py

This file was deleted.

0 comments on commit bcd71f7

Please sign in to comment.