hope this works

keyboards/reviung41/config.h

@@ -16,15 +16,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
-
 #include "config_common.h"
 
+
 /* USB Device descriptor parameter */
-#define VENDOR_ID 0x7807
-#define PRODUCT_ID 0xDCCB
-#define DEVICE_VER 0x0001
-#define MANUFACTURER gtips
-#define PRODUCT reviung41
+#define VENDOR_ID                  0x7807
+#define PRODUCT_ID                 0xDCCB
+#define DEVICE_VER                 0x0001
+#define MANUFACTURER               gtips
+#define PRODUCT                    Reviung41
 
 /* key matrix size */
 #define MATRIX_ROWS 7
@@ -67,7 +67,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
 // /*== all animations enable ==*/
-  #define RGBLIGHT_ANIMATIONS
+   #define RGBLIGHT_ANIMATIONS
 // /*== or choose animations ==*/
 //   #define RGBLIGHT_EFFECT_BREATHING
 //   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -93,9 +93,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define MATRIX_HAS_GHOST
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
+// #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
+// #define LOCKING_RESYNC_ENABLE
 
 /* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
  * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
@@ -144,3 +144,21 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
+
+// Configure the global tapping term (default: 200ms)
+#define TAPPING_TERM 210
+
+// Prevent normal rollover on alphas from accidentally triggering mods.
+#define IGNORE_MOD_TAP_INTERRUPT
+
+#define MK_3_SPEED
+#define MK_MOMENTARY_ACCEL
+
+//#ifdef OLED_DRIVER_ENABLE
+  #define OLED_DISPLAY_128X32
+  #define OLED_BRIGHTNESS          64
+  #define OLED_TIMEOUT             60000
+  #define OLED_FADE_OUT
+  #define OLED_FADE_OUT_INTERVAL   10
+  #define OLED_SCROLL_TIMEOUT      1
+//#endif

keyboards/reviung41/reviung41.c

@@ -13,4 +13,4 @@
  * 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 "reviung41.h"
+#include "reviung41.h"

keyboards/reviung41/rules.mk

@@ -7,12 +7,19 @@ BOOTLOADER = caterina
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+MOUSEKEY_ENABLE = yes       # Mouse keys
+NKRO_ENABLE = no            # Enable N-Key Rollover
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+
+DYNAMIC_TAPPING_TERM_ENABLE = yes
+DEFERRED_EXEC_ENABLE = yes
+OLED_ENABLE = yes
+OLED_DRIVER = SSD1306
+
+SRC += bel_air/mr_smith.c

keyboards/skergo/config.h

@@ -47,7 +47,11 @@
 #define DEBOUNCE 5
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-// #define LOCKING_SUPPORT_ENABLE
+#define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
-// #define LOCKING_RESYNC_ENABLE*/
+#define LOCKING_RESYNC_ENABLE
+
+#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) 
+// with keys that convert to other keys on hold (z becomes ctrl when you hold it, and 
+// when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)

keyboards/skergo/keymaps/jmwtsn/bel_air/mr_smith.c

@@ -17,11 +17,7 @@
 // For full documentation of Pascal Getreuer's original project, see
 // https://getreuer.info/posts/keyboards/mouse-turbo-click
 
-<<<<<<< HEAD
 #include "bel_air/mr_smith.h"
-=======
-#include "bel_air/mister_smith.h"
->>>>>>> 1312beac920949dcb7ac04e70637b1a032d2bf91
 
 // This library relies on that mouse keys and the deferred execution API are
 // enabled, which we check for here. Enable them in you rules.mk by setting:

keyboards/skergo/keymaps/jmwtsn/keymap.c

@@ -16,12 +16,31 @@
 */
 
 #include QMK_KEYBOARD_H
-<<<<<<< HEAD
-//#include "bel_air/mr_smith.h"
-=======
-#include "features/mister_smith.h"
->>>>>>> 1312beac920949dcb7ac04e70637b1a032d2bf91
+//#include "bel_air/mr_smith.h"tt
 
+// Left-hand home row mods for Qwerty
+#define HRM_A LGUI_T(KC_A)
+#define HRM_S LALT_T(KC_S)
+#define HRM_D LSFT_T(KC_D)
+#define HRM_F LCTL_T(KC_F)
+
+// Right-hand home row mods for Qwerty
+#define HRM_J RCTL_T(KC_J)
+#define HRM_K RSFT_T(KC_K)
+#define HRM_L LALT_T(KC_L)
+#define HRM_SCLN RGUI_T(KC_SCLN)
+
+// Left-hand home row mods for Colemak
+#define CLHRM_A LGUI_T(KC_A)
+#define CLHRM_R LALT_T(KC_R)
+#define CLHRM_S LSFT_T(KC_S)
+#define CLHRM_T LCTL_T(KC_T)
+
+// Right-hand home row mods for Colemak
+#define CLHRM_N RCTL_T(KC_N)
+#define CLHRM_E RSFT_T(KC_E)
+#define CLHRM_I LALT_T(KC_I)
+#define CLHRM_O RGUI_T(KC_O)
 
 enum custom_keycodes {
     MSG = SAFE_RANGE,
@@ -38,17 +57,15 @@ enum custom_keycodes {
     SLSAST,
     ASTSLS,
     NXT,
-    JIGGY
+    JIGGY,
+	PHNUM,
+	NOTES
 };
 
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
-<<<<<<< HEAD
 //  if (!process_get_jiggy_with_it(keycode, record, JIGGY)) { return false; }
-=======
-  if (!process_get_jiggy_with_it(keycode, record, JIGGY)) { return false; }
->>>>>>> 1312beac920949dcb7ac04e70637b1a032d2bf91
 
     switch (keycode) {
     
@@ -111,7 +128,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         
     case DNC2:
         if (record->event.pressed) {
-            SEND_STRING("Interupted by call-in. ");
+            SEND_STRING("Interrupted by call-in. ");
         } else {
         }
         break;
@@ -150,29 +167,20 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         break;
         
         
-    case NOCON:
-        if (record->event.pressed) {
-            SEND_STRING(
-            SS_DOWN(X_LALT)SS_TAP(X_TAB)SS_UP(X_LALT)
-            SS_DELAY(200)
-            SS_TAP(X_TAB) 
-            SS_DELAY(300) "n" 
-            SS_TAP(X_TAB) SS_TAP(X_ENT)
-            SS_DELAY(200) 
-            );
-        } else {
-        }
-        break;
+
         
         
     case SELNUM:
         if (record->event.pressed) {
             SEND_STRING(
+			SS_DOWN(X_LCTL)SS_TAP(X_TAB)SS_UP(X_LCTL)
+		    SS_TAP(X_ESC)
             SS_TAP(X_F7)
             SS_DELAY(100)
             SS_TAP(X_ENT)
             SS_DELAY(200)            //turn on caret browsing and wait
             SS_LCTL("f")"Calling "
+			SS_DELAY(100)
             SS_TAP(X_ENT)
             SS_TAP(X_ESC)
             SS_DELAY(200)
@@ -184,34 +192,88 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             SS_TAP(X_LEFT)SS_UP(X_LSFT)
             SS_LCTL("c")             //select phone number
             SS_TAP(X_F7)             //turn off caret browsing
-            SS_DOWN(X_LALT)SS_TAP(X_TAB)SS_UP(X_LALT)
+            SS_DOWN(X_LGUI)SS_TAP(X_3)SS_UP(X_LGUI)
             SS_DELAY(200)            //switch to VCC and wait
-            SS_LCTL("v")             //paste number
-            SS_TAP(X_ENT)
+     		SS_LCTL("v")             //paste number
+			SS_TAP(X_ENT)
             );
         } else {
         }
         break;
 
 
-    case DISCO:
-        if (record->event.pressed) {
+
+
+
+
+    case DISCO:										// Hang up VCC call
+        if (record->event.pressed) {				// Start fron VCC number field
             SEND_STRING(
-            SS_TAP(X_TAB)SS_TAP(X_TAB)
-            SS_DOWN(X_LCTL) "d" SS_UP(X_LCTL)
-            SS_DOWN(X_LSFT)SS_TAP(X_TAB)SS_TAP(X_TAB)SS_TAP(X_TAB)SS_UP(X_LSFT)
+            SS_TAP(X_TAB)SS_TAP(X_TAB)				// Tab to My Interactions
+            SS_DOWN(X_LCTL) "d" SS_UP(X_LCTL)		// Disconnect
+            SS_DOWN(X_LSFT)SS_TAP(X_TAB)SS_TAP(X_TAB)SS_TAP(X_TAB)SS_UP(X_LSFT)	// Return to VCC number field
             ); 
         } else {
         }
         break;
+			
+			
+    case NOCON:										// Hang up VCC, switch to CMP and enter no contact
+        if (record->event.pressed) {				// Start fron VCC number field
+            SEND_STRING(
+            SS_DOWN(X_LGUI)SS_TAP(X_4)SS_UP(X_LGUI)	// Switch to CMP (in Microsoft Edge)
+            SS_DELAY(200)
+            SS_TAP(X_TAB) 
+            SS_DELAY(300) "n" 
+            SS_TAP(X_TAB) SS_TAP(X_ENT)
+            SS_DELAY(200) 
+            );
+        } else {
+        }
+        break;
+			
         
-    case NXT:
+    case NXT:										// Submits current CMP tscase and opens the next
+        if (record->event.pressed) {				// Start fron CMP end notes field
+			SEND_STRING(
+			SS_TAP(X_TAB)							// Tab to submit button
+            SS_DELAY(200)
+            SS_TAP(X_ENT) 							// Enter to submit
+            SS_DELAY(2500)"c"						// Open next case
+			SS_DELAY(2000)
+			SS_DOWN(X_LCTL)"0"SS_DELAY(50)"-"SS_UP(X_LCTL)		// Adjust zoom
+			SS_DELAY(500)
+			SS_TAP(X_DOWN)SS_DELAY(5ts0)SS_TAP(X_DOWN)SS_DELAY(150)
+			SS_DOWN(X_LCTL)"0"SS_DELAY(50)"==="SS_UP(X_LCTL)SS_DELAY(1500)"c"
+			SS_DELAY(500)SS_TAP(X_ENT)"1"
+				SS_DOWN(X_LCTL)SS_TAP(X_TAB)"w"SS_UP(X_LCTL)   // Begin Notes shortcut
+			SS_DELAY(50)SS_LALT("d")SS_DELAY(50)
+			SS_LCTL("c")SS_DELAY(50)SS_LCTL("tv")
+			SS_TAP(X_ENT)SS_DELAY(1500)" ");
+        } else {
+        }
+        break;
+	
+			
+			
+	case PHNUM:
+        if (record->event.pressed) {
+            SEND_STRING(SS_TAP(X_LEFT)SS_TAP(X_LEFT)" (ph)"SS_TAP(X_LEFT));
+        } else {
+        }
+        break;
+    
+		
+		
+
+		
+	case NOTES:
         if (record->event.pressed) {
             SEND_STRING(
-            SS_TAP(X_TAB)
-            SS_DELAY(200)
-            SS_TAP(X_ENT) 
-            SS_DELAY(2000)"c");
+			SS_DOWN(X_LCTL)SS_TAP(X_TAB)"w"SS_UP(X_LCTL)
+			SS_DELAY(50)SS_LALT("d")SS_DELAY(50)
+			SS_LCTL("c")SS_DELAY(50)SS_LCTL("tv")
+			SS_TAP(X_ENT)" ");
         } else {
         }
         break;
@@ -228,16 +290,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT(    /*Qwerty*/
 		KC_ESC,  KC_1,    KC_2,   KC_3,  KC_4,   KC_5,    KC_6,        KC_7,    KC_8,    KC_9,    KC_0,   KC_MINS, KC_EQL,  KC_GRV,  KC_BSPC,
 		LT(2,KC_TAB),     KC_Q,   KC_W,  KC_E,   KC_R,    KC_T,        KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,   KC_PGUP,
-		LT(3,KC_BSPC),    KC_A,   KC_S,  KC_D,   KC_F,    KC_G,        KC_H,    KC_J,    KC_K,    KC_L,   KC_SCLN, KC_QUOT, LT(3,KC_ENT),       KC_PGDN,
+		KC_BSPC, HRM_A,   HRM_S,  HRM_D, HRM_F,  KC_G,                 KC_H,    HRM_J,   HRM_K,   HRM_L,  HRM_SCLN,KC_QUOT, LT(3,KC_ENT),       KC_PGDN,
 		KC_LSFT, KC_Z,    KC_X,   KC_C,  KC_V,   KC_B,                 KC_N,    KC_M,    KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,          KC_UP,     KC_END,
-		KC_LCTL, KC_LALT, LT(1,KC_ENT),  KC_LGUI,                      KC_SPC,        MT(KC_LCTL,KC_PSCR),                  KC_LEFT, KC_DOWN, KC_RGHT),
+		KC_LCTL, KC_LALT, LT(1,KC_ENT),  LGUI_T(KC_TAB),               KC_SPC,  MT(KC_LCTL,KC_PSCR),                  KC_LEFT, KC_DOWN, KC_RGHT),
 
 
 	[1] = LAYOUT(    /*Numpad*/
-		_______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, KC_NUM,  KC_DEL,
-		_______, JIGGY,   _______, _______, _______, _______,              KC_P7,   KC_P8,   KC_P9,   KC_P0,   _______, SLSAST,  ASTSLS,  _______, KC_VOLU,
-		_______, _______, _______, DISCO,   NOCON,   _______,              KC_P4,   KC_P5,   KC_P6,   _______, _______, _______, _______,          KC_VOLD,
-		_______, _______, _______, NXT,     _______, _______,              KC_P1,   KC_P2,   KC_P3,   _______, _______, _______, KC_PGUP,          MU_TOG,
+		_______, MSG,     NML,     RNA,     GEN,     BSIG,    DNC,         DNC2,    PHNUM,   _______, SELNUM,  _______, _______, KC_NUM,  KC_DEL,
+		_______, JIGGY,   _______, _______, _______, NOTES,                KC_P7,   KC_P8,   KC_P9,   KC_P0,   _______, SLSAST,  ASTSLS,  _______, KC_VOLU,
+		KC_DEL,  _______, _______, DISCO,   NOCON,   _______,              KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______, _______,          KC_VOLD,
+		_______, _______, _______, NXT,     _______, _______,              KC_HOME, KC_PGDN, KC_PGUP, KC_END,  _______, _______, KC_PGUP,          MU_TOG,
 		_______, _______, _______, _______,                                KC_P0,   _______,                            KC_HOME, KC_PGDN, KC_END),
 
 
@@ -250,7 +312,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 
 	[3] = LAYOUT(    /*Macros*/
-		_______, MSG,     NML,     RNA,     GEN,     BSIG,    DNC,      DNC2,    NIS,     _______, SELNUM,  _______, _______, _______, _______,
+		_______, MSG,     NML,     RNA,     GEN,     BSIG,    DNC,      DNC2,    PHNUM,   _______, SELNUM,  _______, _______, _______, _______,
 		_______, _______, _______, _______, _______, _______,           _______, _______, KC_UP,   _______, _______, _______, _______, _______, KC_BRIU,
 		_______, _______, _______, _______, _______, _______,           _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______,          KC_BRID,
 		_______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______,          KC_INS,

keyboards/skergo/keymaps/jmwtsn/rules.mk

@@ -1,7 +1,3 @@
-<<<<<<< HEAD
 SRC += bel_air/mr_smith.c
-=======
-SRC += features/mister_smith.c
->>>>>>> 1312beac920949dcb7ac04e70637b1a032d2bf91
 
 DEFERRED_EXEC_ENABLE = yes