More stable fixes

This commit is contained in:
Michael Droogleever Fortuyn
2019-11-30 21:24:05 +01:00
parent e957a7ccc1
commit d6b866a4dd
5 changed files with 18 additions and 18 deletions

View File

@@ -2,5 +2,5 @@ target remote :3333
monitor arm semihosting enable
set print asm-demangle on
load
#break main
break main
continue

View File

@@ -1,9 +1,9 @@
[package]
name = "display"
version = "0.1.0"
version = "0.2.0"
[dependencies]
cortex-m-rt="~0.6"
cortex-m-semihosting="~0.3"
panic-semihosting = "~0.5"
microbit="~0.7"
microbit="~0.8"

View File

@@ -69,10 +69,10 @@ impl Display {
/// Clear display
pub fn clear(&mut self) {
for row in &mut self.rows {
row.set_low();
row.set_low().unwrap();
}
for col in &mut self.cols {
col.set_high();
col.set_high().unwrap();
}
}
@@ -97,18 +97,18 @@ impl Display {
let loops = duration_ms / (self.rows.len() as u32 * self.delay_ms);
for _ in 0..loops {
for (row_line, led_matrix_row) in self.rows.iter_mut().zip(led_matrix.iter()) {
row_line.set_high();
row_line.set_high().unwrap();
for (col_line, led_matrix_val) in self.cols.iter_mut().zip(led_matrix_row.iter()) {
// We are keeping it simple, and not adding brightness
if *led_matrix_val > 0 {
col_line.set_low();
col_line.set_low().unwrap();
}
}
delay.delay_ms(self.delay_ms);
for col_line in &mut self.cols {
col_line.set_high();
col_line.set_high().unwrap();
}
row_line.set_low();
row_line.set_low().unwrap();
}
}
}
@@ -127,8 +127,8 @@ fn main() -> ! {
let rx = gpio.pin25.into_floating_input().downgrade();
// Configure serial communication
let (mut tx, _) = serial::Serial::uart0(p.UART0, tx, rx, BAUD115200).split();
writeln!(tx, "");
writeln!(tx, "Init");
writeln!(tx, "").unwrap();
writeln!(tx, "Init").unwrap();
// Create delay provider
let mut delay = Delay::new(p.TIMER0);
@@ -179,10 +179,10 @@ fn main() -> ! {
[0, 1, 1, 1, 0],
];
writeln!(tx, "Starting!");
writeln!(tx, "Starting!").unwrap();
loop {
writeln!(tx, "I <3 Rust on the micro:bit!");
writeln!(tx, "I <3 Rust on the micro:bit!").unwrap();
leds.display(&mut delay, letter_I, 1000);
leds.display(&mut delay, heart, 1000);
leds.display(&mut delay, letter_U, 1000);

View File

@@ -1,9 +1,9 @@
[package]
name = "hello"
version = "0.2.0"
version = "0.3.0"
[dependencies]
microbit="~0.7"
microbit="~0.8"
cortex-m-rt="~0.6"
cortex-m-semihosting="~0.3"
panic-semihosting = "~0.5"

View File

@@ -26,14 +26,14 @@ fn main() -> ! {
let rx = gpio.pin25.into_floating_input().downgrade();
// Configure serial communication
let (mut tx, _) = serial::Serial::uart0(p.UART0, tx, rx, BAUD115200).split();
write!(tx, "serial - start\r\n");
write!(tx, "serial - start\r\n").unwrap();
// Get row and column for display
let mut led = gpio.pin13.into_push_pull_output();
let _ = gpio.pin4.into_push_pull_output();
// Set row high (column starts low)
led.set_high();
led.set_high().unwrap();
// Write string with newline and carriage return
write!(tx, "serial - LED on\r\n");
write!(tx, "serial - LED on\r\n").unwrap();
}
panic!("End");
}