Skip to content

Commit a93bddc

Browse files
author
Jonathan Pallant
authored
Merge pull request #17 from 42-technology-ltd/v500_release
Updated to 0.5.0.
2 parents b70a7d7 + 49e18af commit a93bddc

File tree

4 files changed

+13
-9
lines changed

4 files changed

+13
-9
lines changed

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "nrfxlib"
3-
version = "0.4.0"
3+
version = "0.5.0"
44
authors = ["Jonathan Pallant (42 Technology) <[email protected]>"]
55
edition = "2018"
66
license = "MIT OR Apache-2.0"
@@ -10,7 +10,7 @@ description = "Rust driver for the LTE stack on the Nordic nRF9160"
1010

1111
[dependencies]
1212
nrfxlib-sys = "1.2.0"
13-
nrf91 = "0.1.1"
13+
nrf9160-pac = "0.2.1"
1414
cortex-m = "0.6"
1515
heapless = "0.5"
1616
log = "0.4"

README.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,15 @@ See [nrf9160-demo](https://github.com/42-technology-ltd/nrf9160-demo) for a demo
7474

7575
## Changelog
7676

77-
### Unreleased Changes ([Source](https://github.com/42-technology-ltd/nrfxlib/tree/master) | [Changes](https://github.com/42-technology-ltd/nrfxlib/compare/v0.4.0...master))
77+
### Unreleased Changes ([Source](https://github.com/42-technology-ltd/nrfxlib/tree/master) | [Changes](https://github.com/42-technology-ltd/nrfxlib/compare/v0.5.0...master))
7878

7979
* None
8080

81+
### v0.5.0 ([Source](https://github.com/42-technology-ltd/nrfxlib/tree/v0.5.0) | [Changes](https://github.com/42-technology-ltd/nrfxlib/compare/v0.4.0...v0.5.0))
82+
83+
* Updated to nrfxlib version 1.2.0
84+
* Certificates now handled through AT commands.
85+
8186
### v0.4.0 ([Source](https://github.com/42-technology-ltd/nrfxlib/tree/v0.4.0) | [Changes](https://github.com/42-technology-ltd/nrfxlib/compare/v0.3.0...v0.4.0))
8287

8388
* Add TLS v1.3 and DTLS v1.2 support

src/ffi.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
//! Dual-licensed under MIT and Apache 2.0. See the [README](../README.md) for
99
//! more details.
1010
11-
use nrf91;
12-
1311
/// Stores the last error from the library. See `bsd_os_errno_set` and
1412
/// `get_last_error`.
1513
static LAST_ERROR: core::sync::atomic::AtomicI32 = core::sync::atomic::AtomicI32::new(0);
@@ -23,25 +21,25 @@ extern "C" {
2321
/// Function required by BSD library. We need to set the EGU1 interrupt.
2422
#[no_mangle]
2523
pub extern "C" fn bsd_os_application_irq_set() {
26-
cortex_m::peripheral::NVIC::pend(nrf91::Interrupt::EGU1);
24+
cortex_m::peripheral::NVIC::pend(crate::cpu::Interrupt::EGU1);
2725
}
2826

2927
/// Function required by BSD library. We need to clear the EGU1 interrupt.
3028
#[no_mangle]
3129
pub extern "C" fn bsd_os_application_irq_clear() {
32-
cortex_m::peripheral::NVIC::unpend(nrf91::Interrupt::EGU1);
30+
cortex_m::peripheral::NVIC::unpend(crate::cpu::Interrupt::EGU1);
3331
}
3432

3533
/// Function required by BSD library. We need to set the EGU2 interrupt.
3634
#[no_mangle]
3735
pub extern "C" fn bsd_os_trace_irq_set() {
38-
cortex_m::peripheral::NVIC::pend(nrf91::Interrupt::EGU2);
36+
cortex_m::peripheral::NVIC::pend(crate::cpu::Interrupt::EGU2);
3937
}
4038

4139
/// Function required by BSD library. We need to clear the EGU2 interrupt.
4240
#[no_mangle]
4341
pub extern "C" fn bsd_os_trace_irq_clear() {
44-
cortex_m::peripheral::NVIC::unpend(nrf91::Interrupt::EGU2);
42+
cortex_m::peripheral::NVIC::unpend(crate::cpu::Interrupt::EGU2);
4543
}
4644

4745
/// Function required by BSD library. We have no init to do.

src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ pub use raw::{poll, PollEntry, PollFlags, PollResult, Pollable};
5454

5555
use log::{debug, trace};
5656
use nrfxlib_sys as sys;
57+
use nrf9160_pac as cpu;
5758

5859
//******************************************************************************
5960
// Types

0 commit comments

Comments
 (0)