hartytp
/
ionpak-thermostat
forked from M-Labs/ionpak-thermostat
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make ADC actually work.

This commit is contained in:
whitequark 2017-05-07 16:58:57 +00:00
parent 0ba8971aff
commit 3b7eb8bd9a
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
firmware/src/main.rs
View File

@ -232,11 +232,10 @@ fn main() {
while !sysctl.pradc.read().r0().bit() {} while !sysctl.pradc.read().r0().bit() {}
let adc0 = tm4c129x::ADC0.borrow(cs); let adc0 = tm4c129x::ADC0.borrow(cs);
adc0.actss.write(|w| w.asen0().bit(true)); // Due to silicon erratum, this HAS to use PLL. PIOSC is not a suitable source.
adc0.cc.write(|w| w.cs().syspll().clkdiv().bits(16));
adc0.im.write(|w| w.mask0().bit(true)); adc0.im.write(|w| w.mask0().bit(true));
adc0.emux.write(|w| w.em0().timer()); adc0.emux.write(|w| w.em0().timer());
adc0.sac.write(|w| w.avg()._64x());
adc0.ctl.write(|w| w.vref().bit(true));
adc0.ssmux0.write(|w| { adc0.ssmux0.write(|w| {
w.mux0().bits(0) // IC_ADC w.mux0().bits(0) // IC_ADC
.mux1().bits(1) // FBI_ADC .mux1().bits(1) // FBI_ADC
@ -245,7 +244,7 @@ fn main() {
.mux4().bits(5) // AV_ADC .mux4().bits(5) // AV_ADC
.mux5().bits(6) // FBV_ADC .mux5().bits(6) // FBV_ADC
}); });
adc0.ssctl0.write(|w| w.end5().bit(true)); adc0.ssctl0.write(|w| w.ie5().bit(true).end5().bit(true));
adc0.sstsh0.write(|w| { adc0.sstsh0.write(|w| {
w.tsh0()._256() w.tsh0()._256()
.tsh1()._256() .tsh1()._256()
@ -254,6 +253,9 @@ fn main() {
.tsh4()._256() .tsh4()._256()
.tsh5()._256() .tsh5()._256()
}); });
adc0.sac.write(|w| w.avg()._64x());
adc0.ctl.write(|w| w.vref().bit(true));
adc0.actss.write(|w| w.asen0().bit(true));
nvic.enable(Interrupt::ADC0SS0); nvic.enable(Interrupt::ADC0SS0);
@ -268,7 +270,7 @@ fn main() {
timer0.ctl.write(|w| w.taote().bit(true)); timer0.ctl.write(|w| w.taote().bit(true));
timer0.adcev.write(|w| w.tatoadcen().bit(true)); timer0.adcev.write(|w| w.tatoadcen().bit(true));
timer0.cc.write(|w| w.altclk().bit(true)); timer0.cc.write(|w| w.altclk().bit(true));
timer0.ctl.write(|w| w.taen().bit(true)); timer0.ctl.modify(|_, w| w.taen().bit(true));
set_emission_range(EmissionRange::Med); set_emission_range(EmissionRange::Med);
HV_PID.borrow(cs).borrow_mut().set_target(200.0); HV_PID.borrow(cs).borrow_mut().set_target(200.0);