Merge remote-tracking branch 'origin/master' into develop

1 files changed, 20 insertions, 24 deletions

diff --git a/keyboards/mechmini/v1/v1.h b/keyboards/mechmini/v1/v1.h
index 401eac85b7..526f12e410 100644
--- a/keyboards/mechmini/v1/v1.h
+++ b/keyboards/mechmini/v1/v1.h
@@ -15,38 +15,34 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef V1_H
-#define V2_H
+#pragma once
 
-#include "../mechmini.h"
-#include "keycode.h"
-#include "action.h"
-#include "quantum.h"
+#include "mechmini.h"
+
+#define ___ KC_NO
 
 #define LAYOUT( \
-    K03, K13, K23, K33, K43, K53, K26, KC6, KC7, K27, KA3, KB3, \
-    K02, K12, K22, K32, K42, K52, K36, KD6, KD7, K37, KA2, \
-    K01, K11, K21, K31, K41, K51, K46, KE6, KE7, K47, KA1, \
-    K00, K10, K20,      K56, K57, KB0,           KC0, K66  \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
+    K00, K01, K02,           K05,                K09, K0A  \
 ) \
 { \
-    { K00, K10, K20, K56, KC_NO, K57, KC_NO, KC_NO, KB0, KC0, K66, KC_NO }, \
-    { K01, K11, K21, K31, K41,   K51, K46,   KE6,   KE7, K47, KA1, KC_NO }, \
-    { K02, K12, K22, K32, K42,   K52, K36,   KD6,   KD7, K37, KA2, KC_NO }, \
-    { K03, K13, K23, K33, K43,   K53, K26,   KC6,   KC7, K27, KA3, KB3   } \
+    { K00, K01, K02, ___, ___, K05, ___, ___, ___, K09, K0A, ___ }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, ___ }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, ___ }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B } \
 }
 
 #define LAYOUT_split_space( \
-    K03, K13, K23, K33, K43, K53, K26, KC6, KC7, K27, KA3, KB3, \
-    K02, K12, K22, K32, K42, K52, K36, KD6, KD7, K37, KA2, \
-    K01, K11, K21, K31, K41, K51, K46, KE6, KE7, K47, KA1, \
-    K00, K10, K20,      K56, K57, KB0,           KC0, K66  \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
+    K00, K01, K02,      K03, K06, K08,           K09, K0A  \
 ) \
 { \
-    { K00, K10, K20, K56, KC_NO, KC_NO, K57, KC_NO, KB0, KC0, K66, KC_NO }, \
-    { K01, K11, K21, K31, K41,   K51,   K46, KE6,   KE7, K47, KA1, KC_NO }, \
-    { K02, K12, K22, K32, K42,   K52,   K36, KD6,   KD7, K37, KA2, KC_NO }, \
-    { K03, K13, K23, K33, K43,   K53,   K26, KC6,   KC7, K27, KA3, KB3   } \
+    { K00, K01, K02, K03, ___, ___, K06, ___, K08, K09, K0A, ___ }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, ___ }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, ___ }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B } \
 }
-
-#endif