Merge remote-tracking branch 'origin/master' into develop

3 files changed, 79 insertions, 0 deletions

diff --git a/keyboards/soda/pocket/keymaps/default/keymap.c b/keyboards/soda/pocket/keymaps/default/keymap.c
new file mode 100755
index 0000000000..4d65df2d73
--- /dev/null
+++ b/keyboards/soda/pocket/keymaps/default/keymap.c
@@ -0,0 +1,39 @@
+/*
+Copyright 2012,2013 gezhaoyou <gezhaoyou@126.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+enum layer_names {
+    _BASE,
+    _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT(
+               KC_ESC,     MO(1),   KC_EQL,     KC_LPRN,    KC_RPRN,    KC_CALCULATOR,  KC_BSPC,
+               KC_INSERT,  KC_HOME, KC_PGUP,    KC_NUM_LOCK,    KC_PSLS,    KC_PAST,        KC_PMNS,
+               KC_DEL,     KC_END,  KC_PGDN,    KC_P7,      KC_P8,      KC_P9,
+                                                KC_P4,      KC_P5,      KC_P6,          KC_PPLS,
+                           KC_UP,               KC_P1,      KC_P2,      KC_P3,
+               KC_LEFT,    KC_DOWN, KC_RGHT,                KC_P0,      KC_PDOT,        KC_PENT),
+   [_FN] = LAYOUT(
+               KC_TRNS,             KC_TRNS, KC_TRNS,           KC_TRNS, KC_TRNS,               KC_TRNS, QK_BOOTLOADER,
+               RGB_TOG,   RGB_HUI, RGB_MODE_FORWARD,  KC_TRNS,  KC_TRNS,   KC_TRNS, KC_TRNS,
+               KC_TRNS,             RGB_HUD, RGB_MODE_REVERSE,  KC_TRNS, KC_TRNS, KC_TRNS,
+                                                                KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,
+                        RGB_VAI,                                KC_TRNS, KC_TRNS, KC_TRNS,
+               RGB_SPD, RGB_VAD, RGB_SPI,                       KC_TRNS, KC_TRNS, QK_CLEAR_EEPROM),
+};
+
diff --git a/keyboards/soda/pocket/keymaps/via/keymap.c b/keyboards/soda/pocket/keymaps/via/keymap.c
new file mode 100755
index 0000000000..4d65df2d73
--- /dev/null
+++ b/keyboards/soda/pocket/keymaps/via/keymap.c
@@ -0,0 +1,39 @@
+/*
+Copyright 2012,2013 gezhaoyou <gezhaoyou@126.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+enum layer_names {
+    _BASE,
+    _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT(
+               KC_ESC,     MO(1),   KC_EQL,     KC_LPRN,    KC_RPRN,    KC_CALCULATOR,  KC_BSPC,
+               KC_INSERT,  KC_HOME, KC_PGUP,    KC_NUM_LOCK,    KC_PSLS,    KC_PAST,        KC_PMNS,
+               KC_DEL,     KC_END,  KC_PGDN,    KC_P7,      KC_P8,      KC_P9,
+                                                KC_P4,      KC_P5,      KC_P6,          KC_PPLS,
+                           KC_UP,               KC_P1,      KC_P2,      KC_P3,
+               KC_LEFT,    KC_DOWN, KC_RGHT,                KC_P0,      KC_PDOT,        KC_PENT),
+   [_FN] = LAYOUT(
+               KC_TRNS,             KC_TRNS, KC_TRNS,           KC_TRNS, KC_TRNS,               KC_TRNS, QK_BOOTLOADER,
+               RGB_TOG,   RGB_HUI, RGB_MODE_FORWARD,  KC_TRNS,  KC_TRNS,   KC_TRNS, KC_TRNS,
+               KC_TRNS,             RGB_HUD, RGB_MODE_REVERSE,  KC_TRNS, KC_TRNS, KC_TRNS,
+                                                                KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,
+                        RGB_VAI,                                KC_TRNS, KC_TRNS, KC_TRNS,
+               RGB_SPD, RGB_VAD, RGB_SPI,                       KC_TRNS, KC_TRNS, QK_CLEAR_EEPROM),
+};
+
diff --git a/keyboards/soda/pocket/keymaps/via/rules.mk b/keyboards/soda/pocket/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/soda/pocket/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes