From 04ab6ebe72eac7f23bf77e91ffd52e21df107937 Mon Sep 17 00:00:00 2001
From: wolfv6 <wolfv6@users.noreply.github.com>
Date: Sat, 18 Jun 2016 16:32:21 -0600
Subject: [PATCH] change activeHigh to static, add LED_PinNumber,
 RowScanner_SPI-ShiftRegisters, keybrd regression tests, remove
 MCP23018::begin()

---
 .../tests_regression/classes/Code_Sc_LED.cpp  |  13 ++
 .../tests_regression/classes/Code_Sc_LED.h    |  21 +++
 examples/tests_regression/keybrd/classes      |   1 +
 examples/tests_regression/keybrd/keybrd.ino   | 150 ++++++++++++++++++
 .../keybrd/keybrd_MCP23018_begin_hangs.no     | 129 +++++++++++++++
 examples/tests_regression/keybrd_AVR/classes  |   1 +
 .../keybrd_AVR/keybrd_AVR.ino                 | 113 +++++++++++++
 src/Code_Sc.h                                 |   2 +-
 src/ColPort_MCP23018.cpp                      |  21 +--
 src/ColPort_MCP23018.h                        |   2 +-
 src/ColPort_PCA9655E.cpp                      |   6 -
 src/ColPort_PCA9655E.h                        |   1 +
 src/LED_AVR.h                                 |   2 -
 src/LED_PinNumber.cpp                         |  11 ++
 src/LED_PinNumber.h                           |  22 +++
 src/RowBase.cpp                               |   4 +-
 src/RowPort_MCP23018.cpp                      |   6 -
 src/RowPort_PCA9655E.cpp                      |   6 -
 src/RowPort_PCA9655E.h                        |   2 +
 src/RowScanner_PinsArray.cpp                  |  36 ++++-
 src/RowScanner_PinsArray.h                    |  15 +-
 src/RowScanner_PinsBitwise.cpp                |   1 -
 src/RowScanner_PinsBitwise.h                  |   2 +-
 src/RowScanner_SPIShiftRegisters.cpp          |  23 +++
 src/RowScanner_SPIShiftRegisters.h            |  25 +++
 src/Row_IOE.h                                 |  10 +-
 src/Row_ShiftRegisters.cpp                    |  16 ++
 src/Row_ShiftRegisters.h                      |  38 +++++
 src/Row_uC.h                                  |   8 +-
 tutorials/breadboard_keyboard_supplies.ods    | Bin 18414 -> 18410 bytes
 tutorials/tutorial_1_breadboard_keyboard.md   |  14 +-
 .../tutorial_4_split_keyboard_with_IOE.md     |   6 +-
 32 files changed, 640 insertions(+), 67 deletions(-)
 create mode 100644 examples/tests_regression/classes/Code_Sc_LED.cpp
 create mode 100644 examples/tests_regression/classes/Code_Sc_LED.h
 create mode 120000 examples/tests_regression/keybrd/classes
 create mode 100644 examples/tests_regression/keybrd/keybrd.ino
 create mode 100644 examples/tests_regression/keybrd/keybrd_MCP23018_begin_hangs.no
 create mode 120000 examples/tests_regression/keybrd_AVR/classes
 create mode 100644 examples/tests_regression/keybrd_AVR/keybrd_AVR.ino
 create mode 100644 src/LED_PinNumber.cpp
 create mode 100644 src/LED_PinNumber.h
 create mode 100644 src/RowScanner_SPIShiftRegisters.cpp
 create mode 100644 src/RowScanner_SPIShiftRegisters.h
 create mode 100644 src/Row_ShiftRegisters.cpp
 create mode 100644 src/Row_ShiftRegisters.h

diff --git a/examples/tests_regression/classes/Code_Sc_LED.cpp b/examples/tests_regression/classes/Code_Sc_LED.cpp
new file mode 100644
index 0000000..389f8de
--- /dev/null
+++ b/examples/tests_regression/classes/Code_Sc_LED.cpp
@@ -0,0 +1,13 @@
+#include "Code_Sc_LED.h"
+
+void Code_Sc_LED::press()
+{
+    Keyboard.press(scancode);
+    refLED.on();
+}
+
+void Code_Sc_LED::release()
+{
+    Keyboard.release(scancode);
+    refLED.off();
+}
diff --git a/examples/tests_regression/classes/Code_Sc_LED.h b/examples/tests_regression/classes/Code_Sc_LED.h
new file mode 100644
index 0000000..6832702
--- /dev/null
+++ b/examples/tests_regression/classes/Code_Sc_LED.h
@@ -0,0 +1,21 @@
+#ifndef CODE_SC_LED_H
+#define CODE_SC_LED_H
+#include <Arduino.h>
+#include <inttypes.h>
+#include <Code.h>
+#include <LED.h>
+
+/* Class Code_Sc_LED sends a scancode when press() or release() is called.
+"S" stands for Scancode.
+*/
+class Code_Sc_LED : public Code
+{
+    private:
+        const uint16_t scancode;
+        LED& refLED;
+    public:
+        Code_Sc_LED(const uint16_t scancode, LED& refLED): scancode(scancode), refLED(refLED) { }
+        virtual void press();
+        virtual void release();
+};
+#endif
diff --git a/examples/tests_regression/keybrd/classes b/examples/tests_regression/keybrd/classes
new file mode 120000
index 0000000..9046554
--- /dev/null
+++ b/examples/tests_regression/keybrd/classes
@@ -0,0 +1 @@
+../classes
\ No newline at end of file
diff --git a/examples/tests_regression/keybrd/keybrd.ino b/examples/tests_regression/keybrd/keybrd.ino
new file mode 100644
index 0000000..8ef3d19
--- /dev/null
+++ b/examples/tests_regression/keybrd/keybrd.ino
@@ -0,0 +1,150 @@
+/* this works on Teensy LC 1*bb, active low and active high
+MCP23018 is not working, MCP23018::begin() hangs, details in setup()
+
+| Layout | **0** | **1** |
+|:------:|-------|-------|
+|  **0** | a     | b     |
+|  **1** | c     | d     |
+*/
+// ################## GLOBAL ###################
+// ================= INCLUDES ==================
+#include <Debug.h>
+
+//LEDs
+#include <LED_PinNumber.h>
+#include "classes/Code_Sc_LED.h"                //symlink: ln -s ../classes classes
+
+//IOE Ports
+#include "IOExpanderPort.h"
+#include <RowPort_MCP23018.h>
+#include <ColPort_MCP23018.h>
+
+//Codes
+#include <Code_Sc.h>
+
+//Matrix
+#include <Row_uC.h>
+#include <SPI.h>
+#include <Row_ShiftRegisters.h>
+
+// =============== CONFIGURATION ===============
+const unsigned int RowBase::DELAY_MICROSECONDS = 500;
+
+//activeLow  has diode cathode (band) on row
+//activeHigh has diode cathode (band) on col, and pull down resistors on cols
+//0=active low, 1= active high
+const bool RowScanner_PinsArray::activeHigh = 0;
+//const bool RowScanner_PinsBitwise::activeHigh = 0;
+
+Debug debug;
+
+// ================ LEFT PORTS =================
+uint8_t readPins[] = {14, 15};
+uint8_t READ_PIN_COUNT = sizeof(readPins)/sizeof(*readPins);
+
+LED_PinNumber LED1(16);                     //Teensy LC pins 16, 17 are 20 ma
+
+// ================ RIGHT PORTS ================
+/*
+const uint8_t IOExpanderPort::ADDR = 0x20;
+
+IOExpanderPort portA(0, 0);
+RowPort_MCP23018 rowPort(portA);
+
+IOExpanderPort portB(1, 0);
+ColPort_MCP23018 colPort(portB, 1<<0 | 1<<1 );
+*/
+// =================== CODES ===================
+Code_Sc s_a(KEY_A);
+Code_Sc s_b(KEY_B);
+Code_Sc s_c(KEY_C);
+Code_Sc_LED s_d(KEY_D, LED1);
+
+Code_Sc s_0(KEY_0);
+Code_Sc s_1(KEY_1);
+Code_Sc s_2(KEY_2);
+Code_Sc s_3(KEY_3);
+Code_Sc s_4(KEY_4);
+Code_Sc s_5(KEY_5);
+Code_Sc s_6(KEY_6);
+Code_Sc s_7(KEY_7);
+Code_Sc s_z(KEY_Z);
+
+// ================= LEFT ROWS =================
+Key* ptrsKeys_L0[] = { &s_a, &s_b };
+Row_uC row_L0(0, readPins, READ_PIN_COUNT, ptrsKeys_L0);
+
+Key* ptrsKeys_L1[] = { &s_c, &s_d };
+Row_uC row_L1(1, readPins, READ_PIN_COUNT, ptrsKeys_L1);
+
+// ================= RIGHT ROWS ================
+/*
+Key* ptrsKeys_R[] = { &s_0, &s_z, &s_z, &s_z,
+                      &s_4, &s_z, &s_z, &s_z,
+                      &s_8, &s_z, &s_z, &s_z }; //the s_z are place holders and should not print
+*/
+Key* ptrsKeys_R[] = { &s_0, &s_1, &s_2, &s_3,
+                      &s_4, &s_5, &s_6, &s_7 }; //the most that 8-bit send() can handle
+const uint8_t KEY_COUNT = sizeof(ptrsKeys_R)/sizeof(*ptrsKeys_R);
+//Row_ShiftRegisters row_R(9, 2, ptrsKeys_R, KEY_COUNT);
+Row_ShiftRegisters row_R(9, 1, ptrsKeys_R, KEY_COUNT); //1 byte
+
+// ################### MAIN ####################
+void setup()
+{
+    Keyboard.begin();
+    SPI.begin();
+    row_R.begin();
+
+    //delay(1000);        //time for OS to detect USB before printing
+    Keyboard.print(F("activeState.ino "));
+    debug.print_free_RAM();
+
+    //Wire.begin();
+/* Teensy LC on 1*bb 6/13/16 copied to: activeState_MCP23018_begin_hangs.no
+RowPort_MCP23018::begin() hangs
+ColPort_MCP23018::begin() sometimes hangs, sometimes prints after 6 seconds
+PCA9655E::begin()s works on 4*bb
+maybe hangs if IOE is not attached because endTransmission() waiting for confirmation??
+
+trouble shooting MCP23018::begin()s
+    checked wiring against datasheets
+    measured power and ground, 3.3 volts checks out
+!! next things to check could take days:
+    test MCP23018 with Teensy 2.0, because it worked last year
+    set Teensy 2.0 to 3.3 volts and test again
+    try with PCA9655E instead of MCP23018 (works on 4*bb)
+    might be solder joints on LC (I soldered it), try using other Teensy LC
+    test MCP23018 on simple demo sketch /home/wolfv/Documents/Arduino/demo_keep/mcp23018_../
+    test MCP23018 with signal analyzer
+
+    //rowPort.begin(); //this breaks sketch, does not print "activeState.ino ", kb unresponsive
+    //colPort.begin(RowScanner_PinsBitwise::activeHigh); //hanges for 6 seconds
+    Keyboard.println(F("  after Port.begin()"));
+*/
+}
+
+//uint16_t next = 0;
+//elapsedMillis elapsed;
+
+void loop()
+{
+    row_L0.process();
+    row_L1.process();
+
+    row_R.process();
+
+    //row_R0.process();
+    //row_R1.process();
+
+/* used this when debugging MCP23018::begin() hangs
+if ( (next < 10) && (elapsed > 1000 * next) )
+{
+    Keyboard.print(next);
+    Keyboard.print(F(" "));
+    next++;
+}
+*/
+//delay(100);
+//Keyboard.println("");
+}
diff --git a/examples/tests_regression/keybrd/keybrd_MCP23018_begin_hangs.no b/examples/tests_regression/keybrd/keybrd_MCP23018_begin_hangs.no
new file mode 100644
index 0000000..2c509b5
--- /dev/null
+++ b/examples/tests_regression/keybrd/keybrd_MCP23018_begin_hangs.no
@@ -0,0 +1,129 @@
+/* this works on Teensy LC 1*bb, active low and active high
+MCP23018::begin() hangs, details in setup()
+
+| Layout | **0** | **1** |
+|:------:|-------|-------|
+|  **0** | a     | b     |
+|  **1** | c     | d     |
+*/
+// ################## GLOBAL ###################
+// ================= INCLUDES ==================
+#include <Debug.h>
+
+//IOE Ports
+#include "IOExpanderPort.h"
+#include <RowPort_MCP23018.h>
+#include <ColPort_MCP23018.h>
+
+//Codes
+#include <Code_Sc.h>
+
+//Matrix
+#include <Row_uC.h>
+#include <Row_IOE.h>
+
+// =============== CONFIGURATION ===============
+const unsigned int RowBase::DELAY_MICROSECONDS = 500;
+
+//activeLow  has diode cathode (band) on row
+//activeHigh has diode cathode (band) on col, and pull down resistors on cols
+//0=active low, 1= active high
+const bool RowScanner_PinsArray::activeHigh = 0;
+const bool RowScanner_PinsBitwise::activeHigh = 0;
+
+Debug debug;
+
+// ================= uC PINS =================
+uint8_t readPins[] = {14, 15};
+uint8_t READ_PIN_COUNT = sizeof(readPins)/sizeof(*readPins);
+
+// ================ IOE PORTS ================
+const uint8_t IOExpanderPort::ADDR = 0x20;
+
+IOExpanderPort portA(0, 0);
+RowPort_MCP23018 rowPort(portA);
+
+IOExpanderPort portB(1, 0);
+ColPort_MCP23018 colPort(portB, 1<<0 | 1<<1 );
+
+// =================== CODES ===================
+Code_Sc s_a(KEY_A);
+Code_Sc s_b(KEY_B);
+Code_Sc s_c(KEY_C);
+Code_Sc s_d(KEY_D);
+
+Code_Sc s_0(KEY_0);
+Code_Sc s_1(KEY_1);
+Code_Sc s_2(KEY_2);
+Code_Sc s_3(KEY_3);
+
+// ================= LEFT ROWS =================
+Key* ptrsKeys_L0[] = { &s_a, &s_b };
+Row_uC row_L0(0, readPins, READ_PIN_COUNT, ptrsKeys_L0);
+
+Key* ptrsKeys_L1[] = { &s_c, &s_d };
+Row_uC row_L1(1, readPins, READ_PIN_COUNT, ptrsKeys_L1);
+
+// ================= RIGHT ROWS ================
+Key* ptrsKeys_R0[] = { &s_0, &s_1 };
+Row_IOE row_R0(rowPort, 1<<0, colPort, ptrsKeys_R0);
+
+Key* ptrsKeys_R1[] = { &s_2, &s_3 };
+Row_IOE row_R1(rowPort, 1<<1, colPort, ptrsKeys_R1);
+
+// ################### MAIN ####################
+void setup()
+{
+    Keyboard.begin();
+    Wire.begin();           //Wire.begin() must be called before rowPort.begin() colPort.begin()
+
+    //delay(1000);        //time for OS to detect USB before printing
+    Keyboard.print(F("activeState.ino "));
+    debug.print_free_RAM();
+
+/* Teensy LC on 1*bb
+RowPort_MCP23018::begin() hangs
+ColPort_MCP23018::begin() sometimes hangs, sometimes prints after 6 seconds
+PCA9655E::begin()s works on 4*bb
+maybe hangs if IOE is not attached because endTransmission() waiting for confirmation??
+
+trouble shooting MCP23018::begin()s
+    checked wiring against datasheets
+    measured power and ground, 3.3 volts checks out
+!! next things to check could take days:
+    test MCP23018 with Teensy 2.0, because it worked last year
+    set Teensy 2.0 to 3.3 volts and test again
+    try with PCA9655E instead of MCP23018 (works on 4*bb)
+    might be solder joints on LC (I soldered it), try using other Teensy LC
+    test MCP23018 on simple demo sketch /home/wolfv/Documents/Arduino/demo_keep/mcp23018_../
+    test MCP23018 with signal analyzer
+
+    //rowPort.begin(); //this breaks sketch, does not print "activeState.ino ", kb unresponsive
+    //colPort.begin(RowScanner_PinsBitwise::activeHigh); //hanges for 6 seconds
+    Keyboard.println(F("  after Port.begin()"));
+*/
+}
+
+
+uint16_t next = 0;
+elapsedMillis elapsed;
+
+void loop()
+{
+    row_L0.process();
+    row_L1.process();
+
+    //row_R0.process();
+    //row_R1.process();
+
+/* used this when debugging MCP23018::begin() hangs
+if ( (next < 10) && (elapsed > 1000 * next) )
+{
+    Keyboard.print(next);
+    Keyboard.print(F(" "));
+    next++;
+}
+*/
+//delay(500);
+//Keyboard.println("");
+}
diff --git a/examples/tests_regression/keybrd_AVR/classes b/examples/tests_regression/keybrd_AVR/classes
new file mode 120000
index 0000000..9046554
--- /dev/null
+++ b/examples/tests_regression/keybrd_AVR/classes
@@ -0,0 +1 @@
+../classes
\ No newline at end of file
diff --git a/examples/tests_regression/keybrd_AVR/keybrd_AVR.ino b/examples/tests_regression/keybrd_AVR/keybrd_AVR.ino
new file mode 100644
index 0000000..3558833
--- /dev/null
+++ b/examples/tests_regression/keybrd_AVR/keybrd_AVR.ino
@@ -0,0 +1,113 @@
+/* this works on DH 4*bb, top-left buttons
+demo RowScanner_PinsBitwise
+
+| Left  | **0** | **1** |  | Right | **0** | **1** |
+|:-----:|-------|-------|  |:-----:|-------|-------|
+| **0** | a     | b     |  | **0** | 0     | 1     |
+| **1** | c     | d     |  | **1** | 2     | 3     |
+*/
+// ################## GLOBAL ###################
+// ================= INCLUDES ==================
+#include <Debug.h>
+
+//Ports
+#include <RowPort_AVR_Optic.h>
+#include <ColPort_AVR.h>
+
+//LEDs
+#include <LED_AVR.h>
+#include <LED_PCA9655E.h>
+#include "classes/Code_Sc_LED.h"                //symlink: ln -s ../classes classes
+
+//Codes
+#include <Code_Sc.h>
+
+//Matrix
+#include <Row_IOE.h>
+#include <Matrix.h>
+
+// =============== CONFIGURATION ===============
+const unsigned int RowBase::DELAY_MICROSECONDS = 500;
+
+const bool RowScanner_PinsBitwise::activeHigh = 1;
+
+Debug debug;
+
+// ================ LEFT PORTS =================
+RowPort_AVR_Optic rowPort_L(DDRF, PORTF);
+ColPort_AVR colPort_L(DDRB, PORTB, PINB, 1<<0 | 1<<1 );
+
+//LED
+LED_AVR LED_L1(PORTB, 1<<6);                    //green
+
+// ================ RIGHT PORTS ================
+#include <IOExpanderPort.h>
+#include <RowPort_PCA9655E.h>
+#include <ColPort_PCA9655E.h>
+
+const uint8_t IOExpanderPort::ADDR = 0x18;
+
+//row port
+IOExpanderPort port1(1, 0);
+RowPort_PCA9655E rowPort_R(port1);
+
+//column and pin numbers on schematic_switch_matrix.png and schematic_pca9655_pin_assignments.png
+//col port
+IOExpanderPort port0(0, 0);
+ColPort_PCA9655E colPort_R(port0, 1<<0 | 1<<1 );
+
+//LED
+LED_PCA9655E LED_R1(port1, 1<<5);               //blue
+
+// =================== CODES ===================
+Code_Sc s_a(KEY_A);
+Code_Sc s_b(KEY_B);
+Code_Sc s_c(KEY_C);
+//Code_Sc s_d(KEY_D);
+Code_Sc_LED s_d(KEY_D, LED_L1);
+
+Code_Sc s_0(KEY_0);
+Code_Sc s_1(KEY_1);
+Code_Sc s_2(KEY_2);
+//Code_Sc s_3(KEY_3);
+Code_Sc_LED s_3(KEY_3, LED_R1);
+
+// ================= LEFT ROWS =================
+Key* const ptrsKeys_L0[] = { &s_a, &s_b };
+Row_IOE row_L0(rowPort_L, 1<<0, colPort_L, ptrsKeys_L0); //strobe F0
+
+Key* const ptrsKeys_L1[] = { &s_c,  &s_d };
+Row_IOE row_L1(rowPort_L, 1<<1, colPort_L, ptrsKeys_L1); //strobe F1
+
+// ================= RIGHT ROWS ================
+Key* ptrsKeys_R0[] = { &s_0, &s_1 };
+Row_IOE row_R0(rowPort_R, 1<<0, colPort_R, ptrsKeys_R0);
+
+Key* ptrsKeys_R1[] = { &s_2, &s_3 };
+Row_IOE row_R1(rowPort_R, 1<<1, colPort_R, ptrsKeys_R1);
+
+// ################### MAIN ####################
+void setup()
+{
+    Keyboard.begin();
+    Wire.begin();
+
+    delay(1000);        //time for OS to detect USB before printing
+    Keyboard.print(F("activeState_AVR.ino "));
+    debug.print_free_RAM();
+
+    rowPort_R.begin();
+    colPort_R.begin();
+}
+
+void loop()
+{
+    row_L0.process();
+    row_L1.process();
+
+    row_R0.process();
+    row_R1.process();
+
+//delay(500);
+//Keyboard.println(F(""));
+}
diff --git a/src/Code_Sc.h b/src/Code_Sc.h
index cd571a7..598654e 100644
--- a/src/Code_Sc.h
+++ b/src/Code_Sc.h
@@ -4,7 +4,7 @@
 #include <inttypes.h>
 #include <Code.h>
 
-/* Class Code_Sc is composed of one scancode, which it sends when press() or release() is called.
+/* Class Code_Sc_LED sends a scancode when press() or release() is called.
 "S" stands for Scancode.
 */
 class Code_Sc : public Code
diff --git a/src/ColPort_MCP23018.cpp b/src/ColPort_MCP23018.cpp
index 2b5e35d..ec1ac33 100644
--- a/src/ColPort_MCP23018.cpp
+++ b/src/ColPort_MCP23018.cpp
@@ -4,25 +4,26 @@
 configures column port's IODIR, GPIO, and GPPU.
 */
 ColPort_MCP23018::ColPort_MCP23018(IOExpanderPort& port, const uint8_t colPins)
-    :  ColPort(colPins), port(port), IODIR(port.num), GPIO(port.num + 0x12), GPPU(port.num + 0x0C)
+    : ColPort(colPins), port(port), IODIR(port.num), GPIO(port.num + 0x12), GPPU(port.num + 0x0C)
 {}
 
-void ColPort_MCP23018::begin()
+void ColPort_MCP23018::begin(uint8_t activeHigh)
 {
-//Wire.begin() should only be called once https://www.arduino.cc/en/Reference/WireBegin
-#ifndef WIRE_BEGIN
-#define WIRE_BEGIN
-    Wire.begin();
-#endif
-
     Wire.beginTransmission(port.ADDR);
     Wire.write(IODIR);
-    Wire.write(colPins); //0=configure as output (for LED), 1=configure as input (for read)
+    Wire.write(colPins);        //0=configure as output (for LED), 1=configure as input (for read)
     Wire.endTransmission();
 
     Wire.beginTransmission(port.ADDR);
     Wire.write(GPPU);
-    Wire.write(colPins); //0=pull-up disabled (for LED), 1=pull-up enabled (for read)
+    if (activeHigh)
+    {
+        Wire.write(0);          //0=pull-up disabled for activeHigh //todo not tested yet
+    }
+    else
+    {
+        Wire.write(colPins);    //0=pull-up disabled (for LED), 1=pull-up enabled (for read)
+    }
     Wire.endTransmission();
 }
 
diff --git a/src/ColPort_MCP23018.h b/src/ColPort_MCP23018.h
index 9333e03..1b16c68 100644
--- a/src/ColPort_MCP23018.h
+++ b/src/ColPort_MCP23018.h
@@ -38,7 +38,7 @@ class ColPort_MCP23018 : public ColPort
     public:
         //The constructor initialization list is in .cpp
         ColPort_MCP23018(IOExpanderPort& port, const uint8_t colPins);
-        void begin();
+        void begin(uint8_t activeHigh);
 
         //read port and store result in portState
         virtual void read();
diff --git a/src/ColPort_PCA9655E.cpp b/src/ColPort_PCA9655E.cpp
index 4fbb564..ed71571 100644
--- a/src/ColPort_PCA9655E.cpp
+++ b/src/ColPort_PCA9655E.cpp
@@ -10,12 +10,6 @@ ColPort_PCA9655E::ColPort_PCA9655E
 
 void ColPort_PCA9655E::begin()
 {
-//Wire.begin() should only be called once https://www.arduino.cc/en/Reference/WireBegin
-#ifndef WIRE_BEGIN
-#define WIRE_BEGIN
-    Wire.begin();
-#endif
-
     Wire.beginTransmission(port.ADDR);
     Wire.write(configurationByteCommand);
     Wire.write(colPins);    //0=configure as output (for LED), 1=configure as input (for read)
diff --git a/src/ColPort_PCA9655E.h b/src/ColPort_PCA9655E.h
index faa8a1b..ca8a565 100644
--- a/src/ColPort_PCA9655E.h
+++ b/src/ColPort_PCA9655E.h
@@ -7,6 +7,7 @@
 #include "IOExpanderPort.h"
 
 /* One PCA9655E I/O expander port connected to matrix columns.
+PCA9655E does not have internal pull-up resistors (PCA9535E does).
 
 Instantiation
  ------------
diff --git a/src/LED_AVR.h b/src/LED_AVR.h
index 815eef1..7656f45 100644
--- a/src/LED_AVR.h
+++ b/src/LED_AVR.h
@@ -15,9 +15,7 @@ class LED_AVR: public LED
 
     public:
         LED_AVR(volatile unsigned char& PORTx, const uint8_t pin): PORT(PORTx), pin(pin) {}
-
         virtual void on();
-
         virtual void off();
 };
 #endif
diff --git a/src/LED_PinNumber.cpp b/src/LED_PinNumber.cpp
new file mode 100644
index 0000000..452801b
--- /dev/null
+++ b/src/LED_PinNumber.cpp
@@ -0,0 +1,11 @@
+#include "LED_PinNumber.h"
+
+void LED_PinNumber::on()
+{
+    digitalWrite(pin, HIGH);
+}
+
+void LED_PinNumber::off()
+{
+    digitalWrite(pin, LOW);
+}
diff --git a/src/LED_PinNumber.h b/src/LED_PinNumber.h
new file mode 100644
index 0000000..5dc8301
--- /dev/null
+++ b/src/LED_PinNumber.h
@@ -0,0 +1,22 @@
+#ifndef LED_PINNUMBER_H
+#define LED_PINNUMBER_H
+#include <Arduino.h>
+#include <inttypes.h>
+#include <LED.h>
+
+/* A LED_PinNumber object is an Aduino pin that is used to power an LED on and off.
+*/
+class LED_PinNumber: public LED
+{
+    private:
+        const uint8_t pin;
+
+    public:
+        LED_PinNumber(const uint8_t pin): pin(pin)
+        {
+            pinMode(pin, OUTPUT);
+        }
+        virtual void on();
+        virtual void off();
+};
+#endif
diff --git a/src/RowBase.cpp b/src/RowBase.cpp
index 45ac658..2b12d23 100644
--- a/src/RowBase.cpp
+++ b/src/RowBase.cpp
@@ -21,6 +21,8 @@ This version of wait() is very simple.  More sophisticated versions can override
 For fastest response time, wait() should be placed before scan() or after pressRelease()
  (waiting between strobe and send would unnecessarily delay send).
 
+DELAY_MICROSECONDS explained
+----------------------------
 A keyboard with a faster scan rate responds faster.
 Follow these step to tune DELAY_MICROSECONDS for maximum scan rate for a given SAMPLE_COUNT:
 Initialize DELAY_MICROSECONDS in your sketch:
@@ -58,7 +60,7 @@ void RowBase::pressRelease(const uint16_t rowEnd, const uint8_t debouncedChanged
 {
     uint8_t isFallingEdge;                      //1 means falling edge
     uint8_t isRisingEdge;                       //1 means rising edge
-    uint8_t rowMask;                            //bitwise, active col bit is 1
+    uint16_t rowMask;                           //bitwise, active col bit is 1 (same type as rowEnd)
     uint8_t col;                                //index for ptrsKeys[col] array
 
     //bit=1 if last debounced changed from 1 to 0, else bit=0
diff --git a/src/RowPort_MCP23018.cpp b/src/RowPort_MCP23018.cpp
index 9e5b00c..4adb2fd 100644
--- a/src/RowPort_MCP23018.cpp
+++ b/src/RowPort_MCP23018.cpp
@@ -9,12 +9,6 @@ RowPort_MCP23018::RowPort_MCP23018(IOExpanderPort& port)
 
 void RowPort_MCP23018::begin()
 {
-//Wire.begin() should only be called once https://www.arduino.cc/en/Reference/WireBegin
-#ifndef WIRE_BEGIN
-#define WIRE_BEGIN
-    Wire.begin();
-#endif
-
     Wire.beginTransmission(port.ADDR);
     Wire.write(IODIR);
     Wire.write(0);                            //0=configure as output (for strobe pins and LED pins)
diff --git a/src/RowPort_PCA9655E.cpp b/src/RowPort_PCA9655E.cpp
index c5d52a6..cddd20e 100644
--- a/src/RowPort_PCA9655E.cpp
+++ b/src/RowPort_PCA9655E.cpp
@@ -9,12 +9,6 @@ RowPort_PCA9655E::RowPort_PCA9655E(IOExpanderPort& port)
 
 void RowPort_PCA9655E::begin()
 {
-//Wire.begin() should only be called once https://www.arduino.cc/en/Reference/WireBegin
-#ifndef WIRE_BEGIN
-#define WIRE_BEGIN
-    Wire.begin();
-#endif
-
     Wire.beginTransmission(port.ADDR);
     Wire.write(configurationByteCommand);
     Wire.write(0);                              //0=configure as output (for strobe pins and LED)
diff --git a/src/RowPort_PCA9655E.h b/src/RowPort_PCA9655E.h
index 32aa5f7..f2c6e3c 100644
--- a/src/RowPort_PCA9655E.h
+++ b/src/RowPort_PCA9655E.h
@@ -23,6 +23,8 @@ Example instantiation for row port 1:
 
 Diode orientation
  ----------------
+PCA9655E does not have internal pull-up resistors, external pull-down resistors are required.
+
 Rows, columns, and diode orientation are explained in Matrix.h
 
 PCA9655E data sheet
diff --git a/src/RowScanner_PinsArray.cpp b/src/RowScanner_PinsArray.cpp
index e2d9341..55709c5 100644
--- a/src/RowScanner_PinsArray.cpp
+++ b/src/RowScanner_PinsArray.cpp
@@ -1,11 +1,43 @@
 #include "RowScanner_PinsArray.h"
 
-/*
-Strobes the row and reads the columns.
+/* constructor
+*/
+RowScanner_PinsArray::RowScanner_PinsArray(const uint8_t strobePin,
+        const uint8_t readPins[], const uint8_t READ_PIN_COUNT)
+    : strobePin(strobePin), readPins(readPins), READ_PIN_COUNT(READ_PIN_COUNT)
+{
+    uint8_t mode;
+
+    //configure row
+    pinMode(strobePin, OUTPUT);
+
+    if (activeHigh)
+    {
+        mode = INPUT;                   //requires external pull-down resistor
+    }
+    else
+    {
+        mode = INPUT_PULLUP;            //uses internal pull-up resistor
+    }
+
+    //configure cols
+    for (uint8_t i=0; i < READ_PIN_COUNT; i++)
+    {
+        pinMode(readPins[i], mode);
+    }
+}
+
+/* scan() Strobes the row and reads the columns.
 Sets rowEnd and returns rowState.
 rowEnd is a bitwise row mask, one col per bit, where active col bit is 1.
 At end of function, 1 bit marks place immediatly after last key of row.
 rowEnd is a larger type than portMask so that it can not overflow.
+
+https://www.arduino.cc/en/Tutorial/DigitalPins
+https://www.arduino.cc/en/Reference/PinMode
+https://www.arduino.cc/en/Reference/DigitalWrite
+https://www.arduino.cc/en/Reference/DigitalRead
+https://www.arduino.cc/en/Reference/Constants > Digital Pins modes: INPUT, INPUT_PULLUP, and OUTPUT
 */
 uint8_t RowScanner_PinsArray::scan(uint16_t& rowEnd)
 {
diff --git a/src/RowScanner_PinsArray.h b/src/RowScanner_PinsArray.h
index 5b14baa..d6b5dda 100644
--- a/src/RowScanner_PinsArray.h
+++ b/src/RowScanner_PinsArray.h
@@ -6,7 +6,7 @@
 #include <RowPort.h>
 #include <ColPort.h>
 
-/* RowScanner_PinsArray class uses Arduino pin numbers (no port name).
+/* RowScanner_PinsArray class uses Arduino pin numbers (not port pin numbers).
 */
 class RowScanner_PinsArray : public RowScannerInterface
 {
@@ -17,18 +17,7 @@ class RowScanner_PinsArray : public RowScannerInterface
         const uint8_t READ_PIN_COUNT;           //number of read pins
     public:
         RowScanner_PinsArray(const uint8_t strobePin,
-                const uint8_t readPins[], const uint8_t READ_PIN_COUNT)
-            : strobePin(strobePin), readPins(readPins), READ_PIN_COUNT(READ_PIN_COUNT)
-        {
-            //row
-            pinMode(strobePin, OUTPUT);
-
-            //cols
-            for (uint8_t i=0; i < READ_PIN_COUNT; i++)
-            {
-                pinMode(readPins[i], INPUT_PULLUP);
-            }
-        }
+                const uint8_t readPins[], const uint8_t READ_PIN_COUNT);
         virtual uint8_t scan(uint16_t& rowEnd);
         uint8_t getRowState(uint16_t& rowEnd);
 };
diff --git a/src/RowScanner_PinsBitwise.cpp b/src/RowScanner_PinsBitwise.cpp
index 42d0a7f..cc641b9 100644
--- a/src/RowScanner_PinsBitwise.cpp
+++ b/src/RowScanner_PinsBitwise.cpp
@@ -69,7 +69,6 @@ uint8_t RowScanner_PinsBitwise::getRowState(uint16_t& rowEnd)
             rowEnd <<= 1;                   //shift rowEnd to next key
         }
     }
-//todo Keyboard.print(rowState);
 
     return rowState;
 }
diff --git a/src/RowScanner_PinsBitwise.h b/src/RowScanner_PinsBitwise.h
index 8aaf805..f7a3fcf 100644
--- a/src/RowScanner_PinsBitwise.h
+++ b/src/RowScanner_PinsBitwise.h
@@ -11,7 +11,6 @@
 class RowScanner_PinsBitwise : public RowScannerInterface
 {
     private:
-        static const bool activeHigh;       //logic level of strobe pin: 0=activeLow, 1=activeHigh
         RowPort& refRowPort;                //this row's IC port
         const uint8_t strobePin;            //bitwise, 1 indicates IC pin connected to this row
         ColPort& refColPort;
@@ -20,6 +19,7 @@ class RowScanner_PinsBitwise : public RowScannerInterface
             ColPort& refColPort)
             : refRowPort(refRowPort), strobePin(strobePin),
               refColPort(refColPort) {}
+        static const bool activeHigh;       //logic level of strobe pin: 0=activeLow, 1=activeHigh
         virtual uint8_t scan(uint16_t& rowEnd);
         uint8_t getRowState(uint16_t& rowEnd);
 };
diff --git a/src/RowScanner_SPIShiftRegisters.cpp b/src/RowScanner_SPIShiftRegisters.cpp
new file mode 100644
index 0000000..5adb215
--- /dev/null
+++ b/src/RowScanner_SPIShiftRegisters.cpp
@@ -0,0 +1,23 @@
+#include "RowScanner_SPIShiftRegisters.h"
+
+void RowScanner_SPIShiftRegisters::begin()
+{
+    pinMode (SS, OUTPUT);
+    digitalWrite (SS, HIGH);
+}
+
+/*
+Sets rowEnd and returns rowState.
+*/
+uint8_t RowScanner_SPIShiftRegisters::scan(uint16_t& rowEnd)
+{
+//todo rowEnd, rowState, return int size depend on BYTE_COUNT, like in send()
+    uint8_t rowState;
+
+    digitalWrite(SS, LOW);
+    digitalWrite(SS, HIGH);
+    SPI.transfer(&rowState, BYTE_COUNT);
+    rowEnd = 1 << KEY_COUNT;
+    return rowState;
+}
+
diff --git a/src/RowScanner_SPIShiftRegisters.h b/src/RowScanner_SPIShiftRegisters.h
new file mode 100644
index 0000000..c590cb4
--- /dev/null
+++ b/src/RowScanner_SPIShiftRegisters.h
@@ -0,0 +1,25 @@
+#ifndef ROWSCANNER_SPI_SHIFTREGISTERS_H
+#define ROWSCANNER_SPI_SHIFTREGISTERS_H
+#include <Arduino.h>
+#include <inttypes.h>
+#include <SPI.h>
+#include <RowScannerInterface.h>
+#include <RowPort.h>
+#include <ColPort.h>
+
+/* RowScanner_SPIShiftRegisters reads all shift registers in a daisy chain.
+//todo delete: Assumes only one row of shift registers is connected (no Slave Select).
+*/
+class RowScanner_SPIShiftRegisters : public RowScannerInterface
+{
+    private:
+        const uint8_t SS;                       //Slave Select, pin on master
+        const uint8_t BYTE_COUNT;               //number of shift registers
+        const uint8_t KEY_COUNT;                //number of keys in row
+    public:
+        RowScanner_SPIShiftRegisters(const uint8_t SS, uint8_t BYTE_COUNT, uint16_t KEY_COUNT)
+            : SS(SS), BYTE_COUNT(BYTE_COUNT), KEY_COUNT(KEY_COUNT) {}
+        virtual uint8_t scan(uint16_t& rowEnd);
+        void begin();
+};
+#endif
diff --git a/src/Row_IOE.h b/src/Row_IOE.h
index 3fc651a..47c019d 100644
--- a/src/Row_IOE.h
+++ b/src/Row_IOE.h
@@ -7,13 +7,15 @@
 
 /* Row_DH_IOE is a row connected to an Input/Output Expander.
 
-Configuration
--------------
-Define and initilize DELAY_MICROSECONDS in sketch.  Detailed how to is in RowBase.cpp.
-
 Instantiation
 -------------
+Definition of DELAY_MICROSECONDS is explained in RowBase.cpp.
+Definition of activeHigh is explained in RowScanner_Interface.h
 Example instantiation of a row:
+
+    const unsigned int RowBase::DELAY_MICROSECONDS = 1000;
+    const bool RowScanner_PinsArray::activeHigh = 0;
+
     const uint8_t IOExpanderPort::ADDR = 0x18;
 
     IOExpanderPort port1(1, 0);
diff --git a/src/Row_ShiftRegisters.cpp b/src/Row_ShiftRegisters.cpp
new file mode 100644
index 0000000..4d59a0c
--- /dev/null
+++ b/src/Row_ShiftRegisters.cpp
@@ -0,0 +1,16 @@
+#include "Row_ShiftRegisters.h"
+
+void Row_ShiftRegisters::begin()
+{
+    scanner.begin();
+}
+
+uint8_t Row_ShiftRegisters::scan(uint16_t& rowEnd)
+{
+    return scanner.scan(rowEnd);
+}
+
+uint8_t Row_ShiftRegisters::debounce(const uint8_t rowState, uint8_t& debounced)
+{
+    return debouncer.debounce(rowState, debounced);
+}
diff --git a/src/Row_ShiftRegisters.h b/src/Row_ShiftRegisters.h
new file mode 100644
index 0000000..51f9b11
--- /dev/null
+++ b/src/Row_ShiftRegisters.h
@@ -0,0 +1,38 @@
+#ifndef ROW_SHIFTREGISTERS_H
+#define ROW_SHIFTREGISTERS_H
+
+#include <RowBase.h>
+#include <RowScanner_SPIShiftRegisters.h>
+#include <Debouncer_4Samples.h>
+
+/* Row_DH_IOE is a row connected to an Input/Output Expander.
+
+Instantiation
+-------------
+Definition of DELAY_MICROSECONDS is explained in RowBase.cpp.
+Example instantiation of a row:
+
+    const unsigned int RowBase::DELAY_MICROSECONDS = 1000;
+
+    todo
+
+    Key* const ptrsKeys_0[] = { &k_00, &k_01, &k_02, &k_03, &k_04, &k_05 };
+    Row_ShiftRegisters row_0(uint8_t BYTE_COUNT, ptrsKeys_0);
+
+Number of pins in colPort0 should equal number of keys in ptrsKeys_0[] array.
+    if a pin is missing, a key will be unresposive
+    if a Key pointer is missing, the keyboard will fail in an unprdictable way
+*/
+class Row_ShiftRegisters : public RowBase
+{
+    private:
+        RowScanner_SPIShiftRegisters scanner;
+        Debouncer_4Samples debouncer;
+    public:
+        Row_ShiftRegisters(const uint8_t SS, uint8_t BYTE_COUNT, Key *const ptrsKeys[], uint16_t KEY_COUNT)
+            : RowBase(ptrsKeys), scanner(SS, BYTE_COUNT, KEY_COUNT) { }
+        void begin();
+        uint8_t scan(uint16_t& rowEnd);
+        uint8_t debounce(const uint8_t rowState, uint8_t& debounced);
+};
+#endif
diff --git a/src/Row_uC.h b/src/Row_uC.h
index bac33ac..ca3e3cd 100644
--- a/src/Row_uC.h
+++ b/src/Row_uC.h
@@ -6,14 +6,16 @@
 #include <Debouncer_4Samples.h>
 
 /* Row_uC is a row connected to a micro controller.
-Configuration
--------------
-Define and initilize DELAY_MICROSECONDS in sketch.  Detailed how to is in RowBase.cpp.
 
 Instantiation
 -------------
+Definition of DELAY_MICROSECONDS is explained in RowBase.cpp.
+todo Definition of activeHigh is explained in RowScanner_Interface.h
 Example instantiation of a row:
 
+    const unsigned int RowBase::DELAY_MICROSECONDS = 1000;
+    const bool RowScanner_PinsArray::activeHigh = 0;
+
     const uint8_t colPins[] = {0,1,2,3,7,8};
     const uint8_t COL_PIN_COUNT = sizeof(colPins)/sizeof(*colPins);
 
diff --git a/tutorials/breadboard_keyboard_supplies.ods b/tutorials/breadboard_keyboard_supplies.ods
index 95e128846865da006fc3d6b5bb3899d8cdc82dbd..f4bcbeadc40b12f52bb22e85d89d55ab24399b95 100644
GIT binary patch
delta 6876
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

delta 6764
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

diff --git a/tutorials/tutorial_1_breadboard_keyboard.md b/tutorials/tutorial_1_breadboard_keyboard.md
index 76a37ad..0df7231 100644
--- a/tutorials/tutorial_1_breadboard_keyboard.md
+++ b/tutorials/tutorial_1_breadboard_keyboard.md
@@ -7,7 +7,8 @@ All the tutorial example sketches run on breadboard keyboards that have 2 to 8 k
 Breadboard keyboards have row-column matrices and diodes just like the big keyboards.
 
 A breadboard is the easiest way to learn keyboard electronics.
-Electronics are fickle, and you won't get everything right the first time.
+It's easy to get some detail wrong with electronics.
+You won't get everything right the first time.
 There is a learning curve.
 Compared to PCBs, breadboard keyboards are easier to learn on because:
 * Mistakes are easily corrected; no soldering and desoldering
@@ -22,12 +23,13 @@ Breadboard keyboards are useful for:
 ## Breadboard keyboard starter kit
 The parts needed to build all the tutorial Breadboard Keyboards are listed in [breadboard_keyboard_supplies.ods](breadboard_keyboard_supplies.ods).
 
-Wire cutters (or nail clipper) is the only required tool.
-A multi-meter is useful for trouble shooting.
+You will need two tools:
+* Wire cutters (or nail clipper)
+* A multi-meter for trouble shooting
 
 ## How a breadboard works
 To understand the breadboard keyboard you will need to know the internal parts of a breadboard:
-* power rail
+* bus strip
 * terminal strip
 
 These are explained in [How to Use a Breadboard](https://learn.sparkfun.com/tutorials/how-to-use-a-breadboard)
@@ -42,7 +44,7 @@ The basic breadboard has 4 switches and a microcontroller.
 ![breadboard keyboard with 2 rows and 2 columns](images/breadboard_keyboard_2x2_labeled.jpg "2x2 breadboard keyboard")
 
 The key matrix has two rows and two columns.
-Breadboard power rails are repurposed as matrix rows.
+Breadboard bus strips are used as matrix rows.
 Short bare wires connect terminal strips into matrix columns.
 Switch-diode pairs connect rows to columns.
 
@@ -63,7 +65,7 @@ Breadboard keyboard assembly instructions:
  * Teensy LC on the terminal strip labeled 1
  * switch leads oriented so that they will connect diodes to columns
  * diode cut offs connect terminal strips into columns
- * diodes are orient with cathode (banded end) towards the row (power strip)
+ * diodes are orient with cathode (banded end) towards the row (bus strip)
 3. Insert jumper wires connecting Teensy2 to the matrix rows and columns.
  * follow pin connections table (below) and consult pinout diagram in
    [close-up pic shows switch way half out, to show lead orientation]
diff --git a/tutorials/tutorial_4_split_keyboard_with_IOE.md b/tutorials/tutorial_4_split_keyboard_with_IOE.md
index 68110f5..d97fec0 100644
--- a/tutorials/tutorial_4_split_keyboard_with_IOE.md
+++ b/tutorials/tutorial_4_split_keyboard_with_IOE.md
@@ -6,10 +6,8 @@ When you finish this tutorial you will be able to be able to modify a 2-matrix k
 The breadboard in this picture models a split keyboard.
 ![breadboard keyboard with 2 rows and 4 columns of keys](images/breadboard_keyboard_2x5_labeled.jpg "2x5 breadboard keyboard")
 
-There is a total of 4 matrix rows, each on a breadboard power rail.
-
-The right matrix is connected to a microcontroller.
-The left matrix is connected to a I/O expander.
+The breadboard has four bus strips used as rows.
+Two rows connected to a microcontroller, and two rows connected to a I/O expander.
 
 The I/O expander has a small notch on one end, which identifies the end with pin 1.
 In the picture, pin 1 is on the right end.