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

Add calibration

Browse source 
Signed-off-by: fly <merspieler@alwaysdata.com>
This commit is contained in:
fly 2024-04-30 22:06:07 +02:00
parent b762566e48
commit de552cad42
1 changed files with 42 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
Pedestal/firmware/src/main.rs
View file

@ -21,12 +21,25 @@ use usb_device::prelude::*;
use usbd_human_interface_device::prelude::*; use usbd_human_interface_device::prelude::*;
use crate::device::{CustomConfig, CustomInputReport, CustomOutputReport}; use crate::device::{CustomConfig, CustomInputReport, CustomOutputReport};
use core::cell::OnceCell;
struct MyPins { struct MyPins {
pa1: Pin<'A', 1, Analog>, pa1: Pin<'A', 1, Analog>,
pa2: Pin<'A', 2, Analog>, pa2: Pin<'A', 2, Analog>,
} }
struct CalibrationData {
min: u16,
max: u16,
factor: OnceCell<f32>,
}
struct Calibration {
integ_lt: CalibrationData,
flood_lt: CalibrationData,
}
#[entry] #[entry]
fn main() -> ! { fn main() -> ! {
// ====================== general setup ================= // ====================== general setup =================
@ -74,13 +87,19 @@ fn main() -> ! {
// Setup ADC // Setup ADC
let mut adc1 = adc::Adc::adc1(p.ADC1, clocks); let mut adc1 = adc::Adc::adc1(p.ADC1, clocks);
// ====================== Calibration ===============
let cal = Calibration {
integ_lt: CalibrationData {min: 100, max: 4000, factor: OnceCell::new()},
flood_lt: CalibrationData {min: 0, max: 0, factor: OnceCell::new()},
};
// ====================== Pin setup ================= // ====================== Pin setup =================
let mut input_pins = MyPins { let mut input_pins = MyPins {
pa1: gpioa.pa1.into_analog(&mut gpioa.crl), pa1: gpioa.pa1.into_analog(&mut gpioa.crl),
pa2: gpioa.pa2.into_analog(&mut gpioa.crl), pa2: gpioa.pa2.into_analog(&mut gpioa.crl),
}; };
let mut last = get_report(&mut input_pins, &mut adc1); let mut last = get_report(&mut input_pins, &mut adc1, &cal);
// ====================== PWM setup ================= // ====================== PWM setup =================
let mut afio = p.AFIO.constrain(); let mut afio = p.AFIO.constrain();
@ -93,7 +112,7 @@ fn main() -> ! {
// ====================== Main loop ================= // ====================== Main loop =================
loop { loop {
let report = get_report(&mut input_pins, &mut adc1); let report = get_report(&mut input_pins, &mut adc1, &cal);
if report != last { if report != last {
match consumer.device().write_report(&report) { match consumer.device().write_report(&report) {
Err(UsbHidError::WouldBlock) => {} Err(UsbHidError::WouldBlock) => {}
@ -129,15 +148,33 @@ fn main() -> ! {
} }
// Returns a CustomInputReport from the inputs given // Returns a CustomInputReport from the inputs given
fn get_report(pins: &mut MyPins, adc1: &mut adc::Adc<pac::ADC1>) -> CustomInputReport { fn get_report(pins: &mut MyPins, adc1: &mut adc::Adc<pac::ADC1>, cal: &Calibration) -> CustomInputReport {
let integ_lt: u16 = adc1.read(&mut pins.pa1).unwrap(); let integ_lt: u16 = adc1.read(&mut pins.pa1).unwrap();
let flood_lt: u16 = adc1.read(&mut pins.pa2).unwrap(); let flood_lt: u16 = adc1.read(&mut pins.pa2).unwrap();
let buttons: u16 = 0; let buttons: u16 = 0;
let integ_lt_norm: u16;
if integ_lt < cal.integ_lt.min {
integ_lt_norm = 0;
}
else if integ_lt > cal.integ_lt.max {
integ_lt_norm = 4095;
}
else {
let factor: f32 = *cal.integ_lt.factor.get_or_init(|| cal.integ_lt.get_scale_factor());
integ_lt_norm = ((integ_lt - cal.integ_lt.min) as f32 * factor) as u16;
}
CustomInputReport { CustomInputReport {
x: integ_lt.into(), x: integ_lt_norm.into(),
y: flood_lt.into(), y: flood_lt.into(),
buttons, buttons,
} }
} }
impl CalibrationData {
const ADC_MAX: u16 = 4095;
fn get_scale_factor (&self) -> f32 {
return (Self::ADC_MAX / (Self::ADC_MAX - self.min - (Self::ADC_MAX - self.max))) as f32;
}
}