Updated to new pin values.

diff --git a/kokare.c b/kokare.c
index 8a42f6b..5393c8b 100644 (file)
--- a/kokare.c
+++ b/kokare.c
@@ -2,14 +2,14 @@
 #include <avr/interrupt.h>
 #include <inttypes.h>
 
-#define SEGA 128
-#define SEGB 64
-#define SEGC 4
-#define SEGD 16
-#define SEGE 32
-#define SEGF 2
-#define SEGG 1
-#define SEGP 8
+#define SEGA 4
+#define SEGB 2
+#define SEGC 1
+#define SEGD 32
+#define SEGE 64
+#define SEGF 16
+#define SEGG 8
+#define SEGP 128
 
 uint8_t font[16] = {
     SEGA | SEGB | SEGC | SEGD | SEGE | SEGF,
@@ -291,7 +291,7 @@ int main(void)
            display(ttimea / 1000);
        }
 #endif
-#if 1
+#if 0
        /*
         * ZVD debug
         */
@@ -374,22 +374,22 @@ ISR(SIG_OVERFLOW1)
 
 ISR(SIG_PIN_CHANGE0)
 {
-    if((sstate == 0) & ((PINB & 1) == 0)) {
+    if((sstate == 0) & ((PINB & 4) == 0)) {
        stime = oticks;
        sstate = 1;
     }
-    if((sstate == 1) & ((PINB & 1) == 1)) {
+    if((sstate == 1) & ((PINB & 4) == 1)) {
        stime = oticks - stime;
        sstate = 2;
     }
     if(pstate == 0) {
        if((PINB & 2) == 0) {
            pstate = 1;
-       } else if((PINB & 4) == 0) {
+       } else if((PINB & 1) == 0) {
            pstate = 2;
        }
     } else if(pstate == 1) {
-       if((PINB & 4) == 0) {
+       if((PINB & 1) == 0) {
            pval++;
            pstate = 3;
        } else {
@@ -403,7 +403,7 @@ ISR(SIG_PIN_CHANGE0)
            pstate = 0;
        }
     } else {
-       if((PINB & 2) && (PINB & 4))
+       if((PINB & 2) && (PINB & 1))
            pstate = 0;
     }
 }