aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Barrett <jabarret@microsoft.com>2017-03-11 22:09:50 -0800
committerJames Barrett <jabarret@microsoft.com>2017-03-11 22:09:50 -0800
commit96bde794d8b922d71f11ec2e7eb1ba0bc0ba8d2d (patch)
tree1168280329e17d6c90e9b1e270c64c3d1db4c04e
parent7c7a77d4bf8f35cd7f59119be0e95b5d28063988 (diff)
downloadqmk_firmware-96bde794d8b922d71f11ec2e7eb1ba0bc0ba8d2d.tar.gz
qmk_firmware-96bde794d8b922d71f11ec2e7eb1ba0bc0ba8d2d.zip
Update readme and default layout for TADA68
Add the default function layer mappings for the keyboard. Provide flashing instructions in the readme.
-rw-r--r--.gitignore1
-rw-r--r--keyboards/tada68/keymaps/default/keymap.c66
-rw-r--r--keyboards/tada68/keymaps/default/readme.md2
-rw-r--r--keyboards/tada68/readme.md15
4 files changed, 26 insertions, 58 deletions
diff --git a/.gitignore b/.gitignore
index f66a961fd..6029afce4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
1.dep 1.dep
2*.o 2*.o
3*.bin
3*.eep 4*.eep
4*.elf 5*.elf
5*.hex 6*.hex
diff --git a/keyboards/tada68/keymaps/default/keymap.c b/keyboards/tada68/keymaps/default/keymap.c
index da57c0343..f28116e0a 100644
--- a/keyboards/tada68/keymaps/default/keymap.c
+++ b/keyboards/tada68/keymaps/default/keymap.c
@@ -1,9 +1,5 @@
1#include "tada68.h" 1#include "tada68.h"
2 2
3
4// Used for SHIFT_ESC
5#define MODS_CTRL_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT))
6
7// Each layer gets a name for readability, which is then used in the keymap matrix below. 3// Each layer gets a name for readability, which is then used in the keymap matrix below.
8// The underscores don't mean anything - you can have a layer called STUFF or any other name. 4// The underscores don't mean anything - you can have a layer called STUFF or any other name.
9// Layer names don't all need to be of the same length, obviously, and you can also skip them 5// Layer names don't all need to be of the same length, obviously, and you can also skip them
@@ -36,63 +32,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
36 32
37 /* Keymap _FL: Function Layer 33 /* Keymap _FL: Function Layer
38 * ,----------------------------------------------------------------. 34 * ,----------------------------------------------------------------.
39 * | | | | | | | | | | | | | | RESET| | 35 * | | F1|F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Del |Ins |
40 * |----------------------------------------------------------------| 36 * |----------------------------------------------------------------|
41 * | | | | | | | | | | | |BL-|BL+|BL | | 37 * | | |Up | | | | | | | | | | | |Hme |
42 * |----------------------------------------------------------------| 38 * |----------------------------------------------------------------|
43 * | | | | | | | | | | | | | | 39 * | |<- |Dn | ->| | | | | | | | | |End |
44 * |----------------------------------------------------------------| 40 * |----------------------------------------------------------------|
45 * | | F1|F2 | F3|F4 | F5| F6| F7| F8| | | | | | 41 * | | | |Bl-|BL |BL+| |VU-|VU+|MUT| |MouseL|MsU|Rck |
46 * |----------------------------------------------------------------| 42 * |----------------------------------------------------------------|
47 * | | | | | | | | | | | 43 * | | | | | | | |MsL|MsD|MsR |
48 * `----------------------------------------------------------------' 44 * `----------------------------------------------------------------'
49 */ 45 */
50[_FL] = KEYMAP_ANSI( 46[_FL] = KEYMAP_ANSI(
51 #ifdef RGBLIGHT_ENABLE 47 _______, 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_DEL, KC_INS , \
52 _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,RESET,_______, \ 48 _______,_______,KC_UP, _______,_______,_______,_______,_______,_______,_______,_______, BL_DEC,BL_INC, BL_TOGG,KC_HOME, \
53 _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, BL_DEC,BL_INC, BL_TOGG,_______, \ 49 _______,KC_LEFT,KC_DOWN,KC_RIGHT,_______,_______,_______,_______,_______,_______,_______,_______, _______,KC_END, \
54 _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______, \ 50 _______,_______,_______,BL_DEC, BL_TOGG,BL_INC, _______,KC_VOLD,KC_VOLU,KC_MUTE,_______,KC_BTN1, KC_MS_U, KC_BTN2, \
55 _______,RGB_TOG,RGB_MOD,RGB_HUI,RGB_HUD,RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD,_______,_______,_______,_______,_______, \ 51 _______,_______,_______, _______, _______,_______,_______,KC_MS_L,KC_MS_D, KC_MS_R),
56 _______,_______,_______, _______, _______,_______,_______,_______,_______, _______),
57 #else
58 _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,RESET,_______, \
59 _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, BL_DEC,BL_INC, BL_TOGG,_______, \
60 _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______, \
61 _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, \
62 _______,_______,_______, _______, _______,_______,_______,_______,_______, _______),
63 #endif
64};
65
66/*enum function_id {
67 //SHIFT_ESC,
68}; 52};
69
70const uint16_t PROGMEM fn_actions[] = {
71 //[0] = ACTION_FUNCTION(SHIFT_ESC),
72};
73
74void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) {
75 static uint8_t shift_esc_shift_mask;
76 switch (id) {
77 case SHIFT_ESC:
78 shift_esc_shift_mask = get_mods()&MODS_CTRL_MASK;
79 if (record->event.pressed) {
80 if (shift_esc_shift_mask) {
81 add_key(KC_GRV);
82 send_keyboard_report();
83 } else {
84 add_key(KC_ESC);
85 send_keyboard_report();
86 }
87 } else {
88 if (shift_esc_shift_mask) {
89 del_key(KC_GRV);
90 send_keyboard_report();
91 } else {
92 del_key(KC_ESC);
93 send_keyboard_report();
94 }
95 }
96 break;
97 }
98}*/
diff --git a/keyboards/tada68/keymaps/default/readme.md b/keyboards/tada68/keymaps/default/readme.md
index 36760d6b9..53412d7c2 100644
--- a/keyboards/tada68/keymaps/default/readme.md
+++ b/keyboards/tada68/keymaps/default/readme.md
@@ -1 +1,3 @@
1# default TADA68 layout 1# default TADA68 layout
2
3This layout replicates the default factory layout of the TADA68.
diff --git a/keyboards/tada68/readme.md b/keyboards/tada68/readme.md
index 552fdea52..dbe2fdca1 100644
--- a/keyboards/tada68/readme.md
+++ b/keyboards/tada68/readme.md
@@ -1,4 +1,15 @@
1TADA68 keyboard firmware 1TADA68 keyboard firmware
2====================== 2========================
3 3
4TODO: to be updated. 41) from the keyboards/tada68 directory run:
5```
6$ make flashbin
7```
8
92) hit the reset button on the TADA, the lights will start flashing.
10
113) You'll see a new drive on your computer called TADA68. Backup the original factory `FLASH.BIN` file thats inside it.
12
134) Delete `FLASH.BIN` from the TADA drive and copy `tada68_default.bin` that was generated at the root of the qmk directory into the TADA drive.
14
155) Hit ESC on the keyboard. The lights will stop flashing and your firmware is loaded! \ No newline at end of file