re-adding calibration on startup

re-added the older calibrate-on-startup code also cleaned up some debugging statements in Chuck.h leftover from a previous refactor
jaustindavid · May 10, 2014 · 2be97f7 · 2be97f7
1 parent 80d34b9
commit 2be97f7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/Wiiceiver/Chuck.h b/Wiiceiver/Chuck.h
@@ -128,7 +128,7 @@ class Chuck {
       lastActivity = activity;
     }
 
-#ifdef DEBUGGING_CHUCK
+#ifdef DEBUGGING_CHUCK_ACTIVITY
     Serial.print("CHUCK: ");
     for (int i = 0; i < 5; i++) {
       Serial.print(status[i], DEC);
@@ -150,20 +150,20 @@ class Chuck {
     byte storedY;
 
     storedY = EEPROM.read(0);
-#ifdef DEBUGGING
+#ifdef DEBUGGING_CHUCK
     Serial.print(F("Reading stored value: Y="));
     Serial.println(storedY);
 #endif
 
     // sanity check: they shouldn't differ by more than 25 units (~10%)
     if (abs(storedY - DEFAULT_Y_ZERO) <= 25) {
       Y0 = storedY;
-#ifdef DEBUGGING
+#ifdef DEBUGGING_CHUCK
       Serial.println("Using stored value");
 #endif
 } 
     else {
-#ifdef DEBUGGING
+#ifdef DEBUGGING_CHUCK
       Serial.println("Ingoring stored value");
 #endif
     }
@@ -172,7 +172,7 @@ class Chuck {
 
   void writeEEPROM() {
     EEPROM.write(0, Y0);
-#ifdef DEBUGGING
+#ifdef DEBUGGING_CHUCK
     Serial.print("Storing value: Y=");
     Serial.println(Y0);	
 #endif	    
@@ -224,7 +224,7 @@ class Chuck {
     }
 
     _computeStatus();
-#ifdef DEBUGGING_CHUCK
+#ifdef DEBUGGING_CHUCK_ACTIVITY
    Serial.print("Active? ");
    Serial.println(isActive() ? "yes" : "no");
 #endif

diff --git a/Wiiceiver/Wiiceiver.ino b/Wiiceiver/Wiiceiver.ino
@@ -3,14 +3,14 @@
 #include <EEPROM.h>
 
 
-// #define DEBUGGING
+#define DEBUGGING
 
 #include "Blinker.h"
 
 // #define DEBUGGING_SMOOTHER
 #include "Smoother.h"
 
-// #define DEBUGGING_CHUCK
+#define DEBUGGING_CHUCK
 // #define DEBUGGING_CHUCK_ACTIVITY
 #define WII_ACTIVITY_COUNTER 100  // once per 20ms; 50 per second
 #include "Chuck.h"
@@ -199,6 +199,7 @@ bool startChuck() {
     Serial.println("(Re)starting the nunchuck");
 #endif
     chuck.setup();
+    chuck.readEEPROM();
     tries ++;
     if (chuck.isActive()) {
       return true;
@@ -311,6 +312,8 @@ void setup() {
   red.high();
   if (! startChuck()) {
     handleInactivity();
+  } else {
+    maybeCalibrate();
   }
 #ifdef DEBUGGING
   Serial.println("Nunchuck is active!");