diff options
7 files changed, 11 insertions, 10 deletions
diff --git a/keyboards/handwired/MS_sculpt_mobile/MS_sculpt_mobile.c b/keyboards/handwired/MS_sculpt_mobile/MS_sculpt_mobile.c index 4c735a6c2..64982fb62 100644 --- a/keyboards/handwired/MS_sculpt_mobile/MS_sculpt_mobile.c +++ b/keyboards/handwired/MS_sculpt_mobile/MS_sculpt_mobile.c | |||
| @@ -1 +1 @@ | |||
| #include "MS-sculpt-mobile.h" | #include "MS_sculpt_mobile.h" | ||
diff --git a/keyboards/handwired/MS_sculpt_mobile/babblePaste.c b/keyboards/handwired/MS_sculpt_mobile/babblePaste.c index 3a9b86997..22394cc7d 100644 --- a/keyboards/handwired/MS_sculpt_mobile/babblePaste.c +++ b/keyboards/handwired/MS_sculpt_mobile/babblePaste.c | |||
| @@ -7,7 +7,8 @@ Huge thanks to https://en.wikipedia.org/wiki/Table_of_keyboard_shortcuts | |||
| 7 | and https://github.com/qmk/qmk_firmware/blob/master/keyboards/planck/keymaps/jeebak/keymap.c | 7 | and https://github.com/qmk/qmk_firmware/blob/master/keyboards/planck/keymaps/jeebak/keymap.c |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include "babblePaste.h" | 10 | #include "../MS_sculpt_mobile/babblePaste.h" |
| 11 | |||
| 11 | #include "action_macro.h" | 12 | #include "action_macro.h" |
| 12 | 13 | ||
| 13 | #ifdef USE_BABLPASTE | 14 | #ifdef USE_BABLPASTE |
| @@ -27,7 +28,7 @@ macro_t* switch_babble_mode( uint8_t id) { | |||
| 27 | // And else statements have problems, see https://gcc.gnu.org/onlinedocs/gcc-3.0.1/cpp_3.html#SEC15 | 28 | // And else statements have problems, see https://gcc.gnu.org/onlinedocs/gcc-3.0.1/cpp_3.html#SEC15 |
| 28 | #define BABLM(ent, macro...) \ | 29 | #define BABLM(ent, macro...) \ |
| 29 | if ( ent == shortcut ) \ | 30 | if ( ent == shortcut ) \ |
| 30 | { action_macro_play( MACRO(macro)); return MACRO_NONE; } | 31 | { action_macro_play( MACRO(macro)); return MACRO_NONE; } |
| 31 | 32 | ||
| 32 | 33 | ||
| 33 | /* this function runs the appropriate babblepaste macro, given | 34 | /* this function runs the appropriate babblepaste macro, given |
| @@ -456,4 +457,4 @@ const macro_t *babblePaste (keyrecord_t *record, uint8_t shortcut) { | |||
| 456 | } | 457 | } |
| 457 | 458 | ||
| 458 | 459 | ||
| 459 | #endif \ No newline at end of file | 460 | #endif |
diff --git a/keyboards/handwired/MS_sculpt_mobile/babblePaste.h b/keyboards/handwired/MS_sculpt_mobile/babblePaste.h index 3067c854d..cedd7d92b 100644 --- a/keyboards/handwired/MS_sculpt_mobile/babblePaste.h +++ b/keyboards/handwired/MS_sculpt_mobile/babblePaste.h | |||
| @@ -9,9 +9,9 @@ and jeebak & algernon's keymap | |||
| 9 | */ | 9 | */ |
| 10 | #ifndef _babblePaste_h_included__ | 10 | #ifndef _babblePaste_h_included__ |
| 11 | #define _babblePaste_h_included__ | 11 | #define _babblePaste_h_included__ |
| 12 | #include "../MS_sculpt_mobile/config.h" | ||
| 12 | #include "action_layer.h" | 13 | #include "action_layer.h" |
| 13 | #include "quantum_keycodes.h" | 14 | #include "quantum_keycodes.h" |
| 14 | #include "config.h" | ||
| 15 | 15 | ||
| 16 | #ifdef USE_BABLPASTE | 16 | #ifdef USE_BABLPASTE |
| 17 | 17 | ||
diff --git a/keyboards/handwired/MS_sculpt_mobile/keymaps/default/config.h b/keyboards/handwired/MS_sculpt_mobile/keymaps/default/config.h index 8893d122e..4f3a425b7 100644 --- a/keyboards/handwired/MS_sculpt_mobile/keymaps/default/config.h +++ b/keyboards/handwired/MS_sculpt_mobile/keymaps/default/config.h | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | #ifndef CONFIG_USER_H | 1 | #ifndef CONFIG_USER_H |
| 2 | #define CONFIG_USER_H | 2 | #define CONFIG_USER_H |
| 3 | 3 | ||
| 4 | #include "../../config.h" | 4 | #include "../../../MS_sculpt_mobile/config.h" |
| 5 | 5 | ||
| 6 | // place overrides here | 6 | // place overrides here |
| 7 | 7 | ||
diff --git a/keyboards/handwired/MS_sculpt_mobile/keymaps/default/keymap.c b/keyboards/handwired/MS_sculpt_mobile/keymaps/default/keymap.c index ab09dcdd1..a8802c99a 100644 --- a/keyboards/handwired/MS_sculpt_mobile/keymaps/default/keymap.c +++ b/keyboards/handwired/MS_sculpt_mobile/keymaps/default/keymap.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #include "MS-sculpt-mobile.h" | 1 | #include "../../MS_sculpt_mobile.h" |
| 2 | 2 | ||
| 3 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 3 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 4 | /* | 4 | /* |
diff --git a/keyboards/handwired/MS_sculpt_mobile/keymaps/milestogo/config.h b/keyboards/handwired/MS_sculpt_mobile/keymaps/milestogo/config.h index 8cf4202cd..5c04f647c 100644 --- a/keyboards/handwired/MS_sculpt_mobile/keymaps/milestogo/config.h +++ b/keyboards/handwired/MS_sculpt_mobile/keymaps/milestogo/config.h | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | #ifndef CONFIG_USER_H | 1 | #ifndef CONFIG_USER_H |
| 2 | #define CONFIG_USER_H | 2 | #define CONFIG_USER_H |
| 3 | 3 | ||
| 4 | #include "../../config.h" | 4 | #include "../../../MS_sculpt_mobile/config.h" |
| 5 | 5 | ||
| 6 | #define USE_BABLPASTE | 6 | #define USE_BABLPASTE |
| 7 | 7 | ||
diff --git a/keyboards/handwired/MS_sculpt_mobile/keymaps/milestogo/keymap.c b/keyboards/handwired/MS_sculpt_mobile/keymaps/milestogo/keymap.c index 395a9fb47..c9a8ccdb6 100644 --- a/keyboards/handwired/MS_sculpt_mobile/keymaps/milestogo/keymap.c +++ b/keyboards/handwired/MS_sculpt_mobile/keymaps/milestogo/keymap.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | #include "MS-sculpt-mobile.h" | 1 | #include "../../../MS_sculpt_mobile/babblePaste.h" |
| 2 | #include "../../MS_sculpt_mobile.h" | ||
| 2 | #include "action_layer.h" | 3 | #include "action_layer.h" |
| 3 | #include "action_util.h" | 4 | #include "action_util.h" |
| 4 | #include "babblePaste.h" | ||
| 5 | 5 | ||
| 6 | #ifdef AUDIO_ENABLE | 6 | #ifdef AUDIO_ENABLE |
| 7 | #include "audio.h" | 7 | #include "audio.h" |
