Sync nrf52840_mdk_dfu with upstream and add DFU-based boards to run_desktop_tests.sh
This commit is contained in:
@@ -22,9 +22,9 @@ const LED1_B_PIN: Pin = Pin::P0_24;
|
||||
const BUTTON_PIN: Pin = Pin::P0_18;
|
||||
const BUTTON_RST_PIN: Pin = Pin::P0_02;
|
||||
|
||||
const UART_RTS: Pin = Pin::P0_21;
|
||||
const UART_RTS: Option<Pin> = Some(Pin::P0_21);
|
||||
const UART_TXD: Pin = Pin::P0_20;
|
||||
const UART_CTS: Pin = Pin::P0_03;
|
||||
const UART_CTS: Option<Pin> = Some(Pin::P0_03);
|
||||
const UART_RXD: Pin = Pin::P0_19;
|
||||
|
||||
const SPI_MOSI: Pin = Pin::P0_05;
|
||||
@@ -76,7 +76,7 @@ pub unsafe fn reset_handler() {
|
||||
let button = components::button::ButtonComponent::new(board_kernel).finalize(
|
||||
components::button_component_helper!((
|
||||
&nrf52840::gpio::PORT[BUTTON_PIN],
|
||||
capsules::button::GpioMode::LowWhenPressed,
|
||||
kernel::hil::ActivationMode::ActiveLow,
|
||||
kernel::hil::gpio::FloatingState::PullUp
|
||||
)),
|
||||
);
|
||||
@@ -84,15 +84,15 @@ pub unsafe fn reset_handler() {
|
||||
let led = components::led::LedsComponent::new().finalize(components::led_component_helper!(
|
||||
(
|
||||
&nrf52840::gpio::PORT[LED1_R_PIN],
|
||||
capsules::led::ActivationMode::ActiveLow
|
||||
kernel::hil::gpio::ActivationMode::ActiveLow
|
||||
),
|
||||
(
|
||||
&nrf52840::gpio::PORT[LED1_G_PIN],
|
||||
capsules::led::ActivationMode::ActiveLow
|
||||
kernel::hil::gpio::ActivationMode::ActiveLow
|
||||
),
|
||||
(
|
||||
&nrf52840::gpio::PORT[LED1_B_PIN],
|
||||
capsules::led::ActivationMode::ActiveLow
|
||||
kernel::hil::gpio::ActivationMode::ActiveLow
|
||||
)
|
||||
));
|
||||
let chip = static_init!(nrf52840::chip::Chip, nrf52840::chip::new());
|
||||
|
||||
Reference in New Issue
Block a user