Skip to content

Commit

Permalink
Merge pull request #18 from quartiq/rj/rm-miniconf
Browse files Browse the repository at this point in the history
remove miniconf dependency
  • Loading branch information
jordens authored Nov 3, 2022
2 parents 62c681e + 4bded38 commit 230e1f8
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 8 deletions.
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [0.9.0](https://github.com/quartiq/idsp/compare/v0.8.6...v0.9.0) 2022-11-03

### Changed

* Removed `miniconf` dependency as with miniconf >= 0.6 `MiniconfAtomic` is implicit.

## [0.8.6] - 2022-08-16

### Changed
Expand Down Expand Up @@ -82,7 +88,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

Library initially released on crates.io

[Unreleased]: https://github.com/quartiq/idsp/compare/v0.8.6...HEAD
[0.8.6]: https://github.com/quartiq/idsp/releases/tag/v0.8.6
[0.8.5]: https://github.com/quartiq/idsp/releases/tag/v0.8.5
[0.8.0]: https://github.com/quartiq/idsp/releases/tag/v0.8.0
Expand Down
3 changes: 1 addition & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "idsp"
version = "0.8.6"
version = "0.9.0"
resolver = "2"
edition = "2018"
authors = ["Robert Jördens <[email protected]>"]
Expand All @@ -13,7 +13,6 @@ documentation = "https://docs.rs/idsp"
[dependencies]
serde = { version = "1.0", features = ["derive"], default-features = false }
num-complex = { version = "0.4.0", features = ["serde"], default-features = false }
miniconf = "0.5"
num-traits = { version = "0.2.14", features = ["libm"], default-features = false}

[dev-dependencies]
Expand Down
5 changes: 2 additions & 3 deletions src/iir.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
use miniconf::MiniconfAtomic;
use serde::{Deserialize, Serialize};

use super::{abs, copysign, macc};
Expand Down Expand Up @@ -43,7 +42,7 @@ pub type Vec5<T> = [T; 5];
/// * Cascading multiple IIR filters allows stable and robust
/// implementation of transfer functions beyond bequadratic terms.
///
/// # Miniconf
/// # Serialization/Deserialization/Miniconf
///
/// `{"y_offset": y_offset, "y_min": y_min, "y_max": y_max, "ba": [b0, b1, b2, a1, a2]}`
///
Expand All @@ -55,7 +54,7 @@ pub type Vec5<T> = [T; 5];
/// new output is computed as `y0 = a1*y1 + a2*y2 + b0*x0 + b1*x1 + b2*x2`.
/// The IIR coefficients can be mapped to other transfer function
/// representations, for example as described in <https://arxiv.org/abs/1508.06319>
#[derive(Copy, Clone, Debug, Default, Deserialize, Serialize, MiniconfAtomic)]
#[derive(Copy, Clone, Debug, Default, Deserialize, Serialize)]
pub struct IIR<T> {
pub ba: Vec5<T>,
pub y_offset: T,
Expand Down
3 changes: 1 addition & 2 deletions src/iir_int.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
use super::tools::macc_i32;
use core::f64::consts::PI;
use miniconf::MiniconfAtomic;
use serde::{Deserialize, Serialize};

/// Generic vector for integer IIR filter.
Expand Down Expand Up @@ -46,7 +45,7 @@ impl Coeff for Vec5 {
/// See `dsp::iir::IIR` for general implementation details.
/// Offset and limiting disabled to suit lowpass applications.
/// Coefficient scaling fixed and optimized.
#[derive(Copy, Clone, Default, Debug, MiniconfAtomic, Serialize, Deserialize)]
#[derive(Copy, Clone, Default, Debug, Serialize, Deserialize)]
pub struct IIR {
pub ba: Vec5,
pub y_offset: i32,
Expand Down

0 comments on commit 230e1f8

Please sign in to comment.