add layers and LEDs to keybrd_5b_LED_on_IOE.ino

src/LayerState.cpp

@@ -19,7 +19,7 @@ void LayerState::lock(const uint8_t layerId)
     lockedLayer = layerId;
 }
 
-/*Derived classes override setActiveLayer() to also set LED indicator lights e.g. LayerState_LED
+/* Derived classes override setActiveLayer() to also set LED indicator lights e.g. LayerState_LED
 */
 void LayerState::setActiveLayer(const uint8_t layerId)
 {

tutorials/keybrd_5a_LED_on_uC/keybrd_5a_LED_on_uC.ino

@@ -1,4 +1,4 @@
-/* keybrd_5_LEDs.ino
+/* keybrd_5a_LED_on_uC.ino
 
 This sketch:
     is firmware for a simple 2-layer keyboard with three LEDs

tutorials/keybrd_5b_LED_on_IOE/keybrd_5b_LED_on_IOE.ino

@@ -9,18 +9,22 @@ This layout table shows left and right matrices:
 
 | Left  | **0** | **1** | | Right | **0** | **1** |
 |:-----:|-------|-------|-|:-----:|-------|-------|
-| **1** |   1   |   2   | | **1** |   3   |CapsLck|
+| **1** |CapsLck| a  1  | | **1** | b  2  | c  3  |
-| **0** |   a   |   b   | | **0** |   c   |   d   |
+| **0** |  fn   | x  =  | | **0** | y  -  | z  /  |
 */
 // ################## GLOBAL ###################
 // ================= INCLUDES ==================
 #include <ScanDelay.h>
+#include <LayerState_LED.h>
+#include <Code_LayerHold.h>
 #include <Code_LEDLock.h>
+#include <Key_LayeredKeys.h>
 #include <Code_Sc.h>
 #include <Row.h>
 
 //left matrix
 #include <Scanner_uC.h>
+#include <LED_uC.h>
 
 //right matrix
 #include <PortIOE.h>
@@ -31,55 +35,99 @@ This layout table shows left and right matrices:
 // ============ SPEED CONFIGURATION ============
 ScanDelay scanDelay(9000);
 
-// ================ LEFT SCANNER ===============
+// ================ LEFT ===============
+// ---------------- LEFT SCANNER ---------------
 uint8_t readPins[] = {14, 15};
-const uint8_t READPIN_COUNT = sizeof(readPins)/sizeof(*readPins);
+const uint8_t readPinCount = sizeof(readPins)/sizeof(*readPins);
 
-Scanner_uC scanner_L(LOW, readPins, READPIN_COUNT);
+Scanner_uC scanner_L(LOW, readPins, readPinCount);
 
-// =============== RIGHT SCANNER ===============
+// ----------------- LEFT LEDs -----------------
+LED_uC LED_CapsLck(21);
+
+// =============== RIGHT ===============
+// --------------- RIGHT SCANNER ---------------
 const uint8_t PortIOE::DEVICE_ADDR = 0x20;      //MCP23S17 address with all 3 ADDR pins are grounded
 
 PortIOE port_A(0);
-PortMCP23S17 portRead(port_A, 1<<0 | 1<<1 );
+PortMCP23S17 portRead(port_A, 1<<0 | 1<<1 );//read and LED
 
 PortIOE port_B(1);
-PortMCP23S17 portWrite(port_B, 0);
+PortMCP23S17 portWrite(port_B, 0);  //write to strobe and LED
 
 Scanner_IOE scanner_R(LOW, portWrite, portRead);
 
-// ================ RIGHT LEDs =================
+// ---------------- RIGHT LEDs -----------------
-LED_IOE LED_CapsLck(portRead, 1<<6); //tested LED on port A (read)
+LED_IOE LED_normal(portRead, 1<<5); //port A
-//LED_IOE LED_CapsLck(portWrite, 1<<6);//tested LED on port B (write)
+LED_IOE LED_fn(portWrite, 1<<4);    //port B
 
 // =================== CODES ===================
+// ---------------- LAYER CODE -----------------
+enum layers { NORMAL, FN };
+
+LED* prtsLayerLEDs[] = { &LED_normal, &LED_fn }; //array index matches enum layerIds
+LayerState_LED layerState(prtsLayerLEDs);
+
+Code_LayerHold l_fn(FN, layerState);
+
+// ---------------- SCAN 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_x(KEY_X);
+Code_Sc s_y(KEY_Y);
+Code_Sc s_z(KEY_Z);
 
 Code_Sc s_1(KEY_1);
 Code_Sc s_2(KEY_2);
 Code_Sc s_3(KEY_3);
 
+Code_Sc s_minus(KEY_MINUS);
+Code_Sc s_equal(KEY_EQUAL);
+Code_Sc s_slash(KEY_SLASH);
+
 Code_LEDLock o_capsLock(KEY_CAPS_LOCK, LED_CapsLck);
 
+// =================== KEYS ====================
+//row0
+Key* const ptrsKeys_01[] = { &s_a, &s_1 };
+Key_LayeredKeys k_01(ptrsKeys_01);
+
+Key* const ptrsKeys_02[] = { &s_b, &s_2 };
+Key_LayeredKeys k_02(ptrsKeys_02);
+
+Key* const ptrsKeys_03[] = { &s_c, &s_3 };
+Key_LayeredKeys k_03(ptrsKeys_03);
+
+//row1
+Key* const ptrsKeys_11[] = { &s_x, &s_equal };
+Key_LayeredKeys k_11(ptrsKeys_11);
+
+Key* const ptrsKeys_12[] = { &s_y, &s_minus };
+Key_LayeredKeys k_12(ptrsKeys_12);
+
+Key* const ptrsKeys_13[] = { &s_z, &s_slash };
+Key_LayeredKeys k_13(ptrsKeys_13);
+
+LayerStateInterface& Key_LayeredKeys::refLayerState = layerState;
+
 // =================== ROWS ====================
 // ---------------- LEFT ROWS ------------------
-Key* ptrsKeys_L0[] = { &s_1, &s_2 };
+Key* ptrsKeys_L0[] = { &o_capsLock, &k_01 };
 const uint8_t KEY_COUNT_L0 = sizeof(ptrsKeys_L0)/sizeof(*ptrsKeys_L0);
 Row row_L0(scanner_L, 0, ptrsKeys_L0, KEY_COUNT_L0);
 
-Key* ptrsKeys_L1[] = { &s_a, &s_b };
+Key* ptrsKeys_L1[] = { &l_fn, &k_11 };
 const uint8_t KEY_COUNT_L1 = sizeof(ptrsKeys_L1)/sizeof(*ptrsKeys_L1);
 Row row_L1(scanner_L, 1, ptrsKeys_L1, KEY_COUNT_L1);
 
 // ---------------- RIGHT ROWS -----------------
-Key* ptrsKeys_R0[] = { &s_3, &o_capsLock };
+Key* ptrsKeys_R0[] = { &k_02, &k_03};
 const uint8_t KEY_COUNT_R0 = sizeof(ptrsKeys_R0)/sizeof(*ptrsKeys_R0);
 Row row_R0(scanner_R, 1<<0, ptrsKeys_R0, KEY_COUNT_R0);
 
-Key* ptrsKeys_R1[] = { &s_c,  &s_d };
+Key* ptrsKeys_R1[] = { &k_12,  &k_13 };
 const uint8_t KEY_COUNT_R1 = sizeof(ptrsKeys_R1)/sizeof(*ptrsKeys_R1);
 Row row_R1(scanner_R, 1<<1, ptrsKeys_R1, KEY_COUNT_R1);
 
@@ -87,8 +135,8 @@ Row row_R1(scanner_R, 1<<1, ptrsKeys_R1, KEY_COUNT_R1);
 void setup()
 {
     Keyboard.begin();
-delay(7000);
     scanner_R.begin();
+    layerState.begin();//must be after scanner begin for IOE ?? todo
 }
 
 void loop()