fly/A320-homecockpit
1
0
Fork 0
Code Issues 18 Pull requests Projects 2 Activity

Fix timer in MCDU firmware

Browse source 
Signed-off-by: fly <merspieler@alwaysdata.net>
This commit is contained in:
fly 2024-09-23 23:18:29 +02:00
parent a5e70075f6
commit deaeebcebb
1 changed files with 18 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
Pedestal/MCDU/firmware/src/main.rs
View file

@ -11,13 +11,15 @@ mod device;
use panic_halt as _; use panic_halt as _;
use nb::block;
use cortex_m::asm::delay; use cortex_m::asm::delay;
use cortex_m_rt::entry; use cortex_m_rt::entry;
use stm32f1xx_hal::{ use stm32f1xx_hal::{
gpio::{Pin, Input, PullDown, Output, PushPull}, gpio::{Pin, Input, PullDown, Output, PushPull},
pac, pac,
prelude::*, prelude::*,
// timer::{Channel}, timer::Timer,
usb::{Peripheral, UsbBus}, usb::{Peripheral, UsbBus},
}; };
@ -82,6 +84,7 @@ struct MyPins {
fn main() -> ! { fn main() -> ! {
// ====================== general setup ================= // ====================== general setup =================
// Acquire peripherals // Acquire peripherals
let cp = cortex_m::Peripherals::take().unwrap();
let p = pac::Peripherals::take().unwrap(); let p = pac::Peripherals::take().unwrap();
let mut flash = p.FLASH.constrain(); let mut flash = p.FLASH.constrain();
let rcc = p.RCC.constrain(); let rcc = p.RCC.constrain();
@ -182,31 +185,26 @@ fn main() -> ! {
pc14: gpioc.pc14.into_push_pull_output(&mut gpioc.crh), // FM1 pc14: gpioc.pc14.into_push_pull_output(&mut gpioc.crh), // FM1
}; };
// let mut last = get_report(&mut io_pins);
// ====================== Timer setup =============== // ====================== Timer setup ===============
// let timer = Instant; let mut timer = Timer::syst(cp.SYST, &clocks).counter_hz();
// let mut last_report_sent = timer.elapsed(); timer.start(1.kHz()).unwrap();
// ====================== Main loop ================= // ====================== Main loop =================
loop { loop {
block!(timer.wait()).unwrap();
let report = get_report(&mut io_pins); let report = get_report(&mut io_pins);
// TODO figure out timer and only send in like 1ms intervals or on change match consumer.device().write_report(&report) {
// if report != last { Err(UsbHidError::WouldBlock) => {}
match consumer.device().write_report(&report) { Err(UsbHidError::UsbError(usb_device::UsbError::BufferOverflow)) => {
Err(UsbHidError::WouldBlock) => {} core::panic!("Failed to write consumer report, report is too big")
Err(UsbHidError::UsbError(usb_device::UsbError::BufferOverflow)) => {
core::panic!("Failed to write consumer report, report is too big")
}
Ok(_) => {
// last = report;
}
Err(e) => {
io_pins.pa10.set_high(); // set as indicator that this has happened
core::panic!("Failed to write consumer report: {:?}", e)
}
} }
// } Ok(_) => {
}
Err(e) => {
io_pins.pa10.set_high(); // set as indicator that this has happened
core::panic!("Failed to write consumer report: {:?}", e)
}
}
if usb_dev.poll(&mut [&mut consumer]) { if usb_dev.poll(&mut [&mut consumer]) {
match consumer.device().read_report() { match consumer.device().read_report() {