Updated for ProMicro pinout. Not working yet

Author: dplassgit

xr22-950-splint/xr22-950-splint.ino

@@ -9,40 +9,44 @@
    See https://docs.google.com/spreadsheets/d/1VIy-GSjdG2L6Flt3NPSkQuhC4tW-Hb9asVCBoYnCuk4/edit
    for the key matrix in spreadsheet form.
 
-   THIS VERSION FOR UNO ONLY.
+   THIS VERSION FOR PRO MICRO ONLY.
 */
 
 // This MUST be an interrupt-enabled pin.
 const int outputEnabledPin = 2;
 
-// Input (control) pins are PD6 (D) through PD3 (A)
+// Input (control) pins are PF4 (A) through PF7 (D)
 // These aren't used because we need to use direct port manipulation to
 // read all 4 pins at the same time.
-// const int aPin = 3;
-// const int bPin = 4;
-// const int cPin = 5;
-// const int dPin = 6;
+// const int aPin = A3;
+// const int bPin = A2;
+// const int cPin = A1;
+// const int dPin = A0;
 
-// Output (splint) pins are PB0 (pin 8) through PB5 (pin 12)
+// Output (splint) pins are PB2 through PB6
 // These aren't used because we need to use direct port manipulation to
 // set the appropriate pin high for a very short duration, and digitalWrite
 // is too slow.
-// const int y0 = 8;  // PB2, XR22-950 pin 12 (Y0)
-// const int y1 = 9;  // PB3, XR22-950 pin 13 (Y1)
-// const int y2 = 10; // PB4, XR22-950 pin 14 (Y2)
-// const int y3 = 11; // PB5, XR22-950 pin 15 (Y3)
-// const int y4 = 12; // PB6, XR22-950 pin 16 (Y4)
+// const int y0 = 16;  // PB2, XR22-950 pin 12 (Y0)
+// const int y1 = 14;  // PB3, XR22-950 pin 13 (Y1)
+// const int y2 = 8;   // PB4, XR22-950 pin 14 (Y2)
+// const int y3 = 9;   // PB5, XR22-950 pin 15 (Y3)
+// const int y4 = 10;  // PB6, XR22-950 pin 16 (Y4)
 
 void setup() {
   Serial.begin(9600);
-  Serial.println("Hello xr22-950-splint for uno");
+
+  while (!Serial) {
+    ; // wait for serial port to connect. Needed for native USB port only
+  }
+  Serial.println("Hello xr22-950-splint for ProMicro");
 
   pinMode(outputEnabledPin, INPUT);
 
-  // Input (control) pins are PD6 (D) through PD3 (A)
-  DDRD = B00000000;
-  // Output (splint) pins are PB0 (pin8) through PB5 (pin 12)
-  DDRB |= B00011111;
+  // Input (control) pins are PF4 (A) through PF7 (D)
+  DDRF = B00000000;
+  // Output (splint) pins are PB2 through PB6
+  DDRB |= B01111100;
   // Set outputs to low
   PORTB = 0;
 
@@ -58,11 +62,11 @@ void setupSplintPins() {
     splintPins[i] = 0;
   }
 
-  splintPins[0] = B00000001; // PB2, XR22-950 Pin 12 (Y0). Restores shift, ctrl, caps lock.
-  splintPins[1] = B00000010; // PB3, XR22-950 Pin 13 (Y1): Should restore the right half of the numeric keypad.
-  splintPins[2] = B00000100; // PB4, XR22-950 Pin 14 (Y2): Should restore the left half of the numeric keypad.
-  splintPins[3] = B00001000; // PB5, XR22-950 Pin 15 (Y3). Should restore right third of keys (enter, backspace), etc.
-  splintPins[4] = B00010000; // PB6, XR22-950 Pin 16 (Y4). Restores AZXCV, space.
+  splintPins[0] = B00000100; // PB2, XR22-950 Pin 12 (Y0). Restores shift, ctrl, caps lock.
+  splintPins[1] = B00001000; // PB3, XR22-950 Pin 13 (Y1): Should restore the right half of the numeric keypad.
+  splintPins[2] = B00010000; // PB4, XR22-950 Pin 14 (Y2): Should restore the left half of the numeric keypad.
+  splintPins[3] = B00100000; // PB5, XR22-950 Pin 15 (Y3). Should restore right third of keys (enter, backspace), etc.
+  splintPins[4] = B01000000; // PB6, XR22-950 Pin 16 (Y4). Restores AZXCV, space.
 }
 
 // One nop is 62NS
@@ -79,38 +83,34 @@ void setupSplintPins() {
 // Delay 1.4 microseconds. One nop = 62.5ns, so we use 22 nops (1.375 us)
 #define DELAY_1_4US "nop\n\tnop\n\tnop\n\tnop\n\tnop\n\tnop\n\tnop\n\tnop\n\tnop\n\tnop\n\tnop\n\tnop\n\tnop\n\tnop\n\tnop\n\tnop\n\tnop\n\tnop\n\tnop\n\tnop\n\tnop\n\tnop\n\t"
 
-#undef DEBUG
+#define DEBUG 1
 
 #ifdef DEBUG
-#define DBG_COUNT 1000000
-volatile int printed = 0; // debugging
+#define DBG_COUNT 1000
+long printed = 0; // debugging
 #endif
 
 void intHandler() {
   // Read pins a,b,c,d at the same time (upper 4 bits, then shift to the bottom nibble)
-  int controlPins = (PIND & B01111000) >> 3;
+  int inputPins = (PINF & B11110000) >> 4;
+  byte outputPins = splintPins[inputPins];
 
 #ifdef DEBUG
   if (printed == DBG_COUNT) {
-    int a = (controlPins & B00000001),
-        b = (controlPins & B00000010) >> 1,
-        c = (controlPins & B00000100) >> 2,
-        d = (controlPins & B00001000) >> 3;
+    int a = (inputPins & B00000001),
+        b = (inputPins & B00000010) >> 1,
+        c = (inputPins & B00000100) >> 2,
+        d = (inputPins & B00001000) >> 3;
     // Debugging
     Serial.print("DCBA="); Serial.print(d); Serial.print(c); Serial.print(b); Serial.println(a);
+    Serial.print("sending blip on 0B"); Serial.println(outputPins, BIN);
+    printed = 0;
   } else {
     printed++;
   }
 #endif
 
-  byte outputPins = splintPins[controlPins];
   if (outputPins != 0) {
-#ifdef DEBUG
-    if (printed == DBG_COUNT) {
-      Serial.print("sending blip on 0B"); Serial.println(outputPins, BIN);
-    }
-#endif
-
     // Wait 3 us between the OE and the pulse.
     __asm__(DELAY_3US);
     // Set all outputs on Port B
@@ -120,11 +120,6 @@ void intHandler() {
     __asm__(DELAY_4US);
     PORTB = B00000000;
   }
-#ifdef DEBUG
-  if (printed == DBG_COUNT) {
-    printed = 0;
-  }
-#endif
 }
 
 void loop() {