summaryrefslogtreecommitdiffstats
path: root/keyboards
diff options
context:
space:
mode:
authorJoe Wasson <jwasson+github@gmail.com>2018-11-21 13:18:18 -0800
committerDrashna Jaelre <drashna@live.com>2018-11-21 13:18:18 -0800
commit2f34252278280c34b6958066240e38a2ee6a7237 (patch)
tree142aed28a654e22da23126cd34c3ce78845cabc3 /keyboards
parent1485098443b66462b67137715a1ba7c589db9150 (diff)
Keymap: Update keymap to match latest changes to Wilba's firmware. (#4432)
* Fix firmware to work with latest Wilba changes (i.e. dynamic keymap) and M60a. * Get back RGB Backlight codes. * More tweaks. * Update users/talljoe/rules.mk Co-Authored-By: Talljoe <jwasson+github@gmail.com>
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/rama/m60_a/rules.mk6
-rw-r--r--keyboards/thevankeyboards/minivan/keymaps/talljoe-minivan/config.h (renamed from keyboards/tv44/keymaps/talljoe-minivan/config.h)10
-rw-r--r--keyboards/thevankeyboards/minivan/keymaps/talljoe-minivan/keymap.c (renamed from keyboards/tv44/keymaps/talljoe-minivan/keymap.c)0
-rw-r--r--keyboards/thevankeyboards/minivan/keymaps/talljoe-minivan/rules.mk (renamed from keyboards/tv44/keymaps/talljoe-minivan/rules.mk)0
4 files changed, 9 insertions, 7 deletions
diff --git a/keyboards/rama/m60_a/rules.mk b/keyboards/rama/m60_a/rules.mk
index 7ab1b7d3ba..9c1a2d9df7 100644
--- a/keyboards/rama/m60_a/rules.mk
+++ b/keyboards/rama/m60_a/rules.mk
@@ -54,7 +54,7 @@ BOOTLOADER = atmel-dfu
OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
# Build Options
-# change to "no" to disable the options, or define them in the Makefile in
+# 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)
@@ -68,7 +68,7 @@ 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.
+RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
@@ -76,3 +76,5 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
RAW_ENABLE = yes
DYNAMIC_KEYMAP_ENABLE = yes
CIE1931_CURVE = yes
+
+LAYOUTS = 60_hhkb
diff --git a/keyboards/tv44/keymaps/talljoe-minivan/config.h b/keyboards/thevankeyboards/minivan/keymaps/talljoe-minivan/config.h
index fa1f43adce..26d5e207e8 100644
--- a/keyboards/tv44/keymaps/talljoe-minivan/config.h
+++ b/keyboards/thevankeyboards/minivan/keymaps/talljoe-minivan/config.h
@@ -11,7 +11,7 @@
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
K40, K41, K42, K44, K45, K46, K48, K49, K4B, K4C \
-) KEYMAP_ARROW( \
+) LAYOUT_arrow( \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1D, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K0D, \
@@ -24,7 +24,7 @@
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
K40, K41, K42, K44, K45, K46, K48, K49, K4B, K4C \
-) KEYMAP_ARROW( \
+) LAYOUT_arrow( \
K00, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1D, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2C, \
K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \
@@ -37,14 +37,14 @@
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
K40, K41, K42, K44, K45, K46, K48, K49, K4B, K4C \
-) KEYMAP_ARROW( \
+) LAYOUT_arrow( \
K00, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K2D, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2C, \
K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \
- K40, K49, K42, K44, K45, K48, K0B, K0C, K4C \
+ K40, K41, K42, K44, K45, K48, K0B, K0C, K4C \
)
-#define TEMPLATE_RESET KEYMAP_ARROW( \
+#define TEMPLATE_RESET LAYOUT_arrow( \
RESET, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RESET, \
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \
diff --git a/keyboards/tv44/keymaps/talljoe-minivan/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/talljoe-minivan/keymap.c
index 7812add812..7812add812 100644
--- a/keyboards/tv44/keymaps/talljoe-minivan/keymap.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/talljoe-minivan/keymap.c
diff --git a/keyboards/tv44/keymaps/talljoe-minivan/rules.mk b/keyboards/thevankeyboards/minivan/keymaps/talljoe-minivan/rules.mk
index a4e40d0ba6..a4e40d0ba6 100644
--- a/keyboards/tv44/keymaps/talljoe-minivan/rules.mk
+++ b/keyboards/thevankeyboards/minivan/keymaps/talljoe-minivan/rules.mk