From ceec9f3561e673e34e1d28a014068938fd07515a Mon Sep 17 00:00:00 2001
From: Jeremy Rand <jeremy@halcyontouch.com>
Date: Fri, 20 Jul 2012 10:58:55 -0500
Subject: [PATCH] Update UI a bit

---
 curtaUI.c | 41 ++++++++++++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 13 deletions(-)

diff --git a/curtaUI.c b/curtaUI.c
index 41303d6..c83d3ab 100644
--- a/curtaUI.c
+++ b/curtaUI.c
@@ -70,25 +70,27 @@ typedef int8_t tJoyPos;
 #define SLIDER_Y_SPACING (SLIDER_HEIGHT + (2 * SLIDER_Y_OFFSET))
 
 
-static void printDigits(char *label, tDigit *digits, tDigitPos maxPos)
+static void printCounter(void)
 {
     tDigitPos pos;
 
-    printf("%7s:", label);
-    for(pos = maxPos - 1; pos >= 0; pos--) {
-        printf(" %d", digits[pos]);
+    printf("Counter:              ");
+    for(pos = NUM_COUNTER_DIGITS - 1; pos >= 0; pos--) {
+        printf(" %d", GET_COUNTER_DIGIT(pos));
     }
     printf("\n");
 }
 
 
-static void printState(void)
+static void printResult(void)
 {
     tDigitPos pos;
-    printDigits("Counter", counter, NUM_COUNTER_DIGITS);
-    printDigits("Result", result, NUM_RESULT_DIGITS);
 
-    printf("      ");
+    printf(" Result:");
+    for(pos = NUM_RESULT_DIGITS - 1; pos >= 0; pos--) {
+        printf(" %d", GET_RESULT_DIGIT(pos));
+    }
+    printf("\n      ");
     for(pos = 0; pos < NUM_RESULT_DIGITS - basePos; pos++) {
         printf("  ");
     }
@@ -96,6 +98,13 @@ static void printState(void)
 }
 
 
+static void printState(void)
+{
+    printCounter();
+    printResult();
+}
+
+
 static void drawOperand(tDigitPos pos)
 {
     char xPos;
@@ -190,11 +199,7 @@ static tAction getNextAction(void)
     joyState = joy_read(JOY_1);
     joyPos = getJoyPos(joyState);
 
-    if ((JOY_BTN_FIRE2(oldJoyState) &&
-        (!JOY_BTN_FIRE2(joyState)))) {
-        oldJoyState = joyState;
-        result = ACTION_CLEAR;
-    } else if (joyPos == oldJoyPos) {
+    if (joyPos == oldJoyPos) {
         oldJoyState = joyState;
         return result;
     } else if (oldJoyPos == JOY_POS_CENTER) {
@@ -216,6 +221,8 @@ static tAction getNextAction(void)
             possibleActions = (1 << ACTION_OPERAND_INC);
             if (JOY_BTN_FIRE(joyState)) {
                 possibleActions |= (1 << ACTION_SUBTRACT);
+            } else if (JOY_BTN_FIRE2(joyState)) {
+                possibleActions |= (1 << ACTION_CLEAR);
             } else {
                 possibleActions |= (1 << ACTION_ADD);
             }
@@ -285,6 +292,14 @@ static tAction getNextAction(void)
             } else if (joyPos != oldJoyPos + 1) {
                 possibleActions &= (~(1 << ACTION_SUBTRACT));
             }
+        } else if (possibleActions & (1 << ACTION_CLEAR)) {
+            if ((joyPos == JOY_POS_DOWN) &&
+                (oldJoyPos == JOY_POS_DOWN_RIGHT)) {
+                result = ACTION_CLEAR;
+                possibleActions = 0;
+            } else if (joyPos != oldJoyPos + 1) {
+                possibleActions &= (~(1 << ACTION_CLEAR));
+            }
         }
 
         if (joyPos == JOY_POS_CENTER) {