Modify main.rs for nRF52832
This commit is contained in:
parent
9c38ed7a03
commit
ad51819ce1
10
src/main.rs
10
src/main.rs
@ -5,7 +5,7 @@ use static_cell::StaticCell;
|
||||
|
||||
use core::mem;
|
||||
use embassy_nrf::interrupt::{self, InterruptExt};
|
||||
use embassy_nrf::peripherals::TWI0;
|
||||
use embassy_nrf::peripherals::TWISPI0;
|
||||
use embassy_time::Timer;
|
||||
use nrf_softdevice::ble::advertisement_builder::{
|
||||
Flag, LegacyAdvertisementBuilder, LegacyAdvertisementPayload, ServiceList, ServiceUuid16,
|
||||
@ -115,10 +115,10 @@ impl<T: twim::Instance> GenericTempHumiditySensor<T> {
|
||||
}
|
||||
|
||||
bind_interrupts!(struct Irqs {
|
||||
TWIM0_TWIS0_TWI0 => twim::InterruptHandler<peripherals::TWI0>;
|
||||
SPIM0_SPIS0_TWIM0_TWIS0_SPI0_TWI0 => twim::InterruptHandler<peripherals::TWISPI0>;
|
||||
});
|
||||
|
||||
type TempHumiditySensor = GenericTempHumiditySensor<TWI0>;
|
||||
type TempHumiditySensor = GenericTempHumiditySensor<TWISPI0>;
|
||||
|
||||
#[embassy_executor::task]
|
||||
async fn measurement_task(mut sensor: TempHumiditySensor, server: &'static Server) {
|
||||
@ -148,7 +148,7 @@ static SERVER: StaticCell<Server> = StaticCell::new();
|
||||
async fn main(spawner: Spawner) {
|
||||
// Set up peripherals
|
||||
|
||||
interrupt::TWIM0_TWIS0_TWI0.set_priority(interrupt::Priority::P2);
|
||||
interrupt::SPIM0_SPIS0_TWIM0_TWIS0_SPI0_TWI0.set_priority(interrupt::Priority::P2);
|
||||
|
||||
let mut embassy_config = embassy_nrf::config::Config::default();
|
||||
embassy_config.gpiote_interrupt_priority = interrupt::Priority::P2;
|
||||
@ -156,7 +156,7 @@ async fn main(spawner: Spawner) {
|
||||
let p = embassy_nrf::init(embassy_config);
|
||||
|
||||
let config = twim::Config::default();
|
||||
let twi = twim::Twim::new(p.TWI0, Irqs, p.P0_14, p.P0_13, config);
|
||||
let twi = twim::Twim::new(p.TWISPI0, Irqs, p.P0_14, p.P0_13, config);
|
||||
let sensor = TempHumiditySensor::new(0x44, twi);
|
||||
|
||||
let mut led = Output::new(p.P0_20, Level::Low, OutputDrive::Standard);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user