sambuc/rust-arduino-blink-led-no-core-with-cargo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use stable volatile methods

Browse Source
This commit is contained in:
Jake Goulding
2016-06-03 08:10:21 -04:00
parent 49c1bd785b
commit 66c5471146
3 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
blink/src/main.rs
View File

@@ -1,6 +1,5 @@
#![feature(lang_items)]
#![feature(no_core)]
#![feature(core_intrinsics)]
#![feature(asm)]
#![no_core]
@@ -10,7 +9,7 @@ extern crate core as avr_core;
extern crate arduino;
use avr_core::prelude::v1::*;
use avr_core::intrinsics::{volatile_load, volatile_store};
use avr_core::ptr::{read_volatile, write_volatile};
pub mod prelude;
pub mod timer0;
@@ -27,8 +26,8 @@ extern fn panic_fmt() -> ! { loop {} }
#[no_mangle]
pub unsafe extern "avr-interrupt" fn _ivr_timer0_compare_a() {
let prev_value = volatile_load(PORTB);
volatile_store(PORTB, prev_value ^ PINB5);
let prev_value = read_volatile(PORTB);
write_volatile(PORTB, prev_value ^ PINB5);
}
const CPU_FREQUENCY_HZ: u64 = 16_000_000;
@@ -45,9 +44,9 @@ pub extern fn main() {
unsafe {
without_interrupts(|| {
// Configure all Port B pins as outputs
volatile_store(DDRB, 0xFF);
write_volatile(DDRB, 0xFF);
// Turn on all Port B pins
volatile_store(PORTB, 0xFF);
write_volatile(PORTB, 0xFF);
timer0::Timer::new()
.waveform_generation_mode(timer0::WaveformGenerationMode::ClearOnTimerMatchOutputCompare)

12
blink/src/timer0.rs
View File

@@ -1,5 +1,5 @@
use avr_core::prelude::v1::*;
use avr_core::intrinsics::volatile_store;
use avr_core::ptr::write_volatile;
use arduino::*;
@@ -112,18 +112,18 @@ impl Timer {
pub fn configure(self) {
unsafe {
volatile_store(TCCR0A, self.a);
volatile_store(TCCR0B, self.b);
write_volatile(TCCR0A, self.a);
write_volatile(TCCR0B, self.b);
// Reset counter to zero
volatile_store(TCNT0, 0);
write_volatile(TCNT0, 0);
if let Some(v) = self.output_compare_1 {
// Set the match
volatile_store(OCR0A, v);
write_volatile(OCR0A, v);
// Enable compare interrupt
volatile_store(TIMSK0, OCIE0A);
write_volatile(TIMSK0, OCIE0A);
}
}
}

14
blink/src/timer1.rs
View File

@@ -1,5 +1,5 @@
use avr_core::prelude::v1::*;
use avr_core::intrinsics::volatile_store;
use avr_core::ptr::write_volatile;
use arduino::*;
@@ -131,19 +131,19 @@ impl Timer {
pub fn configure(self) {
unsafe {
volatile_store(TCCR1A, self.a);
volatile_store(TCCR1B, self.b);
volatile_store(TCCR1C, self.c);
write_volatile(TCCR1A, self.a);
write_volatile(TCCR1B, self.b);
write_volatile(TCCR1C, self.c);
// Reset counter to zero
volatile_store(TCNT1, 0);
write_volatile(TCNT1, 0);
if let Some(v) = self.output_compare_1 {
// Set the match
volatile_store(OCR1A, v);
write_volatile(OCR1A, v);
// Enable compare interrupt
volatile_store(TIMSK1, OCIE1A);
write_volatile(TIMSK1, OCIE1A);
}
}
}