[Keyboard] Add Cantor Pro Frood v2

10 files changed, 32 insertions, 8 deletions

diff --git a/keyboards/42keebs/cantor_pro_frood/readme.md b/keyboards/42keebs/cantor_pro_frood/README.md
index 48d8ff19de..a76a3e0899 100644
--- a/keyboards/42keebs/cantor_pro_frood/readme.md
+++ b/keyboards/42keebs/cantor_pro_frood/README.md
@@ -1,6 +1,6 @@
 # Cantor Pro Frood
 
-![cantor](https://i.imgur.com/Uvxm3zVh.jpg)
+![Cantor Pro Frood](https://42keebs.eu/wp-content/uploads/2022/09/2024-02-01-15-01-58-551-scaled.jpg)
 
 The Cantor Pro Frood keyboard is a 42 key diodeless split keyboard, designed with simplicity in mind. It based on the original [Cantor](https://github.com/diepala/cantor) by [Diego Palacios](https://github.com/diepala), itself inspired by the popular [corne](https://github.com/foostan/crkbd), [ferris](https://github.com/pierrechevalier83/ferris) and [sweep](https://github.com/davidphilipbarr/Sweep) keyboards, aiming to provide a more ergonomic (stronger column stagger) corne-like layout with a simple, easy to assemble and cheap design.
 
@@ -12,7 +12,7 @@ Cantor Pro Frood, as the name suggests, uses the powerful but affordable [42. Ke
 
 Make example for this keyboard (after setting up your build environment):
 
-    make 42keebs/cantor_pro_frood:vial
+    qmk compile -kb 42keebs/cantor_pro_frood -km vial
 
 To flash the firmware .uf2 file, reset the Frood to the bootloader mode (see below) which will present it as a USB mass storage device (a.k.a. USB flash) and copy the file to the device.
 
diff --git a/keyboards/42keebs/cantor_pro_frood/config.h b/keyboards/42keebs/cantor_pro_frood/config.h
index bf388864b8..c52ad7a418 100644
--- a/keyboards/42keebs/cantor_pro_frood/config.h
+++ b/keyboards/42keebs/cantor_pro_frood/config.h
@@ -10,8 +10,13 @@
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
 
-#define SERIAL_USART_FULL_DUPLEX
-#define SERIAL_USART_TX_PIN GP8
-#define SERIAL_USART_RX_PIN GP9
-
 #define SPLIT_HAND_PIN GP19
+
+/**************************************************
+** Include headers specific to keyboard revision **
+**************************************************/
+#if defined(KEYBOARD_42keebs_cantor_pro_frood_v1)
+#    include "v1.h"
+#elif defined(KEYBOARD_42keebs_cantor_pro_frood_v2)
+#    include "v2.h"
+#endif
diff --git a/keyboards/42keebs/cantor_pro_frood/info.json b/keyboards/42keebs/cantor_pro_frood/info.json
index a9d3e7277b..53fb0325b2 100644
--- a/keyboards/42keebs/cantor_pro_frood/info.json
+++ b/keyboards/42keebs/cantor_pro_frood/info.json
@@ -15,8 +15,7 @@
     "bootloader": "rp2040",
     "usb": {
         "vid": "0x1209",
-        "pid": "0x4204",
-        "device_version": "1.0.0"
+        "pid": "0x4204"
     },
     "bootmagic": {
         "matrix": [4, 5]
diff --git a/keyboards/42keebs/cantor_pro_frood/rules.mk b/keyboards/42keebs/cantor_pro_frood/rules.mk
index 161ec22b16..a31bf5d95f 100644
--- a/keyboards/42keebs/cantor_pro_frood/rules.mk
+++ b/keyboards/42keebs/cantor_pro_frood/rules.mk
@@ -1 +1,2 @@
+DEFAULT_FOLDER=42keebs/cantor_pro_frood/v2
 SERIAL_DRIVER = vendor
diff --git a/keyboards/42keebs/cantor_pro_frood/v1/info.json b/keyboards/42keebs/cantor_pro_frood/v1/info.json
new file mode 100644
index 0000000000..ad889c2304
--- /dev/null
+++ b/keyboards/42keebs/cantor_pro_frood/v1/info.json
@@ -0,0 +1,5 @@
+{
+    "usb": {
+        "device_version": "1.0.0"
+    }
+}
diff --git a/keyboards/42keebs/cantor_pro_frood/v1/rules.mk b/keyboards/42keebs/cantor_pro_frood/v1/rules.mk
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/keyboards/42keebs/cantor_pro_frood/v1/rules.mk
diff --git a/keyboards/42keebs/cantor_pro_frood/v1/v1.h b/keyboards/42keebs/cantor_pro_frood/v1/v1.h
new file mode 100644
index 0000000000..4acb1b0b8a
--- /dev/null
+++ b/keyboards/42keebs/cantor_pro_frood/v1/v1.h
@@ -0,0 +1,6 @@
+// Copyright 2024 piit79
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#define SERIAL_USART_FULL_DUPLEX
+#define SERIAL_USART_TX_PIN GP8
+#define SERIAL_USART_RX_PIN GP9
diff --git a/keyboards/42keebs/cantor_pro_frood/v2/info.json b/keyboards/42keebs/cantor_pro_frood/v2/info.json
new file mode 100644
index 0000000000..f3a757c9c3
--- /dev/null
+++ b/keyboards/42keebs/cantor_pro_frood/v2/info.json
@@ -0,0 +1,8 @@
+{
+    "usb": {
+        "device_version": "2.0.0"
+    },
+    "split": {
+        "soft_serial_pin": "GP9"
+    }
+}
diff --git a/keyboards/42keebs/cantor_pro_frood/v2/rules.mk b/keyboards/42keebs/cantor_pro_frood/v2/rules.mk
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/keyboards/42keebs/cantor_pro_frood/v2/rules.mk
diff --git a/keyboards/42keebs/cantor_pro_frood/v2/v2.h b/keyboards/42keebs/cantor_pro_frood/v2/v2.h
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/keyboards/42keebs/cantor_pro_frood/v2/v2.h