Menu system fixes; made state less global

NuEVI/src/hardware.h

@@ -31,24 +31,24 @@ int readAltPressure();
 // I2C
 #define MainI2CBus Wire1
 #define AuxI2CBus Wire
-#define KeysI2CAddr 0x5B
-#define UtilI2CAddr 0x5A
+#define KeysI2CAddr 0x5A
+#define UtilI2CAddr 0x5B
 
 // Digital pins for encoder buttons
-#define b1Pin 0
-#define b2Pin 2
-#define b3Pin 3
-#define b4Pin 4
+#define b1Pin 4
+#define b2Pin 3
+#define b3Pin 2
+#define b4Pin 0
 
 // Digital pins for encoder quadrature
-#define e1aPin 5
-#define e2aPin 6
+#define e1aPin 6
+#define e2aPin 8
 #define e3aPin 7
-#define e4aPin 8
+#define e4aPin 5
 
-#define e1bPin 20
+#define e1bPin 22
 #define e2bPin 21
-#define e3bPin 22
+#define e3bPin 20
 #define e4bPin 23
 
 // CV pins
@@ -64,33 +64,34 @@ int readAltPressure();
 
 // Key pins
 // RH keys
-#define K1Pin 0 
-#define K2Pin 1
+#define K1Pin 5 
+#define K2Pin 6
 #define K3Pin 2
-#define K4Pin 3
+#define K4Pin 11
 #define K5Pin 4
-#define K6Pin 5
-#define K7Pin 6
-#define K8Pin 7
+#define K6Pin 7
+#define K7Pin 9
+#define K8Pin 10
 
 // LH keys
-#define K9Pin 8
-#define K10Pin 9
-#define K11Pin 10
-#define K12Pin 11
+#define K9Pin 3
+#define K10Pin 8
+#define K11Pin 0
+#define K12Pin 1
 
 // Octave roller pins
-#define R1Pin 0
-#define R2Pin 1
-#define R3Pin 2
-#define R4Pin 3
-#define R5Pin 4
-#define R6Pin 5
+#define R1Pin 11
+#define R2Pin 10
+#define R3Pin 9
+#define R4Pin 8
+#define R5Pin 7
+#define R6Pin 6
 
 // Additional pins
-#define bitePin 6
-#define pbUpPin 7
-#define pbDnPin 8
-#define vibratoPin 9
+#define bitePin 0
+#define extraPin 2
+#define pbUpPin 4
+#define pbDnPin 5
+#define vibratoPin 3
 
 #endif