Browse Source

Switch to RTIC master

Until next release or something breaks.
dev/doc
Marc Poulhiès 2 years ago
parent
commit
dea4d2cc61
  1. 3
      Cargo.toml
  2. 4
      src/main.rs

3
Cargo.toml

@ -47,8 +47,7 @@ smart-leds = "0.3"
## Waiting for next release with 2in13 support
epd-waveshare = {git = "https://github.com/caemor/epd-waveshare.git", rev="87e63741ef9335439d97f587a781630077be2515" }
embedded-graphics = "0.6"
cortex-m-rtic = "0.6.0-alpha.0"
rtic-core = "0.3"
cortex-m-rtic = { git = "https://github.com/rtic-rs/cortex-m-rtic" }
bme680 = { version = "0.5", optional = true }

4
src/main.rs

@ -271,10 +271,6 @@ type RotarySwitchT = Switch<RotarySwitchPinT>;
#[rtic::app(device = tm4c123x_hal::pac, peripherals = true, monotonic = rtic::cyccnt::CYCCNT, dispatchers = [UART1, UART2, UART3, UART4])]
mod app {
extern crate rtic_core;
use rtic_core::prelude::*;
use crate::{
draw_config_hint, Bme680T, FSMState, OperatingMode, RotarySwitchT, RotaryT, RtcT, Screen,
SimpleAsmDelay, Spi1T, SubConfig, TimeRange, ToggleSwitchT, FONT_RIGHT_BAR, FONT_TIME,

Loading…
Cancel
Save