aqueductfluidics
diff --git a/‎.github/workflows/rust.yml‎
Lines changed: 10 additions & 34 deletions b/‎.github/workflows/rust.yml‎
Lines changed: 10 additions & 34 deletions
diff --git a/‎README.md‎
Lines changed: 3 additions & 21 deletions b/‎README.md‎
Lines changed: 3 additions & 21 deletions
diff --git a/‎docs/RELEASE.md‎
Lines changed: 6 additions & 11 deletions b/‎docs/RELEASE.md‎
Lines changed: 6 additions & 11 deletions
diff --git a/‎imxrt-hal/CHANGELOG.md‎
Lines changed: 5 additions & 0 deletions b/‎imxrt-hal/CHANGELOG.md‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎imxrt-hal/Cargo.toml‎
Lines changed: 2 additions & 2 deletions b/‎imxrt-hal/Cargo.toml‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎imxrt-hal/README.md‎
Lines changed: 12 additions & 16 deletions b/‎imxrt-hal/README.md‎
Lines changed: 12 additions & 16 deletions
diff --git a/‎imxrt-hal/src/adc.rs‎
Lines changed: 9 additions & 8 deletions b/‎imxrt-hal/src/adc.rs‎
Lines changed: 9 additions & 8 deletions
@@ -3,42 +3,18 @@ name: All Checks
 on: [push, pull_request]
 
 jobs:
-  build-hals:
+  build-hal:
     runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Build HAL(s)
-      run: cargo build --verbose
-    - name: Run HAL(s) tests
-      run: cargo test --verbose
-    - name: Check format for HAL(s)
-      run: cargo fmt --all -- --check
-    - name: Run clippy for HAL(s)
-      run: cargo clippy -- -D warnings
-
-  # imxrt1060-hal feature checks
-  imxrt1060-features:
     strategy:
       matrix:
-        features: ["rand_core", "rtic", "rt", "rand_core,rtic,rt"]
-    env:
-      RUSTFLAGS: -D warnings
-    runs-on: ubuntu-latest
+        feature: ["imxrt1061", "imxrt1062", "imxrt1064"]
     steps:
     - uses: actions/checkout@v2
-    - uses: actions-rs/toolchain@v1
-      with:
-        toolchain: stable
-        target: thumbv7em-none-eabihf
-        override: true
-        profile: minimal
-    - name: Check imxrt-hal with features '${{ matrix.features }}'
-      uses: actions-rs/cargo@v1
-      with:
-        command: check
-        args: >
-          --features=${{ matrix.features }}
-          --manifest-path=imxrt-hal/Cargo.toml
-          --target=thumbv7em-none-eabihf
-          --verbose
-
+    - name: Build imxrt-hal for (${{ matrix.feature }}) HAL
+      run: cd imxrt-hal && cargo build --verbose --features ${{ matrix.feature }}
+    - name: Run tests (${{ matrix.feature }}) for HAL
+      run: cd imxrt-hal && cargo test --verbose --features ${{ matrix.feature }}
+    - name: Check format (${{ matrix.feature }}) for HAL
+      run: cd imxrt-hal && cargo fmt --all -- --check
+    - name: Run clippy (${{ matrix.feature }}) for HAL
+      run: cd imxrt-hal && cargo clippy --features ${{ matrix.feature }} -- -D warnings
@@ -1,4 +1,4 @@
-# imxrt-hal
+# imxrt-rs
 
 A Rust hardware abstraction layer (HAL) for NXP i.MX RT processors.
 
@@ -9,19 +9,6 @@ A Rust hardware abstraction layer (HAL) for NXP i.MX RT processors.
 [imxrt-hal-badge]: https://img.shields.io/crates/v/imxrt-hal
 [imxrt-hal-url]: https://crates.io/crates/imxrt-hal
 
-[matrix-chat](https://matrix.to/#/#imxrt-rs:matrix.org)
-
-## Goals
-
-- Create *the* collaborative group to support using Rust on NXP's i.MX RT series.
-- Simple but useful register level access. It compiles quickly, and it's intuitive for existing embedded developers. Every hal republishes the RAL.
-- Embedded HAL support.
-- RTIC support.
-- NXP EVK board support
-- Supporting popular boards such as the Teensy 4.
-
-## Getting Started
-
 ### HAL
 
 If you want to develop Rust libraries and applications for an i.MX RT-based system, use the `imxrt-hal` crate. The `imxrt-hal` crate provides implementations of the [`embedded-hal` traits](https://crates.io/crates/embedded-hal) specific to i.MX RT processors. Use the HAL if you want to
@@ -33,7 +20,7 @@ If you want to develop Rust libraries and applications for an i.MX RT-based syst
 - read and write serial data (UART)
 - send and receive data over SPI
 
-The publicly-supported HAL is on [crates.io](https://crates.io/crates/imxrt-hal). Include the HAL in your Rust library or binary:
+The HAL is on [crates.io](https://crates.io/crates/imxrt-hal). Include the HAL in your Rust library or binary:
 
 ```toml
 [dependencies.imxrt-hal]
@@ -52,11 +39,6 @@ The `"rt"` feature flag is recommended for users who are
 
 Enabling the `"rt"` feature-flag will link in the i.MX RT interrupt table. If you're familiar with crates that are generated from `svd2rust`, [the `"rt"` feature](https://docs.rs/svd2rust/0.17.0/svd2rust/#the-rt-feature) has the same behaviors in the `imxrt-hal` as it does in `svd2rust`-generated crates.
 
-#### Future of the HAL
-
-Follow #56 to understand how we're breaking `imxrt-hal` into separate crates. If you'd like to try the new HAL crate(s), depend on `imxrt1060-hal`, and skip the feature flag that describes your i.MX RT variant.
-
-
 ## Q/A
 
 #### *Are there any board support packages (BSP) that use the `imxrt-hal` crate?*
@@ -94,4 +76,4 @@ Licensed under either of
   http://www.apache.org/licenses/LICENSE-2.0)
 - MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
 
-at your option.
+at your option.
@@ -1,22 +1,17 @@
 ## Publish a release
 
-From a clean repository, at the root:
+Ensure that all other imxrt-rs dependencies, like `imxrt-ral` and
+`imxrt-iomuxc`, are already published. Then, publish the HAL:
 
-1. If needed, publish a new imxrt-ral following instructions there for release.
-2. In each HAL such as imxrt1060-hal/Cargo.toml`, update both
-    - the version of the HAL
-    - the HAL's dependency of the RAL
-3. Commit the changes, and create a tag.
-4. Publish the HAL(s):
-    ```
-    cargo publish --manifest-path imxrt1060-hal/Cargo.toml
-    ```
+```
+cargo publish --manifest-path imxrt-hal/Cargo.toml --features imxrt1062
+```
 
 ## Maintaining older releases
 
 This section describes how imxrt-rs project maintainers support older releases.
 If there is a bug fix that you would like to apply to an older version of the
-RAL or HAL crates, follow the process below to create a new patch
+RAL, HAL, or IOMUXC crates, follow the process below to create a new patch
 release.
 
 - Integrate bug fixes on the main branch.
 
@@ -2,6 +2,11 @@
 
 ## [Unreleased]
 
+### Added
+
+Abstraction layer for `tempmon` module. Incl. auto measurement and
+alarm interrupts (only available for `"imxrt106x"`)
+
 ## [0.4.5] 2021-12-02
 
 ### Added
 
@@ -23,8 +23,8 @@ rand_core = { version = "0.5", default-features = false, optional = true }
 
 [dependencies.imxrt-iomuxc]
 version = "0.1.2"
-git = "https://github.com/dstric-aqueduct/imxrt-iomuxc.git"
-branch = "v0.1.2/can"
+git = "https://github.com/imxrt-rs/imxrt-iomuxc.git"
+branch = "v0.1"
 
 [dev-dependencies.cortex-m-rt]
 version = "0.6"
 
@@ -1,22 +1,18 @@
-# imxrt-hal
+# imxrt1060-hal
 
-This project provides a Rust HAL (hardware abstraction layer) for all NXP i.MX RT
-microcontrollers based on the imxrt-ral crate.
+`imxrt1060-hal` is a Rust hardware abstraction layer that's specific to i.MX
+RT 1060 processors. This includes some of the following processor parts:
 
-A feature flag needs to be set for any of the supported i.MX RT SoC.
+- i.MX RT 1061
+- i.MX RT 1062
 
-## What is it?
+It is the successor to `imxrt-hal`, version 0.4, with `feature = "imxrt1062"`.
 
-imxrt-hal is an experiment into a lightweight hardware abstraction layer. It
-provides access to some of the peripherals of the i.MX RT series processors
-from NXP using embedded-hal and other community driven hardware APIs.
+## Features
 
-The main aims are fast compilation, compactness, and simplicity.
+The table below describes the optional features supported by `imxrt1060-hal`.
 
-Please consider trying it out and contributing or leaving feedback!
-
-## Goals
-
-* Simple to use and hard to use incorrectly
-* All peripherals and busses supported
-* Support the entire i.MX RT Series with a single crate to maximize code reuse
+| Feature  | Description                        |
+| -------- | ---------------------------------- |
+| `"rt"`   | Runtime support with `cortex-m-rt` |
+| `"rtic"` | Support for RTIC                   |
@@ -4,10 +4,10 @@
 //!
 //! # Example
 //! ```no_run
-//! use imxrt1060_hal::{self, adc};
+//! use imxrt_hal::{self, adc};
 //! use embedded_hal::adc::OneShot;
 //!
-//! let mut peripherals = imxrt1060_hal::Peripherals::take().unwrap();
+//! let mut peripherals = imxrt_hal::Peripherals::take().unwrap();
 //! let (adc1_builder, _) = peripherals.adc.clock(&mut peripherals.ccm.handle);
 //!
 //! let mut adc1 = adc1_builder.build(adc::ClockSelect::default(), adc::ClockDivision::default());
@@ -258,26 +258,27 @@ where
     }
 }
 
-unsafe impl<ADCx, P> crate::dma::peripheral::Source<u16> for AdcSource<ADCx, P>
+impl<ADCx, P> crate::dma::peripheral::Source<u16> for AdcSource<ADCx, P>
 where
     ADCx: adc::ADC + AdcDmaSource,
     P: Pin<ADCx>,
 {
-    fn source_signal(&self) -> u32 {
-        ADCx::SOURCE_REQUEST_SIGNAL
-    }
+    type Error = ();
+
+    const SOURCE_REQUEST_SIGNAL: u32 = ADCx::SOURCE_REQUEST_SIGNAL;
 
     fn source(&self) -> *const u16 {
         &self.adc.reg.R0 as *const _ as *const u16
     }
 
-    fn enable_source(&self) {
+    fn enable_source(&mut self) -> Result<(), Self::Error> {
         let channel = <P as Pin<ADCx>>::Input::U32;
         ral::modify_reg!(ral::adc, self.adc.reg, GC, ADCO: 1, DMAEN: 1);
         ral::modify_reg!(ral::adc, self.adc.reg, HC0, |_| channel);
+        Ok(())
     }
 
-    fn disable_source(&self) {
+    fn disable_source(&mut self) {
         ral::modify_reg!(ral::adc, self.adc.reg, GC, ADCO: 0, DMAEN: 0);
     }
 }