From d127f50746e916b3475e84b6a2ee60383b28ab07 Mon Sep 17 00:00:00 2001
From: Thomas Haukland <thomas.haukland@gmail.com>
Date: Sun, 18 Feb 2024 15:23:51 +0100
Subject: [PATCH] Bugfix default qwerty layout

https://github.com/tompi/cheapino/issues/19

Also small changes to user keymaps
---
 .../cheapino/keymaps/default/keymap.json      |  8 ++---
 keyboards/cheapino/keymaps/lars/config.h      |  2 +-
 keyboards/cheapino/keymaps/lars/keymap.json   |  2 +-
 keyboards/cheapino/keymaps/tompi/keymap.json  | 34 +++++++++----------
 4 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/keyboards/cheapino/keymaps/default/keymap.json b/keyboards/cheapino/keymaps/default/keymap.json
index 00583dc636d..30eb7e2f631 100644
--- a/keyboards/cheapino/keymaps/default/keymap.json
+++ b/keyboards/cheapino/keymaps/default/keymap.json
@@ -16,7 +16,7 @@
       "KC_U",
       "KC_I",
       "KC_O",
-      "KC_SCLN",
+      "KC_P",
       "LGUI_T(KC_A)",
       "LALT_T(KC_S)",
       "LCTL_T(KC_D)",
@@ -26,7 +26,7 @@
       "RSFT_T(KC_J)",
       "LCTL_T(KC_K)",
       "LALT_T(KC_L)",
-      "LGUI_T(KC_M)",
+      "LGUI_T(KC_SCLN)",
       "KC_Z",
       "KC_X",
       "KC_C",
@@ -183,7 +183,7 @@
       "KC_EXLM",
       "KC_LBRC",
       "KC_RBRC",
-      "KC_TRNS",
+      "KC_GRV",
       "KC_NO",
       "KC_NO",
       "KC_NO",
@@ -274,4 +274,4 @@
     ]
   ],
   "author": "thomas.haukland@gmail.com"
-}
+}
\ No newline at end of file
diff --git a/keyboards/cheapino/keymaps/lars/config.h b/keyboards/cheapino/keymaps/lars/config.h
index f735e9a60e2..b5f1a1b5c91 100644
--- a/keyboards/cheapino/keymaps/lars/config.h
+++ b/keyboards/cheapino/keymaps/lars/config.h
@@ -36,7 +36,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #undef TAPPING_TERM
 #define TAPPING_TERM 200
 // #define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
+//#define IGNORE_MOD_TAP_INTERRUPT
 #define TAPPING_FORCE_HOLD
 //#define RETRO_TAPPING
 
diff --git a/keyboards/cheapino/keymaps/lars/keymap.json b/keyboards/cheapino/keymaps/lars/keymap.json
index a78df9d539e..beab5769b2c 100644
--- a/keyboards/cheapino/keymaps/lars/keymap.json
+++ b/keyboards/cheapino/keymaps/lars/keymap.json
@@ -118,7 +118,7 @@
       "KC_TAB",
       "KC_DEL",
       "TO(0)",
-      "KC_TRNS"
+      "RGB_TOG"
     ]
   ],
   "author": "thomas.haukland@gmail.com"
diff --git a/keyboards/cheapino/keymaps/tompi/keymap.json b/keyboards/cheapino/keymaps/tompi/keymap.json
index 99c58c8dc63..4dcd3c7f266 100644
--- a/keyboards/cheapino/keymaps/tompi/keymap.json
+++ b/keyboards/cheapino/keymaps/tompi/keymap.json
@@ -39,8 +39,8 @@
       "KC_SLSH",
       "LT(6,KC_ESC)",
       "LT(3,KC_SPC)",
-      "LT(5,KC_TAB)",
-      "LT(1,KC_DEL)",
+      "LT(3,KC_TAB)",
+      "LT(2,KC_NO)",
       "LT(2,KC_BSPC)",
       "LT(4,KC_ENT)"
     ],
@@ -54,7 +54,7 @@
       "KC_NO",
       "KC_NO",
       "KC_NO",
-      "QK_RBT",
+      "ANY(QK_RBT)",
       "KC_MS_L",
       "KC_BTN2",
       "KC_BTN1",
@@ -83,41 +83,41 @@
       "KC_NO"
     ],
     [
-      "KC_NO",
+      "KC_PSCR",
       "KC_HOME",
       "KC_DEL",
       "KC_PGUP",
+      "KC_PAUS",
       "KC_NO",
       "KC_NO",
       "KC_NO",
       "KC_NO",
       "KC_NO",
-      "KC_NO",
-      "KC_NO",
+      "KC_INS",
       "KC_LEFT",
       "KC_UP",
       "KC_RGHT",
-      "KC_NO",
+      "KC_NUM",
       "KC_NO",
       "KC_TRNS",
       "KC_TRNS",
       "KC_TRNS",
       "KC_TRNS",
-      "KC_NO",
+      "KC_SCRL",
       "KC_END",
       "KC_DOWN",
       "KC_PGDN",
-      "KC_NO",
+      "KC_BSPC",
       "KC_NO",
       "KC_BTN1",
       "KC_BTN2",
       "KC_BTN3",
       "KC_BTN4",
       "KC_NO",
-      "KC_TRNS",
-      "KC_TRNS",
       "KC_NO",
       "KC_NO",
+      "TO(0)",
+      "KC_NO",
       "KC_NO"
     ],
     [
@@ -159,11 +159,11 @@
       "KC_NO"
     ],
     [
-      "KC_EQL",
+      "KC_GRV",
       "KC_CIRC",
       "KC_LT",
       "KC_GT",
-      "KC_SCLN",
+      "KC_QUOT",
       "KC_NO",
       "KC_NO",
       "KC_NO",
@@ -173,7 +173,7 @@
       "KC_RCBR",
       "KC_LPRN",
       "KC_RPRN",
-      "KC_AT",
+      "KC_PSCR",
       "KC_NO",
       "KC_TRNS",
       "KC_TRNS",
@@ -197,7 +197,7 @@
       "KC_NO"
     ],
     [
-      "QK_RBT",
+      "ANY(QK_RBT)",
       "KC_NO",
       "KC_NO",
       "KC_NO",
@@ -245,7 +245,7 @@
       "KC_P8",
       "KC_P9",
       "KC_PAST",
-      "EE_CLR",
+      "KC_TRNS",
       "KC_TRNS",
       "KC_TRNS",
       "KC_TRNS",
@@ -268,7 +268,7 @@
       "KC_NO",
       "KC_NO",
       "KC_NO",
-      "KC_0",
+      "KC_DOT",
       "KC_COMM",
       "KC_P0"
     ]