Rename to splitboard

hardware.c

@@ -52,8 +52,8 @@
 	#include "hardware/kinesis110.c"
 #elif HARDWARE_VARIANT == ERGODOX
 	#include "hardware/ergodox.c"
-#elif HARDWARE_VARIANT == KEYPAD
-	#include "hardware/keypad.c"
+#elif HARDWARE_VARIANT == SPLITBOARD
+	#include "hardware/splitboard.c"
 #else
 	#error "Unknown hardware variant selected"
 #endif

hardware.h

@@ -49,7 +49,7 @@
 #define KINESIS    1
 #define KINESIS110 2
 #define ERGODOX    3
-#define KEYPAD     4
+#define SPLITBOARD 4
 
 // Select the specific keyboard hardware
 #if HARDWARE_VARIANT == KINESIS
@@ -58,8 +58,8 @@
 	#include "hardware/kinesis110.h"
 #elif HARDWARE_VARIANT == ERGODOX
 	#include "hardware/ergodox.h"
-#elif HARDWARE_VARIANT == KEYPAD
-	#include "hardware/keypad.h"
+#elif HARDWARE_VARIANT == SPLITBOARD
+	#include "hardware/splitboard.h"
 #else
 	#error "Unknown hardware variant selected"
 #endif

hardware/keypad.c → hardware/splitboard.c

@@ -42,7 +42,7 @@
 */
 
 #include <util/delay.h>     /* for _delay_ms() */
-#include "keypad.h"
+#include "splitboard.h"
 
 
 #define NO_LHS_KEY NO_KEY

hardware/keypad.h → hardware/splitboard.h

@@ -52,8 +52,8 @@
 
 // But define different descriptive strings
 #define USB_MANUFACTURER_STRING L"andreae.gen.nz"
-#define USB_PRODUCT_STRING L"Programmable USB Keypad"
-#define USB_SERIAL_NUMBER_STRING L"andreae.gen.nz:keypad"
+#define USB_PRODUCT_STRING L"Programmable USB Splitboard"
+#define USB_SERIAL_NUMBER_STRING L"andreae.gen.nz:splitboard"
 
 // Unique identifier representing this keyboard's layout and
 // definition of logical_keycode values.  Is reported to the
@@ -78,7 +78,8 @@
 #define NUM_LOGICAL_KEYS  NUM_PHYSICAL_KEYS * 2
 #define KEYPAD_LAYER_SIZE NUM_PHYSICAL_KEYS
 
-// The The keyboard is two 8x8 matrixes driven simultaneously via a pair of 164/165 shift registers.
+// Describes an ergodox-esque keyboard made up of two 8x8 matrixes driven
+// simultaneously via a pair of 164/165 shift registers.
 
 #define MATRIX_ROWS 8  // Drive side. On this keyboard, actually columns.
 #define MATRIX_COLS 16 // Read side.  On this keyboard, actually rows.

qtclient/.gitignore

@@ -1,6 +1,8 @@
 Makefile
 moc_*.cpp
 qrc_*.cpp
+*.dmg
+*.app
 compiler.pri
 appdir
 KeyboardClient

qtclient/devicemock.cc

@@ -53,7 +53,7 @@ static const unsigned char ergodox_default_mapping[152] = {
 	0xe8, 0xe9, 0xe6, 0xe4, 0x4b, 0x4e, 0x28, 0x2c
 };
 
-static const unsigned char ugboard_default_mapping[192] = {
+static const unsigned char splitboard_default_mapping[192] = {
 	0x2c, 0xe4, 0x28, 0xe7, 0xe5, 0xe6, 0xff, 0x23,
 	0x1c, 0x0b, 0x11, 0xff, 0x3e, 0x24, 0x18, 0x0d,
 	0x10, 0x52, 0x3f, 0x25, 0x0c, 0x0e, 0x36, 0x51,
@@ -113,13 +113,13 @@ void DeviceMock::enumerateTo(KeyboardComm::DeviceList *target) {
 	append_mock(target,
 	            QSharedPointer<Device>{
 	                new DeviceMock(
-	                    "Mock UgBoard",
+	                    "Mock Splitboard",
 	                    3,                               // layout
-	                    sizeof(ugboard_default_mapping), // mapping size
+	                    sizeof(splitboard_default_mapping), // mapping size
 	                    2, 256,                          // programs
 	                    60, 256, 4,                      // macros
-	                    QByteArray(reinterpret_cast<const char*>(&ugboard_default_mapping[0]),
-	                               sizeof(ugboard_default_mapping)))});
+	                    QByteArray(reinterpret_cast<const char*>(&splitboard_default_mapping[0]),
+	                               sizeof(splitboard_default_mapping)))});
 }
 
 uint8_t DeviceSessionMock::getLayoutID() {

qtclient/deviceusb.cc

@@ -17,7 +17,7 @@ static const struct {
 } valid_ids[] = {
 	{0x16c0, 0x27db}, // VUSB IDs used by Kinesis modification
 	{0x1d50, 0x6028}, // IDs used by Ergodox
-	{0x16c0, 0x27dc}, // VUSB IDs used by ugboard
+	{0x16c0, 0x27dc}, // VUSB IDs used by splitboard
 };
 
 bool DeviceUSB::isValidID(const uint16_t vid, const uint16_t pid) {

qtclient/layout/3.xml

@@ -1,4 +1,4 @@
-<keyboard layout="ugboard" layoutid="3" image="ugboard.png"><layout>
+<keyboard layout="splitboard" layoutid="3" image="splitboard.png"><layout>
 <key name="0" w="50" h="50" x="652" y="328"/>
 <key name="1" w="50" h="50" x="598" y="328"/>
 <key name="2" w="50" h="50" x="544" y="328"/>

qtclient/layout/generator/generate.rb

@@ -1,6 +1,6 @@
 require_relative 'layout'
 
-UGBOARD_LAYOUT = Layout.new(3, "ugboard") do
+SPLITBOARD_LAYOUT = Layout.new(3, "splitboard") do
   # Right thumb
   square_matrix(2, 3, col_start: 12, row_start: 6, row_stride: +1, col_stride: -1, order: :rows)
   # Right keywell
@@ -11,4 +11,4 @@
   square_matrix(6, 7, col_start: 6, col_stride: -1, order: :cols)
 end
 
-UGBOARD_LAYOUT.dump
+SPLITBOARD_LAYOUT.dump

qtclient/qtclient.qrc

@@ -5,6 +5,6 @@
   <file>layout/2.xml</file>
   <file>layout/ergodox.png</file>
   <file>layout/3.xml</file>
-  <file>layout/ugboard.png</file>
+  <file>layout/splitboard.png</file>
 </qresource>
 </RCC>