Merge branch 'master' of github.com:blinkenrocket/firmware

1 files changed, 8 insertions, 9 deletions

diff --git a/src/main.cc b/src/main.cc
index 9558109..4398d02 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -20,13 +20,7 @@ int main (void)
 	// Enable pull-ups on PC3 and PC7 (button pins)
 	PORTC |= _BV(PC3) | _BV(PC7);
 
-	display.string[0] = 'O';
-	display.string[1] = 'h';
-	display.string[2] = 'a';
-	display.string[3] = 'i';
-	display.string[4] = '!';
-	display.string[5] = ' ';
-	display.string[6] = 0;
+	display.setString("Ohai! ");
 
 	display.enable();
 	modem.enable();
@@ -37,9 +31,14 @@ int main (void)
 		// nothing to do here, go to idle to save power
 		SMCR = _BV(SE);
 		asm("sleep");
-		// The display timer causes a wakeup after 256µs. Run the system
-		// loop after the timer's ISR is done.
+		/*
+		 * The display timer causes a wakeup after 256µs. Run the system
+		 * loop after the timer's ISR is done.
+		 * The Modem also causes wakeups, which is pretty convenient since
+		 * it means we can immediately process the received data.
+		 */
 		rocket.loop();
+		display.update();
 	}
 
 	return 0;