Changed case of protosplit

Also updated readme to have correct capitalization.

diff --git a/keyboards/deltasplit75/deltasplit75.h b/keyboards/deltasplit75/deltasplit75.h
index 7ca898aa5295c1ac0a2ff6d100f5f5576a40475b..070dcc71b5b66a663958ac2243ebf61b3159da13 100644 (file)
--- a/keyboards/deltasplit75/deltasplit75.h
+++ b/keyboards/deltasplit75/deltasplit75.h
@@ -4,8 +4,8 @@
 #ifdef SUBPROJECT_v2\r
     #include "v2.h"\r
 #endif\r
-#ifdef SUBPROJECT_ProtoSplit\r
-    #include "ProtoSplit.h"\r
+#ifdef SUBPROJECT_protosplit\r
+    #include "protosplit.h"\r
 #endif\r
 \r
 #include "quantum.h"\r

diff --git a/keyboards/deltasplit75/keymaps/default/config.h b/keyboards/deltasplit75/keymaps/default/config.h
new file mode 100644 (file)
index 0000000..c72c00e
--- /dev/null
+++ b/keyboards/deltasplit75/keymaps/default/config.h
@@ -0,0 +1,31 @@
+/*\r
+Copyright 2012 Jun Wako <wakojun@gmail.com>\r
+\r
+This program is free software: you can redistribute it and/or modify\r
+it under the terms of the GNU General Public License as published by\r
+the Free Software Foundation, either version 2 of the License, or\r
+(at your option) any later version.\r
+\r
+This program is distributed in the hope that it will be useful,\r
+but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+GNU General Public License for more details.\r
+\r
+You should have received a copy of the GNU General Public License\r
+along with this program.  If not, see <http://www.gnu.org/licenses/>.\r
+*/\r
+\r
+\r
+#define USE_SERIAL\r
+\r
+#define MASTER_LEFT\r
+// #define _MASTER_RIGHT\r
+// #define EE_HANDS\r
+\r
+\r
+#ifdef SUBPROJECT_v2\r
+    #include "../../v2/config.h"\r
+#endif\r
+#ifdef SUBPROJECT_protosplit\r
+    #include "../../protosplit/config.h"\r
+#endif\r

diff --git a/keyboards/deltasplit75/keymaps/default/keymap.c b/keyboards/deltasplit75/keymaps/default/keymap.c
new file mode 100644 (file)
index 0000000..bfb6ac2
--- /dev/null
+++ b/keyboards/deltasplit75/keymaps/default/keymap.c
@@ -0,0 +1,31 @@
+#include "deltasplit75.h"\r
+#include "action_layer.h"\r
+#include "eeconfig.h"\r
+\r
+extern keymap_config_t keymap_config;\r
+\r
+// Each layer gets a name for readability, which is then used in the keymap matrix below.\r
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.\r
+// Layer names don't all need to be of the same length, obviously, and you can also skip them\r
+// entirely and just use numbers.\r
+\r
+// Fillers to make layering more clear\r
+\r
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { \r
+       KEYMAP(\r
+               KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_HOME, KC_PGUP, \r
+               KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL, KC_END, KC_PGDN, \r
+               KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_SLCK, \r
+               KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_TRNS, KC_ENT, KC_PAUS,  //modify KC_TRNS to enable ISO Support\r
+               KC_LSFT, KC_TRNS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, KC_PSCR, //modify KC_TRNS to enable ISO Support\r
+               KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),\r
+\r
+       KEYMAP(\r
+               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, \r
+               KC_BSLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \r
+               KC_TRNS, KC_VOLU, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \r
+               M(1), KC_LEFT, KC_DOWN, KC_RGHT, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \r
+               KC_TRNS, KC_TRNS, KC_VOLD, M(0), KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \r
+               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),\r
+\r
+};
\ No newline at end of file

diff --git a/keyboards/deltasplit75/keymaps/protosplit/config.h b/keyboards/deltasplit75/keymaps/protosplit/config.h
new file mode 100644 (file)
index 0000000..c72c00e
--- /dev/null
+++ b/keyboards/deltasplit75/keymaps/protosplit/config.h
@@ -0,0 +1,31 @@
+/*\r
+Copyright 2012 Jun Wako <wakojun@gmail.com>\r
+\r
+This program is free software: you can redistribute it and/or modify\r
+it under the terms of the GNU General Public License as published by\r
+the Free Software Foundation, either version 2 of the License, or\r
+(at your option) any later version.\r
+\r
+This program is distributed in the hope that it will be useful,\r
+but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+GNU General Public License for more details.\r
+\r
+You should have received a copy of the GNU General Public License\r
+along with this program.  If not, see <http://www.gnu.org/licenses/>.\r
+*/\r
+\r
+\r
+#define USE_SERIAL\r
+\r
+#define MASTER_LEFT\r
+// #define _MASTER_RIGHT\r
+// #define EE_HANDS\r
+\r
+\r
+#ifdef SUBPROJECT_v2\r
+    #include "../../v2/config.h"\r
+#endif\r
+#ifdef SUBPROJECT_protosplit\r
+    #include "../../protosplit/config.h"\r
+#endif\r

diff --git a/keyboards/deltasplit75/keymaps/protosplit/keymap.c b/keyboards/deltasplit75/keymaps/protosplit/keymap.c
new file mode 100644 (file)
index 0000000..14bf6e0
--- /dev/null
+++ b/keyboards/deltasplit75/keymaps/protosplit/keymap.c
@@ -0,0 +1,31 @@
+#include "deltasplit75.h"\r
+#include "action_layer.h"\r
+#include "eeconfig.h"\r
+\r
+extern keymap_config_t keymap_config;\r
+\r
+// Each layer gets a name for readability, which is then used in the keymap matrix below.\r
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.\r
+// Layer names don't all need to be of the same length, obviously, and you can also skip them\r
+// entirely and just use numbers.\r
+\r
+// Fillers to make layering more clear\r
+\r
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { \r
+       KEYMAP(\r
+               KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_HOME, KC_PGUP, \r
+               KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL, KC_END, KC_PGDN, \r
+               KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_SLCK, \r
+               KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PAUS,\r
+               KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, KC_PSCR,\r
+               KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),\r
+\r
+       KEYMAP(\r
+               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, \r
+               KC_BSLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \r
+               KC_TRNS, KC_VOLU, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \r
+               M(1), KC_LEFT, KC_DOWN, KC_RGHT, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \r
+               KC_TRNS, KC_VOLD, M(0), KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \r
+               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),\r
+\r
+};
\ No newline at end of file

diff --git a/keyboards/deltasplit75/protosplit/Makefile b/keyboards/deltasplit75/protosplit/Makefile
new file mode 100644 (file)
index 0000000..4e2a6f0
--- /dev/null
+++ b/keyboards/deltasplit75/protosplit/Makefile
@@ -0,0 +1,3 @@
+ifndef MAKEFILE_INCLUDED
+       include ../../Makefile
+endif
\ No newline at end of file

diff --git a/keyboards/deltasplit75/protosplit/config.h b/keyboards/deltasplit75/protosplit/config.h
new file mode 100644 (file)
index 0000000..d1f6f79
--- /dev/null
+++ b/keyboards/deltasplit75/protosplit/config.h
@@ -0,0 +1,90 @@
+/*\r
+Copyright 2012 Jun Wako <wakojun@gmail.com>\r
+\r
+This program is free software: you can redistribute it and/or modify\r
+it under the terms of the GNU General Public License as published by\r
+the Free Software Foundation, either version 2 of the License, or\r
+(at your option) any later version.\r
+\r
+This program is distributed in the hope that it will be useful,\r
+but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+GNU General Public License for more details.\r
+\r
+You should have received a copy of the GNU General Public License\r
+along with this program.  If not, see <http://www.gnu.org/licenses/>.\r
+*/\r
+\r
+#ifndef CONFIG_H\r
+#define CONFIG_H\r
+\r
+#include "config_common.h"\r
+\r
+/* USB Device descriptor parameter */\r
+#define VENDOR_ID       0xFEED\r
+#define PRODUCT_ID      0x3060\r
+#define DEVICE_VER      0x0001\r
+#define MANUFACTURER    xyxjj\r
+#define PRODUCT         DeltaSplit75\r
+#define DESCRIPTION     75% split keyboard\r
+\r
+/* key matrix size */\r
+// Rows are doubled-up\r
+#define MATRIX_ROWS 14\r
+#define MATRIX_COLS 8\r
+\r
+// wiring of each half\r
+#define MATRIX_ROW_PINS { F4, F5, F6, F7, B1, B3, B2 }\r
+#define MATRIX_COL_PINS { B6, B5, B4, E6, D7, C6, D4, D1}\r
+\r
+#define CATERINA_BOOTLOADER\r
+\r
+/* COL2ROW or ROW2COL */\r
+#define DIODE_DIRECTION COL2ROW\r
+\r
+/* define if matrix has ghost */\r
+//#define MATRIX_HAS_GHOST\r
+\r
+/* number of backlight levels */\r
+// #define BACKLIGHT_LEVELS 3\r
+\r
+/* Set 0 if debouncing isn't needed */\r
+#define DEBOUNCING_DELAY 5\r
+\r
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */\r
+#define LOCKING_SUPPORT_ENABLE\r
+/* Locking resynchronize hack */\r
+#define LOCKING_RESYNC_ENABLE\r
+\r
+/* key combination for command */\r
+#define IS_COMMAND() ( \\r
+    keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \\r
+)\r
+\r
+/* ws2812 RGB LED */\r
+#define RGB_DI_PIN D3\r
+#define RGBLIGHT_TIMER\r
+#define RGBLED_NUM 12    // Number of LEDs\r
+#define ws2812_PORTREG  PORTD\r
+#define ws2812_DDRREG   DDRD\r
+\r
+/*\r
+ * Feature disable options\r
+ *  These options are also useful to firmware size reduction.\r
+ */\r
+\r
+/* disable debug print */\r
+// #define NO_DEBUG\r
+\r
+/* disable print */\r
+// #define NO_PRINT\r
+\r
+/* disable action features */\r
+//#define NO_ACTION_LAYER\r
+//#define NO_ACTION_TAPPING\r
+//#define NO_ACTION_ONESHOT\r
+//#define NO_ACTION_MACRO\r
+//#define NO_ACTION_FUNCTION\r
+\r
+\r
+#endif
\ No newline at end of file

diff --git a/keyboards/deltasplit75/protosplit/protosplit.c b/keyboards/deltasplit75/protosplit/protosplit.c
new file mode 100644 (file)
index 0000000..a4b54dc
--- /dev/null
+++ b/keyboards/deltasplit75/protosplit/protosplit.c
@@ -0,0 +1,32 @@
+#include "deltasplit75.h"\r
+\r
+#ifdef AUDIO_ENABLE\r
+    float tone_startup[][2] = SONG(STARTUP_SOUND);\r
+    float tone_goodbye[][2] = SONG(GOODBYE_SOUND);\r
+#endif\r
+\r
+void matrix_init_kb(void) {\r
+\r
+    #ifdef AUDIO_ENABLE\r
+        _delay_ms(20); // gets rid of tick\r
+        PLAY_NOTE_ARRAY(tone_startup, false, 0);\r
+    #endif\r
+\r
+    // // green led on\r
+    // DDRD |= (1<<5);\r
+    // PORTD &= ~(1<<5);\r
+\r
+    // // orange led on\r
+    // DDRB |= (1<<0);\r
+    // PORTB &= ~(1<<0);\r
+\r
+       matrix_init_user();\r
+};\r
+\r
+void shutdown_user(void) {\r
+    #ifdef AUDIO_ENABLE\r
+        PLAY_NOTE_ARRAY(tone_goodbye, false, 0);\r
+       _delay_ms(150);\r
+       stop_all_notes();\r
+    #endif\r
+}\r

diff --git a/keyboards/deltasplit75/protosplit/protosplit.h b/keyboards/deltasplit75/protosplit/protosplit.h
new file mode 100644 (file)
index 0000000..7a0f5b7
--- /dev/null
+++ b/keyboards/deltasplit75/protosplit/protosplit.h
@@ -0,0 +1,37 @@
+#ifndef protosplit_H\r
+#define protosplit_H\r
+\r
+#include "../deltasplit75.h"\r
+\r
+//void promicro_bootloader_jmp(bool program);\r
+#include "quantum.h"\r
+\r
+//void promicro_bootloader_jmp(bool program);\r
+//matrix is defined in a weird way here; the layout on both sides are asymmetrical, but the "matrix" is symmetrical but with empty gaps\r
+//the last column is defined as a separate row because the firmware currently doesnt support more than 8 columns (this layout has 9 columns per side) K45 and K110 are the Bs on both sides\r
+#define KEYMAP( \\r
+       K00,   K01,   K02,   K03,   K04,   K05,   K06,       K70,   K71,   K72,   K73,   K74,   K75,   K76,   K77,   K132, \\r
+       K10,   K11,   K12,   K13,   K14,   K15,   K16,       K80,   K81,   K82,   K83,   K84,   K85,   K86,   K87,   K133, \\r
+       K20,   K21,   K22,   K23,   K24,   K25,              K90,   K91,   K92,   K93,   K94,   K95,   K96,   K97,   K134, \\r
+       K30,   K31,   K32,   K33,   K34,   K35,              K100,  K101,  K102,  K103,  K104,  K105,         K107,  K135, \\r
+       K40,   K41,   K42,   K43,   K44,   K45,              K110,  K111,  K112,  K113,  K114,  K115,  K116,  K117,  K136, \\r
+       K50,   K51,   K52,          K54,   K55,              K120,  K121,  K122,  K123,                K126,  K127,  K137 \\r
+       ) \\r
+       { \\r
+               { K00,   K01,   K02,   K03,   K04,   K05,   K06,   KC_NO}, \\r
+               { K10,   K11,   K12,   K13,   K14,   K15,   K16,   KC_NO}, \\r
+               { K20,   K21,   K22,   K23,   K24,   K25,   KC_NO, KC_NO}, \\r
+               { K30,   K31,   K32,   K33,   K34,   K35,   KC_NO, KC_NO}, \\r
+               { K40,   K41,   K42,   K43,   K44,   K45,   KC_NO, KC_NO}, \\r
+               { K50,   K51,   K52,   KC_NO, K54,   K55,   KC_NO, KC_NO}, \\r
+               { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO}, \\r
+               { K70  , K71,   K72,   K73,   K74,   K75,   K76,   K77}, \\r
+               { K80,   K81,   K82,   K83,   K84,   K85,   K86,   K87}, \\r
+               { K90,   K91,   K92,   K93,   K94,   K95,   K96,   K97}, \\r
+               { K100,  K101,  K102,  K103,  K104,  K105,  KC_NO, K107}, \\r
+               { K110,  K111,  K112,  K113,  K114,  K115,  K116,  K117}, \\r
+               { K120,  K121,  K122,  K123,  KC_NO, KC_NO, K126,  K127}, \\r
+               { KC_NO, KC_NO, K132,  K133,  K134,  K135,  K136,  K137} \\r
+       }\r
+\r
+#endif
\ No newline at end of file

diff --git a/keyboards/deltasplit75/protosplit/rules.mk b/keyboards/deltasplit75/protosplit/rules.mk
new file mode 100644 (file)
index 0000000..80a942d
--- /dev/null
+++ b/keyboards/deltasplit75/protosplit/rules.mk
@@ -0,0 +1,5 @@
+BACKLIGHT_ENABLE = no
+
+ifndef QUANTUM_DIR
+       include ../../../Makefile
+endif

diff --git a/keyboards/deltasplit75/readme.md b/keyboards/deltasplit75/readme.md
index 6932c556bf20e40d6216e8097e330f6fdeeb6e43..5844412bf6f8afcd8a5f504ee1f8fbaaf2f6bb5a 100644 (file)
--- a/keyboards/deltasplit75/readme.md
+++ b/keyboards/deltasplit75/readme.md
@@ -17,21 +17,21 @@ Files are available here: https://github.com/xyxjj/DeltaSplit75-Case-files
 Download or clone the whole firmware and navigate to the keyboards/DeltaSplit75 directory. Once your dev env is setup, you'll be able to generate the default .hex using:\r
 \r
 ```\r
-make V2\r
+make v2\r
 \r
 or\r
 \r
-make ProtoSplit-ProtoSplit (if you have one of the prototype PCBs)\r
+make protosplit-protosplit (if you have one of the prototype PCBs)\r
 ```\r
 \r
 You will see a lot of output and if everything worked correctly you will see the built hex files:\r
 \r
 ```\r
-DeltaSplit75_ProtoSplit_ProtoSplit.hex\r
+deltasplit75_protosplit_protosplit.hex\r
 \r
 or\r
 \r
-DeltaSplit75_V2_Default.hex\r
+deltasplit75_v2_default.hex\r
 \r
 ```\r
 \r