huntc
16b6c78332
Removed debugging logs
2021-10-18 10:26:11 +11:00
huntc
103a3305e2
Implements continuous sampling for the nRF SAADC
...
Implements continuous sampling for the nRF SAADC and also renames `OneShot` to `Saadc`. The one-shot behaviour is retained with the `sample` method and a new `run_sampler` method is provided for efficiently (i.e. zero copying) sampler processing. A double buffer is used for continuously sampling, which wlll be swapped once sampling has taken place.
A sample frequency is provided and will set the internal timer of the SAADC when there is just the one channel being sampled. Otherwise, PPI will be used to hook up the TIMER peripheral to drive the sampling task.
2021-10-18 10:26:11 +11:00
Dario Nieuwenhuis
a2e7c24e00
Clippy fixes
2021-10-18 01:05:29 +02:00
Dario Nieuwenhuis
66d70cd146
nrf/uarte: do not use WFE on drop.
...
- It disturbs other stuff that uses WFE/SEV in the system. I ran into
issues with this.
- It needs the irq handler to check for RXTO/TXSTOPPED errors, which makes
it slower.
2021-10-16 03:14:47 +02:00
bors[bot]
05bc4d198e
Merge #423
...
423: nRF9160 support r=Dirbaio a=diondokter
- Created a chip file with all the peripherals, interrupts and peripheral implementations.
- All peripherals now use an alias for the NS (non-secure) version of the nRF9160 version.
- Implementations of peripherals that don't exist are ignored.
- Most PPI functionality has been stubbed out because the nRF91 has the newer DPPI which is not compatible with the current API. (The channels are also set to not configurable, so they are kinda useless now, but in principle the stubs should never be called)
Co-authored-by: Dion Dokter <dion@tweedegolf.com>
2021-10-13 21:11:41 +00:00
Dario Nieuwenhuis
c675fb1036
nrf/saadc: make InputChannel private.
2021-10-13 22:13:30 +02:00
Dario Nieuwenhuis
d8c3365d6a
nrf/saadc: make Input trait sealed.
2021-10-13 22:13:26 +02:00
Dario Nieuwenhuis
0d709fa5c8
nrf/saadc: require unborrow for Input.
...
This allows using borrowed pins in ChannelConfig.
2021-10-13 22:06:09 +02:00
Dion Dokter
c1c704bfc8
- Removed the enable assert from UARTE.
...
- Added nRF9160 to CI.
2021-10-13 15:00:08 +02:00
Dion Dokter
ddcee446c1
Added anomaly workaround from the HAL to improve the UARTE
2021-10-12 13:35:08 +02:00
Dion Dokter
2c2c284482
Undoing unnecessary changes
2021-10-12 11:55:38 +02:00
Dion Dokter
995cd01cbc
ran fmt
2021-10-11 15:31:25 +02:00
Dion Dokter
4643727fea
Made all PPI channels not configurable (even though they are) so they can't use unimplemented features
2021-10-11 15:12:40 +02:00
Dion Dokter
a8407c8aba
Merge remote-tracking branch 'upstream/master'
2021-10-11 10:59:34 +02:00
Dion Dokter
20674f7126
Initial support for nrf9160
2021-10-11 10:39:38 +02:00
Dario Nieuwenhuis
14c3260d88
nrf/saadc: move chip-specific mappings to chips/
2021-10-11 01:36:31 +02:00
Dario Nieuwenhuis
cf13dd7df8
nrf/ppi: nrf52805 only has 10 configurable channels.
2021-10-11 01:20:51 +02:00
Dario Nieuwenhuis
6e7abba9ff
nrf: rename Cargo feature references from "51" to "nrf51".
...
Note: the feature doesn't actually exist, references are there just in case
nrf51xx is supported in the future.
2021-10-11 01:09:57 +02:00
Dario Nieuwenhuis
668364da9c
nrf/saadc: nrf52805 only has 2 channels
2021-10-11 00:55:31 +02:00
Dario Nieuwenhuis
0b26ab7bbc
nrf/saadc: nrf52820 doesn't have it.
2021-10-11 00:55:17 +02:00
huntc
8c9e50b378
Conflates the negative and positive types as they are the same, and renames pin to input as they can be more than pins
2021-10-11 09:38:35 +11:00
huntc
b043778f75
Removed the NotConnected as it isn't used.
2021-10-11 09:08:58 +11:00
huntc
25d6a2cd13
No use case understood for NotConnected, so hiding it for now
2021-10-11 08:56:53 +11:00
huntc
617a976e96
No need for unwrap
2021-10-11 08:54:24 +11:00
huntc
5f5470a320
Need to borrow the pins for the lifetime of the config, and subsequently the one shot.
2021-10-11 08:52:45 +11:00
huntc
cef6158c31
Extend SAADC one shot support
...
One-shot mode now permits the sampling of differential pins, and the sampling of multiple pins simultaneously.
A new ChannelConfig structure has been introduced so that multiple channels can be configured individually. Further, the `sample` method now accepts a buffer into which samples are written.
Along the way, I've reset some default configuration to align with Nordic's settings in their nrfx saadc driver. Specifically, the channel gain defaults to 6 (from 4) and the time defaults to 10us (from 20us).
2021-10-09 11:25:18 +11:00
Dario Nieuwenhuis
0e05ba688d
nrf/saadc: remove Sample trait.
2021-10-07 02:10:22 +02:00
Ulf Lilleengen
99a94f1d50
Update version of critical-section
2021-09-13 17:05:17 +02:00
Ulf Lilleengen
e24528051b
Add WASM support for executor
...
* Adds an executor for WASM runtimes based on wasm_bindgen.
* Add time driver based on JS time handling.
* Add example that can run in browser locally.
* Update to critical-section version that supports 'std' flag
2021-09-13 16:42:39 +02:00
Dario Nieuwenhuis
ead987245d
embassy: Refactor module structure to remove kitchen-sink util.
2021-09-11 02:35:35 +02:00
Dario Nieuwenhuis
f2623e7e9b
Update lots of deps
2021-09-11 01:35:23 +02:00
Dario Nieuwenhuis
de016e8456
Remove trait_alias, allow(incomplete_features).
...
trait_alias seems unused. no idea why it's there.
2021-09-03 17:00:58 +02:00
Dario Nieuwenhuis
d0c8749399
Merge pull request #382 from fnafnio/typestate_nrf_timer
...
Typestate nrf timer
2021-09-02 13:39:55 +02:00
f_punk
34c66fa78d
removed type aliases
...
NotAwaitable as default generic param
added awaitable_timer example
2021-09-02 12:02:31 +02:00
Dario Nieuwenhuis
a81b963561
nrf/saadc: don't use wake_on_interrupt.
2021-09-01 23:54:26 +02:00
f_punk
1cef7134d4
moved CC::wait to awaitable typestate
2021-09-01 16:20:32 +02:00
f_punk
a0c40562ea
added typestate to nrf-Timer
...
useful for hooking up the PPI to an Event without needing interrupt
tested with buffered_uart example on nRF52840-DK
2021-09-01 16:16:56 +02:00
Dario Nieuwenhuis
7c0990ad1e
time: allow storing state inside the driver struct.
2021-08-25 21:06:27 +02:00
Richard Dodd
ed1ed5225f
Expose EASY_DMA_SIZE.
2021-08-22 00:23:03 +01:00
Dario Nieuwenhuis
3457bb9f05
nrf: make gpiote and time-driver optional via cargo features.
2021-08-20 15:42:42 +02:00
Dario Nieuwenhuis
17659e2e44
nrf/wdt: add handle steal
2021-08-20 14:23:24 +02:00
Dario Nieuwenhuis
fe355af4f0
nrf: update to cortex-m-rt 0.7
2021-08-19 17:11:17 +02:00
Dario Nieuwenhuis
d3aeb45fb3
Update cortex-m-rt to v0.7 for stm32, rp.
2021-08-19 00:56:11 +02:00
Dario Nieuwenhuis
066abfe4c6
nrf/time: allow configuring the rtc irq prio
2021-08-18 22:13:02 +02:00
Dario Nieuwenhuis
2540a960e5
nrf: add WDT driver
2021-08-07 14:26:28 +02:00
Dario Nieuwenhuis
452f7e0c2c
nrf: update PACs to 0.10
2021-08-07 12:41:12 +02:00
Dario Nieuwenhuis
05e50e1f4a
time_driver: use regular fn ptr -> raw ptr casts
2021-08-05 19:19:47 +02:00
Dario Nieuwenhuis
0ea6a2d890
time: replace dyn clock/alarm with a global Driver trait
2021-08-05 19:14:09 +02:00
Dario Nieuwenhuis
07d4b196f7
Update nightly, remove removed features.
2021-08-04 19:48:14 +02:00
Dario Nieuwenhuis
3f28bb6c77
common: Initialize PeripheralMutex state with closure to ensure it's done in-place.
2021-08-02 20:13:41 +02:00
Dario Nieuwenhuis
af87031d62
hal-common: remove Pin in PeripheralMutex
2021-08-02 19:55:04 +02:00
Dario Nieuwenhuis
7bfb763e09
Rename embassy-extras to embassy-hal-common
2021-07-29 13:44:51 +02:00
Dario Nieuwenhuis
c8a48d726a
Merge pull request #277 from Liamolucko/fix-peripheral-ub
...
extras: Fix UB in `Peripheral`
2021-07-29 13:08:30 +02:00
Liam Murphy
d5ba35424d
Replace PeripheralStateUnchecked with register_interrupt_unchecked
2021-07-29 15:11:26 +10:00
Liam Murphy
079526559f
Remove critical sections from PeripheralMutex interrupt handler by checking the interrupt's priority on startup.
...
Since `PeripheralMutex` is the only way to safely maintain state across interrupts, and it no longer allows setting the interrupt's priority, the priority changing isn't a concern.
This also prevents other causes of UB due to the interrupt being exposed during `with`, and allowing enabling the interrupt and setting its context to a bogus pointer.
2021-07-27 17:28:52 +10:00
Liam Murphy
1b7ad7080e
Add Send/Sync bounds to PeripheralState
2021-07-24 12:53:57 +10:00
Bob McWhirter
58edefff6e
Formatting.
2021-07-23 13:22:39 -04:00
Bob McWhirter
d5ed5c3ef3
Split up the nRF impls for SPI traits.
2021-07-23 13:22:39 -04:00
Dario Nieuwenhuis
f916fe5476
all hals: reexport PAC if unstable-pac feature is set.
2021-07-14 22:19:04 +02:00
Dario Nieuwenhuis
35a76c364a
embassy/time: make optional via Cargo feature
2021-07-12 03:45:48 +02:00
Liam Murphy
744e2cbb8a
extras: Fix UB in Peripheral
...
`Peripheral` assumed that interrupts can't be preempted,
when they can be preempted by higher priority interrupts.
So I put the interrupt handler inside a critical section,
and also added checks for whether the state had been dropped
before the critical section was entered.
I also added a `'static` bound to `PeripheralState`,
since `Pin` only guarantees that the memory it directly references
will not be invalidated.
It doesn't guarantee that memory its pointee references also won't be invalidated.
There were already some implementations of `PeripheralState`
that weren't `'static`, though,
so I added an unsafe `PeripheralStateUnchecked` trait
and forwarded the `unsafe` to the constructors of the implementors.
2021-07-05 17:42:43 +10:00
Dario Nieuwenhuis
7ebd4e3aa9
nrf/gpio: fix unused warning on chips without ports
2021-07-05 02:44:16 +02:00
Dario Nieuwenhuis
e55c89f890
Merge pull request #262 from Liamolucko/nrf-rng
...
Add an nRF RNG driver
2021-07-01 01:55:55 +02:00
Liam Murphy
99339e940e
fix: check if new_ptr == end, not the old pointer
2021-06-30 16:04:34 +10:00
Liam Murphy
53b95588df
Use atomics to share state instead of a RefCell
2021-06-30 15:55:52 +10:00
Liam Murphy
89fdad3a6b
Don't wake the future for every byte in fill_bytes
2021-06-30 12:34:57 +10:00
Liam Murphy
ae0219de6f
Move initialisation inside of future
2021-06-30 09:45:49 +10:00
Liam Murphy
8a4ab29819
Add an nRF RNG driver
...
Resolves #187
Like the stm32 driver, this has both a non-blocking and blocking API, and implements `rand_core::RngCore` for the blocking API.
2021-06-29 17:26:16 +10:00
Liam Murphy
c0ef40d6e9
Correctly unset bits
2021-06-29 15:12:42 +10:00
Liam Murphy
e6d0dba5ca
Write bits directly to intenset/clr + shorts
2021-06-29 14:37:37 +10:00
Liam Murphy
87ca902e44
Handle differences between PACs
2021-06-29 13:04:05 +10:00
Liam Murphy
0c0597f775
Don't include extended timer support on chips without it
2021-06-29 12:07:10 +10:00
Liam Murphy
94e13ef053
Fix Cc::event_compare
2021-06-29 11:39:50 +10:00
Liam Murphy
e5a5031f20
Get rid of the TODO about variant names, stop the timer before setting BITMODE and set a default frequency.
2021-06-29 11:29:32 +10:00
Liam Murphy
e7addf094b
Fix Cc::wait never resolving and refactor some APIs
...
I think the interrupt was getting immediately re-triggered as soon as the handler exited, so I disabled the interrupt in the handler.
2021-06-29 10:33:41 +10:00
Liam Murphy
02781ed744
Add an nRF Timer driver
...
Resolves #189
2021-06-26 17:58:36 +10:00
Dario Nieuwenhuis
76ae9e0e7c
nrf: use released nrf52805-pac, nrf52820-pac
2021-06-15 22:25:37 +02:00
Jacob Rosenthal
e9bd8428e3
embassy-nrf: twim derive defmt
2021-06-07 19:09:03 -07:00
Dario Nieuwenhuis
d1eeef5864
nrf/buffered_uarte: Fix crash when calling set_baudrate as the very first thing.
2021-06-08 00:32:14 +02:00
Dario Nieuwenhuis
3be49d3e79
fmt: Add dunmy use to avoid "unused variable" errors when no log is enabled.
2021-06-07 03:21:37 +02:00
Dario Nieuwenhuis
ef1ebefec0
fmt: use absolute paths
2021-06-07 03:15:05 +02:00
Dario Nieuwenhuis
e7dc5c0939
fmt: make all macros macro_rules so scoping is consistent.
2021-06-07 00:16:39 +02:00
Folkert
749633ddf2
fix errors
2021-06-05 12:02:17 +02:00
Folkert
0c0bf6e4db
extract the polled-on function
2021-06-05 11:59:58 +02:00
Folkert
28c0023c9a
add distinct read and write functions
2021-06-05 11:48:00 +02:00
Folkert
d0dd0f007a
changes after review
2021-06-05 11:37:11 +02:00
Folkert
3f74c557ed
skip 'in ram' check for mutable slice in fullduplex
2021-06-05 11:34:50 +02:00
Folkert
857ac3386b
nrf async twim
2021-06-04 17:31:35 +02:00
Folkert
990d83d424
match on mode
2021-06-03 11:38:25 +02:00
Dario Nieuwenhuis
3bd36dce76
nrf/qspi: wait MORE for DPM enter.
2021-05-27 00:42:29 +02:00
Dario Nieuwenhuis
de703eb605
nrf/qspi: proper lowpower drop, supporting DPM.
2021-05-26 23:26:07 +02:00
Dario Nieuwenhuis
42abeca493
nrf/spim: disable and deconfigure pins on drop.
2021-05-26 20:11:23 +02:00
Dario Nieuwenhuis
39c420733f
nrf/uarte: deconfigure pins on drop
2021-05-26 20:11:23 +02:00
Dario Nieuwenhuis
8dfb6dff86
nrf/twim: make pullup configurable, do not enable it by default.
2021-05-26 20:11:23 +02:00
Dario Nieuwenhuis
b449f6de9d
nrf/twim: deconfigure pins on drop
2021-05-26 18:23:10 +02:00
Dario Nieuwenhuis
55c3ba2a5f
nrf/saadc: do not use dyn
2021-05-22 15:42:14 +02:00
Ulf Lilleengen
13524080d3
Avoid using full GAT
2021-05-22 13:23:09 +02:00
Ulf Lilleengen
f6cac6944c
Makes it possible to use the ADC with different analog pins
2021-05-21 13:12:27 +02:00
Dario Nieuwenhuis
105c8504b6
Mark Unborrow as unsafe to implement
2021-05-19 23:29:33 +02:00
Dario Nieuwenhuis
e3ab02c7e3
nrf/saadc: remove Pin
2021-05-19 20:22:15 +02:00
Dario Nieuwenhuis
58723a8e76
Merge pull request #185 from embassy-rs/nrf-improvement
...
nrf improvements
2021-05-17 22:48:36 +02:00
Dario Nieuwenhuis
32fc17f0fd
nrf/gpiote: Allow choosing IRQ priority.
2021-05-17 21:27:27 +02:00
Rukai
3e83acc1cb
Fix unused field warnings
2021-05-17 20:23:04 +10:00
Rukai
149ddf2f29
Fix warnings
2021-05-17 19:48:58 +10:00
Dario Nieuwenhuis
f7858631d8
stm32: fix build, add ci
2021-05-17 03:16:58 +02:00
Dario Nieuwenhuis
a5ad79927e
nrf: add Unborrow<Target = Self> bound to all instance traits
2021-05-17 01:01:31 +02:00
Dario Nieuwenhuis
8394603ea6
nrf/pwm: add enable/disable
2021-05-17 00:57:37 +02:00
Dario Nieuwenhuis
88f664b434
nrf/pwm: set initial value to Low, according to the PS
2021-05-17 00:57:37 +02:00
Dario Nieuwenhuis
f9bcf6df6b
nrf: add PWM
2021-05-17 00:57:37 +02:00
Dario Nieuwenhuis
0310e4d458
Add init fn. Initializes hw and returns Peripherals.
2021-05-17 00:57:37 +02:00
Dario Nieuwenhuis
97b01f1c47
nrf/gpiote: initialize automatically
2021-05-17 00:57:20 +02:00
Dario Nieuwenhuis
92be72e0e3
Add #[interrupt] macro to register static interrupts.
2021-05-17 00:57:20 +02:00
Dario Nieuwenhuis
eb4571dc4c
nrf: add blocking TWIM
2021-05-17 00:57:20 +02:00
Dario Nieuwenhuis
bd9589d0ce
nrf: add support for nrf52805, nrf52811, nrf52820
2021-05-17 00:57:20 +02:00
Ulf Lilleengen
3b86e85770
Bump version of critical-section to 0.2.1
2021-05-13 18:17:50 +02:00
Dario Nieuwenhuis
e0809ab0fb
Switch to use PrioritX enums.
2021-05-11 01:34:24 +02:00
Dario Nieuwenhuis
7fa0e57172
Use critical_section crate
2021-05-11 01:15:30 +02:00
Ulf Lilleengen
0a3c236510
Improve comment
2021-05-10 23:06:25 +02:00
Ulf Lilleengen
e9eb3ce6c1
Disable PPI trigger during normal read
2021-05-10 23:06:25 +02:00
Ulf Lilleengen
687dda106f
Read rx amount outside of poll_fn
2021-05-10 23:06:25 +02:00
Ulf Lilleengen
5afe01617a
Use rxdrdy as trigger for timer
2021-05-10 23:06:25 +02:00
Ulf Lilleengen
dda338cedb
Add implementation of ReadUntilIdle for nRF UART
...
Add type UarteWithIdle that implements Read, Write and ReadUntilIdle
traits. The type uses a timer + 2 PPI channels internally, triggered on
RTXSTARTED event.
2021-05-10 23:06:25 +02:00
Dario Nieuwenhuis
76f737bb0e
Merge pull request #158 from derekdreery/blocking_spim
...
Implement the blocking hal api for SPIM.
2021-05-05 22:52:36 +02:00
Richard Dodd
212e83aa22
Make changes to Write as well as Transfer
2021-05-05 19:18:57 +01:00
Richard Dodd
9d427a1ba4
Address issues in PR
...
Also add some documentation.
2021-05-05 18:33:45 +01:00
Richard Dodd
9de12a0a7a
Address issues in PR.
2021-05-05 18:25:14 +01:00
Richard Dodd
1ad18aa09a
Implement the blocking hal api for SPIM.
2021-05-05 14:50:28 +01:00
Richard Dodd
0b3ccca69b
Add a pin variant that can change between disconnected/input/output.
...
I'm in no way attached to the name and encourage better suggestions.
2021-05-05 14:46:51 +01:00
Ulf Lilleengen
e2ad5e1395
Add detection of edge transitions for ports
2021-04-16 07:58:24 +02:00
Dario Nieuwenhuis
97ca54fa66
Rename PeripheralBorrow to Unborrow
2021-04-14 19:59:52 +02:00
Dario Nieuwenhuis
5ee87cf25d
Remove Pin from Flash trait
2021-04-14 17:04:40 +02:00
Dario Nieuwenhuis
c15411d1bd
Remove Pin from SPI
2021-04-14 17:04:40 +02:00
Dario Nieuwenhuis
8b1ffb2cb7
Remove Pin from GPIO traits
2021-04-14 17:04:40 +02:00
Dario Nieuwenhuis
59ccc45f28
Remove pin from Uart
2021-04-14 17:04:40 +02:00
Dario Nieuwenhuis
402f7f1886
nrf/gpio: remove DummyPin
2021-04-10 01:48:37 +02:00
Dario Nieuwenhuis
5b74e326e5
nrf/qpsi: make config non_exhaustive
2021-03-29 00:58:58 +02:00
Dario Nieuwenhuis
b9e709403d
nrf: better macro naming.
2021-03-29 00:58:58 +02:00
Dario Nieuwenhuis
48cf1f6ebf
nrf/system: add configure
2021-03-29 00:58:58 +02:00
Dario Nieuwenhuis
3a18373828
nrf/uarte: update BufferedUarte to new APi
2021-03-29 00:58:58 +02:00
Dario Nieuwenhuis
00e5f30352
nrf/ppi: add AnyConfigurableChannel
2021-03-29 00:58:58 +02:00
Dario Nieuwenhuis
31b817ed27
nrf/timer: add instance traits
2021-03-29 00:58:58 +02:00
Dario Nieuwenhuis
aa0341056e
nrf/uarte: deal with hwfc correctly
2021-03-29 00:58:58 +02:00
Dario Nieuwenhuis
b6496a85d8
nrf/ppi: implement and add example
2021-03-29 00:58:58 +02:00
Dario Nieuwenhuis
26705ec328
nrf/ppi: add peris and traits
2021-03-29 00:58:58 +02:00
Dario Nieuwenhuis
646be40ac5
nrf/gpiote: make number() public, change to usize
2021-03-29 00:58:58 +02:00
Dario Nieuwenhuis
90f599bc2f
nrf/gpiote: update output channel to new API
2021-03-29 00:58:58 +02:00
Dario Nieuwenhuis
2bd9323f28
nrf/gpiote: update input channel to new API
2021-03-29 00:58:58 +02:00
Dario Nieuwenhuis
a338841797
extras: add impl_unborrow macro
2021-03-29 00:58:58 +02:00
Richard Dodd
2c248dab56
nrf/spim: make mosi,miso optional
2021-03-29 00:58:58 +02:00
Dario Nieuwenhuis
5646926cca
nrf/rtc: update to new api
2021-03-29 00:58:58 +02:00
