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

support resetting settings using pushbutton

pull/1/head
Sebastien Bourdeauducq 2017-08-08 12:19:05 +08:00
parent 5c1cacbd38
commit 9c64304cf2
2 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
firmware/src/board.rs
View File

@ -22,6 +22,7 @@ const FBI_ERRN: u8 = 0x04; // PL2
const AV_ERRN: u8 = 0x08; // PL3 const AV_ERRN: u8 = 0x08; // PL3
const AI_ERRN: u8 = 0x10; // PL4 const AI_ERRN: u8 = 0x10; // PL4
const ERR_LATCHN: u8 = 0x20; // PL5 const ERR_LATCHN: u8 = 0x20; // PL5
const BTNN: u8 = 0x80; // PL7
const ERR_RESN: u8 = 0x01; // PQ0 const ERR_RESN: u8 = 0x01; // PQ0
const PWM_LOAD: u16 = (/*pwmclk*/120_000_000u32 / /*freq*/100_000) as u16; const PWM_LOAD: u16 = (/*pwmclk*/120_000_000u32 / /*freq*/100_000) as u16;
@ -57,6 +58,14 @@ pub fn set_led(state: bool) {
}); });
} }
pub fn get_button() -> bool {
let gpio_dat = cortex_m::interrupt::free(|cs| {
let gpio_l = tm4c129x::GPIO_PORTL.borrow(cs);
gpio_l.data.read().bits() as u8
});
gpio_dat & BTNN == 0
}
pub fn set_hv_pwm(duty: u16) { pub fn set_hv_pwm(duty: u16) {
cortex_m::interrupt::free(|cs| { cortex_m::interrupt::free(|cs| {
let pwm0 = tm4c129x::PWM0.borrow(cs); let pwm0 = tm4c129x::PWM0.borrow(cs);
@ -136,23 +145,23 @@ pub fn error_latched() -> bool {
} }
pub fn process_errors() { pub fn process_errors() {
let errors_n = cortex_m::interrupt::free(|cs| { let gpio_dat = cortex_m::interrupt::free(|cs| {
let gpio_l = tm4c129x::GPIO_PORTL.borrow(cs); let gpio_l = tm4c129x::GPIO_PORTL.borrow(cs);
gpio_l.data.read().bits() as u8 gpio_l.data.read().bits() as u8
}); });
if errors_n & FV_ERRN == 0 { if gpio_dat & FV_ERRN == 0 {
println!("Filament overvolt"); println!("Filament overvolt");
} }
if errors_n & FBV_ERRN == 0 { if gpio_dat & FBV_ERRN == 0 {
println!("Filament bias overvolt"); println!("Filament bias overvolt");
} }
if errors_n & FBI_ERRN == 0 { if gpio_dat & FBI_ERRN == 0 {
println!("Filament bias overcurrent"); println!("Filament bias overcurrent");
} }
if errors_n & AV_ERRN == 0 { if gpio_dat & AV_ERRN == 0 {
println!("Anode overvolt"); println!("Anode overvolt");
} }
if errors_n & AI_ERRN == 0 { if gpio_dat & AI_ERRN == 0 {
println!("Anode overcurrent"); println!("Anode overcurrent");
} }
} }
@ -232,11 +241,11 @@ pub fn init() {
set_emission_range(EmissionRange::Med); set_emission_range(EmissionRange::Med);
set_electrometer_range(ElectrometerRange::Med); set_electrometer_range(ElectrometerRange::Med);
// Set up error pins // Set up error and pushbutton pins
let gpio_l = tm4c129x::GPIO_PORTL.borrow(cs); let gpio_l = tm4c129x::GPIO_PORTL.borrow(cs);
let gpio_q = tm4c129x::GPIO_PORTQ.borrow(cs); let gpio_q = tm4c129x::GPIO_PORTQ.borrow(cs);
gpio_l.pur.write(|w| w.pue().bits(FV_ERRN|FBV_ERRN|FBI_ERRN|AV_ERRN|AI_ERRN)); gpio_l.pur.write(|w| w.pue().bits(FV_ERRN|FBV_ERRN|FBI_ERRN|AV_ERRN|AI_ERRN|BTNN));
gpio_l.den.write(|w| w.den().bits(FV_ERRN|FBV_ERRN|FBI_ERRN|AV_ERRN|AI_ERRN|ERR_LATCHN)); gpio_l.den.write(|w| w.den().bits(FV_ERRN|FBV_ERRN|FBI_ERRN|AV_ERRN|AI_ERRN|ERR_LATCHN|BTNN));
gpio_q.dir.write(|w| w.dir().bits(ERR_RESN)); gpio_q.dir.write(|w| w.dir().bits(ERR_RESN));
gpio_q.den.write(|w| w.den().bits(ERR_RESN)); gpio_q.den.write(|w| w.den().bits(ERR_RESN));
reset_error(); // error latch is an undefined state upon power-up; reset it reset_error(); // error latch is an undefined state upon power-up; reset it

15
firmware/src/main.rs
View File

@ -106,10 +106,15 @@ macro_rules! create_socket {
fn main() { fn main() {
board::init(); board::init();
let button_pressed = board::get_button();
let mut config = config::Config::new(); let mut config = config::Config::new();
eeprom::init(); eeprom::init();
config.load(); if button_pressed {
config.save();
} else {
config.load();
}
cortex_m::interrupt::free(|cs| { cortex_m::interrupt::free(|cs| {
let mut loop_anode = LOOP_ANODE.borrow(cs).borrow_mut(); let mut loop_anode = LOOP_ANODE.borrow(cs).borrow_mut();
@ -200,6 +205,7 @@ fn main() {
board::start_adc(); board::start_adc();
let mut fast_blink_count = if button_pressed { 40 } else { 0 };
let mut next_blink = 0; let mut next_blink = 0;
let mut led_state = true; let mut led_state = true;
let mut latch_reset_time = None; let mut latch_reset_time = None;
@ -244,7 +250,12 @@ fn main() {
if time > next_blink { if time > next_blink {
led_state = !led_state; led_state = !led_state;
next_blink = time + 500; if fast_blink_count > 0 {
fast_blink_count -= 1;
next_blink = time + 100;
} else {
next_blink = time + 500;
}
board::set_led(led_state); board::set_led(led_state);
} }