diff --git a/boards/nrf52840_mdk_dfu/src/main.rs b/boards/nrf52840_mdk_dfu/src/main.rs index 0dc58d8a0de981a381bcd89b6f55c3b0ea21458b..7c9d476bb21c3cc1e2fbed60b4f812a429d05195 100644 --- a/boards/nrf52840_mdk_dfu/src/main.rs +++ b/boards/nrf52840_mdk_dfu/src/main.rs @@ -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()); diff --git a/run_desktop_tests.sh b/run_desktop_tests.sh index 0c887ff0bd913d65247a56fcc1068aee760d6c5d..864b8fecca526ddc56726348472de28b8876a347 100755 --- a/run_desktop_tests.sh +++ b/run_desktop_tests.sh @@ -48,6 +48,10 @@ echo "Checking that supported boards build properly..." make -C third_party/tock/boards/nordic/nrf52840dk make -C third_party/tock/boards/nordic/nrf52840_dongle +echo "Checking that other boards build properly..." +make -C boards/nrf52840_dongle_dfu +make -C boards/nrf52840_mdk_dfu + if [ -z "${TRAVIS_OS_NAME}" -o "${TRAVIS_OS_NAME}" = "linux" ] then echo "Running unit tests on the desktop (release mode)..."