From 110465f9600588d2bf557841e318b5376f8cc402 Mon Sep 17 00:00:00 2001
From: flowenol <flovenol@gmail.com>
Date: Wed, 16 Oct 2019 22:26:42 +0200
Subject: [PATCH] keyboard pin swap

---
 Keyboard.ino                  | 2 +-
 MacintoshKeyboardRemapper.ino | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Keyboard.ino b/Keyboard.ino
index ee5acf4..c8ddeea 100644
--- a/Keyboard.ino
+++ b/Keyboard.ino
@@ -61,7 +61,7 @@ void read_data_from_kbd(kbd_state next_state) {
         if (keyboard_state == READ_MODEL_NUMBER) {
           model_number = kbd_data_read;
         } else if (kbd_data_read != TEST_ACK && kbd_data_read != TEST_NAK) {
-          kbd_last_data_read_index = (kbd_last_data_read_index + 1) % 4;
+          kbd_last_data_read_index = (kbd_last_data_read_index + 1) % KBD_BUFFER_SIZE;
           kbd_last_data_read[kbd_last_data_read_index] = kbd_data_read;
         }
   
diff --git a/MacintoshKeyboardRemapper.ino b/MacintoshKeyboardRemapper.ino
index 27cb70d..4eaeb33 100644
--- a/MacintoshKeyboardRemapper.ino
+++ b/MacintoshKeyboardRemapper.ino
@@ -1,8 +1,8 @@
 #define CLK_MAC 5
 #define DATA_MAC 6
 
-#define CLK_KBD 7
-#define DATA_KBD 8
+#define CLK_KBD 8
+#define DATA_KBD 7
 
 #define CLOCK_START_MSEC 500
 #define CLOCK_TRANSITION_USEC 300
@@ -13,6 +13,8 @@
 #define MAC_RESP_DELAY_MSEC 240
 #define MAC_DETECT_READY_USEC 300
 
+#define KBD_BUFFER_SIZE 4
+
 // command constants
 const byte MODEL_NUMBER_CMD = 0x16;
 const byte TEST_CMD = 0x36;
@@ -53,7 +55,7 @@ unsigned long kbd_clock_transition_start;
 unsigned long kbd_delay_start;
 
 byte kbd_data_read;
-byte kbd_last_data_read[4];
+byte kbd_last_data_read[KBD_BUFFER_SIZE];
 short kbd_last_data_read_index = -1;
 byte model_number;