language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-10-01 22:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

MCU: use a rp_pico::hal::Timer instead of the RealTimeClock

Browse source 
It has millisecond accurency, which is what we want
This commit is contained in:
Olivier Goffart 2022-01-22 22:22:36 +01:00
parent e02486523b
commit ad2894e71b
1 changed files with 5 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

30
sixtyfps_runtime/rendering_backends/mcu/pico_st7789.rs
View file

@ -8,9 +8,9 @@ pub use cortex_m_rt::entry;
use embedded_hal::blocking::spi::Transfer; use embedded_hal::blocking::spi::Transfer;
use embedded_hal::digital::v2::{InputPin, OutputPin}; use embedded_hal::digital::v2::{InputPin, OutputPin};
use embedded_time::rate::*; use embedded_time::rate::*;
use rp_pico::hal;
use rp_pico::hal::pac; use rp_pico::hal::pac;
use rp_pico::hal::prelude::*; use rp_pico::hal::prelude::*;
use rp_pico::hal::{self, Timer};
use defmt_rtt as _; // global logger use defmt_rtt as _; // global logger
@ -22,7 +22,6 @@ fn oom(layout: core::alloc::Layout) -> ! {
panic!("Out of memory {:?}", layout); panic!("Out of memory {:?}", layout);
} }
use alloc_cortex_m::CortexMHeap; use alloc_cortex_m::CortexMHeap;
use rp_pico::hal::rtc::{DateTime, RealTimeClock};
use crate::Devices; use crate::Devices;
@ -99,30 +98,16 @@ pub fn init_board() {
) )
.unwrap(); .unwrap();
let clock = RealTimeClock::new( let timer = Timer::new(pac.TIMER, &mut pac.RESETS);
pac.RTC,
clocks.rtc_clock,
&mut pac.RESETS,
DateTime {
year: 1970,
month: 1,
day: 1,
day_of_week: hal::rtc::DayOfWeek::Thursday,
hour: 0,
minute: 0,
second: 0,
},
)
.unwrap();
crate::init_with_display(PicoDevices { display, touch, last_touch: Default::default(), clock }); crate::init_with_display(PicoDevices { display, touch, last_touch: Default::default(), timer });
} }
struct PicoDevices<Display, Touch> { struct PicoDevices<Display, Touch> {
display: Display, display: Display,
touch: Touch, touch: Touch,
last_touch: Option<sixtyfps_corelib::graphics::Point>, last_touch: Option<sixtyfps_corelib::graphics::Point>,
clock: RealTimeClock, timer: Timer,
} }
impl<Display: Devices, IRQ: InputPin, CS: OutputPin<Error = IRQ::Error>, SPI: Transfer<u8>> Devices impl<Display: Devices, IRQ: InputPin, CS: OutputPin<Error = IRQ::Error>, SPI: Transfer<u8>> Devices
@ -167,12 +152,7 @@ impl<Display: Devices, IRQ: InputPin, CS: OutputPin<Error = IRQ::Error>, SPI: Tr
} }
fn time(&mut self) -> core::time::Duration { fn time(&mut self) -> core::time::Duration {
let time = self.clock.now(); core::time::Duration::from_micros(self.timer.get_counter())
match time {
// FIXME! milisecond
Ok(t) => core::time::Duration::from_secs(t.second as u64 + t.minute as u64 * 60),
Err(_) => core::time::Duration::ZERO,
}
} }
} }