Skip to content

Commit

Permalink
Merge pull request #29 from stm32-rs/release
Browse files Browse the repository at this point in the history
Release 0.6.0
  • Loading branch information
Disasm authored Mar 12, 2021
2 parents e4cff7f + e2c8bb4 commit c9cdd0d
Show file tree
Hide file tree
Showing 7 changed files with 58 additions and 41 deletions.
32 changes: 32 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
on:
push:
branches: [ staging, trying, master ]
pull_request:

name: CI

jobs:
ci-linux:
runs-on: ubuntu-20.04
continue-on-error: ${{ matrix.experimental || false }}
strategy:
matrix:
rust: [stable, nightly]
include:
# Nightly is only for reference and allowed to fail
- rust: nightly
experimental: true

steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: ${{ matrix.rust }}
override: true

- name: Check code
run: cargo check

- name: Check examples
run: cargo check --examples
23 changes: 23 additions & 0 deletions .github/workflows/rustfmt.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
on:
push:
branches: [ staging, trying, master ]
pull_request:

name: Code formatting check

jobs:
fmt:
name: Rustfmt
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: stable
override: true
components: rustfmt
- uses: actions-rs/cargo@v1
with:
command: fmt
args: --all -- --check
18 changes: 0 additions & 18 deletions .travis.yml

This file was deleted.

9 changes: 2 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "stm32-usbd"
version = "0.5.1"
version = "0.6.0"
edition = "2018"
authors = ["Matti Virkkunen <[email protected]>", "Vadim Kaushan <[email protected]>", "Nicolas Stalder <[email protected]>", "Jonas Martin <[email protected]>"]
description = "'usb-device' implementation for STM32 microcontrollers"
Expand All @@ -15,9 +15,4 @@ cortex-m = "0.7.1"
usb-device = "0.2.3"

[dev-dependencies]
stm32f1xx-hal = { version = "0.4.0", features = ["stm32f103"] }

[features]
# USB RAM access scheme
ram_access_1x16 = []
ram_access_2x16 = []
stm32f1xx-hal = { version = "0.7.0", features = ["stm32f103"] }
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[![crates.io](https://img.shields.io/crates/d/stm32-usbd.svg)](https://crates.io/crates/stm32-usbd)
[![crates.io](https://img.shields.io/crates/v/stm32-usbd.svg)](https://crates.io/crates/stm32-usbd)
[![Build Status](https://travis-ci.org/stm32-rs/stm32-usbd.svg?branch=master)](https://travis-ci.org/stm32-rs/stm32-usbd)
![Build Status](https://github.com/stm32-rs/stm32-usbd/workflows/CI/badge.svg)

# `stm32-usbd`

Expand Down
7 changes: 0 additions & 7 deletions ci/script.sh

This file was deleted.

8 changes: 0 additions & 8 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@

#![no_std]

#[cfg(all(feature = "ram_access_1x16", feature = "ram_access_2x16"))]
compile_error!("Multiple ram_access features are specified. Only a single feature can be specified.");

pub mod bus;
mod endpoint;
mod endpoint_memory;
Expand All @@ -32,16 +29,11 @@ pub unsafe trait UsbPeripheral: Send + Sync {
/// Endpoint memory size in bytes
const EP_MEMORY_SIZE: usize;

#[cfg(not(any(feature = "ram_access_1x16", feature = "ram_access_2x16")))]
/// Endpoint memory access scheme
///
/// Check Reference Manual for details.
/// Set to `true` if "2x16 bits/word" access scheme is used, otherwise set to `false`.
const EP_MEMORY_ACCESS_2X16: bool;
#[cfg(feature = "ram_access_1x16")]
const EP_MEMORY_ACCESS_2X16: bool = false;
#[cfg(feature = "ram_access_2x16")]
const EP_MEMORY_ACCESS_2X16: bool = true;

/// Enables USB device on its peripheral bus
fn enable();
Expand Down

0 comments on commit c9cdd0d

Please sign in to comment.