diff --git a/keyboards/handwired/MS-sculpt-mobile/babblePaste.c b/keyboards/handwired/MS-sculpt-mobile/babblePaste.c
index 00e8416f41..93ff486e0d 100644
--- a/keyboards/handwired/MS-sculpt-mobile/babblePaste.c
+++ b/keyboards/handwired/MS-sculpt-mobile/babblePaste.c
@@ -8,242 +8,159 @@ and https://github.com/qmk/qmk_firmware/blob/master/keyboards/planck/keymaps/jee
*/
#include "babblePaste.h"
-#include "action_layer.h"
+#include "action_macro.h"
-// GLOBAL variable. Sets startup default if no eeppom
-char babble_mode = MAC_MODE ;
+#ifdef USE_BABLPASTE
+
+// GLOBAL variable to determine mode. Sets startup default if no eeppom
+uint8_t babble_mode =0 ;
+
+
+// Today I learned that the preprocessor can not create a switch statement label from an argument
+// And else statements have problems, see https://gcc.gnu.org/onlinedocs/gcc-3.0.1/cpp_3.html#SEC15
+#define BABLM(ent, macro...) \
+ if ( ent == shortcut ) \
+ { action_macro_play( MACRO(macro)); return MACRO_NONE; }
-const static macro_t *babblePaste (keyrecord_t *record, uint16_t shortcut) {
+const macro_t *babblePaste (keyrecord_t *record, uint8_t shortcut) {
+/* this function runs the appropriate babblepaste macro, given
+the global babble_mode, and a shortcut from the ENUM in babblePaste.h
+TODO, the pointers in this function should be stored in a PROGMEM array, not ram.
+But that requires even more clever preprocessor foo.
+*/
- switch(babble_mode) {
-
+ if ( shortcut < BABL_START_NUM || \
+ shortcut >= (BABL_START_NUM + BABL_NUM_MACROS ) ) {
+ return MACRO_NONE;
+ }
+
+
+ switch(babble_mode) {
+
#ifdef MS_MODE
- case MS_MODE:
- switch(shortcut) {
-
- case BABL_DEL_RIGHT_1C:
- return (static macro_t *) MACRO( D(DEL), END );
- case BABL_DEL_LEFT_WORD:
- return MACRO( D(LCTRL), T(BSPACE), U(LCTRL), END );
- case BABL_DEL_RIGHT_WORD:
- return MACRO( D(LCTRL), T(DEL), U(LCTRL), END );
- case BABL_GO_LEFT_1C:
- return MACRO( T(LEFT), END );
- case BABL_GO_RIGHT_1C:
- return MACRO( T(RIGHT), END );
- case BABL_GO_LEFT_WORD:
- return MACRO( D(LCTRL), T(LEFT), U(LCTRL), END );
- case BABL_GO_RIGHT_WORD:
- return MACRO( D(LCTRL), T(RIGHT), U(LCTRL), END );
- case BABL_GO_START_LINE:
- return MACRO( T(HOME), END );
- case BABL_GO_START_DOC:
- return MACRO( D(LCTRL),T(HOME), U(LCTRL),END );
- case BABL_GO_END_LINE:
- return MACRO( T(END), END );
- case BABL_GO_END_DOC:
- return MACRO( D(LCTRL),T(END), U(LCTRL),END );
- case BABL_GO_NEXT_LINE:
- return MACRO( T(DOWN), END );
- case BABL_GO_PREV_LINE:
- return MACRO( T(UP), END );
- case BABL_PGDN:
- return MACRO( T(PGDN), END );
- case BABL_PGUP:
- return MACRO( T(PGUP), END );
+
+ case MS_MODE:
+ BABLM( BABL_DEL_RIGHT_1C, T(DEL), END );
+ BABLM( BABL_DEL_LEFT_WORD, D(LCTRL), T(BSPACE), U(LCTRL), END );
+ BABLM( BABL_DEL_RIGHT_WORD,D(LCTRL), T(DEL), U(LCTRL), END );
+ BABLM( BABL_GO_LEFT_1C, T(LEFT), END );
+ BABLM( BABL_GO_RIGHT_1C , T(RIGHT), END );
+ BABLM( BABL_GO_LEFT_WORD, D(LCTRL), T(LEFT), U(LCTRL), END );
+ BABLM( BABL_GO_RIGHT_WORD, D(LCTRL), T(RIGHT), U(LCTRL), END );
+ BABLM( BABL_GO_START_LINE, T(HOME), END );
+ BABLM( BABL_GO_START_DOC, D(LCTRL),T(HOME), U(LCTRL),END );
+ BABLM( BABL_GO_END_LINE, T(END), END );
+ BABLM( BABL_GO_END_DOC, D(LCTRL),T(END), U(LCTRL),END );
+ BABLM( BABL_GO_NEXT_LINE, T(DOWN), END );
+ BABLM( BABL_GO_PREV_LINE, T(UP), END );
+ BABLM( BABL_PGDN, T(PGDN), END );
+ BABLM( BABL_PGUP, T(PGUP), END );
#ifndef BABL_MOVEMENTONLY
- case BABL_UNDO:
- return MACRO( D(LCTRL), T(Z), U(LCTRL), END );
- case BABL_REDO:
- return MACRO( D(LCTRL), T(Y), U(LCTRL), END );
- case BABL_CUT:
- return MACRO( D(LCTRL), T(X), U(LCTRL), END );
- case BABL_COPY:
- return MACRO( D(LCTRL), T(C), U(LCTRL), END );
- case BABL_PASTE:
- return MACRO( D(LCTRL), T(V), U(LCTRL), END );
- case BABL_SELECT_ALL:
- return MACRO( D(LCTRL), T(A), U(LCTRL), END );
- case BABL_UNDO:
- return MACRO( D(LCTRL), T(Z), U(LCTRL), END );
- case BABL_REDO:
- return MACRO( D(LCTRL), T(Y), U(LCTRL), END );
- case BABL_CUT:
- return MACRO( D(LCTRL), T(X), U(LCTRL), END );
- case BABL_COPY:
- return MACRO( D(LCTRL), T(C), U(LCTRL), END );
- case BABL_PASTE:
- return MACRO( D(LCTRL), T(V), U(LCTRL), END );
- case BABL_SELECT_ALL:
- return MACRO( D(LCTRL), T(A), U(LCTRL), END );
- case BABL_FIND:
- return MACRO( D(LCTRL),T(F), U(LCTRL),END );
- case BABL_FIND_NEXT:
- return MACRO( T(F3),END );
- case BABL_FIND_REPLACE:
- return MACRO( D(LCTRL),T(H), U(LCTRL),END );
- case BABL_RUNAPP:
- return MACRO( D(LGUI),T(R), U(LGUI),END );
- case BABL_SWITCH_APP_NEXT:
- return MACRO( D(LALT),T(TAB), U(LALT),END );
- case BABL_SWITCH_APP_LAST:
- return MACRO( D(LSFT),D(LALT),T(TAB), U(LALT), U(LSFT),END );
- case BABL_CLOSE_APP:
- return MACRO( D(LALT),T(F4), U(LALT),END );
- case BABL_HELP:
- return MACRO( T(F1),END );
+ BABLM( BABL_UNDO, D(LCTRL), T(Z), U(LCTRL), END );
+ BABLM( BABL_REDO, D(LCTRL), T(Y), U(LCTRL), END );
+ BABLM( BABL_CUT, D(LCTRL), T(X), U(LCTRL), END );
+ BABLM( BABL_COPY, D(LCTRL), T(C), U(LCTRL), END );
+ BABLM( BABL_PASTE, D(LCTRL), T(V), U(LCTRL), END );
+ BABLM( BABL_SELECT_ALL, D(LCTRL), T(A), U(LCTRL), END );
+ BABLM( BABL_UNDO, D(LCTRL), T(Z), U(LCTRL), END );
+ BABLM( BABL_REDO, D(LCTRL), T(Y), U(LCTRL), END );
+ BABLM( BABL_CUT, D(LCTRL), T(X), U(LCTRL), END );
+ BABLM( BABL_COPY, D(LCTRL), T(C), U(LCTRL), END );
+ BABLM( BABL_PASTE, D(LCTRL), T(V), U(LCTRL), END );
+ BABLM( BABL_SELECT_ALL, D(LCTRL), T(A), U(LCTRL), END );
+ BABLM( BABL_FIND, D(LCTRL),T(F), U(LCTRL),END );
+ BABLM( BABL_FIND_NEXT, T(F3),END );
+ BABLM( BABL_FIND_REPLACE, D(LCTRL),T(H), U(LCTRL),END );
+ BABLM( BABL_RUNAPP, D(LGUI),T(R), U(LGUI),END );
+ BABLM( BABL_SWITCH_APP_NEXT, D(LALT),T(TAB), U(LALT),END );
+ BABLM( BABL_SWITCH_APP_LAST, D(LSFT),D(LALT),T(TAB), U(LALT), U(LSFT),END );
+ BABLM( BABL_CLOSE_APP, D(LALT),T(F4), U(LALT),END );
+ BABLM( BABL_HELP, T(F1),END );
#endif
- break;
-
- return MACRO_NONE;
- }
-
-#endif
+
+
+ return MACRO_NONE;
+
+
+#endif /* MS_MODE*/
+
+
#ifdef LINUX_MODE
case LINUX_MODE:
- switch(shortcut) {
-
- case BABL_DEL_RIGHT_1C:
- return MACRO( D(DEL), END );
- case BABL_DEL_LEFT_WORD:
- return MACRO( D(LCTRL), T(BSPACE), U(LCTRL), END );
- case BABL_DEL_RIGHT_WORD:
- return MACRO( D(LCTRL), T(DEL), U(LCTRL), END );
- case BABL_GO_LEFT_1C:
- return MACRO( T(LEFT), END );
- case BABL_GO_RIGHT_1C:
- return MACRO( T(RIGHT), END );
- case BABL_GO_LEFT_WORD:
- return MACRO( D(LCTRL), T(LEFT), U(LCTRL), END );
- case BABL_GO_RIGHT_WORD:
- return MACRO( D(LCTRL), T(RIGHT), U(LCTRL), END );
- case BABL_GO_START_LINE:
- return MACRO( T(HOME), END );
- case BABL_GO_START_DOC:
- return MACRO( D(LCTRL),T(HOME), U(LCTRL),END );
- case BABL_GO_END_LINE:
- return MACRO( T(END), END );
- case BABL_GO_END_DOC:
- return MACRO( D(LCTRL),T(END), U(LCTRL),END );
- case BABL_GO_NEXT_LINE:
- return MACRO( T(DOWN), END );
- case BABL_GO_PREV_LINE:
- return MACRO( T(UP), END );
- case BABL_PGDN:
- return MACRO( T(PGDN), END );
- case BABL_PGUP:
- return MACRO( T(PGUP), END );
+
+ BABLM( BABL_DEL_RIGHT_1C , D(DEL), END );
+ BABLM( BABL_DEL_LEFT_WORD , D(LCTRL), T(BSPACE), U(LCTRL), END );
+ BABLM( BABL_DEL_RIGHT_WORD , D(LCTRL), T(DEL), U(LCTRL), END );
+ BABLM( BABL_GO_LEFT_1C , T(LEFT), END );
+ BABLM( BABL_GO_RIGHT_1C , T(RIGHT), END );
+ BABLM( BABL_GO_LEFT_WORD , D(LCTRL), T(LEFT), U(LCTRL), END );
+ BABLM( BABL_GO_RIGHT_WORD , D(LCTRL), T(RIGHT), U(LCTRL), END );
+ BABLM( BABL_GO_START_LINE , T(HOME), END );
+ BABLM( BABL_GO_START_DOC , D(LCTRL),T(HOME), U(LCTRL),END );
+ BABLM( BABL_GO_END_LINE , T(END), END );
+ BABLM( BABL_GO_END_DOC , D(LCTRL),T(END), U(LCTRL),END );
+ BABLM( BABL_GO_NEXT_LINE , T(DOWN), END );
+ BABLM( BABL_GO_PREV_LINE , T(UP), END );
+ BABLM( BABL_PGDN , T(PGDN), END );
+ BABLM( BABL_PGUP , T(PGUP), END );
#ifndef BABL_MOVEMENTONLY
- case BABL_UNDO:
- return MACRO( D(LCTRL), T(Z), U(LCTRL), END );
- case BABL_REDO:
- return MACRO( D(LCTRL), T(Y), U(LCTRL), END );
- case BABL_CUT:
- return MACRO( D(LCTRL), T(X), U(LCTRL), END );
- case BABL_COPY:
- return MACRO( D(LCTRL), T(C), U(LCTRL), END );
- case BABL_PASTE:
- return MACRO( D(LCTRL), T(V), U(LCTRL), END );
- case BABL_SELECT_ALL:
- return MACRO( D(LCTRL), T(A), U(LCTRL), END );
-
- case BABL_FIND:
- return MACRO( D(LCTRL),T(F), U(LCTRL),END );
- case BABL_FIND_NEXT:
- /* return MACRO( T(F3),END ); KDE */
- return MACRO( D(LCTRL),T(G), U(LCTRL),END ); // Gnome*/
- case BABL_FIND_REPLACE:
- /* return MACRO( D(LCTRL),T(R), U(LCTRL),END ); KDE */
- return MACRO( D(LCTRL),T(H), U(LCTRL),END ); // Gnome*/
- case BABL_RUNAPP:
- return MACRO( D(LALT),T(F2), U(LALT),END );
- case BABL_SWITCH_APP_NEXT:
- return MACRO( D(LCTL),T(TAB), U(LCTL),END );
- case BABL_SWITCH_APP_LAST:
- return MACRO( D(LSFT),D(LCTL),T(TAB), U(LCTL), U(LSFT),END );
- case BABL_CLOSE_APP:
- return MACRO( D(LALT),T(F4), U(LALT),END );
- case BABL_HELP:
- return MACRO_NONE;
+ BABLM( BABL_UNDO , D(LCTRL), T(Z), U(LCTRL), END );
+ BABLM( BABL_REDO , D(LCTRL), T(Y), U(LCTRL), END );
+ BABLM( BABL_CUT , D(LCTRL), T(X), U(LCTRL), END );
+ BABLM( BABL_COPY , D(LCTRL), T(C), U(LCTRL), END );
+ BABLM( BABL_PASTE , D(LCTRL), T(V), U(LCTRL), END );
+ BABLM( BABL_SELECT_ALL, D(LCTRL), T(A), U(LCTRL), END );
+ BABLM( BABL_FIND, D(LCTRL),T(F), U(LCTRL),END );
+ /* BABLM(BABL_FIND_NEXT , T(F3),END ); KDE */
+ BABLM( BABL_FIND_NEXT, D(LCTRL),T(G), U(LCTRL),END ); // Gnome*/
+ /* BABLM( , D(LCTRL),T(R), U(LCTRL),END ); KDE */
+ BABLM( BABL_FIND_REPLACE, D(LCTRL),T(H), U(LCTRL),END ); // Gnome*/
+ BABLM( BABL_RUNAPP, D(LALT),T(F2), U(LALT),END );
+ BABLM( BABL_SWITCH_APP_NEXT, D(LCTL),T(TAB), U(LCTL),END );
+ BABLM( BABL_SWITCH_APP_LAST, D(LSFT),D(LCTL),T(TAB), U(LCTL), U(LSFT),END );
+ BABLM( BABL_CLOSE_APP, D(LALT),T(F4), U(LALT),END );
+ BABLM( BABL_HELP, END );
#endif
- break;
-
return MACRO_NONE;
- }
#endif
#ifdef MAC_MODE
case MAC_MODE:
- switch(shortcut) {
-
-
- case BABL_DEL_RIGHT_1C:
- return MACRO( D(DEL), END );
- case BABL_DEL_LEFT_WORD:
- return MACRO( D(LALT), T(BSPACE), U(LALT), END );
- case BABL_DEL_RIGHT_WORD:
- return MACRO( D(LALT), T(DEL), U(LALT), END );
- case BABL_GO_LEFT_1C:
- return MACRO( T(LEFT), END );
- case BABL_GO_RIGHT_1C:
- return MACRO( T(RIGHT), END );
- case BABL_GO_LEFT_WORD:
- return MACRO( D(LALT), T(LEFT), U(LALT), END );
- case BABL_GO_RIGHT_WORD:
- return MACRO( D(LALT), T(RIGHT), U(LALT), END );
- case BABL_GO_START_LINE:
- return MACRO( D(LGUI), T(LEFT), U(LGUI), END );
- case BABL_GO_START_DOC:
- return MACRO( D(LGUI),T(UP), U(LGUI),END );
- case BABL_GO_END_LINE:
- return MACRO( D(LGUI), T(RIGHT), U(LGUI), END );
- case BABL_GO_END_DOC:
- return MACRO( D(LGUI),T(DOWN), U(LGUI),END );
- case BABL_GO_NEXT_LINE:
- return MACRO( T(DOWN), END );
- case BABL_GO_PREV_LINE:
- return MACRO( T(UP), END );
- case BABL_PGDN:
- return MACRO( D(LALT), T(DOWN), U(LALT), END );
- case BABL_PGUP:
- return MACRO( D(LALT), T(UP), U(LALT), END );
+ BABLM( BABL_DEL_RIGHT_1C , D(DEL), END );
+ BABLM( BABL_DEL_LEFT_WORD , D(LALT), T(BSPACE), U(LALT), END );
+ BABLM( BABL_DEL_RIGHT_WORD, D(LALT), T(DEL), U(LALT), END );
+ BABLM( BABL_GO_LEFT_1C , T(LEFT), END );
+ BABLM( BABL_GO_RIGHT_1C, T(RIGHT), END );
+ BABLM( BABL_GO_LEFT_WORD , D(LALT), T(LEFT), U(LALT), END );
+ BABLM( BABL_GO_RIGHT_WORD , D(LALT), T(RIGHT), U(LALT), END );
+ BABLM( BABL_GO_START_LINE , D(LGUI), T(LEFT), U(LGUI), END );
+ BABLM( BABL_GO_START_DOC , D(LGUI),T(UP), U(LGUI),END );
+ BABLM( BABL_GO_END_LINE , D(LGUI), T(RIGHT), U(LGUI), END );
+ BABLM( BABL_GO_END_DOC , D(LGUI),T(DOWN), U(LGUI),END );
+ BABLM( BABL_GO_NEXT_LINE , T(DOWN), END );
+ BABLM( BABL_GO_PREV_LINE , T(UP), END );
+ BABLM( BABL_PGDN , D(LALT),T(DOWN), U(LALT), END );
+ BABLM( BABL_PGUP , D(LALT),T(UP), U(LALT), END );
#ifndef BABL_MOVEMENTONLY
- case BABL_UNDO:
- return MACRO( D(LGUI), T(Z), U(LGUI), END );
- case BABL_REDO:
- return MACRO( D(LSFT),D(LGUI), T(Z), U(LSFT),U(LGUI), END );
- case BABL_CUT:
- return MACRO( D(LGUI), T(X), U(LGUI), END );
- case BABL_COPY:
- return MACRO( D(LGUI), T(C), U(LGUI), END );
- case BABL_PASTE:
- return MACRO( D(LGUI), T(V), U(LGUI), END );
- case BABL_SELECT_ALL:
- return MACRO( D(LGUI), T(A), U(LGUI), END );
- case BABL_FIND:
- return MACRO( D(LGUI),T(F), U(LGUI),END );
- case BABL_FIND_NEXT:
- return MACRO( D(LGUI),T(G), U(LGUI),END );
- case BABL_FIND_REPLACE:
- return MACRO( D(LGUI),T(F), U(LGUI),END );
- case BABL_RUNAPP:
- return MACRO( D(LGUI),T(R), U(LGUI),END );
- case BABL_SWITCH_APP_NEXT:
- return MACRO( D(LGUI),T(TAB), U(LGUI),END );
- case BABL_SWITCH_APP_LAST:
- return MACRO( D(LSFT),D(LGUI),T(TAB), U(LGUI), U(LSFT),END );
- case BABL_CLOSE_APP:
- return MACRO( D(LGUI),T(Q), U(LGUI),END );
- case BABL_HELP:
- return MACRO( D(LSFT),D(LGUI),T(SLASH), U(LGUI), U(LSFT),END );
+ BABLM( BABL_UNDO , D(1), D(LGUI), T(Z), U(LGUI), END );
+ BABLM( BABL_REDO , D(LSFT),D(LGUI), T(Z), U(LSFT),U(LGUI), END );
+ BABLM( BABL_CUT , D(LGUI), T(X), U(LGUI), END );
+ BABLM( BABL_COPY , D(LGUI), T(C), U(LGUI), END );
+ BABLM( BABL_PASTE , D(LGUI), T(V), U(LGUI), END );
+ BABLM( BABL_SELECT_ALL , D(LGUI), T(A), U(LGUI), END );
+ BABLM( BABL_FIND , D(LGUI),T(F), U(LGUI),END );
+ BABLM( BABL_FIND_NEXT, D(LGUI),T(G), U(LGUI),END );
+ BABLM( BABL_FIND_REPLACE, D(LGUI),T(F), U(LGUI),END );
+ BABLM( BABL_RUNAPP , D(LGUI),T(R), U(LGUI),END );
+ BABLM( BABL_SWITCH_APP_NEXT , D(LGUI),T(TAB), U(LGUI),END );
+ BABLM( BABL_SWITCH_APP_LAST , D(LSFT),D(LGUI),T(TAB), U(LGUI), U(LSFT),END );
+ BABLM( BABL_CLOSE_APP , D(LGUI),T(Q), U(LGUI),END );
+ BABLM( BABL_HELP , D(LSFT),D(LGUI),T(SLASH), U(LGUI), U(LSFT),END );
#endif
- break;
-
+
return MACRO_NONE;
- }
-
#endif
#ifdef EMACS_MODE
@@ -252,64 +169,64 @@ const static macro_t *babblePaste (keyrecord_t *record, uint16_t shortcut) {
//probably should allow meta to not be ALT
case BABL_DEL_RIGHT_1C:
- return MACRO( D(LCTL), T(D), U(LCTL),END );
+ BABLM( , D(LCTL), T(D), U(LCTL),END );
case BABL_DEL_LEFT_WORD:
- return MACRO( D(LCTL), T(BSPACE), U(LCTL), END );
+ BABLM( , D(LCTL), T(BSPACE), U(LCTL), END );
case BABL_DEL_RIGHT_WORD:
- return MACRO( D(LALT), T(D), U(LALT), END );
+ BABLM( , D(LALT), T(D), U(LALT), END );
case BABL_GO_LEFT_1C:
- return MACRO( T(LEFT), END );
+ BABLM( , T(LEFT), END );
case BABL_GO_RIGHT_1C:
- return MACRO( T(RIGHT), END );
+ BABLM( , T(RIGHT), END );
case BABL_GO_LEFT_WORD:
- return MACRO( D(LALT), T(B), U(LALT), END );
+ BABLM( , D(LALT), T(B), U(LALT), END );
case BABL_GO_RIGHT_WORD:
- return MACRO( D(LALT), T(F), U(LALT), END );
+ BABLM( , D(LALT), T(F), U(LALT), END );
case BABL_GO_START_LINE:
- return MACRO( D(LCTRL), T(A), U(LCTRL), END );
+ BABLM( , D(LCTRL), T(A), U(LCTRL), END );
case BABL_GO_START_DOC:
- return MACRO( D(LALT), D(LSFT), T(COMM),U(LSFT), U(LALT) ,END );
+ BABLM( , D(LALT), D(LSFT), T(COMM),U(LSFT), U(LALT) ,END );
case BABL_GO_END_LINE:
- return MACRO( D(LCTRL), T(E), U(LCTRL), END );
+ BABLM( , D(LCTRL), T(E), U(LCTRL), END );
case BABL_GO_END_DOC:
- return MACRO( D(LALT), D(LSFT), T(DOT),U(LSFT), U(LALT) ,END );
+ BABLM( , D(LALT), D(LSFT), T(DOT),U(LSFT), U(LALT) ,END );
case BABL_GO_NEXT_LINE:
- return MACRO( D(LCTRL), T(N), U(LCTRL), END );
+ BABLM( , D(LCTRL), T(N), U(LCTRL), END );
case BABL_GO_PREV_LINE:
- return MACRO( D(LCTRL), T(P), U(LCTRL), END );
+ BABLM( , D(LCTRL), T(P), U(LCTRL), END );
case BABL_PGDN:
- return MACRO(D(LCTRL), T(V), U(LCTRL), END );
+ BABLM( ,D(LCTRL), T(V), U(LCTRL), END );
case BABL_PGUP:
- return MACRO( D(LALT), T(V), U(LALT), END );
+ BABLM( , D(LALT), T(V), U(LALT), END );
#ifndef BABL_MOVEMENTONLY
case BABL_UNDO:
- return MACRO( D(LCTL), T(X), U(LCTL),T(C), END );
+ BABLM( , D(LCTL), T(X), U(LCTL),T(C), END );
case BABL_REDO:
- return MACRO( D(LCTL), T(X), U(LCTL),T(C), END ); // arguably
+ BABLM( , D(LCTL), T(X), U(LCTL),T(C), END ); // arguably
case BABL_CUT:
- return MACRO( D(LCTL), T(W), U(LCTL), END );
+ BABLM( , D(LCTL), T(W), U(LCTL), END );
case BABL_COPY:
- return MACRO( D(LALT), T(W), U(LALT), END ); //really?
+ BABLM( , D(LALT), T(W), U(LALT), END ); //really?
case BABL_PASTE:
- return MACRO( D(LCTL), T(Y), U(LCTL), END );
+ BABLM( , D(LCTL), T(Y), U(LCTL), END );
case BABL_SELECT_ALL:
- return MACRO(D(LCTL), T(X), U(LCTL),T(H), END );
+ BABLM( ,D(LCTL), T(X), U(LCTL),T(H), END );
case BABL_FIND:
- return MACRO( D(LCTRL), T(S), U(LCTRL),END );
+ BABLM( , D(LCTRL), T(S), U(LCTRL),END );
case BABL_FIND_NEXT:
- return MACRO( D(LCTRL), T(S), U(LCTRL),END );
+ BABLM( , D(LCTRL), T(S), U(LCTRL),END );
case BABL_FIND_REPLACE:
- return MACRO( D(LALT),D(LSFT), T(5),U(LSFT), U(LALT), END );
+ BABLM( , D(LALT),D(LSFT), T(5),U(LSFT), U(LALT), END );
case BABL_RUNAPP:
- return MACRO( D(LALT), T(X), U(LALT),T(S),T(H),T(E),T(L),T(L),END );// arguably
+ BABLM( , D(LALT), T(X), U(LALT),T(S),T(H),T(E),T(L),T(L),END );// arguably
case BABL_SWITCH_APP_NEXT:
- return MACRO( D(LCTL), T(X), U(LCTL),T(RIGHT), END ); // arguably
+ BABLM( , D(LCTL), T(X), U(LCTL),T(RIGHT), END ); // arguably
case BABL_SWITCH_APP_LAST:
- return MACRO( D(LCTL), T(X), U(LCTL),T(LEFT), END ); // arguably
+ BABLM( , D(LCTL), T(X), U(LCTL),T(LEFT), END ); // arguably
case BABL_CLOSE_APP:
- return MACRO(D(LCTL), T(X), U(LCTL),T(C),END );
+ BABLM( ,D(LCTL), T(X), U(LCTL),T(C),END );
case BABL_HELP:
- return MACRO( D(LCTL),T(H), U(LCTL),T(A),END); // start search in help
+ BABLM( , D(LCTL),T(H), U(LCTL),T(A),END); // start search in help
#endif
break;
@@ -319,150 +236,90 @@ const static macro_t *babblePaste (keyrecord_t *record, uint16_t shortcut) {
#endif
#ifdef VI_MODE
case VI_MODE:
- switch(shortcut) {
//assume esc is already called
- case BABL_DEL_RIGHT_1C:
- return MACRO( T(X),END );
- case BABL_DEL_LEFT_WORD:
- return MACRO( T(D),T(G),T(E),END );
- case BABL_DEL_RIGHT_WORD:
- return MACRO( T(D),T(W),END );
- case BABL_GO_LEFT_1C:
- return MACRO( T(H), END );
- case BABL_GO_RIGHT_1C:
- return MACRO( T(L), END );
- case BABL_GO_LEFT_WORD:
- return MACRO( T(B),END );
- case BABL_GO_RIGHT_WORD:
- return MACRO( T(W), END );
- case BABL_GO_START_LINE:
- return MACRO( D(LSFT), T(6),U(LSFT), END ); //^
- case BABL_GO_START_DOC:
- return MACRO( T(G),T(G) ,END );
- case BABL_GO_END_LINE:
- return MACRO( D(LSFT), T(4),U(LSFT) , END ); //$
- case BABL_GO_END_DOC:
- return MACRO( D(LSFT), T(G),U(LSFT),END );
- case BABL_GO_NEXT_LINE:
- return MACRO( T(J), END );
- case BABL_GO_PREV_LINE:
- return MACRO( T(K), END );
- case BABL_PGDN:
- return MACRO(D(LCTRL), T(F), U(LCTRL), END );
- case BABL_PGUP:
- return MACRO( D(LCTRL), T(B), U(LCTRL), END );
+ BABLM( BABL_DEL_RIGHT_1C , T(X),END );
+ BABLM( BABL_DEL_LEFT_WORD , T(D),T(G),T(E),END );
+ BABLM( BABL_DEL_RIGHT_WORD , T(D),T(W),END );
+ BABLM( BABL_GO_LEFT_1C , T(H), END );
+ BABLM( BABL_GO_RIGHT_1C , T(L), END );
+ BABLM( BABL_GO_LEFT_WORD , T(B),END );
+ BABLM( BABL_GO_RIGHT_WORD , T(W), END );
+ BABLM( BABL_GO_START_LINE , D(LSFT), T(6),U(LSFT), END ); //^
+ BABLM( BABL_GO_START_DOC , T(G),T(G) ,END );
+ BABLM( BABL_GO_END_LINE , D(LSFT), T(4),U(LSFT) , END ); //$
+ BABLM( BABL_GO_END_DOC , D(LSFT), T(G),U(LSFT),END );
+ BABLM( BABL_GO_NEXT_LINE , T(J), END );
+ BABLM( BABL_GO_PREV_LINE, T(K), END );
+ BABLM( BABL_PGDN ,D(LCTRL), T(F), U(LCTRL), END );
+ BABLM( BABL_PGUP , D(LCTRL), T(B), U(LCTRL), END );
#ifndef BABL_MOVEMENTONLY
- case BABL_UNDO:
- return MACRO( T(U), END );
- case BABL_REDO:
- return MACRO( D(LCTL), T(R), U(LCTL), END );
- case BABL_CUT:
- return MACRO( T(X), END );
- case BABL_COPY:
- return MACRO( T(Y),END );
- case BABL_PASTE:
- return MACRO( T(P), END );
- case BABL_SELECT_ALL:
- return MACRO( D(LSFT), T(SCLN),U(LSFT),D(LSFT), T(5),U(LSFT),T(Y), END ); // wrong but helpful?
- case BABL_FIND:
- return MACRO( T(SLASH),END );
- case BABL_FIND_NEXT:
- return MACRO( T(N),END );
- case BABL_FIND_REPLACE:
- return MACRO( D(LALT),D(LSFT), T(5),U(LSFT), U(LALT), END );
- case BABL_RUNAPP:
- return MACRO_NONE;
- case BABL_SWITCH_APP_NEXT:
- return MACRO_NONE;
- case BABL_SWITCH_APP_LAST:
- return MACRO_NONE;
- case BABL_CLOSE_APP:
- return MACRO(D(LSFT), T(SCLN),U(LSFT), T(Q), D(RSFT), T(1),U(RSFT), END );
- case BABL_HELP:
- return MACRO(D(LSFT), T(SCLN),U(LSFT),T(H),END); // start search in help
- break;
+ BABLM( BABL_UNDO , T(U), END );
+ BABLM( BABL_REDO , D(LCTL), T(R), U(LCTL), END );
+ BABLM( BABL_CUT , T(X), END );
+ BABLM( BABL_COPY , T(Y),END );
+ BABLM( BABL_PASTE , T(P), END );
+ BABLM( BABL_SELECT_ALL , D(LSFT), T(SCLN),U(LSFT),D(LSFT), T(5),U(LSFT),T(Y), END ); // wrong but helpful?
+ BABLM( BABL_FIND , T(SLASH),END );
+ BABLM( BABL_FIND_NEXT , T(N),END );
+ BABLM( BABL_FIND_REPLACE , D(LALT),D(LSFT), T(5),U(LSFT), U(LALT), END );
+ BABLM( BABL_RUNAPP,END );
+ BABLM( BABL_SWITCH_APP_NEXT ,END );
+ BABLM( BABL_SWITCH_APP_LAST ,END );
+ BABLM(BABL_CLOSE_APP, D(LSFT), T(SCLN),U(LSFT), T(Q), D(RSFT), T(1),U(RSFT), END );
+ BABLM(BABL_HELP, D(LSFT), T(SCLN),U(LSFT),T(H),END); // start search in help
#endif
- return MACRO_NONE;
- }
-
+ return MACRO_NONE;
#endif
+
+
+
+
#ifdef READMUX_MODE
// Readline command line editing + tmux windowing
// I havent decided how much to do readline and how much tmux
- case READMUX_MODE:
- switch(shortcut) {
-
- case BABL_DEL_RIGHT_1C:
- return MACRO( D(LCTL), T(D), U(LCTL),END );
- case BABL_DEL_LEFT_WORD:
- return MACRO( D(LCTL), T(W), U(LCTL), END );
- case BABL_DEL_RIGHT_WORD:
- return MACRO( D(LALT), T(D), U(LALT), END );
- case BABL_GO_LEFT_1C:
- return MACRO( T(LEFT), END );
- case BABL_GO_RIGHT_1C:
- return MACRO( T(RIGHT), END );
- case BABL_GO_LEFT_WORD:
- return MACRO( D(LALT), T(B), U(LALT), END );
- case BABL_GO_RIGHT_WORD:
- return MACRO( D(LALT), T(F), U(LALT), END );
- case BABL_GO_START_LINE:
- return MACRO( D(LCTRL), T(A), U(LCTRL), END );
- case BABL_GO_START_DOC:
- return MACRO_NONE; // tmux?
- case BABL_GO_END_LINE:
- return MACRO( D(LCTRL), T(E), U(LCTRL), END );
- case BABL_GO_END_DOC:
- return MACRO_NONE; // tmux?
- case BABL_GO_NEXT_LINE:
- return MACRO( D(LCTRL), T(N), U(LCTRL), END );
- case BABL_GO_PREV_LINE:
- return MACRO( D(LCTRL), T(P), U(LCTRL), END );
- case BABL_PGDN:
- return MACRO( T(PGDN), END );
- case BABL_PGUP:
- return MACRO( T(PGUP), END );
+ case READMUX_MODE:
+ BABLM( BABL_DEL_RIGHT_1C , D(LCTL), T(D), U(LCTL),END );
+ BABLM( BABL_DEL_LEFT_WORD , D(LCTL), T(W), U(LCTL), END );
+ BABLM( BABL_DEL_RIGHT_WORD , D(LALT), T(D), U(LALT), END );
+ BABLM( BABL_GO_LEFT_1C , T(LEFT), END );
+ BABLM( BABL_GO_RIGHT_1C , T(RIGHT), END );
+ BABLM( BABL_GO_LEFT_WORD , D(LALT), T(B), U(LALT), END );
+ BABLM( BABL_GO_RIGHT_WORD , D(LALT), T(F), U(LALT), END );
+ BABLM( BABL_GO_START_LINE , D(LCTRL), T(A), U(LCTRL), END );
+ BABLM( BABL_GO_START_DOC ,END );// tmux?
+ BABLM( BABL_GO_END_LINE , D(LCTRL), T(E), U(LCTRL), END );
+ BABLM( BABL_GO_END_DOC ,END ); // tmux?
+ BABLM( BABL_GO_NEXT_LINE , D(LCTRL), T(N), U(LCTRL), END );
+ BABLM( BABL_GO_PREV_LINE , D(LCTRL), T(P), U(LCTRL), END );
+ BABLM( BABL_PGDN , T(PGDN), END );
+ BABLM( BABL_PGUP , T(PGUP), END );
#ifndef BABL_MOVEMENTONLY
- case BABL_UNDO:
- return MACRO( D(LALT), T(R), U(LALT) , END );
- case BABL_REDO:
- return MACRO( D(LCTL), T(X), U(LCTL),T(C), END ); // arguably
- case BABL_CUT:
- return MACRO( D(LCTL), T(K), U(LCTL), END ); // wrong half the time
- case BABL_COPY:
- return MACRO_NONE;
- case BABL_PASTE:
- return MACRO( D(LCTL), T(Y), U(LCTL), END );
- case BABL_SELECT_ALL:
- return MACRO(D(LCTL), T(A), T(K), T(Y), U(LCTL) , END );
- case BABL_FIND:
- return MACRO( D(LCTRL), T(R), U(LCTRL), END ); // search history
- case BABL_FIND_NEXT:
- eturn MACRO( D(LCTRL), T(S), U(LCTRL), END );
- case BABL_FIND_REPLACE:
- return MACRO_NONE; // tmux?
- case BABL_RUNAPP:
- return MACRO( D(LCTRL), T(B), U(LCTRL), T(C),END ); //tmux
- case BABL_SWITCH_APP_NEXT:
- return MACRO( D(LCTRL), T(B), U(LCTRL), T(N),END ); //tmux
- case BABL_SWITCH_APP_LAST:
- return MACRO( D(LCTRL), T(B), U(LCTRL), T(P),END ); //tmux
- case BABL_CLOSE_APP:
- return MACRO( D(LCTRL), T(B), U(LCTRL), T(D),END); // usually what I want
- break;
- case BABL_HELP:
- return MACRO_NONE;
+ BABLM( BABL_UNDO , D(LALT), T(R), U(LALT) , END );
+ BABLM( BABL_REDO , D(LCTL), T(X), U(LCTL),T(C), END ); // arguably
+ BABLM( BABL_CUT , D(LCTL), T(K), U(LCTL), END ); // wrong half the time
+ BABLM( BABL_COPY ,END );
+ BABLM( BABL_PASTE , D(LCTL), T(Y), U(LCTL), END );
+ BABLM( BABL_SELECT_ALL ,D(LCTL), T(A), T(K), T(Y), U(LCTL) , END );
+ BABLM( BABL_FIND , D(LCTRL), T(R), U(LCTRL), END ); // search history
+ BABLM(BABL_FIND_NEXT, D(LCTRL), T(S), U(LCTRL), END );
+ BABLM( BABL_FIND_REPLACE ,END );
+ BABLM( BABL_RUNAPP , D(LCTRL), T(B), U(LCTRL), T(C),END ); //tmux
+ BABLM( BABL_SWITCH_APP_NEXT , D(LCTRL), T(B), U(LCTRL), T(N),END ); //tmux
+ BABLM( BABL_SWITCH_APP_LAST , D(LCTRL), T(B), U(LCTRL), T(P),END ); //tmux
+ BABLM( BABL_CLOSE_APP , D(LCTRL), T(B), U(LCTRL), T(D),END); // usually what I want
+ BABLM( BABL_HELP ,END );
#endif
- break;
-
- return MACRO_NONE;
- }
+
+ return MACRO_NONE;
#endif
- return MACRO_NONE;
- }
+ default:
+ return MACRO_NONE;
+ }
}
+
+#endif
\ No newline at end of file
diff --git a/keyboards/handwired/MS-sculpt-mobile/babblePaste.h b/keyboards/handwired/MS-sculpt-mobile/babblePaste.h
index 63b79a2055..313fa80ec4 100644
--- a/keyboards/handwired/MS-sculpt-mobile/babblePaste.h
+++ b/keyboards/handwired/MS-sculpt-mobile/babblePaste.h
@@ -9,27 +9,39 @@ and jeebak & algernon's keymap
*/
#ifndef _babblePaste_h_included__
#define _babblePaste_h_included__
+#include "action_layer.h"
+#ifdef USE_BABLPASTE
-/* Add this to your config.h
-// Uncomment any modes you want.
-// Windows.
-//#define MS_MODE 0
+/* ***************************
+
+// Uncomment any modes you want. Whatever mode = 0 will be the default on boot
+
+//#define MS_MODE 0 // Windows.
//#define MAC_MODE 1
-//aka gnome+KDE
-//#define LINUX_MODE 2
+//#define LINUX_MODE 2 //aka gnome+KDE
//#define EMACS_MODE 3
//#define VI_MODE 4
//#define WORDSTAR_MODE 5
-// Readline and tmux
-//#define READMUX 6
-*/
+//#define READMUX 6 // Readline and tmux
+****************************/
-/* Macros handled by babblepaste. Most should be available for all platforms. */
+
+// Uncomment if you need more free flash space
+// It removes everything but cursor movement
+//#define BABL_MOVEMENTONLY
+
+
+// Define starting number for BABL macros in the macro range.
+// Probably can start the default even lower
+#define BABL_START_NUM 50
+
+/* Macros handled by babblepaste. Most should be available for all platforms.
+Whatever isn't defined will NOP */
enum {
// Movement
- BABL_DEL_RIGHT_1C=200,
+ BABL_DEL_RIGHT_1C= BABL_START_NUM,
BABL_DEL_LEFT_WORD,
BABL_DEL_RIGHT_WORD,
BABL_GO_LEFT_1C,
@@ -64,9 +76,26 @@ enum {
#endif
};
+// How many macros/ how many array elements?
+#define BABL_NUM_MACROS 28
+/* from action_macro.h
+typedef uint8_t macro_t;
+
+#define MACRO_NONE (macro_t*)0
+#define MACRO(...) ({ static const macro_t __m[] PROGMEM = { __VA_ARGS__ }; &__m[0]; })
+#define MACRO_GET(p) pgm_read_byte(p)
+
+#define BABL_MSTART (entry, os, macro...) ( const macro_t bablDict[entry][os] PROGMEM = { macro... }; )
+
+*/
+
+const macro_t *babblePaste(keyrecord_t *record, uint8_t shortcut);
+
+macro_t* switch_babble_mode( uint8_t id);
+
+
+#endif
+#endif
-//static macro_t *babblePaste(keyrecord_t *record, uint16_t shortcut)
-
- #endif
\ No newline at end of file
diff --git a/keyboards/handwired/MS-sculpt-mobile/keymaps/milestogo/config.h b/keyboards/handwired/MS-sculpt-mobile/keymaps/milestogo/config.h
index aaf0077b14..7ad1b0f0f5 100644
--- a/keyboards/handwired/MS-sculpt-mobile/keymaps/milestogo/config.h
+++ b/keyboards/handwired/MS-sculpt-mobile/keymaps/milestogo/config.h
@@ -3,5 +3,25 @@
#include "../../config.h"
+#define USE_BABLPASTE
+
+#ifdef USE_BABLPASTE
+//define BabblePaste maps
+// Windows.
+//#define MS_MODE 1
+#define MAC_MODE 0
+//aka gnome+KDE
+//#define LINUX_MODE 2
+//#define EMACS_MODE 3
+//#define VI_MODE 4
+//#define WORDSTAR_MODE 5
+// Readline and tmux
+#define READMUX_MODE 6
+#endif
+
+// Uncomment if you need more free flash space
+// It removes everything but cursor movement
+//#define BABL_MOVEMENTONLY
+
// place overrides here
#endif
diff --git a/keyboards/handwired/MS-sculpt-mobile/keymaps/milestogo/keymap.c b/keyboards/handwired/MS-sculpt-mobile/keymaps/milestogo/keymap.c
index 244d52dc56..3a162db864 100644
--- a/keyboards/handwired/MS-sculpt-mobile/keymaps/milestogo/keymap.c
+++ b/keyboards/handwired/MS-sculpt-mobile/keymaps/milestogo/keymap.c
@@ -1,5 +1,7 @@
#include "MS-sculpt-mobile.h"
#include "action_layer.h"
+#include "action_util.h"
+#include "babblePaste.h"
#ifdef AUDIO_ENABLE
#include "audio.h"
@@ -12,6 +14,13 @@
#define _TRAN 5
+
+
+// adjust babblemode default
+extern uint8_t babble_mode;
+
+
+
enum layer_keycodes {
QWR,
CDH,
@@ -37,7 +46,11 @@ TRAN
enum macro_keycodes {
DHPASTE=1,
VIBRK,
-TO_CDH,
+B_LNX,
+B_WIN,
+B_MAC,
+B_VI,
+B_READ ,
};
@@ -71,8 +84,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, QWR, \
KC_ESC, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, \
KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, ____, ____, ____,\
- TT_MOV, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, KC_QUOT, KC_ENT, ____,\
- KC_LSFT, KC_Z, KC_X, KC_C, M(DHPASTE), KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, ____, ____,\
+ TT_MOV, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, KC_QUOT, KC_ENT, KC_2,\
+ KC_LSFT, KC_Z, KC_X, KC_C, M(DHPASTE), KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, ____, KC_1,\
____, ____, ____ , KC_FN1, ____, ____, ____, ____, ____, ____
),
@@ -86,9 +99,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* --------------------------------------------------------------------------
* | ESC: | ^ | { | } | @ | % | | [ | ( | ) | _ | [ | ] | \ | |
* -------------------------------------------------------------------------------'
-* |Bak/Mov| ! | # | 0 | = | | * | - | 1 | + | ] | ` | enter |PgUp|
+* |Bak/Mov| ! | # | 0 | = | { | } | - | 1 | + | ] | ` | enter |PgUp|
* --------------------------------------------------------------------------------
-* |Lsft | ; | ~ | : | ~ | "|"| $ | ~ | | | / | Rsft| Up| PgDn|
+* |Lsft | ; | ~ | : | ~ | "|"| $ | * | | . | / | Rsft| Up| PgDn|
* ---------------------------------------------------------------------------------
* |Lctl |Lgui |Lalt | Space/Sym | GUI | Sym | Rctl |Left|Down|Rght|
* ---------------------------------------------------------------------------------
@@ -98,16 +111,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, \
____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, \
M(VIBRK), KC_CIRC, KC_LCBR, KC_RCBR,KC_AT, KC_PERC, ____, KC_LBRC,KC_LPRN,KC_RPRN,KC_UNDS, ____, ____, ____,\
- ____, KC_EXLM, KC_HASH, KC_0, KC_EQL, ____, KC_ASTR,KC_MINS,KC_1, KC_PLUS,KC_RBRC, KC_GRV, ____, ____,\
- ____, KC_SCLN, KC_TILDE, KC_COLN, KC_TILDE, KC_PIPE, KC_DLR, KC_TILDE,____, ____, KC_SLSH, ____, ____, ____,\
+ ____, KC_EXLM, KC_HASH, KC_0, KC_EQL, KC_LCBR, KC_RCBR,KC_MINS,KC_1, KC_PLUS,KC_RBRC, KC_GRV, ____, ____,\
+ ____, KC_SCLN, KC_TILDE, KC_COLN, KC_TILDE, KC_PIPE, KC_DLR, KC_ASTR, ____, KC_DOT , KC_SLSH, ____, ____, ____,\
____, ____, ____, ____, ____, ____, ____, ____, ____, ____
),
[_MOV] = KEYMAP (\
- ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, \
- ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, \
- ____, ____,RGUI(KC_TAB), ____, ____, RCTL(KC_B), ____, ____, KC_UP, ____, ____, ____, ____, ____, \
- ____, RCTL(KC_A), KC_S, RCTL(KC_K), RCTL(KC_E), ____, ____, KC_LEFT,KC_DOWN, KC_RIGHT, ____, ____,____,____,\
+ ____, M(B_WIN),M(B_MAC),M(B_READ), M(B_VI), ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, \
+ ____, M(BABL_UNDO), ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, \
+ ____, ____,RGUI(KC_TAB), ____, ____, RCTL(KC_B), ____, M(BABL_DEL_LEFT_WORD), KC_UP, M(BABL_DEL_RIGHT_WORD), ____, ____, ____, ____, \
+ ____, RCTL(KC_A), KC_S, RCTL(KC_K), RCTL(KC_E), ____, M(BABL_GO_START_LINE), KC_LEFT,KC_DOWN, KC_RIGHT, M(BABL_GO_END_LINE), ____,____,____,\
____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, \
____, ____, ____, ____, ____, ____, ____, ____, ____, ____
),
@@ -122,7 +135,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
)
};
-
const uint16_t PROGMEM fn_actions[] = {
[1] = ACTION_LAYER_TAP_KEY(_SYM,KC_SPACE),
[2] = ACTION_LAYER_TAP_KEY(_MOV,KC_BSPC)
@@ -171,10 +183,21 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return true;
}
-
-
+
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 */
+#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?
+
+ babblePaste ( record, id );
+ return MACRO_NONE;
+ }
+ }
+#endif
+
// MACRODOWN only works in this function
switch(id) {
case 0:
@@ -185,49 +208,72 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
}
break;
-
- case DHPASTE:
- if(keyboard_report->mods & MOD_BIT(KC_LGUI) ) {
- if (record->event.pressed) {
- clear_keyboard_but_mods();
- register_code(KC_V);
- } else {
- unregister_code(KC_V);
- }
- }else {
- if (record->event.pressed) {
- register_code(KC_D);
+ /* Colemak mod-dh moves the D key to the qwerty V position
+ This hack makes apple-V_position do what I mean */
+ case DHPASTE:
+ if(keyboard_report->mods & MOD_BIT(KC_LGUI) ) {
+ if (record->event.pressed) {
+ clear_keyboard_but_mods();
+ register_code(KC_V);
+ } else {
+ unregister_code(KC_V);
+ }
+ } else {
+ if (record->event.pressed) {
+ register_code(KC_D);
} else {
- unregister_code(KC_D);
- }
- }
+ unregister_code(KC_D);
+ }
+ }
break;
case VIBRK: // vi esc:
if (record->event.pressed) {
- return MACRO( T(E),D(LSFT),T(SCLN),U(LSFT), END );
+ return MACRO( T(ESC),D(LSFT),T(SCLN),U(LSFT), END );
}
break;
- }
- return MACRO_NONE;
-};
+
+#ifdef USE_BABLPASTE
-#ifdef AUDIO_ENABLE
-
-
-void startup_user()
-{
- _delay_ms(20); // gets rid of tick
- PLAY_NOTE_ARRAY(tone_startup, false, 0);
-}
+#ifdef LINUX_MODE
+ case B_LNX:
+ return switch_babble_mode(LINUX_MODE);
+#endif
+#ifdef MS_MODE
+ case B_WIN:
+ return switch_babble_mode(MS_MODE);
+#endif
+#ifdef MAC_MODE
+ case B_MAC:
+ return switch_babble_mode(MAC_MODE);
+#endif
+#ifdef VI_MODE
+ case B_VI:
+ return switch_babble_mode(VI_MODE);
+#endif
+#ifdef READMUX_MODE
+ case B_READ:
+ return switch_babble_mode(READMUX_MODE);
+#endif
#endif
-void matrix_init_user(void) {
+ default:
+ return MACRO_NONE;
+ }
+
+return MACRO_NONE;
+};
+
+
+
+
+
+void matrix_init_user(void) {
}
void matrix_scan_user(void) {
@@ -240,3 +286,11 @@ void led_set_user(uint8_t usb_led) {
}
+macro_t* switch_babble_mode( uint8_t id) {
+ babble_mode= id;
+ return MACRO_NONE; //less typing above
+}
+
+
+
+
diff --git a/keyboards/handwired/MS-sculpt-mobile/rules.mk b/keyboards/handwired/MS-sculpt-mobile/rules.mk
index cb9d5813cf..34ac78da81 100644
--- a/keyboards/handwired/MS-sculpt-mobile/rules.mk
+++ b/keyboards/handwired/MS-sculpt-mobile/rules.mk
@@ -1,5 +1,9 @@
#CFLAGS=-D ASTAR
+## Project specific files
+SRC= babblePaste.c
+
+
ifdef ASTAR
OPT_DEFS += -DBOOTLOADER_SIZE=4096
MCU = atmega32u4