M-Labs/thermostat
9
0
Fork 5
Code Issues 9 Pull Requests 5 Releases Wiki Activity

add Channels::read_ref_adc()

Browse Source
This commit is contained in:
Astro 2020-05-13 00:15:29 +02:00
parent 3d1740b23b
commit eb9aeb160a
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/channels.rs
View File

@ -75,4 +75,18 @@ impl Channels {
channel channel
}) })
} }
pub fn read_ref_adc(&mut self, channel: usize) -> u16 {
match channel {
0 => self.channel0.ref_adc.convert(
&self.channel0.ref_pin,
stm32f4xx_hal::adc::config::SampleTime::Cycles_480
),
1 => self.channel1.ref_adc.convert(
&self.channel1.ref_pin,
stm32f4xx_hal::adc::config::SampleTime::Cycles_480
),
_ => unreachable!(),
}
}
} }

13
src/main.rs
View File

@ -141,19 +141,16 @@ fn main() -> ! {
} }
Command::Show(ShowCommand::Input) => { Command::Show(ShowCommand::Input) => {
for channel in 0..CHANNELS { for channel in 0..CHANNELS {
if let Some(adc_data) = channels.channel_state(channel).adc_data {
let ref_adc_data = channels.read_ref_adc(channel);
let state = channels.channel_state(channel); let state = channels.channel_state(channel);
if let Some(adc_data) = state.adc_data {
let _ = writeln!( let _ = writeln!(
socket, "t={} raw{}=0x{:06X}", socket, "t={} raw{}=0x{:06X} ref_adc={}",
state.adc_time, channel, adc_data state.adc_time, channel, adc_data,
ref_adc_data
); );
} }
} }
let ref0 = channels.channel0.ref_adc.convert(
&channels.channel0.ref_pin, stm32f4xx_hal::adc::config::SampleTime::Cycles_480
);
let _ = writeln!(socket, "ref0={}", ref0);
} }
Command::Show(ShowCommand::Pid) => { Command::Show(ShowCommand::Pid) => {
for channel in 0..CHANNELS { for channel in 0..CHANNELS {