diff --git a/keyboards/fingerpunch/src/vik/rules.mk b/keyboards/fingerpunch/src/vik/rules.mk
index dd6176f419..045a2927b8 100644
--- a/keyboards/fingerpunch/src/vik/rules.mk
+++ b/keyboards/fingerpunch/src/vik/rules.mk
@@ -93,7 +93,8 @@ ifeq ($(strip $(VIK_TRACKPOINT)), yes)
# The only thing that's left is busywait, which is not recommended by QMK, and also requires PAL_MODE_OUTPUT_OPENDRAIN
# https://github.com/qmk/qmk_firmware/blob/master/docs/feature_ps2_mouse.md#busywait-version-idbusywait-version
- # So, our only option is to use two consecutive pins, which means we can't even use the VIK connector...
+ # So, our only option is to use two consecutive pins, which means we can't even use the VIK connector unless GPIO AD1 and AD2
+ # are consecutive, as defined by the RP2040 vendor driver, check QMK docs
# Options are:
# 1) hand wire from VIK module to a PCB with consecutive GPIO available (assuming RP2040), or hand wire to any two GPIO for non-RP2040 controllers. This also requires a bodge for 3.3v (untested) or a logic level conversion between 3.3v and 5v if using a 3.3v controller
diff --git a/keyboards/fingerpunch/ximi/config.h b/keyboards/fingerpunch/ximi/config.h
index 47633d81b6..c7060ff629 100644
--- a/keyboards/fingerpunch/ximi/config.h
+++ b/keyboards/fingerpunch/ximi/config.h
@@ -26,18 +26,15 @@ along with this program. If not, see .
#define MATRIX_ROWS 8
#define MATRIX_COLS 8
-// For shift register (and optionally trackball)
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+// For General SPI pins and VIK on v2
+#define SPI_DRIVER SPID0
#define SPI_SCK_PIN GP22
#define SPI_MOSI_PIN GP23
#define SPI_MISO_PIN GP20
-// wiring of each half
-#define MATRIX_ROW_PINS { GP29, GP28, GP27, GP24 }
-#define MATRIX_COL_PINS { GP10, GP11, GP26, GP12, GP13, GP14, GP15, GP16 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
#define ENCODERS_PAD_A { GP7 }
#define ENCODERS_PAD_B { GP8 }
@@ -179,12 +176,6 @@ along with this program. If not, see .
#define PMW33XX_CS_PIN GP9
#define PMW33XX_CPI 1000
#define PMW33XX_CS_DIVISOR 8
-
- /* SPI config for pmw3360 sensor. */
- #define SPI_DRIVER SPID0
- // #define SPI_SCK_PAL_MODE 5 // already defined in chibios
- // #define SPI_MOSI_PAL_MODE 5 // already defined in chibios
- // #define SPI_MISO_PAL_MODE 5 // already defined in chibios
#endif
// All the possible configurations of pointing devices
diff --git a/keyboards/fingerpunch/ximi/rules.mk b/keyboards/fingerpunch/ximi/rules.mk
index 6b148b0118..7422c31944 100644
--- a/keyboards/fingerpunch/ximi/rules.mk
+++ b/keyboards/fingerpunch/ximi/rules.mk
@@ -123,6 +123,9 @@ ifeq ($(strip $(FP_SPLIT_RIGHT)), yes)
OPT_DEFS += -DFP_SPLIT_RIGHT
endif
+# include here so that if VIK enables the PMW3360, the OPT_DEFS get set appropriately for ximi
+include keyboards/fingerpunch/src/rules.mk
+
ifeq ($(strip $(CIRQUE_ENABLE)), yes)
POINTING_DEVICE_ENABLE := yes
POINTING_DEVICE_DRIVER := cirque_pinnacle_spi
@@ -134,6 +137,4 @@ ifeq ($(strip $(PMW3360_ENABLE)), yes)
POINTING_DEVICE_DRIVER := pmw3360
QUANTUM_LIB_SRC += spi_master.c
OPT_DEFS += -DFP_TRACKBALL_ENABLE
-endif
-
-include keyboards/fingerpunch/src/rules.mk
+endif
\ No newline at end of file
diff --git a/keyboards/fingerpunch/ximi/v1/config.h b/keyboards/fingerpunch/ximi/v1/config.h
new file mode 100644
index 0000000000..52958f4c03
--- /dev/null
+++ b/keyboards/fingerpunch/ximi/v1/config.h
@@ -0,0 +1,23 @@
+/*
+Copyright 2012 Jun Wako
+
+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 .
+*/
+
+#pragma once
+
+// wiring of each half
+#define MATRIX_ROW_PINS { GP29, GP28, GP27, GP24 }
+#define MATRIX_COL_PINS { GP10, GP11, GP26, GP12, GP13, GP14, GP15, GP16 }
+
diff --git a/keyboards/fingerpunch/ximi/fp_build.json b/keyboards/fingerpunch/ximi/v1/fp_build.json
similarity index 100%
rename from keyboards/fingerpunch/ximi/fp_build.json
rename to keyboards/fingerpunch/ximi/v1/fp_build.json
diff --git a/keyboards/fingerpunch/ximi/halconf.h b/keyboards/fingerpunch/ximi/v1/halconf.h
similarity index 100%
rename from keyboards/fingerpunch/ximi/halconf.h
rename to keyboards/fingerpunch/ximi/v1/halconf.h
diff --git a/keyboards/fingerpunch/ximi/info.json b/keyboards/fingerpunch/ximi/v1/info.json
similarity index 88%
rename from keyboards/fingerpunch/ximi/info.json
rename to keyboards/fingerpunch/ximi/v1/info.json
index d80c7d8c7c..68d949f472 100644
--- a/keyboards/fingerpunch/ximi/info.json
+++ b/keyboards/fingerpunch/ximi/v1/info.json
@@ -1,6 +1,6 @@
{
"manufacturer": "sadekbaroudi",
- "keyboard_name": "ximi",
+ "keyboard_name": "ximi v1",
"url": "https://fingerpunch.xyz/product/ximi/",
"maintainer": "Sadek Baroudi ",
"usb": {
diff --git a/keyboards/fingerpunch/ximi/keymaps/default/keymap.c b/keyboards/fingerpunch/ximi/v1/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/fingerpunch/ximi/keymaps/default/keymap.c
rename to keyboards/fingerpunch/ximi/v1/keymaps/default/keymap.c
diff --git a/keyboards/fingerpunch/ximi/keymaps/manna-harbour_miryoku/config.h b/keyboards/fingerpunch/ximi/v1/keymaps/manna-harbour_miryoku/config.h
similarity index 100%
rename from keyboards/fingerpunch/ximi/keymaps/manna-harbour_miryoku/config.h
rename to keyboards/fingerpunch/ximi/v1/keymaps/manna-harbour_miryoku/config.h
diff --git a/keyboards/fingerpunch/ximi/keymaps/manna-harbour_miryoku/keymap.c b/keyboards/fingerpunch/ximi/v1/keymaps/manna-harbour_miryoku/keymap.c
similarity index 100%
rename from keyboards/fingerpunch/ximi/keymaps/manna-harbour_miryoku/keymap.c
rename to keyboards/fingerpunch/ximi/v1/keymaps/manna-harbour_miryoku/keymap.c
diff --git a/keyboards/fingerpunch/ximi/keymaps/sadekbaroudi/config.h b/keyboards/fingerpunch/ximi/v1/keymaps/sadekbaroudi/config.h
similarity index 100%
rename from keyboards/fingerpunch/ximi/keymaps/sadekbaroudi/config.h
rename to keyboards/fingerpunch/ximi/v1/keymaps/sadekbaroudi/config.h
diff --git a/keyboards/fingerpunch/ximi/keymaps/sadekbaroudi/keymap.c b/keyboards/fingerpunch/ximi/v1/keymaps/sadekbaroudi/keymap.c
similarity index 100%
rename from keyboards/fingerpunch/ximi/keymaps/sadekbaroudi/keymap.c
rename to keyboards/fingerpunch/ximi/v1/keymaps/sadekbaroudi/keymap.c
diff --git a/keyboards/fingerpunch/ximi/keymaps/sadekbaroudi/rules.mk b/keyboards/fingerpunch/ximi/v1/keymaps/sadekbaroudi/rules.mk
similarity index 100%
rename from keyboards/fingerpunch/ximi/keymaps/sadekbaroudi/rules.mk
rename to keyboards/fingerpunch/ximi/v1/keymaps/sadekbaroudi/rules.mk
diff --git a/keyboards/fingerpunch/ximi/mcuconf.h b/keyboards/fingerpunch/ximi/v1/mcuconf.h
similarity index 100%
rename from keyboards/fingerpunch/ximi/mcuconf.h
rename to keyboards/fingerpunch/ximi/v1/mcuconf.h
diff --git a/keyboards/fingerpunch/ximi/readme.md b/keyboards/fingerpunch/ximi/v1/readme.md
similarity index 100%
rename from keyboards/fingerpunch/ximi/readme.md
rename to keyboards/fingerpunch/ximi/v1/readme.md
diff --git a/keyboards/fingerpunch/ximi/v1/rules.mk b/keyboards/fingerpunch/ximi/v1/rules.mk
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/keyboards/fingerpunch/ximi/v1/v1.c b/keyboards/fingerpunch/ximi/v1/v1.c
new file mode 100644
index 0000000000..a6070c528e
--- /dev/null
+++ b/keyboards/fingerpunch/ximi/v1/v1.c
@@ -0,0 +1,152 @@
+/* Copyright 2021 Sadek Baroudi
+ *
+ * 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 .
+ */
+#include "v1.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+// Layout
+//
+//┌────────────────────────┐ ┌────────────────────────┐
+//│ 18 17 12 11 06 05 │ │ 26 27 32 33 38 39 │
+//│────────────────────────┤ ├────────────────────────│
+//│ 19 16 13 10 07 04 │ │ 25 28 31 34 37 40 │
+//├────────────────────────┤ ├────────────────────────┤
+//│ 20 15 14 09 08 03 │ │ 24 29 30 35 36 41 │
+//└───────────────────┬────┴───────┐ ┌───────┴────┬───────────────────┘
+// │ 02 01 00 │ │ 21 22 23 │
+// └────────────┘ └────────────┘
+//
+//
+
+// use this matrix if you use the 6 column layout ----------------------------------------------
+
+led_config_t g_led_config = { {
+//COL 00 01 02 03 04 05 06 ROW
+ { 18, 17, 12, 11, 6, 5, 2 },//00
+ { 19, 16, 13, 10, 7, 4, 1 },//01
+ { 20, 15, 14, 9, 8, 3, 0 },//02
+ { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },//03
+ { 39, 38, 33, 32, 27, 26, 23 },//00
+ { 40, 37, 34, 31, 28, 25, 22 },//01
+ { 41, 36, 35, 30, 29, 24, 21 },//02
+ { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },//03
+}, {
+ // Left
+ {93 , 63}, // Thumb reachy
+ {77 , 55}, // Thumb homing
+ {61 , 50}, // Thumb tucky
+ {81 , 38}, // C5 R3
+ {85 , 25}, // C5 R2
+ {89 , 12}, // C5 R1
+ {74 , 6}, // C4 R1
+ {70 , 20}, // C4 R2
+ {66 , 33}, // C4 R3
+ {52 , 26}, // C3 R3
+ {56 , 12}, // C3 R2
+ {60 , 0}, // C3 R1
+ {43 , 0}, // C2 R1
+ {39 , 12}, // C2 R2
+ {35 , 26}, // C2 R3
+ {17 , 31}, // C1 R3
+ {21 , 18}, // C1 R2
+ {25 , 4}, // C1 R1
+ {7 , 5}, // C0 R1
+ {3 , 19}, // C0 R2
+ {0 , 32}, // C0 R3
+ // Right
+ {129, 63}, // Thumb reachy
+ {145, 55}, // Thumb homing
+ {161, 50}, // Thumb tucky
+ {141, 38}, // C6 R3 (or C5)
+ {137, 25}, // C6 R2 (or C5)
+ {133, 12}, // C6 R1 (or C5)
+ {148, 6}, // C7 R1 (or C4)
+ {152, 20}, // C7 R2 (or C4)
+ {156, 33}, // C7 R3 (or C4)
+ {170, 26}, // C8 R3 (or C3)
+ {166, 12}, // C8 R2 (or C3)
+ {162, 0}, // C8 R1 (or C3)
+ {179, 0}, // C9 R1 (or C2)
+ {183, 12}, // C9 R2 (or C2)
+ {187, 26}, // C9 R3 (or C2)
+ {205, 31}, // C10 R3 (or C1)
+ {201, 18}, // C10 R2 (or C1)
+ {197, 4}, // C10 R1 (or C1)
+ {215, 5}, // C11 R1 (or C0)
+ {219, 19}, // C11 R2 (or C0)
+ {223, 32} // C11 R3 (or C0)
+}, {
+ //LEFT
+ 1, 1, 1, // 1, 9, 1, // change to this if you want the thumb home key to be highlighted as a home row key color
+ 4, 4, 4,
+ 4, 12, 4,
+ 4, 12, 4,
+ 4, 12, 4,
+ 4, 12, 4,
+ 1, 1, 1,
+ //RIGHT
+ 1, 1, 1, // 1, 9, 1, // change to this if you want the thumb home key to be highlighted as a home row key color
+ 4, 4, 4,
+ 4, 12, 4,
+ 4, 12, 4,
+ 4, 12, 4,
+ 4, 12, 4,
+ 1, 1, 1
+} };
+
+// -----------------------------------------------------------------------------------------------
+
+
+// use this matrix if you use the 5 column layout ──────────────────────────────────────────┐
+/*
+led_config_t g_led_config = { {
+//COL 00 01 02 03 04 05 ROW
+ { NO_LED, 17, 12, 11, 5, 4 },//00
+ { NO_LED, 16, 13, 10, 6, 3 },//01
+ { NO_LED, 15, 14, 9, 7, 2 },//02
+ { NO_LED, 8, 1, 0, NO_LED, NO_LED },//03
+ { NO_LED, 35, 30, 29, 23, 22 },//00
+ { NO_LED, 34, 31, 28, 24, 21 },//01
+ { NO_LED, 33, 32, 27, 25, 20 },//02
+ { NO_LED, 26, 19, 18, NO_LED, NO_LED } //03
+}, {
+ //LEFT
+ //thumb1 ▼ thumb2 ▼ thumb3 ▼ C0 R3 ▼ C0 R2 ▼ C0 R1 ▼ C1 R1 ▼
+ { 89, 54 }, { 74, 49 }, { 75, 34 }, { 75, 21 }, { 75, 8 }, { 60, 6 },
+ //C1 R2 ▼ C1 R3 ▼ thumb4 ▼ C2 R3 ▼ C2 R2 ▼ C2 R1 ▼ C3 R1 ▼
+ { 60, 19 }, { 60, 32 }, { 58, 48 }, { 46, 25 }, { 46, 12 }, { 46, 0 }, { 29, 7 },
+ //C3 R2 ▼ C3 R3 ▼ C4 R3 ▼ C4 R2 ▼ C4 R1 ▼ C5 R2 ▼ C5 R3 ▼
+ { 30, 20 }, { 31, 33 }, { 17, 42 }, { 15, 30 }, { 13, 17 },
+ //RIGHT
+ //thumb1 ▼ thumb2 ▼ thumb3 ▼ C0 R3 ▼ C0 R2 ▼ C0 R1 ▼ C1 R1 ▼
+ { 135, 54 }, { 150, 49 }, { 149, 34 }, { 149, 21 }, { 149, 8 }, { 163, 6 },
+ //C1 R2 ▼ C1 R3 ▼ thumb4 ▼ C2 R3 ▼ C2 R2 ▼ C2 R1 ▼ C3 R1 ▼
+ { 163, 19 }, { 163, 32 }, { 166, 48 }, { 178, 25 }, { 178, 12 }, { 178, 0 }, { 195, 7 },
+ //C3 R2 ▼ C3 R3 ▼ C4 R3 ▼ C4 R2 ▼ C4 R1 ▼ C5 R2 ▼ C5 R3 ▼
+ { 194, 20 }, { 193, 33 }, { 206, 42 }, { 209, 30 }, { 211, 17 }
+}, {
+ //LEFT
+ 1, 1, 4, 4, 4, 4,
+ 4, 4, 1, 4, 4, 4, 4,
+ 4, 4, 4, 4, 4,
+ //RIGHT
+ 1, 1, 4, 4, 4, 4,
+ 4, 4, 1, 4, 4, 4, 4,
+ 4, 4, 4, 4, 4
+} };
+*/
+// ────────────────────────────────────────────────────────────────────────────────────────────────────┘
+#endif
diff --git a/keyboards/fingerpunch/ximi/v1/v1.h b/keyboards/fingerpunch/ximi/v1/v1.h
new file mode 100644
index 0000000000..f7589f9443
--- /dev/null
+++ b/keyboards/fingerpunch/ximi/v1/v1.h
@@ -0,0 +1,22 @@
+#pragma once
+#include "quantum.h"
+
+#define ___ KC_NO
+
+#define LAYOUT_ximi( \
+ K00, K01, K02, K03, K04, K05, K35, K34, K33, K32, K31, K30, \
+ K10, K11, K12, K13, K14, K15, K45, K44, K43, K42, K41, K40, \
+ K20, K21, K22, K23, K24, K25, K55, K54, K53, K52, K51, K50, \
+ K98, K06, K16, K26, K56, K46, K36, K99, \
+ K07, K17, K27, K57, K47, K37 \
+ ) \
+ { \
+ { K00, K01, K02, K03, K04, K05, K06, K07 }, \
+ { K10, K11, K12, K13, K14, K15, K16, K17 }, \
+ { K20, K21, K22, K23, K24, K25, K26, K27 }, \
+ { ___, ___, K98, ___, ___, ___, ___, ___ }, \
+ { K30, K31, K32, K33, K34, K35, K36, K37 }, \
+ { K40, K41, K42, K43, K44, K45, K46, K47 }, \
+ { K50, K51, K52, K53, K54, K55, K56, K57 }, \
+ { ___, ___, K99, ___, ___, ___, ___, ___ } \
+ }
diff --git a/keyboards/fingerpunch/ximi/v2/config.h b/keyboards/fingerpunch/ximi/v2/config.h
new file mode 100644
index 0000000000..143d7f21f6
--- /dev/null
+++ b/keyboards/fingerpunch/ximi/v2/config.h
@@ -0,0 +1,39 @@
+/*
+Copyright 2012 Jun Wako
+
+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 .
+*/
+
+#pragma once
+
+// wiring of each half
+#define MATRIX_ROW_PINS { GP29, GP4, GP5, GP24 }
+#define MATRIX_COL_PINS { GP10, GP11, GP6, GP12, GP13, GP14, GP15, GP16 }
+
+// VIK pin config
+#define VIK_SPI_DRIVER SPID0
+#define VIK_SPI_SCK_PIN GP22
+#define VIK_SPI_MOSI_PIN GP23
+#define VIK_SPI_MISO_PIN GP20
+#define VIK_SPI_CS GP9
+#define VIK_I2C_DRIVER I2CD1
+#define VIK_I2C_SDA_PIN GP2
+#define VIK_I2C_SCL_PIN GP3
+#define VIK_GPIO_1 GP27
+#define VIK_GPIO_2 GP26
+#define VIK_WS2812_DI_PIN GP25
+
+// Used only if you have a weact st7735 display, set to unused pin
+#define VIK_ST7735_UNUSED_PIN GP15
+#define FP_QP_ROTATION QP_ROTATION_270
diff --git a/keyboards/fingerpunch/ximi/v2/fp_build.json b/keyboards/fingerpunch/ximi/v2/fp_build.json
new file mode 100644
index 0000000000..6a10fe85f0
--- /dev/null
+++ b/keyboards/fingerpunch/ximi/v2/fp_build.json
@@ -0,0 +1,44 @@
+[
+ {
+ "type" : "one-of",
+ "names" : [
+ "FP_TRACKBALL_BOTH",
+ "FP_CIRQUE_BOTH",
+ "FP_TRACKBALL_LEFT_ONLY",
+ "FP_TRACKBALL_RIGHT_ONLY",
+ "FP_CIRQUE_LEFT_ONLY",
+ "FP_CIRQUE_RIGHT_ONLY",
+ "FP_TRACKBALL_LEFT_CIRQUE_RIGHT",
+ "FP_CIRQUE_LEFT_TRACKBALL_RIGHT"
+ ],
+ "user_input": "What config would you like to use? (NONE, FP_TRACKBALL_BOTH, FP_CIRQUE_BOTH, FP_TRACKBALL_LEFT_ONLY, FP_TRACKBALL_RIGHT_ONLY, FP_CIRQUE_LEFT_ONLY, FP_CIRQUE_RIGHT_ONLY, FP_TRACKBALL_LEFT_CIRQUE_RIGHT, FP_CIRQUE_LEFT_TRACKBALL_RIGHT):"
+ },
+ {
+ "type" : "one-of",
+ "names" : [
+ "FP_SPLIT_LEFT",
+ "FP_SPLIT_RIGHT"
+ ],
+ "user_input": "This is only applicable if you are doing mixed pointing devices. 0 if not applicable, 1 to build left firmware, 2 to build right firmware:"
+ },
+ {
+ "type" : "one-of",
+ "names" : [ "RGBLIGHT_ENABLE", "RGB_MATRIX_ENABLE" ],
+ "user_input": "No RGB, RGB light, RGB matrix?"
+ },
+ {
+ "type" : "single",
+ "name" : "ENCODER_ENABLE",
+ "user_input": "Do you have one or more rotary encoders?"
+ },
+ {
+ "type" : "single",
+ "name" : "AUDIO_ENABLE",
+ "user_input": "Do you have an audio buzzer?"
+ },
+ {
+ "type" : "single",
+ "name" : "HAPTIC_ENABLE",
+ "user_input": "Do you have haptic feedback?"
+ }
+]
diff --git a/keyboards/fingerpunch/ximi/v2/halconf.h b/keyboards/fingerpunch/ximi/v2/halconf.h
new file mode 100644
index 0000000000..e659a63244
--- /dev/null
+++ b/keyboards/fingerpunch/ximi/v2/halconf.h
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2022 Charly Delay (@0xcharly)
+ *
+ * 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 .
+ */
+
+#pragma once
+
+#define HAL_USE_SPI TRUE
+#define HAL_USE_I2C TRUE
+#define HAL_USE_PWM TRUE
+#define HAL_USE_PAL TRUE
+
+#include_next "halconf.h"
diff --git a/keyboards/fingerpunch/ximi/v2/info.json b/keyboards/fingerpunch/ximi/v2/info.json
new file mode 100644
index 0000000000..25a071abe8
--- /dev/null
+++ b/keyboards/fingerpunch/ximi/v2/info.json
@@ -0,0 +1,11 @@
+{
+ "manufacturer": "sadekbaroudi",
+ "keyboard_name": "ximi v2",
+ "url": "https://fingerpunch.xyz/product/ximi-v2/",
+ "maintainer": "Sadek Baroudi ",
+ "usb": {
+ "vid": "0xFEFE",
+ "pid": "0xB171",
+ "device_version": "2.0.0"
+ }
+}
diff --git a/keyboards/fingerpunch/ximi/v2/keymaps/default/keymap.c b/keyboards/fingerpunch/ximi/v2/keymaps/default/keymap.c
new file mode 100644
index 0000000000..729fe4ff7c
--- /dev/null
+++ b/keyboards/fingerpunch/ximi/v2/keymaps/default/keymap.c
@@ -0,0 +1,182 @@
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+ _QWERTY,
+ _COLEMAK,
+ _LOWER,
+ _RAISE,
+ _ADJUST
+};
+
+enum custom_keycodes {
+ QWERTY = SAFE_RANGE,
+ LOWER,
+ RAISE,
+ ADJUST
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+
+/* Qwerty
+ *
+ * ,-----------------------------------------. ,-----------------------------------------.
+ * | Esc | Q | W | E | R | T | | Y | U | I | O | P | \ |
+ * |------+------+------+------+------+------| |------+------+------+------+------+------|
+ * | Tab | A | S | D | F | G | | H | J | K | L | ; | ' |
+ * |------+------+------+------+------+------| |------+------+------+------+------+------|
+ * | Shft | Z | X | C | V | B | | N | M | , | . | / | Ctrl |
+ * `-----------------------------------------' `-----------------------------------------'
+ * ,------. ,--------------------. ,--------------------. ,------.
+ * | MUTE | | LOWER| Enter| Del | |BckSpc| Space| RAISE| | MUTE |
+ * `------' `--------------------' `--------------------. `------'
+ * ,--------------------. ,--------------------.
+ * |Mouse3|Mouse1|Mouse2| | Vol- | Mute | Vol+ | // 3 way thumb switch
+ * `--------------------' `--------------------.
+ */
+
+// Default config uses home row mods. So hold each of the keys on the home row to use ctrl, gui, alt, or shift
+[_QWERTY] = LAYOUT_ximi(
+ KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
+ KC_TAB, LCTL_T(KC_A), LGUI_T(KC_S), LALT_T(KC_D), LSFT_T(KC_F), KC_G, KC_H, RSFT_T(KC_J), RALT_T(KC_K), RGUI_T(KC_L), RCTL_T(KC_SCLN), KC_QUOT,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RCTL,
+ KC_MUTE, LOWER, KC_ENT, KC_DEL, KC_BSPC, KC_SPC, RAISE, KC_MUTE,
+ KC_MS_BTN3, KC_MS_BTN1, KC_MS_BTN2, KC_VOLD, KC_MUTE, KC_VOLU
+),
+
+/* Colemak
+ *
+ * ,-----------------------------------------. ,-----------------------------------------.
+ * | Esc | Q | W | F | P | B | | J | L | U | Y | ; | \ |
+ * |------+------+------+------+------+------| |------+------+------+------+------+------|
+ * | Tab | A | R | S | T | G | | M | N | E | I | O | ' |
+ * |------+------+------+------+------+------| |------+------+------+------+------+------|
+ * | Shft | Z | X | C | D | V | | K | H | , | . | / | Ctrl |
+ * `--------------------+--------------------' `-----------------------------------------'
+ * ,------. ,--------------------. ,--------------------. ,------.
+ * | MUTE | | LOWER| Enter| ' | |BckSpc| Space| RAISE| | MUTE |
+ * `------' `--------------------' `--------------------. `------'
+ * ,--------------------. ,--------------------.
+ * | Undo | Redo2| Redo | | Vol- | Mute | Vol+ | // 3 way thumb switch
+ * `--------------------' `--------------------.
+ */
+
+// Default config uses home row mods. So hold each of the keys on the home row to use ctrl, gui, alt, or shift
+[_COLEMAK] = LAYOUT_ximi(
+ KC_ESC, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSLS,
+ KC_TAB, LCTL_T(KC_A), LGUI_T(KC_R), LALT_T(KC_S), LSFT_T(KC_T), KC_G, KC_M, RSFT_T(KC_N), RALT_T(KC_E), RGUI_T(KC_I), RCTL_T(KC_O), KC_QUOT,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_RCTL,
+ KC_MUTE, LOWER, KC_ENT, KC_QUOT, KC_BSPC, KC_SPC, RAISE, KC_MUTE,
+ C(KC_Z), C(S(KC_Z)), C(KC_Y), KC_VOLD, KC_MUTE, KC_VOLU
+),
+
+/* Raise
+ *
+ * ,-----------------------------------------. ,-----------------------------------------.
+ * | ____ | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | ____ |
+ * |------+------+------+------+------+------| |------+------+------+------+------+------|
+ * | ____ | Left | Down | Up | Right| Tab | | | - | = | [ | ] | ____ |
+ * |------+------+------+------+------+------| |------+------+------+------+------+------|
+ * | ____ | Ctrl| ` | GUI | Alt | | | | | | \ | ' | ____ |
+ * `-----------------------------------------' `-----------------------------------------'
+ * ,------. ,--------------------. ,--------------------. ,------.
+ * | MUTE | | LOWER| | | | | | RAISE| | MUTE |
+ * `------' `--------------------' `--------------------. `------'
+ * ,--------------------. ,--------------------.
+ * | Undo | Redo2| Redo | | Vol- | Mute | Vol+ | // 3 way thumb switch
+ * `--------------------' `--------------------.
+ */
+[_RAISE] = LAYOUT_ximi(
+ _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______,
+ _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_TAB, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, _______,
+ _______, KC_LCTL, KC_GRV, KC_LGUI, KC_LALT, _______, _______, _______, _______, KC_BSLS, KC_QUOT, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______
+),
+
+/* Lower
+ *
+ * ,-----------------------------------------. ,-----------------------------------------.
+ * | ____ | ! | @ | # | $ | % | | ^ | & | * | ( | ) | ____ |
+ * |------+------+------+------+------+------| |------+------+------+------+------+------|
+ * | ____ | Esc | | | |EECLR | | | _ | + | { | } | ____ |
+ * |------+------+------+------+------+------| |------+------+------+------+------+------|
+ * | ____ | Caps| ~ | |Reset |Btldr | | | | | | | ' | ____ |
+ * `-----------------------------------------' `-----------------------------------------'
+ * ,------. ,--------------------. ,--------------------. ,------.
+ * | MUTE | | LOWER| | | | Del | | RAISE| | MUTE |
+ * `------' `--------------------' `--------------------. `------'
+ * ,--------------------. ,--------------------.
+ * | Undo | Redo2| Redo | | Vol- | Mute | Vol+ | // 3 way thumb switch
+ * `--------------------' `--------------------.
+ */
+[_LOWER] = LAYOUT_ximi(
+ _______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
+ _______, KC_ESC, _______, _______, _______, EE_CLR, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______,
+ _______, KC_CAPS, KC_TILD, _______, QK_RBT, QK_BOOT, _______, _______, _______, KC_PIPE, KC_DQT, _______,
+ _______, _______, _______, _______, KC_DEL, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______
+),
+
+/* Adjust (Lower + Raise)
+ *
+ * ,-----------------------------------------. ,-----------------------------------------.
+ * | ____ | RGB_T| RGB_R| RGB_F| |QWERTY| | F1 | F2 | F3 | F4 | F5 | ____ |
+ * |------+------+------+------+------+------| |------+------+------+------+------+------|
+ * | ____ | SPD_I| HUE_I| SAT_I| VAL_I|COLEMK| | F6 | F7 | F8 | F9 | F10 | ____ |
+ * |------+------+------+------+------+------| |------+------+------+------+------+------|
+ * | ____ | SPD_D| HUE_D| SAT_D| VAL_D| | | F11 | F12 | |Reset | Btldr| ____ |
+ * `-----------------------------------------' `-----------------------------------------'
+ * ,------. ,--------------------. ,--------------------. ,------.
+ * | MUTE | | LOWER| | | | | | RAISE| | MUTE |
+ * `------' `--------------------' `--------------------. `------'
+ * ,--------------------. ,--------------------.
+ * | Undo | Redo2| Redo | | Vol- | Mute | Vol+ | // 3 way thumb switch
+ * `--------------------' `--------------------.
+ */
+[_ADJUST] = LAYOUT_ximi(
+ _______, RGB_TOG, RGB_RMOD, RGB_MOD, _______, TO(_QWERTY), KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______,
+ _______, RGB_SPI, RGB_HUI, RGB_SAI, RGB_VAI, TO(_COLEMAK), KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______,
+ _______, RGB_SPD, RGB_HUD, RGB_SAD, RGB_VAD, _______, KC_F11, KC_F12, _______, QK_RBT, QK_BOOT, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______
+)
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+ switch (keycode) {
+ case LOWER:
+ if (record->event.pressed) {
+ layer_on(_LOWER);
+ update_tri_layer(_LOWER, _RAISE, _ADJUST);
+ } else {
+ layer_off(_LOWER);
+ update_tri_layer(_LOWER, _RAISE, _ADJUST);
+ }
+ return false;
+ break;
+ case RAISE:
+ if (record->event.pressed) {
+ layer_on(_RAISE);
+ update_tri_layer(_LOWER, _RAISE, _ADJUST);
+ } else {
+ layer_off(_RAISE);
+ update_tri_layer(_LOWER, _RAISE, _ADJUST);
+ }
+ return false;
+ break;
+ case ADJUST:
+ if (record->event.pressed) {
+ layer_on(_ADJUST);
+ } else {
+ layer_off(_ADJUST);
+ }
+ return false;
+ break;
+ default:
+ break;
+ }
+
+ return true;
+}
diff --git a/keyboards/fingerpunch/ximi/v2/keymaps/manna-harbour_miryoku/config.h b/keyboards/fingerpunch/ximi/v2/keymaps/manna-harbour_miryoku/config.h
new file mode 100644
index 0000000000..3f51e3478d
--- /dev/null
+++ b/keyboards/fingerpunch/ximi/v2/keymaps/manna-harbour_miryoku/config.h
@@ -0,0 +1,22 @@
+// Copyright 2023 Manna Harbour
+// https://github.com/manna-harbour/miryoku
+
+// 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 .
+
+#pragma once
+
+#define XXX KC_NO
+
+#define LAYOUT_miryoku( \
+ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
+ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
+ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
+ N30, N31, K32, K33, K34, K35, K36, K37, N38, N39 \
+) \
+LAYOUT_ximi( \
+XXX, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, XXX, \
+XXX, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, XXX, \
+XXX, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, XXX, \
+ XXX, K32, K33, K34, K35, K36, K37, XXX, \
+ XXX, XXX, XXX, XXX, XXX, XXX \
+)
diff --git a/keyboards/fingerpunch/ximi/v2/keymaps/manna-harbour_miryoku/keymap.c b/keyboards/fingerpunch/ximi/v2/keymaps/manna-harbour_miryoku/keymap.c
new file mode 100644
index 0000000000..fadfdc8365
--- /dev/null
+++ b/keyboards/fingerpunch/ximi/v2/keymaps/manna-harbour_miryoku/keymap.c
@@ -0,0 +1,4 @@
+// Copyright 2022 Manna Harbour
+// https://github.com/manna-harbour/miryoku
+
+// 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 .
diff --git a/keyboards/fingerpunch/ximi/v2/keymaps/sadekbaroudi/config.h b/keyboards/fingerpunch/ximi/v2/keymaps/sadekbaroudi/config.h
new file mode 100644
index 0000000000..2d4969581b
--- /dev/null
+++ b/keyboards/fingerpunch/ximi/v2/keymaps/sadekbaroudi/config.h
@@ -0,0 +1,14 @@
+#define FP_POINTING_COMBINED_SCROLLING_LEFT false
+#define FP_POINTING_COMBINED_SNIPING_LEFT true
+
+#ifdef DEBOUNCE
+ #undef DEBOUNCE
+ #define DEBOUNCE 12
+#endif
+
+// --------------------------- Other keyboard build specific configs ------------------------------
+#ifdef XIMI_TRACKPOINT_BUILD
+#define MASTER_RIGHT
+#define PS2_CLOCK_PIN GP6
+#define PS2_DATA_PIN GP5
+#endif
\ No newline at end of file
diff --git a/keyboards/fingerpunch/ximi/v2/keymaps/sadekbaroudi/keymap.c b/keyboards/fingerpunch/ximi/v2/keymaps/sadekbaroudi/keymap.c
new file mode 100644
index 0000000000..8e47a814de
--- /dev/null
+++ b/keyboards/fingerpunch/ximi/v2/keymaps/sadekbaroudi/keymap.c
@@ -0,0 +1,106 @@
+/* Copyright 2021 Sadek Baroudi
+ *
+ * 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 .
+ */
+
+#include "sadekbaroudi.h"
+#include QMK_KEYBOARD_H
+
+/*
+ * The `LAYOUT_luakeeb_base` macro is a template to allow the use of identical
+ * modifiers for the default layouts (eg ALPHA_ALT, Colemak, Dvorak, etc), so
+ * that there is no need to set them up for each layout, and modify all of
+ * them if I want to change them. This helps to keep consistency and ease
+ * of use. K## is a placeholder to pass through the individual keycodes
+ */
+
+// Note: changed the thumb keys from the following, testing out a new layout:
+// KC_DEL, LT(_NAVIGATION,KC_ENT), LT(_FUNCTION,KC_TAB), LT(_FUNCTION,KC_BSPC), LT(_SYMBOLS,KC_SPACE), KC_QUOT "\"
+// _______, KC_BSPC, LT(_NAVIGATION,KC_ENT), LT(_SYMBOLS,KC_SPACE), KC_QUOT, _______ "\"
+
+// clang-format off
+#define LAYOUT_ximi_base( \
+ K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
+ K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
+ K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
+ K33, K34, K35, K36, K37, K38 \
+ ) \
+ LAYOUT_wrapper( \
+ KC_MS_BTN3, K01, K02, K03, LT(_FUNCTION, K04), K05, K06, LT(_FUNCTION, K07), K08, K09, K0A, FP_ZOOM_TOG, \
+ KC_MS_BTN1, LCTL_T(K11), LGUI_T(K12), LALT_T(K13), LSFT_T(K14), K15, LT(_MOUSE, K16), RSFT_T(K17), RALT_T(K18), RGUI_T(K19), RCTL_T(K1A), FP_SCROLL_TOG, \
+ KC_MS_BTN2, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, FP_SNIPE_TOG, \
+ KC_MUTE, K33, LT(_NAVIGATION,K34), LT(_FUNCTION,K35), LT(_MEDIA,K36), LT(_SYMBOLS,K37), K38, KC_MUTE, \
+ KC_MS_BTN3, KC_MS_BTN1, KC_MS_BTN2, KC_VOLD, KC_MUTE, KC_VOLU \
+ )
+
+/* Re-pass though to allow templates to be used */
+#define LAYOUT_ximi_base_wrapper(...) LAYOUT_ximi_base(__VA_ARGS__)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ [_ALPHA_ALT] = LAYOUT_ximi_base_wrapper(
+ _________________ALPHA_ALT_L1_________________, _________________ALPHA_ALT_R1_________________,
+ _________________ALPHA_ALT_L2_________________, _________________ALPHA_ALT_R2_________________,
+ _________________ALPHA_ALT_L3_________________, _________________ALPHA_ALT_R3_________________,
+ __ALPHA_ALT_THUMBS_6__
+ ),
+
+ [_ALPHA] = LAYOUT_ximi_base_wrapper(
+ __________________ALPHA_L1____________________, __________________ALPHA_R1____________________,
+ __________________ALPHA_L2____________________, __________________ALPHA_R2____________________,
+ __________________ALPHA_L3____________________, __________________ALPHA_R3____________________,
+ __ALPHA_THUMBS_6__
+ ),
+
+ [_NAVIGATION] = LAYOUT_wrapper(
+ _______, ________________NAVIGATION_1_______________, _________________NUMPAD_1__________________, _______,
+ _______, ________________NAVIGATION_2_______________, _________________NUMPAD_2__________________, _______,
+ _______, ________________NAVIGATION_3_______________, _________________NUMPAD_3__________________, _______,
+ _______, _______, _______, KC_TAB, KC_BSPC, KC_SPACE, KC_DOT, _______,
+ _______, _______, _______, _______, _______, _______
+ ),
+
+ [_SYMBOLS] = LAYOUT_wrapper(
+ _______, ________________SYMBOLS_L1_________________, ________________SYMBOLS_R1_________________, _______,
+ _______, ________________SYMBOLS_L2_________________, ________________SYMBOLS_R2_________________, _______,
+ _______, ________________SYMBOLS_L3_________________, ________________SYMBOLS_R3_________________, _______,
+ _______, _______, KC_ENT, KC_DEL, KC_BSPC, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______
+ ),
+
+ [_FUNCTION] = LAYOUT_wrapper(
+ _______, ________________SHIFTNAV_1_________________, ________________FUNCTION_1_________________, _______,
+ _______, ________________SHIFTNAV_2_________________, ________________FUNCTION_2_________________, _______,
+ _______, ________________SHIFTNAV_3_________________, ________________FUNCTION_3_________________, _______,
+ _______, _______, _______, _______, N_DEL_LINE, KC_SPACE, _______, _______,
+ _______, _______, _______, _______, _______, _______
+ ),
+
+ [_MEDIA] = LAYOUT_wrapper(
+ _______, ___________________RGB_1___________________, _________________MACROS_1__________________, _______,
+ _______, ___________________RGB_2___________________, _________________MACROS_2__________________, _______,
+ _______, ___________________RGB_3___________________, _________________MACROS_3__________________, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______
+ ),
+
+ [_MOUSE] = LAYOUT_wrapper(
+ _______, __________________MOUSE_1__________________, ___________________BLANK___________________, _______,
+ _______, __________________MOUSE_2__________________, ___________________BLANK___________________, _______,
+ _______, __________________MOUSE_3__________________, ___________________BLANK___________________, _______,
+ _______, _______, KC_MS_BTN1, KC_MS_BTN3, KC_MS_BTN3, KC_MS_BTN2, _______, _______,
+ _______, _______, _______, _______, _______, _______
+ )
+
+};
diff --git a/keyboards/fingerpunch/ximi/v2/keymaps/sadekbaroudi/rules.mk b/keyboards/fingerpunch/ximi/v2/keymaps/sadekbaroudi/rules.mk
new file mode 100644
index 0000000000..1073626259
--- /dev/null
+++ b/keyboards/fingerpunch/ximi/v2/keymaps/sadekbaroudi/rules.mk
@@ -0,0 +1,7 @@
+# bin/fp_build.sh -k ximi -m sadekbaroudi -i -r -e "XIMI_TRACKPOINT_BUILD=yes"
+ifeq ($(strip $(XIMI_TRACKPOINT_BUILD)), yes)
+ PS2_MOUSE_ENABLE = yes
+ PS2_ENABLE = yes
+ PS2_DRIVER = vendor
+ OPT_DEFS += -DXIMI_TRACKPOINT_BUILD
+endif
diff --git a/keyboards/fingerpunch/ximi/v2/mcuconf.h b/keyboards/fingerpunch/ximi/v2/mcuconf.h
new file mode 100644
index 0000000000..bca5a557aa
--- /dev/null
+++ b/keyboards/fingerpunch/ximi/v2/mcuconf.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#include_next "mcuconf.h"
+
+#undef RP_SPI_USE_SPI0
+#define RP_SPI_USE_SPI0 TRUE
+
+#undef RP_I2C_USE_I2C1
+#define RP_I2C_USE_I2C1 TRUE
+
+#undef RP_PWM_USE_PWM1
+#define RP_PWM_USE_PWM1 TRUE
diff --git a/keyboards/fingerpunch/ximi/v2/readme.md b/keyboards/fingerpunch/ximi/v2/readme.md
new file mode 100644
index 0000000000..b3d0535a40
--- /dev/null
+++ b/keyboards/fingerpunch/ximi/v2/readme.md
@@ -0,0 +1,40 @@
+# ximi
+
+* Keyboard Maintainer: sadekbaroudi
+* Hardware Supported: ximi PCB
+
+Make example for this keyboard (after setting up your build environment):
+```
+ make fingerpunch/ximi:default RGB_MATRIX_ENABLE=yes FP_CIRQUE_BOTH=yes HAPTIC_ENABLE=yes
+```
+
+Options are:
+```
+ RGB_MATRIX_ENABLE=yes
+ RGBLIGHT_ENABLE=yes
+ AUDIO_ENABLE=yes
+ HAPTIC_FEEDBACK=yes
+ ENCODER_ENABLE=yes
+ // for the options below, select only one, or none
+ FP_TRACKBALL_BOTH=yes
+ FP_CIRQUE_BOTH=yes
+ FP_TRACKBALL_LEFT_ONLY=yes
+ FP_TRACKBALL_RIGHT_ONLY=yes
+ FP_CIRQUE_LEFT_ONLY=yes
+ FP_CIRQUE_RIGHT_ONLY=yes
+ FP_TRACKBALL_LEFT_CIRQUE_RIGHT=yes
+ FP_CIRQUE_LEFT_TRACKBALL_RIGHT=yes
+ FP_SPLIT_LEFT=yes # only applicable if doing a mixed pointing device build (e.g. trackpad left, trackball right)
+ FP_SPLIT_RIGHT=yes # only applicable if doing a mixed pointing device build (e.g. trackpad left, trackball right)
+```
+
+**IMPORTANT NOTES:**
+* Pick one (or none) of FP_TRACKBALL_* or FP_CIRQUE_* only.
+* If you are building a ximi with a trackpad on one side, and a trackball on the other, you will need to build two firmware files. Once with FP_SPLIT_LEFT=yes, and once with FP_SPLIT_RIGHT=yes - then you'll need to unplug the trrs and flash the left firmware on the left half, and the right firmware on the right half
+
+See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
+
+## Build Guide
+
+See:
+https://github.com/sadekbaroudi/fingerpunch/blob/master/ximi/
diff --git a/keyboards/fingerpunch/ximi/v2/rules.mk b/keyboards/fingerpunch/ximi/v2/rules.mk
new file mode 100644
index 0000000000..73ae417057
--- /dev/null
+++ b/keyboards/fingerpunch/ximi/v2/rules.mk
@@ -0,0 +1 @@
+VIK_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/fingerpunch/ximi/v2/v2.c b/keyboards/fingerpunch/ximi/v2/v2.c
new file mode 100644
index 0000000000..c7d99eca4c
--- /dev/null
+++ b/keyboards/fingerpunch/ximi/v2/v2.c
@@ -0,0 +1,152 @@
+/* Copyright 2021 Sadek Baroudi
+ *
+ * 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 .
+ */
+#include "v2.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+// Layout
+//
+//┌────────────────────────┐ ┌────────────────────────┐
+//│ 18 17 12 11 06 05 │ │ 26 27 32 33 38 39 │
+//│────────────────────────┤ ├────────────────────────│
+//│ 19 16 13 10 07 04 │ │ 25 28 31 34 37 40 │
+//├────────────────────────┤ ├────────────────────────┤
+//│ 20 15 14 09 08 03 │ │ 24 29 30 35 36 41 │
+//└───────────────────┬────┴───────┐ ┌───────┴────┬───────────────────┘
+// │ 02 01 00 │ │ 21 22 23 │
+// └────────────┘ └────────────┘
+//
+//
+
+// use this matrix if you use the 6 column layout ----------------------------------------------
+
+led_config_t g_led_config = { {
+//COL 00 01 02 03 04 05 06 ROW
+ { 18, 17, 12, 11, 6, 5, 2 },//00
+ { 19, 16, 13, 10, 7, 4, 1 },//01
+ { 20, 15, 14, 9, 8, 3, 0 },//02
+ { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },//03
+ { 39, 38, 33, 32, 27, 26, 23 },//00
+ { 40, 37, 34, 31, 28, 25, 22 },//01
+ { 41, 36, 35, 30, 29, 24, 21 },//02
+ { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },//03
+}, {
+ // Left
+ {93 , 63}, // Thumb reachy
+ {77 , 55}, // Thumb homing
+ {61 , 50}, // Thumb tucky
+ {81 , 38}, // C5 R3
+ {85 , 25}, // C5 R2
+ {89 , 12}, // C5 R1
+ {74 , 6}, // C4 R1
+ {70 , 20}, // C4 R2
+ {66 , 33}, // C4 R3
+ {52 , 26}, // C3 R3
+ {56 , 12}, // C3 R2
+ {60 , 0}, // C3 R1
+ {43 , 0}, // C2 R1
+ {39 , 12}, // C2 R2
+ {35 , 26}, // C2 R3
+ {17 , 31}, // C1 R3
+ {21 , 18}, // C1 R2
+ {25 , 4}, // C1 R1
+ {7 , 5}, // C0 R1
+ {3 , 19}, // C0 R2
+ {0 , 32}, // C0 R3
+ // Right
+ {129, 63}, // Thumb reachy
+ {145, 55}, // Thumb homing
+ {161, 50}, // Thumb tucky
+ {141, 38}, // C6 R3 (or C5)
+ {137, 25}, // C6 R2 (or C5)
+ {133, 12}, // C6 R1 (or C5)
+ {148, 6}, // C7 R1 (or C4)
+ {152, 20}, // C7 R2 (or C4)
+ {156, 33}, // C7 R3 (or C4)
+ {170, 26}, // C8 R3 (or C3)
+ {166, 12}, // C8 R2 (or C3)
+ {162, 0}, // C8 R1 (or C3)
+ {179, 0}, // C9 R1 (or C2)
+ {183, 12}, // C9 R2 (or C2)
+ {187, 26}, // C9 R3 (or C2)
+ {205, 31}, // C10 R3 (or C1)
+ {201, 18}, // C10 R2 (or C1)
+ {197, 4}, // C10 R1 (or C1)
+ {215, 5}, // C11 R1 (or C0)
+ {219, 19}, // C11 R2 (or C0)
+ {223, 32} // C11 R3 (or C0)
+}, {
+ //LEFT
+ 1, 1, 1, // 1, 9, 1, // change to this if you want the thumb home key to be highlighted as a home row key color
+ 4, 4, 4,
+ 4, 12, 4,
+ 4, 12, 4,
+ 4, 12, 4,
+ 4, 12, 4,
+ 1, 1, 1,
+ //RIGHT
+ 1, 1, 1, // 1, 9, 1, // change to this if you want the thumb home key to be highlighted as a home row key color
+ 4, 4, 4,
+ 4, 12, 4,
+ 4, 12, 4,
+ 4, 12, 4,
+ 4, 12, 4,
+ 1, 1, 1
+} };
+
+// -----------------------------------------------------------------------------------------------
+
+
+// use this matrix if you use the 5 column layout ──────────────────────────────────────────┐
+/*
+led_config_t g_led_config = { {
+//COL 00 01 02 03 04 05 ROW
+ { NO_LED, 17, 12, 11, 5, 4 },//00
+ { NO_LED, 16, 13, 10, 6, 3 },//01
+ { NO_LED, 15, 14, 9, 7, 2 },//02
+ { NO_LED, 8, 1, 0, NO_LED, NO_LED },//03
+ { NO_LED, 35, 30, 29, 23, 22 },//00
+ { NO_LED, 34, 31, 28, 24, 21 },//01
+ { NO_LED, 33, 32, 27, 25, 20 },//02
+ { NO_LED, 26, 19, 18, NO_LED, NO_LED } //03
+}, {
+ //LEFT
+ //thumb1 ▼ thumb2 ▼ thumb3 ▼ C0 R3 ▼ C0 R2 ▼ C0 R1 ▼ C1 R1 ▼
+ { 89, 54 }, { 74, 49 }, { 75, 34 }, { 75, 21 }, { 75, 8 }, { 60, 6 },
+ //C1 R2 ▼ C1 R3 ▼ thumb4 ▼ C2 R3 ▼ C2 R2 ▼ C2 R1 ▼ C3 R1 ▼
+ { 60, 19 }, { 60, 32 }, { 58, 48 }, { 46, 25 }, { 46, 12 }, { 46, 0 }, { 29, 7 },
+ //C3 R2 ▼ C3 R3 ▼ C4 R3 ▼ C4 R2 ▼ C4 R1 ▼ C5 R2 ▼ C5 R3 ▼
+ { 30, 20 }, { 31, 33 }, { 17, 42 }, { 15, 30 }, { 13, 17 },
+ //RIGHT
+ //thumb1 ▼ thumb2 ▼ thumb3 ▼ C0 R3 ▼ C0 R2 ▼ C0 R1 ▼ C1 R1 ▼
+ { 135, 54 }, { 150, 49 }, { 149, 34 }, { 149, 21 }, { 149, 8 }, { 163, 6 },
+ //C1 R2 ▼ C1 R3 ▼ thumb4 ▼ C2 R3 ▼ C2 R2 ▼ C2 R1 ▼ C3 R1 ▼
+ { 163, 19 }, { 163, 32 }, { 166, 48 }, { 178, 25 }, { 178, 12 }, { 178, 0 }, { 195, 7 },
+ //C3 R2 ▼ C3 R3 ▼ C4 R3 ▼ C4 R2 ▼ C4 R1 ▼ C5 R2 ▼ C5 R3 ▼
+ { 194, 20 }, { 193, 33 }, { 206, 42 }, { 209, 30 }, { 211, 17 }
+}, {
+ //LEFT
+ 1, 1, 4, 4, 4, 4,
+ 4, 4, 1, 4, 4, 4, 4,
+ 4, 4, 4, 4, 4,
+ //RIGHT
+ 1, 1, 4, 4, 4, 4,
+ 4, 4, 1, 4, 4, 4, 4,
+ 4, 4, 4, 4, 4
+} };
+*/
+// ────────────────────────────────────────────────────────────────────────────────────────────────────┘
+#endif
diff --git a/keyboards/fingerpunch/ximi/v2/v2.h b/keyboards/fingerpunch/ximi/v2/v2.h
new file mode 100644
index 0000000000..f7589f9443
--- /dev/null
+++ b/keyboards/fingerpunch/ximi/v2/v2.h
@@ -0,0 +1,22 @@
+#pragma once
+#include "quantum.h"
+
+#define ___ KC_NO
+
+#define LAYOUT_ximi( \
+ K00, K01, K02, K03, K04, K05, K35, K34, K33, K32, K31, K30, \
+ K10, K11, K12, K13, K14, K15, K45, K44, K43, K42, K41, K40, \
+ K20, K21, K22, K23, K24, K25, K55, K54, K53, K52, K51, K50, \
+ K98, K06, K16, K26, K56, K46, K36, K99, \
+ K07, K17, K27, K57, K47, K37 \
+ ) \
+ { \
+ { K00, K01, K02, K03, K04, K05, K06, K07 }, \
+ { K10, K11, K12, K13, K14, K15, K16, K17 }, \
+ { K20, K21, K22, K23, K24, K25, K26, K27 }, \
+ { ___, ___, K98, ___, ___, ___, ___, ___ }, \
+ { K30, K31, K32, K33, K34, K35, K36, K37 }, \
+ { K40, K41, K42, K43, K44, K45, K46, K47 }, \
+ { K50, K51, K52, K53, K54, K55, K56, K57 }, \
+ { ___, ___, K99, ___, ___, ___, ___, ___ } \
+ }
diff --git a/keyboards/fingerpunch/ximi/ximi.c b/keyboards/fingerpunch/ximi/ximi.c
index 5918f66956..1d0ca066ef 100644
--- a/keyboards/fingerpunch/ximi/ximi.c
+++ b/keyboards/fingerpunch/ximi/ximi.c
@@ -1,137 +1,16 @@
+/* Copyright 2024 Sadek Baroudi
+ *
+ * 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 .
+ */
#include "ximi.h"
-
-#ifdef RGB_MATRIX_ENABLE
-
-// Layout
-//
-//┌────────────────────────┐ ┌────────────────────────┐
-//│ 18 17 12 11 06 05 │ │ 26 27 32 33 38 39 │
-//│────────────────────────┤ ├────────────────────────│
-//│ 19 16 13 10 07 04 │ │ 25 28 31 34 37 40 │
-//├────────────────────────┤ ├────────────────────────┤
-//│ 20 15 14 09 08 03 │ │ 24 29 30 35 36 41 │
-//└───────────────────┬────┴───────┐ ┌───────┴────┬───────────────────┘
-// │ 02 01 00 │ │ 21 22 23 │
-// └────────────┘ └────────────┘
-//
-//
-
-// use this matrix if you use the 6 column layout ----------------------------------------------
-
-led_config_t g_led_config = { {
-//COL 00 01 02 03 04 05 06 ROW
- { 18, 17, 12, 11, 6, 5, 2 },//00
- { 19, 16, 13, 10, 7, 4, 1 },//01
- { 20, 15, 14, 9, 8, 3, 0 },//02
- { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },//03
- { 39, 38, 33, 32, 27, 26, 23 },//00
- { 40, 37, 34, 31, 28, 25, 22 },//01
- { 41, 36, 35, 30, 29, 24, 21 },//02
- { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },//03
-}, {
- // Left
- {93 , 63}, // Thumb reachy
- {77 , 55}, // Thumb homing
- {61 , 50}, // Thumb tucky
- {81 , 38}, // C5 R3
- {85 , 25}, // C5 R2
- {89 , 12}, // C5 R1
- {74 , 6}, // C4 R1
- {70 , 20}, // C4 R2
- {66 , 33}, // C4 R3
- {52 , 26}, // C3 R3
- {56 , 12}, // C3 R2
- {60 , 0}, // C3 R1
- {43 , 0}, // C2 R1
- {39 , 12}, // C2 R2
- {35 , 26}, // C2 R3
- {17 , 31}, // C1 R3
- {21 , 18}, // C1 R2
- {25 , 4}, // C1 R1
- {7 , 5}, // C0 R1
- {3 , 19}, // C0 R2
- {0 , 32}, // C0 R3
- // Right
- {129, 63}, // Thumb reachy
- {145, 55}, // Thumb homing
- {161, 50}, // Thumb tucky
- {141, 38}, // C6 R3 (or C5)
- {137, 25}, // C6 R2 (or C5)
- {133, 12}, // C6 R1 (or C5)
- {148, 6}, // C7 R1 (or C4)
- {152, 20}, // C7 R2 (or C4)
- {156, 33}, // C7 R3 (or C4)
- {170, 26}, // C8 R3 (or C3)
- {166, 12}, // C8 R2 (or C3)
- {162, 0}, // C8 R1 (or C3)
- {179, 0}, // C9 R1 (or C2)
- {183, 12}, // C9 R2 (or C2)
- {187, 26}, // C9 R3 (or C2)
- {205, 31}, // C10 R3 (or C1)
- {201, 18}, // C10 R2 (or C1)
- {197, 4}, // C10 R1 (or C1)
- {215, 5}, // C11 R1 (or C0)
- {219, 19}, // C11 R2 (or C0)
- {223, 32} // C11 R3 (or C0)
-}, {
- //LEFT
- 1, 1, 1, // 1, 9, 1, // change to this if you want the thumb home key to be highlighted as a home row key color
- 4, 4, 4,
- 4, 12, 4,
- 4, 12, 4,
- 4, 12, 4,
- 4, 12, 4,
- 1, 1, 1,
- //RIGHT
- 1, 1, 1, // 1, 9, 1, // change to this if you want the thumb home key to be highlighted as a home row key color
- 4, 4, 4,
- 4, 12, 4,
- 4, 12, 4,
- 4, 12, 4,
- 4, 12, 4,
- 1, 1, 1
-} };
-
-// -----------------------------------------------------------------------------------------------
-
-
-// use this matrix if you use the 5 column layout ──────────────────────────────────────────┐
-/*
-led_config_t g_led_config = { {
-//COL 00 01 02 03 04 05 ROW
- { NO_LED, 17, 12, 11, 5, 4 },//00
- { NO_LED, 16, 13, 10, 6, 3 },//01
- { NO_LED, 15, 14, 9, 7, 2 },//02
- { NO_LED, 8, 1, 0, NO_LED, NO_LED },//03
- { NO_LED, 35, 30, 29, 23, 22 },//00
- { NO_LED, 34, 31, 28, 24, 21 },//01
- { NO_LED, 33, 32, 27, 25, 20 },//02
- { NO_LED, 26, 19, 18, NO_LED, NO_LED } //03
-}, {
- //LEFT
- //thumb1 ▼ thumb2 ▼ thumb3 ▼ C0 R3 ▼ C0 R2 ▼ C0 R1 ▼ C1 R1 ▼
- { 89, 54 }, { 74, 49 }, { 75, 34 }, { 75, 21 }, { 75, 8 }, { 60, 6 },
- //C1 R2 ▼ C1 R3 ▼ thumb4 ▼ C2 R3 ▼ C2 R2 ▼ C2 R1 ▼ C3 R1 ▼
- { 60, 19 }, { 60, 32 }, { 58, 48 }, { 46, 25 }, { 46, 12 }, { 46, 0 }, { 29, 7 },
- //C3 R2 ▼ C3 R3 ▼ C4 R3 ▼ C4 R2 ▼ C4 R1 ▼ C5 R2 ▼ C5 R3 ▼
- { 30, 20 }, { 31, 33 }, { 17, 42 }, { 15, 30 }, { 13, 17 },
- //RIGHT
- //thumb1 ▼ thumb2 ▼ thumb3 ▼ C0 R3 ▼ C0 R2 ▼ C0 R1 ▼ C1 R1 ▼
- { 135, 54 }, { 150, 49 }, { 149, 34 }, { 149, 21 }, { 149, 8 }, { 163, 6 },
- //C1 R2 ▼ C1 R3 ▼ thumb4 ▼ C2 R3 ▼ C2 R2 ▼ C2 R1 ▼ C3 R1 ▼
- { 163, 19 }, { 163, 32 }, { 166, 48 }, { 178, 25 }, { 178, 12 }, { 178, 0 }, { 195, 7 },
- //C3 R2 ▼ C3 R3 ▼ C4 R3 ▼ C4 R2 ▼ C4 R1 ▼ C5 R2 ▼ C5 R3 ▼
- { 194, 20 }, { 193, 33 }, { 206, 42 }, { 209, 30 }, { 211, 17 }
-}, {
- //LEFT
- 1, 1, 4, 4, 4, 4,
- 4, 4, 1, 4, 4, 4, 4,
- 4, 4, 4, 4, 4,
- //RIGHT
- 1, 1, 4, 4, 4, 4,
- 4, 4, 1, 4, 4, 4, 4,
- 4, 4, 4, 4, 4
-} };
-*/
-// ────────────────────────────────────────────────────────────────────────────────────────────────────┘
-#endif
diff --git a/keyboards/fingerpunch/ximi/ximi.h b/keyboards/fingerpunch/ximi/ximi.h
index f2d134ae87..bea6caf138 100644
--- a/keyboards/fingerpunch/ximi/ximi.h
+++ b/keyboards/fingerpunch/ximi/ximi.h
@@ -1,24 +1,26 @@
+/* Copyright 2022 Sadek Baroudi
+ *
+ * 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 .
+ */
#pragma once
+
#include "quantum.h"
-#define ___ KC_NO
-
-#define LAYOUT_ximi( \
- K00, K01, K02, K03, K04, K05, K35, K34, K33, K32, K31, K30, \
- K10, K11, K12, K13, K14, K15, K45, K44, K43, K42, K41, K40, \
- K20, K21, K22, K23, K24, K25, K55, K54, K53, K52, K51, K50, \
- K98, K06, K16, K26, K56, K46, K36, K99, \
- K07, K17, K27, K57, K47, K37 \
- ) \
- { \
- { K00, K01, K02, K03, K04, K05, K06, K07 }, \
- { K10, K11, K12, K13, K14, K15, K16, K17 }, \
- { K20, K21, K22, K23, K24, K25, K26, K27 }, \
- { ___, ___, K98, ___, ___, ___, ___, ___ }, \
- { K30, K31, K32, K33, K34, K35, K36, K37 }, \
- { K40, K41, K42, K43, K44, K45, K46, K47 }, \
- { K50, K51, K52, K53, K54, K55, K56, K57 }, \
- { ___, ___, K99, ___, ___, ___, ___, ___ } \
- }
+#if defined(KEYBOARD_fingerpunch_ximi_v1)
+# include "v1.h"
+#elif defined(KEYBOARD_fingerpunch_ximi_v2)
+# include "v2.h"
+#endif
#include "keyboards/fingerpunch/src/fp.h"