Merge branch 'master' of https://github.com/qmk/qmk_firmware

4 files changed, 0 insertions, 221 deletions

diff --git a/keyboards/tv44/keymaps/tong92/config.h b/keyboards/tv44/keymaps/tong92/config.h
deleted file mode 100644
index be959a823c..0000000000
--- a/keyboards/tv44/keymaps/tong92/config.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-// place overrides here
-#ifdef BACKLIGHT_ENABLE
-    #define BACKLIGHT_PIN B2
-    #define BACKLIGHT_LEVELS 7
-#endif
-
-#endif
diff --git a/keyboards/tv44/keymaps/tong92/keymap.c b/keyboards/tv44/keymaps/tong92/keymap.c
deleted file mode 100644
index a8c101b646..0000000000
--- a/keyboards/tv44/keymaps/tong92/keymap.c
+++ /dev/null
@@ -1,136 +0,0 @@
-//Author: tong92 <tong92power@gmail.com>
-
-#include "tv44.h"
-#include "action_layer.h"
-#include "eeconfig.h"
-#ifdef BACKLIGHT_ENABLE
-  #include "backlight.h"
-#endif
-
-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define LOWER F(1)
-#define RAISE F(2)
-#define FTN MO(4)
-#define MOUSE M(10)
-#define GO_DEFT M(99)
-#define XXXXXXX KC_NO
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,--------------------------------------------------------------------------.
- * | Tab  |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  Bksp |
- * |------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-------|
- * | Ctrl  |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  | Enter|
- * |-------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`------|
- * | Shift  |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  | /   |Shift|
- * |--------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----|
- * | Ftn1 |  GUI  | Alt  | Space/LOWER | Space/RAISE |  '   |  [  |  ]  | Alt |
- * `--------------------------------------------------------------------------'
- */
-[0] = LAYOUT_arrow(
-KC_TAB, KC_Q,   KC_W,   KC_E, KC_R,   KC_T,   KC_Y,   KC_U, KC_I,   KC_O,   KC_P,   KC_BSPC,
-KC_LCTL,KC_A,   KC_S,   KC_D, KC_F,   KC_G,   KC_H,   KC_J, KC_K,   KC_L,   KC_SCLN,KC_ENT,
-KC_LSFT,KC_Z,   KC_X,   KC_C, KC_V,   KC_B,   KC_N,   KC_M, KC_COMM,KC_DOT, KC_SLSH,KC_RSFT,
-FTN,    KC_LGUI,KC_LALT,              LOWER,  RAISE,        KC_QUOT,KC_LBRC,KC_RBRC,KC_RALT
-),
-/* LOWER
- * ,--------------------------------------------------------------------------.
- * |  `   |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |       |
- * |------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-------|
- * |       |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  -  |  +  |  [  |  ]  |   \  |
- * |-------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`------|
- * |        |  F7 |  F8 |  F9 | F10 | F11 | F12 |     | HOME| PgUp|  UP | PgDo|
- * |--------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----|
- * |      |       |      |             |             |  END | LEFT| Down|RIGHT|
- * `--------------------------------------------------------------------------'
- */
-[1] = LAYOUT_arrow(
-KC_GRV, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   _______,
-_______,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_MINS,KC_PLUS,KC_LBRC,KC_RBRC,KC_BSLS,
-_______,KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, XXXXXXX,KC_HOME,KC_PGUP,KC_UP  ,KC_PGDN,
-XXXXXXX,_______,_______,                _______,XXXXXXX,        KC_END, KC_LEFT,KC_DOWN,KC_RIGHT
-),
-/* RAISE
- * ,--------------------------------------------------------------------------.
- * |  ~   |  !  |  @  |  #  |  $  |  %  |  ^  |  &  |  *  |  (  |  )  |       |
- * |------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-------|
- * |       |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  _  |  =  |  {  |  }  |   |  |
- * |-------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`------|
- * |        |  F7 |  F8 |  F9 | F10 | F11 | F12 |     | HOME| PgUp|  UP | PgDo|
- * |--------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----|
- * |      |       |      |             |             |  END | LEFT| Down|RIGHT|
- * `--------------------------------------------------------------------------'
- */
-[2] = LAYOUT_arrow(
-KC_TILD,KC_EXLM,KC_AT,  KC_HASH,KC_DLR, KC_PERC,KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,_______,
-_______,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_UNDS,KC_EQL, KC_LCBR,KC_RCBR,KC_PIPE,
-_______,KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, _______,KC_HOME,KC_PGUP,KC_UP  ,KC_PGDN,
-XXXXXXX,_______,_______,                _______,_______,        KC_END, KC_LEFT,KC_DOWN,KC_RIGHT
-),
-/* FTN
- * ,--------------------------------------------------------------------------.
- * |  ESC |WinOf|WinUp|     |     |Sh+Ca|     | PgUp| UP  | PgDo|PrtSc| DELET |
- * |------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-------|
- * |       |WinLe|WinDo|WinRi|     |Al+Ca|CapsL| LEFT| DOWN|RIGHT|     |      |
- * |-------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`------|
- * |        |WinLW|WinRW|     |     |Ct+Ca|ScroL| HOME|     | END |     | Ctrl|
- * |--------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----|
- * |      | DeskL | DeskR| Task Manager|    DeskX    | MOUSE|     |     | LED |
- * `--------------------------------------------------------------------------'
- */
-[4] = LAYOUT_arrow(
-KC_ESC ,LALT(KC_F4)        ,LGUI(KC_UP)         ,XXXXXXX       ,XXXXXXX,S(KC_CAPS)         ,XXXXXXX          ,KC_PGUP,KC_UP  ,KC_PGDN ,KC_PSCR,KC_DELT,
-_______,LGUI(KC_LEFT)      ,LGUI(KC_DOWN)       ,LGUI(KC_RIGHT),XXXXXXX,LALT(KC_CAPS)      ,KC_CAPS          ,KC_LEFT,KC_DOWN,KC_RIGHT,XXXXXXX,XXXXXXX,
-_______,LGUI(LSFT(KC_LEFT)),LGUI(LSFT(KC_RIGHT)),XXXXXXX       ,XXXXXXX,LCTL(KC_CAPS)      ,KC_SLCK          ,KC_HOME,XXXXXXX,KC_END  ,XXXXXXX,KC_RCTL,
-_______,LGUI(LCTL(KC_LEFT)),LGUI(LCTL(KC_RIGHT)),                       LCTL(LALT(KC_DELT)),LGUI(LCTL(KC_F4)),        MOUSE  ,XXXXXXX ,XXXXXXX,M(0)
-),
-/* MOUSE
- * ,--------------------------------------------------------------------------.
- * |      |     |     |Mo_Up|     |     |     |M_WhL|M_WhU|M_WhR|     | RESET |
- * |------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-------|
- * |       |     |Mo_Le|Mo_Do|Mo_Ri|     |     |M_Bt1|M_WhD|M_Bt2|     |      |
- * |-------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`------|
- * |        |     |     |     |     |     |     |M_AC0|M_AC1|M_AC2|     |     |
- * |--------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----|
- * |      |      |      | GO_DEFAULT  |  GO_DEFAULT |       |     |     |     |
- * `--------------------------------------------------------------------------'
- */
-[10] = LAYOUT_arrow(
-XXXXXXX,XXXXXXX,XXXXXXX,KC_MS_U,XXXXXXX,XXXXXXX,XXXXXXX,KC_WH_L,KC_WH_U,KC_WH_R,XXXXXXX,RESET,
-XXXXXXX,XXXXXXX,KC_MS_L,KC_MS_D,KC_MS_R,XXXXXXX,XXXXXXX,KC_BTN1,KC_WH_D,KC_BTN2,XXXXXXX,XXXXXXX,
-XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_ACL0,KC_ACL1,KC_ACL2,XXXXXXX,XXXXXXX,
-XXXXXXX,XXXXXXX,XXXXXXX,                GO_DEFT,GO_DEFT,        XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX
-)
-};
-
-const uint16_t PROGMEM fn_actions[] = {
- [1] = ACTION_LAYER_TAP_KEY(1, KC_SPC),
- [2] = ACTION_LAYER_TAP_KEY(2, KC_SPC)
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-      switch(id) {
-        case 0:
-            if (record->event.pressed) {
-                #ifdef BACKLIGHT_ENABLE
-                    backlight_step();
-                #endif
-            }
-        break;
-        case 10:
-            if (record->event.pressed) {
-                layer_on(10);
-            }
-        break;
-        case 99:
-            if (record->event.pressed) {
-                layer_off(10);
-                layer_off(4);
-            }
-        break;
-      }
-    return MACRO_NONE;
-};
diff --git a/keyboards/tv44/keymaps/tong92/readme.md b/keyboards/tv44/keymaps/tong92/readme.md
deleted file mode 100644
index 8208572568..0000000000
--- a/keyboards/tv44/keymaps/tong92/readme.md
+++ /dev/null
@@ -1,52 +0,0 @@
-# The tong92's keymap for tv44
-
-- Arrow Layout (45key)
-- my keymap for Window User
-- Mouse Layer : space -> Default Layer
-
-## Qwerty
-	,--------------------------------------------------------------------------.
-	| Tab  |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  | Bksp  |
-	|------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-------|
-	| Ctrl  |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  | Enter|
-	|-------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`------|
-	| Shift  |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |Shift|
-	|--------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----|
-	| Ftn1 |  GUI  | Alt  | Space/LOWER | Space/RAISE |  '   |  [  |  ]  | Alt |
-	`--------------------------------------------------------------------------'
-
-
-## RAISE
-	,--------------------------------------------------------------------------.
-	|  ~   |  !  |  @  |  #  |  $  |  %  |  ^  |  &  |  *  |  (  |  )  |       |
-	|------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-------|
-	|       |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  _  |  =  |  {  |  }  |   |  |
-	|-------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`------|
-	|        |  F7 |  F8 |  F9 | F10 | F11 | F12 |     | HOME| PgUp|  UP | PgDo|
-	|--------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----|
-	|      |       |      |             |             |  END | LEFT| Down|RIGHT|
-	`--------------------------------------------------------------------------'
-
-
-## FTN
-	,--------------------------------------------------------------------------.
-	|  ESC |WinOf|WinUp|     |     |Sh+Ca|     | PgUp| UP  | PgDo|PrtSc| DELET |
-	|------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-------|
-	|       |WinLe|WinDo|WinRi|     |Al+Ca|CapsL| LEFT| DOWN|RIGHT|     |      |
-	|-------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`------|
-	|        |WinLW|WinRW|     |     |Ct+Ca|ScroL| HOME|     | END |     | Ctrl|
-	|--------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----|
-	|      | DeskL | DeskR| Task Manager|    DeskX    | MOUSE|     |     | LED |
-	`--------------------------------------------------------------------------'
-
-
-## MOUSE
-	,--------------------------------------------------------------------------.
-	|      |     |     |Mo_Up|     |     |     |M_WhL|M_WhU|M_WhR|     | RESET |
-	|------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-------|
-	|       |     |Mo_Le|Mo_Do|Mo_Ri|     |     |M_Bt1|M_WhD|M_Bt2|     |      |
-	|-------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`------|
-	|        |     |     |     |     |     |     |M_AC0|M_AC1|M_AC2|     |     |
-	|--------`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----`-----|
-	|      |      |      | GO_DEFAULT  |  GO_DEFAULT |       |     |     |     |
-	`--------------------------------------------------------------------------'
diff --git a/keyboards/tv44/keymaps/tong92/rules.mk b/keyboards/tv44/keymaps/tong92/rules.mk
deleted file mode 100644
index e60e3c5c5a..0000000000
--- a/keyboards/tv44/keymaps/tong92/rules.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = no       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = no           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
\ No newline at end of file