Compare commits
No commits in common. "main" and "v0.3.2" have entirely different histories.
3
.github/workflows/ci.yml
vendored
3
.github/workflows/ci.yml
vendored
@ -16,9 +16,11 @@ jobs:
|
||||
override: true
|
||||
- uses: actions-rs/cargo@v1
|
||||
with:
|
||||
use-cross: true
|
||||
command: check
|
||||
- uses: actions-rs/cargo@v1
|
||||
with:
|
||||
use-cross: true
|
||||
command: check
|
||||
args: --examples
|
||||
|
||||
@ -52,6 +54,7 @@ jobs:
|
||||
- run: rustup component add clippy
|
||||
- uses: actions-rs/cargo@v1
|
||||
with:
|
||||
use-cross: true
|
||||
command: clippy
|
||||
args: -- -D warnings
|
||||
|
||||
|
@ -8,13 +8,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
|
||||
|
||||
## [unreleased]
|
||||
|
||||
## [v0.4.0]
|
||||
|
||||
- Update manifest file to have correct links and license
|
||||
- Update some dependencies
|
||||
- `cortex-m-rtic` (dev-depencency) to 1.1.2
|
||||
- Other dependencies: Only revision has changed
|
||||
|
||||
## [v0.3.2]
|
||||
|
||||
- Bump HAL dependency to v0.5.0. Changed API, especially for IRQ handling
|
||||
|
36
Cargo.toml
36
Cargo.toml
@ -1,38 +1,32 @@
|
||||
[package]
|
||||
name = "vorago-reb1"
|
||||
version = "0.4.0"
|
||||
version = "0.3.2"
|
||||
authors = ["Robin Mueller <robin.mueller.m@gmail.com>"]
|
||||
edition = "2021"
|
||||
description = "Board Support Crate for the Vorago REB1 development board"
|
||||
homepage = "https://egit.irs.uni-stuttgart.de/rust/vorago-reb1"
|
||||
repository = "https://egit.irs.uni-stuttgart.de/rust/vorago-reb1"
|
||||
license = "Apache-2.0"
|
||||
homepage = "https://github.com/robamu/vorago-reb1-rs"
|
||||
repository = "https://github.com/robamu/vorago-reb1-rs"
|
||||
license = "MIT OR Apache-2.0"
|
||||
keywords = ["no-std", "reb1", "cortex-m", "vorago", "va108xx"]
|
||||
categories = ["aerospace", "embedded", "no-std", "hardware-support"]
|
||||
categories = ["embedded", "no-std", "hardware-support"]
|
||||
|
||||
[dependencies]
|
||||
cortex-m = "0.7"
|
||||
cortex-m-rt = "0.7"
|
||||
embedded-hal = "0.2.7"
|
||||
dummy-pin = "0.1"
|
||||
max116xx-10bit = "0.2"
|
||||
cortex-m = "0.7.3"
|
||||
cortex-m-rt = "0.7.0"
|
||||
embedded-hal = "0.2.6"
|
||||
dummy-pin = "0.1.1"
|
||||
max116xx-10bit = "0.2.1"
|
||||
|
||||
[dependencies.va108xx-hal]
|
||||
version = "0.5"
|
||||
version = "0.5.0"
|
||||
features = ["rt"]
|
||||
|
||||
[features]
|
||||
rt = ["va108xx-hal/rt"]
|
||||
|
||||
[dev-dependencies]
|
||||
cortex-m-rtic = "1.1"
|
||||
cortex-m-rtic = "0.6.0-rc.4"
|
||||
panic-rtt-target = { version = "0.1", features = ["cortex-m"] }
|
||||
rtt-target = { version = "0.3", features = ["cortex-m"] }
|
||||
panic-halt = "0.2"
|
||||
nb = "1"
|
||||
|
||||
[dev-dependencies.rtt-target]
|
||||
version = "0.3"
|
||||
features = ["cortex-m"]
|
||||
|
||||
[dev-dependencies.panic-rtt-target]
|
||||
version = "0.1"
|
||||
features = ["cortex-m"]
|
||||
nb = "1.0.0"
|
||||
|
@ -1,5 +1,5 @@
|
||||
[![Crates.io](https://img.shields.io/crates/v/vorago-reb1)](https://crates.io/crates/vorago-reb1)
|
||||
[![ci](https://github.com/us-irs/vorago-reb1-rs/actions/workflows/ci.yml/badge.svg)](https://github.com/us-irs/vorago-reb1-rs/actions/workflows/ci.yml)
|
||||
[![ci](https://github.com/robamu-org/vorago-reb1-rs/actions/workflows/ci.yml/badge.svg)](https://github.com/robamu-org/vorago-reb1-rs/actions/workflows/ci.yml)
|
||||
[![docs.rs](https://img.shields.io/docsrs/vorago-reb1)](https://docs.rs/vorago-reb1)
|
||||
|
||||
# Rust BSP for the Vorago REB1 development board
|
||||
@ -7,7 +7,7 @@
|
||||
This is the Rust **B**oard **S**upport **P**ackage crate for the Vorago REB1 development board.
|
||||
Its aim is to provide drivers for the board features of the REB1 board
|
||||
|
||||
The BSP builds on top of the [HAL crate for VA108xx devices](https://egit.irs.uni-stuttgart.de/rust/va108xx-hal).
|
||||
The BSP builds on top of the [HAL crate for VA108xx devices](https://github.com/robamu-org/va108xx-hal-rs).
|
||||
|
||||
## Building
|
||||
|
||||
@ -58,9 +58,8 @@ A `jlink.gdb` file is provided to allow flashing of the board from the command l
|
||||
|
||||
## Debugging with VS Code
|
||||
|
||||
The REB1 board features an on-board JTAG, so all that is required to debug the board is a
|
||||
Micro-USB cable.
|
||||
|
||||
The REB1 board features an on-board JTAG, so all that is required to flash the board is a
|
||||
Micro-USB cable and an
|
||||
You can debug applications on the REB1 board with a graphical user interface using VS Code with
|
||||
the [`Cortex-Debug` plugin](https://marketplace.visualstudio.com/items?itemName=marus25.cortex-debug).
|
||||
|
||||
|
@ -135,11 +135,11 @@ mod app {
|
||||
for i in 0..read {
|
||||
let val = read_buf[i] as char;
|
||||
if val == '0' || val == '1' {
|
||||
return if val == '0' {
|
||||
PressMode::Toggle
|
||||
if val == '0' {
|
||||
return PressMode::Toggle;
|
||||
} else {
|
||||
PressMode::Keep
|
||||
};
|
||||
return PressMode::Keep;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -21,7 +21,7 @@ pub struct Adt75TempSensor {
|
||||
current_reg: RegAddresses,
|
||||
}
|
||||
|
||||
#[derive(PartialEq, Eq, Debug, Copy, Clone)]
|
||||
#[derive(PartialEq, Debug, Copy, Clone)]
|
||||
pub enum RegAddresses {
|
||||
Temperature = 0x00,
|
||||
Configuration = 0x01,
|
||||
@ -67,14 +67,15 @@ impl Adt75TempSensor {
|
||||
let mut reply: [u8; 2] = [0; 2];
|
||||
self.sensor_if.read(ADT75_I2C_ADDR, &mut reply)?;
|
||||
let adc_code = (((reply[0] as u16) << 8) | reply[1] as u16) >> 4;
|
||||
let temp_celcius: f32 = if ((adc_code >> 11) & 0x01) == 0 {
|
||||
let temp_celcius: f32;
|
||||
if ((adc_code >> 11) & 0x01) == 0 {
|
||||
// Sign bit not set, positiv value
|
||||
// Divide ADC code by 16 according to datasheet
|
||||
adc_code as f32 / 16.0
|
||||
temp_celcius = adc_code as f32 / 16.0;
|
||||
} else {
|
||||
// Calculation for negative values, assuming all 12 bits are used
|
||||
(adc_code - 4096) as f32 / 16.0
|
||||
};
|
||||
temp_celcius = (adc_code - 4096) as f32 / 16.0;
|
||||
}
|
||||
Ok(temp_celcius)
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user