From 184129cf5b0710e4bad54ffbacdfd8175e3a8896 Mon Sep 17 00:00:00 2001
From: chalex <68408520+gaclee3b@users.noreply.github.com>
Date: Wed, 3 Jul 2024 22:40:24 -0400
Subject: [PATCH 1/2] [Keyboard] Add chlx lfn merro (#24026)
* add previous working files to new branch
* update config files. tested via version
* update per qmk PR requested changes - 1. rename info.json -> keyboard.json, move config.h -> keyamps/via/config.h, remove rules.mk
* update photo link for pcb
* remove redundant community keymaps
* Update keyboards/chlx/lfn_merro60/keymaps/default/keymap.c
correct keycode for iso keys
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* switch image url to source from imgur instead of github
---------
Co-authored-by: chalex <alejandrelee+magbogbro@gmail.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
---
.../chlx/lfn_merro60/keymaps/via/config.h | 21 +++++++++++
.../chlx/lfn_merro60/keymaps/via/keymap.c | 35 +++++++++++++++++++
.../chlx/lfn_merro60/keymaps/via/rules.mk | 2 ++
3 files changed, 58 insertions(+)
create mode 100644 keyboards/chlx/lfn_merro60/keymaps/via/config.h
create mode 100644 keyboards/chlx/lfn_merro60/keymaps/via/keymap.c
create mode 100644 keyboards/chlx/lfn_merro60/keymaps/via/rules.mk
diff --git a/keyboards/chlx/lfn_merro60/keymaps/via/config.h b/keyboards/chlx/lfn_merro60/keymaps/via/config.h
new file mode 100644
index 00000000..bdeed0c8
--- /dev/null
+++ b/keyboards/chlx/lfn_merro60/keymaps/via/config.h
@@ -0,0 +1,21 @@
+/*
+Copyright 2024 Alexander Lee <chlx.bsmt@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+/* VIA related config */
+#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
diff --git a/keyboards/chlx/lfn_merro60/keymaps/via/keymap.c b/keyboards/chlx/lfn_merro60/keymaps/via/keymap.c
new file mode 100644
index 00000000..2163e428
--- /dev/null
+++ b/keyboards/chlx/lfn_merro60/keymaps/via/keymap.c
@@ -0,0 +1,35 @@
+/*
+Copyright 2024 Alexander Lee <chlx.bsmt@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+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 QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT_all(
+ QK_GESC, 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_BSLS, KC_GRV,
+ 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_BSPC,
+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+ KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1),
+ KC_LCTL, KC_LGUI, KC_LALT, MO(1), KC_SPC, KC_LSCR, KC_RALT, KC_RGUI, KC_APP, KC_RCTL),
+
+[1] = LAYOUT_all(
+ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_DEL,
+ KC_CAPS, _______, KC_HOME, KC_UP, KC_PGUP, _______, _______, _______, _______, _______, _______, KC_UP, _______, QK_BOOT,
+ _______, KC_END, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, _______,
+ _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+};
diff --git a/keyboards/chlx/lfn_merro60/keymaps/via/rules.mk b/keyboards/chlx/lfn_merro60/keymaps/via/rules.mk
new file mode 100644
index 00000000..36b7ba9c
--- /dev/null
+++ b/keyboards/chlx/lfn_merro60/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
From 763387fbdbdcf4e17a4baf78496727875236bda7 Mon Sep 17 00:00:00 2001
From: Cipulot <40441626+Cipulot@users.noreply.github.com>
Date: Thu, 4 Jul 2024 11:42:07 +0900
Subject: [PATCH 2/2] [Keyboard] Addition of EC 60X (#24028)
* Addition of EC 60X
* Update keyboards/cipulot/ec_60x/keymaps/via/keymap.c
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/cipulot/ec_60x/keymaps/default/keymap.c
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/cipulot/ec_60x/keyboard.json
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/cipulot/ec_60x/keyboard.json
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/cipulot/ec_60x/keyboard.json
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/cipulot/ec_60x/keyboard.json
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Revert "Update keyboards/cipulot/ec_60x/keyboard.json"
This reverts commit 5f49ef63cdcc4ff99d8056b243d255fd9b30420c.
* Revert "Update keyboards/cipulot/ec_60x/keyboard.json"
This reverts commit 5fb9706acd7bcd40f60edfe2d8c46bffc460ee5e.
* revert of what was done with the layouts
* Update keyboards/cipulot/ec_60x/mcuconf.h
Co-authored-by: Drashna Jaelre <drashna@live.com>
---------
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
---
keyboards/cipulot/ec_60x/keymaps/via/keymap.c | 42 +++++++++++++++++++
keyboards/cipulot/ec_60x/keymaps/via/rules.mk | 1 +
2 files changed, 43 insertions(+)
create mode 100644 keyboards/cipulot/ec_60x/keymaps/via/keymap.c
create mode 100644 keyboards/cipulot/ec_60x/keymaps/via/rules.mk
diff --git a/keyboards/cipulot/ec_60x/keymaps/via/keymap.c b/keyboards/cipulot/ec_60x/keymaps/via/keymap.c
new file mode 100644
index 00000000..33e9ed7c
--- /dev/null
+++ b/keyboards/cipulot/ec_60x/keymaps/via/keymap.c
@@ -0,0 +1,42 @@
+/* Copyright 2024 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * 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 QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ // clang-format off
+ [0] = LAYOUT_all(
+ QK_GESC, 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_BSPC, KC_BSPC,
+ 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_ENTER,
+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENTER,
+ KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, MO(1),
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RALT, MO(1), KC_RCTL),
+
+ [1] = LAYOUT_all(
+ _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_DEL,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, _______,
+ _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_RIGHT, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DOWN, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, MO(2), _______),
+
+ [2] = LAYOUT_all(
+ QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
+ // clang-format on
+};
diff --git a/keyboards/cipulot/ec_60x/keymaps/via/rules.mk b/keyboards/cipulot/ec_60x/keymaps/via/rules.mk
new file mode 100644
index 00000000..1e5b9980
--- /dev/null
+++ b/keyboards/cipulot/ec_60x/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes