an.tsouchlos/commonsense-sw
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fix configs: Make software compatible with nRF52810 again

Browse Source
This commit is contained in:
Andreas Tsouchlos 2025-10-04 20:05:49 +02:00
parent 3ffa59f5dc
commit ae7bd7b921
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.cargo/config.toml
View File

@ -1,11 +1,11 @@
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
# replace nRF82810_xxAA with your chip as listed in `probe-rs chip list`
runner = "probe-rs run --chip nRF52832_xxAA"
runner = "probe-rs run --chip nRF52810_xxAA"
[alias]
rr = "run --release"
f = "flash --chip nRF52832_xxAA --reset-halt"
fr = "flash --chip nRF52832_xxAA --release --reset-halt"
f = "flash --chip nRF52810_xxAA --reset-halt"
fr = "flash --chip nRF52810_xxAA --release --reset-halt"
[build]
target = "thumbv7em-none-eabi"

2
Cargo.lock generated
View File

@ -734,7 +734,7 @@ dependencies = [
"heapless",
"nrf-softdevice-macro",
"nrf-softdevice-s112",
"nrf52832-pac",
"nrf52810-pac",
"num_enum",
]

4
Cargo.toml
View File

@ -11,7 +11,7 @@ defmt = "0.3.8"
defmt-rtt = "0.4.1"
embassy-executor = { version = "0.6.1", features = ["task-arena-size-8192", "arch-cortex-m", "executor-thread", "executor-interrupt", "defmt", "integrated-timers"] }
embassy-futures = "0.1.1"
embassy-nrf = { version = "0.2.0", features = ["defmt", "nrf52832", "time-driver-rtc1", "gpiote", "unstable-pac", "time"] }
embassy-nrf = { version = "0.2.0", features = ["defmt", "nrf52810", "time-driver-rtc1", "gpiote", "unstable-pac", "time"] }
embassy-sync = { version = "0.6.0", features = ["defmt"] }
embassy-time = { version = "0.3.2", features = ["defmt", "defmt-timestamp-uptime"] }
embedded-storage = "0.3.1"
@ -19,7 +19,7 @@ embedded-storage-async = "0.4.1"
fixed = "1.28.0"
futures = { version = "0.3.31", default-features = false }
heapless = "0.8.0"
nrf-softdevice = { version = "0.1.0", features = ["defmt", "ble-peripheral", "ble-gatt-server", "critical-section-impl", "nrf52832", "s112"] }
nrf-softdevice = { version = "0.1.0", features = ["defmt", "ble-peripheral", "ble-gatt-server", "critical-section-impl", "nrf52810", "s112"] }
nrf-softdevice-s112 = "0.1.2"
panic-probe = { version = "0.3.2", features = ["print-defmt"] }
static_cell = "2.1.0"

4
memory.x
View File

@ -2,6 +2,6 @@ MEMORY
{
/* NOTE 1 K = 1 KiB = 1024 bytes */
/* These values correspond to the NRF52832 with SoftDevice S112 v7.x */
FLASH : ORIGIN = 0x00000000 + 100K, LENGTH = 512K - 100K
RAM : ORIGIN = 0x20000000 + 0x24b8, LENGTH = 64K - 0x24b8
FLASH : ORIGIN = 0x00000000 + 100K, LENGTH = 192K - 100K
RAM : ORIGIN = 0x20000000 + 0x24b8, LENGTH = 24K - 0x24b8
}

10
src/bin/temp_rh_measurement.rs
View File

@ -5,7 +5,7 @@ use static_cell::StaticCell;
use core::mem;
use embassy_nrf::interrupt::{self, InterruptExt};
use embassy_nrf::peripherals::TWISPI0;
use embassy_nrf::peripherals::TWI0;
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 {
SPIM0_SPIS0_TWIM0_TWIS0_SPI0_TWI0 => twim::InterruptHandler<peripherals::TWISPI0>;
TWIM0_TWIS0_TWI0 => twim::InterruptHandler<peripherals::TWI0>;
});
type TempHumiditySensor = GenericTempHumiditySensor<TWISPI0>;
type TempHumiditySensor = GenericTempHumiditySensor<TWI0>;
#[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::SPIM0_SPIS0_TWIM0_TWIS0_SPI0_TWI0.set_priority(interrupt::Priority::P2);
interrupt::TWIM0_TWIS0_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.TWISPI0, Irqs, p.P0_14, p.P0_13, config);
let twi = twim::Twim::new(p.TWI0, 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);