summaryrefslogtreecommitdiff
path: root/keyboards/handwired/MS-sculpt-mobile/keymaps
diff options
context:
space:
mode:
authormilestogo2017-03-08 01:25:33 -0800
committermilestogo2017-03-08 01:25:33 -0800
commit89aba30c7f50aa733262f4add253817e2fb84e8a (patch)
treece69838fa4121e20f744e2a0b945b7377baea36a /keyboards/handwired/MS-sculpt-mobile/keymaps
parent01980c96e9c1e8ab5aad0e89d03c0e15417712c8 (diff)
fix stupid error w/ mode switch
Diffstat (limited to 'keyboards/handwired/MS-sculpt-mobile/keymaps')
-rw-r--r--keyboards/handwired/MS-sculpt-mobile/keymaps/default/Makefile2
-rw-r--r--keyboards/handwired/MS-sculpt-mobile/keymaps/milestogo/config.h10
-rw-r--r--keyboards/handwired/MS-sculpt-mobile/keymaps/milestogo/keymap.c4
3 files changed, 9 insertions, 7 deletions
diff --git a/keyboards/handwired/MS-sculpt-mobile/keymaps/default/Makefile b/keyboards/handwired/MS-sculpt-mobile/keymaps/default/Makefile
index 9d3df5964..8b829218b 100644
--- a/keyboards/handwired/MS-sculpt-mobile/keymaps/default/Makefile
+++ b/keyboards/handwired/MS-sculpt-mobile/keymaps/default/Makefile
@@ -17,5 +17,5 @@ RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
ifndef QUANTUM_DIR
- include ../../../../Makefile
+ include ../../../../../Makefile
endif
diff --git a/keyboards/handwired/MS-sculpt-mobile/keymaps/milestogo/config.h b/keyboards/handwired/MS-sculpt-mobile/keymaps/milestogo/config.h
index 9f9b05094..8cf4202cd 100644
--- a/keyboards/handwired/MS-sculpt-mobile/keymaps/milestogo/config.h
+++ b/keyboards/handwired/MS-sculpt-mobile/keymaps/milestogo/config.h
@@ -10,15 +10,15 @@
#ifdef USE_BABLPASTE
//define BabblePaste maps
// Windows.
-#define MS_MODE 0
-#define MAC_MODE 1
+#define MAC_MODE 0
+#define MS_MODE 1
//aka gnome+KDE
//#define LINUX_MODE 2
//#define EMACS_MODE 3
-#define VI_MODE 4
-//#define WORDSTAR_MODE 5
+#define VI_MODE 3
// Readline and tmux
-#define READMUX_MODE 6
+#define READMUX_MODE 2
+//#define WORDSTAR_MODE 5
#endif
// Uncomment if you need more free flash space
diff --git a/keyboards/handwired/MS-sculpt-mobile/keymaps/milestogo/keymap.c b/keyboards/handwired/MS-sculpt-mobile/keymaps/milestogo/keymap.c
index a66282547..3b2f53a0c 100644
--- a/keyboards/handwired/MS-sculpt-mobile/keymaps/milestogo/keymap.c
+++ b/keyboards/handwired/MS-sculpt-mobile/keymaps/milestogo/keymap.c
@@ -104,7 +104,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
____, ____, ____, ____, ____, ____, ____, ____, ____, ____
),
/*
-* |ESC | Win| MAC|RdLn| VI | | | | | | | | | | | |
+* |ESC | MAC| Win|RdLn| VI | | | | | | | | | | | |
* -------------------------------------------------------------------------------'
* | | | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = |Bakspace| Del|
* ---------------------------------------------------------------------------
@@ -192,6 +192,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
/* If this is in the range of BABL macros, call a separate function */
/* Any clever remapping with modifiers should happen here e.g. shift bablkey does opposite*/
#ifdef USE_BABLPASTE
+
if( id >= BABL_START_NUM && id < (BABL_START_NUM + BABL_NUM_MACROS ) ) {
if (record->event.pressed) { // is there a case where this isn't desired?
@@ -201,6 +202,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
}
#endif
+
// MACRODOWN only works in this function
switch(id) {
case 0: