Skip to content

Commit

Permalink
re-generate using svd2rust v0.13.0 so this compiles on stable
Browse files Browse the repository at this point in the history
  • Loading branch information
japaric committed May 12, 2018
1 parent 50dcb36 commit 8a103cb
Show file tree
Hide file tree
Showing 9 changed files with 568 additions and 488 deletions.
13 changes: 6 additions & 7 deletions .travis.yml
Expand Up @@ -3,18 +3,17 @@ language: rust
matrix:
include:
- env: TARGET=x86_64-unknown-linux-gnu
rust: nightly
addons:
apt:
packages:
- dos2unix

- env: TARGET=thumbv7em-none-eabi
rust: beta

- env: TARGET=thumbv7em-none-eabihf
rust: nightly
rust: beta

before_install: set -e

install:
- sh ci/install.sh
- bash ci/install.sh

script:
- bash ci/script.sh
Expand Down
14 changes: 13 additions & 1 deletion CHANGELOG.md
Expand Up @@ -5,6 +5,15 @@ This project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]

## [v0.7.0] - 2018-05-12

### Changed

- [breaking-change] re-generated using svd2rust v0.13.0. This crate now compiles on stable.

- [breaking-change] the minor versions of the cortex-m, cortex-m-rt and bare-metal dependencies have
been increased.

## [v0.6.2] - 2018-05-07

### Changed
Expand Down Expand Up @@ -95,7 +104,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).

- Initial release

[Unreleased]: https://github.com/japaric/stm32f30x/compare/v0.6.0...HEAD
[Unreleased]: https://github.com/japaric/stm32f30x/compare/v0.7.0...HEAD
[v0.7.0]: https://github.com/japaric/stm32f30x/compare/v0.6.2...v0.7.0
[v0.6.2]: https://github.com/japaric/stm32f30x/compare/v0.6.1...v0.6.2
[v0.6.1]: https://github.com/japaric/stm32f30x/compare/v0.6.0...v0.6.1
[v0.6.0]: https://github.com/japaric/stm32f30x/compare/v0.5.1...v0.6.0
[v0.5.1]: https://github.com/japaric/stm32f30x/compare/v0.5.0...v0.5.1
[v0.5.0]: https://github.com/japaric/stm32f30x/compare/v0.4.1...v0.5.0
Expand Down
10 changes: 5 additions & 5 deletions Cargo.toml
Expand Up @@ -7,16 +7,16 @@ keywords = ["arm", "cortex-m", "stm32", "svd2rust"]
license = "MIT OR Apache-2.0"
name = "stm32f30x"
repository = "https://github.com/japaric/stm32f30x"
version = "0.6.2"
version = "0.7.0"

[dependencies]
bare-metal = "0.1.0"
cortex-m = "0.4.0"
bare-metal = "0.2.0"
cortex-m = "0.5.0"
vcell = "0.1.0"

[dependencies.cortex-m-rt]
optional = true
version = "0.3.0"
version = "0.5.0"

[features]
rt = ["cortex-m-rt"]
rt = ["cortex-m-rt/device"]
16 changes: 16 additions & 0 deletions build.rs
@@ -0,0 +1,16 @@
use std::env;
use std::fs::File;
use std::io::Write;
use std::path::PathBuf;
fn main() {
if env::var_os("CARGO_FEATURE_RT").is_some() {
let out = &PathBuf::from(env::var_os("OUT_DIR").unwrap());
File::create(out.join("device.x"))
.unwrap()
.write_all(include_bytes!("device.x"))
.unwrap();
println!("cargo:rustc-link-search={}", out.display());
println!("cargo:rerun-if-changed=device.x");
}
println!("cargo:rerun-if-changed=build.rs");
}
2 changes: 1 addition & 1 deletion ci/install.sh
@@ -1,4 +1,4 @@
set -ex
set -euxo pipefail

main() {
if [ $TARGET != x86_64-unknown-linux-gnu ]; then
Expand Down
2 changes: 2 additions & 0 deletions ci/script.sh
Expand Up @@ -4,6 +4,8 @@ main() {
local svd=STMicro/STM32F30x.svd

cargo check --target $TARGET
cargo check --target $TARGET --features rt

if [ $TARGET = x86_64-unknown-linux-gnu ]; then
# check than the patch can be applied to the original SVD
local url=https://github.com/posborne/cmsis-svd/raw/python-0.4/data/$svd
Expand Down
67 changes: 67 additions & 0 deletions device.x
@@ -0,0 +1,67 @@
PROVIDE(WWDG = DefaultHandler);
PROVIDE(PVD = DefaultHandler);
PROVIDE(TAMP_STAMP = DefaultHandler);
PROVIDE(RTC_WKUP = DefaultHandler);
PROVIDE(FLASH = DefaultHandler);
PROVIDE(RCC = DefaultHandler);
PROVIDE(EXTI0 = DefaultHandler);
PROVIDE(EXTI1 = DefaultHandler);
PROVIDE(EXTI2_TSC = DefaultHandler);
PROVIDE(EXTI3 = DefaultHandler);
PROVIDE(EXTI4 = DefaultHandler);
PROVIDE(DMA1_CH1 = DefaultHandler);
PROVIDE(DMA1_CH2 = DefaultHandler);
PROVIDE(DMA1_CH3 = DefaultHandler);
PROVIDE(DMA1_CH4 = DefaultHandler);
PROVIDE(DMA1_CH5 = DefaultHandler);
PROVIDE(DMA1_CH6 = DefaultHandler);
PROVIDE(DMA1_CH7 = DefaultHandler);
PROVIDE(ADC1_2 = DefaultHandler);
PROVIDE(USB_HP_CAN_TX = DefaultHandler);
PROVIDE(USB_LP_CAN_RX0 = DefaultHandler);
PROVIDE(CAN_RX1 = DefaultHandler);
PROVIDE(CAN_SCE = DefaultHandler);
PROVIDE(EXTI9_5 = DefaultHandler);
PROVIDE(TIM1_BRK_TIM15 = DefaultHandler);
PROVIDE(TIM1_UP_TIM16 = DefaultHandler);
PROVIDE(TIM1_TRG_COM_TIM17 = DefaultHandler);
PROVIDE(TIM1_CC = DefaultHandler);
PROVIDE(TIM2 = DefaultHandler);
PROVIDE(TIM3 = DefaultHandler);
PROVIDE(TIM4 = DefaultHandler);
PROVIDE(I2C1_EV_EXTI23 = DefaultHandler);
PROVIDE(I2C1_ER = DefaultHandler);
PROVIDE(I2C2_EV_EXTI24 = DefaultHandler);
PROVIDE(I2C2_ER = DefaultHandler);
PROVIDE(SPI1 = DefaultHandler);
PROVIDE(SPI2 = DefaultHandler);
PROVIDE(USART1_EXTI25 = DefaultHandler);
PROVIDE(USART2_EXTI26 = DefaultHandler);
PROVIDE(USART3_EXTI28 = DefaultHandler);
PROVIDE(EXTI15_10 = DefaultHandler);
PROVIDE(RTCALARM = DefaultHandler);
PROVIDE(USB_WKUP = DefaultHandler);
PROVIDE(TIM8_BRK = DefaultHandler);
PROVIDE(TIM8_UP = DefaultHandler);
PROVIDE(TIM8_TRG_COM = DefaultHandler);
PROVIDE(TIM8_CC = DefaultHandler);
PROVIDE(ADC3 = DefaultHandler);
PROVIDE(SPI3 = DefaultHandler);
PROVIDE(UART4_EXTI34 = DefaultHandler);
PROVIDE(UART5_EXTI35 = DefaultHandler);
PROVIDE(TIM6_DACUNDER = DefaultHandler);
PROVIDE(TIM7 = DefaultHandler);
PROVIDE(DMA2_CH1 = DefaultHandler);
PROVIDE(DMA2_CH2 = DefaultHandler);
PROVIDE(DMA2_CH3 = DefaultHandler);
PROVIDE(DMA2_CH4 = DefaultHandler);
PROVIDE(DMA2_CH5 = DefaultHandler);
PROVIDE(ADC4 = DefaultHandler);
PROVIDE(COMP123 = DefaultHandler);
PROVIDE(COMP456 = DefaultHandler);
PROVIDE(COMP7 = DefaultHandler);
PROVIDE(USB_HP = DefaultHandler);
PROVIDE(USB_LP = DefaultHandler);
PROVIDE(USB_WKUP_EXTI = DefaultHandler);
PROVIDE(FPU = DefaultHandler);

0 comments on commit 8a103cb

Please sign in to comment.