From 1ec9e4f5d2f05ec893aede82c0d98a4d823bc6ac Mon Sep 17 00:00:00 2001
From: Cipulot <40441626+Cipulot@users.noreply.github.com>
Date: Sat, 2 Mar 2024 00:03:10 +0100
Subject: [PATCH 1/2] Add EC Type-B

---
 v3/cipulot/ec_typeb/ec_typeb.json | 315 ++++++++++++++++++++++++++++++
 1 file changed, 315 insertions(+)
 create mode 100644 v3/cipulot/ec_typeb/ec_typeb.json

diff --git a/v3/cipulot/ec_typeb/ec_typeb.json b/v3/cipulot/ec_typeb/ec_typeb.json
new file mode 100644
index 0000000000..c396e1a1d4
--- /dev/null
+++ b/v3/cipulot/ec_typeb/ec_typeb.json
@@ -0,0 +1,315 @@
+{
+  "name": "EC Type-B",
+  "vendorId": "0x6369",
+  "productId": "0x6BAA",
+  "menus": [
+    {
+      "label": "EC Tools",
+      "content": [
+        {
+          "label": "Actuation",
+          "content": [
+            {
+              "label": "Mode",
+              "type": "dropdown",
+              "options": [
+                "APC",
+                "Rapid Trigger"
+              ],
+              "content": [
+                "id_actuation_mode",
+                0,
+                1
+              ]
+            },
+            {
+              "showIf": "{id_actuation_mode} == 0",
+              "content": [
+                {
+                  "label": "Actuation Level (0% | 100%)",
+                  "type": "range",
+                  "options": [
+                    1,
+                    1023
+                  ],
+                  "content": [
+                    "id_mode_0_actuation_threshold",
+                    0,
+                    2
+                  ]
+                },
+                {
+                  "label": "Release Level (0% | 100%, ALWAYS < Actuation Level)",
+                  "type": "range",
+                  "options": [
+                    1,
+                    1023
+                  ],
+                  "content": [
+                    "id_mode_0_release_threshold",
+                    0,
+                    3
+                  ]
+                },
+                {
+                  "label": "Apply & save changes",
+                  "type": "button",
+                  "options": [
+                    0
+                  ],
+                  "content": [
+                    "id_save_threshold_data",
+                    0,
+                    4
+                  ]
+                }
+              ]
+            },
+            {
+              "showIf": "{id_actuation_mode} == 1",
+              "content": [
+                {
+                  "label": "Initial Deadzone Offset (0% | 100%)",
+                  "type": "range",
+                  "options": [
+                    1,
+                    1023
+                  ],
+                  "content": [
+                    "id_mode_1_initial_deadzone_offset",
+                    0,
+                    5
+                  ]
+                },
+                {
+                  "label": "Actuation Offset (1-255)",
+                  "type": "range",
+                  "options": [
+                    1,
+                    255
+                  ],
+                  "content": [
+                    "id_mode_1_actuation_offset",
+                    0,
+                    6
+                  ]
+                },
+                {
+                  "label": "Release Offset (1-255)",
+                  "type": "range",
+                  "options": [
+                    1,
+                    255
+                  ],
+                  "content": [
+                    "id_mode_1_release_offset",
+                    0,
+                    7
+                  ]
+                },
+                {
+                  "label": "Apply & save changes",
+                  "type": "button",
+                  "options": [
+                    1
+                  ],
+                  "content": [
+                    "id_save_threshold_data",
+                    0,
+                    4
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "label": "Calibration",
+          "content": [
+            {
+              "label": "Bottoming Calibration",
+              "type": "toggle",
+              "content": [
+                "id_bottoming_calibration",
+                0,
+                8
+              ]
+            },
+            {
+              "label": "Noise Floor Calibration (DO NOT PRESS ANY KEY WHILE CLICKING)",
+              "type": "button",
+              "options": [
+                0
+              ],
+              "content": [
+                "id_noise_floor_calibration",
+                0,
+                9
+              ]
+            },
+            {
+              "label": "Show Calibration Data",
+              "type": "button",
+              "options": [
+                0
+              ],
+              "content": [
+                "id_show_calibration_data",
+                0,
+                10
+              ]
+            },
+            {
+              "label": "Clear Bottoming Calibration Data",
+              "type": "button",
+              "options": [
+                0
+              ],
+              "content": [
+                "id_clear_bottoming_calibration_data",
+                0,
+                11
+              ]
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "matrix": {
+    "rows": 5,
+    "cols": 15
+  },
+  "layouts": {
+    "keymap": [
+      [
+        {
+          "c": "#777777"
+        },
+        "0,0",
+        {
+          "c": "#cccccc"
+        },
+        "0,1",
+        "0,2",
+        "0,3",
+        "0,4",
+        "0,5",
+        "0,6",
+        "0,7",
+        "0,8",
+        "0,9",
+        "0,10",
+        "0,11",
+        "0,12",
+        "0,13",
+        {
+          "c": "#aaaaaa"
+        },
+        "0,14"
+      ],
+      [
+        {
+          "w": 1.5
+        },
+        "1,0",
+        {
+          "c": "#cccccc"
+        },
+        "1,1",
+        "1,2",
+        "1,3",
+        "1,4",
+        "1,5",
+        "1,6",
+        "1,7",
+        "1,8",
+        "1,9",
+        "1,10",
+        "1,11",
+        "1,12",
+        {
+          "w": 1.5
+        },
+        "1,13"
+      ],
+      [
+        {
+          "c": "#aaaaaa",
+          "w": 1.75
+        },
+        "2,0",
+        {
+          "c": "#cccccc"
+        },
+        "2,1",
+        "2,2",
+        "2,3",
+        "2,4",
+        "2,5",
+        "2,6",
+        "2,7",
+        "2,8",
+        "2,9",
+        "2,10",
+        "2,11",
+        {
+          "c": "#777777",
+          "w": 2.25
+        },
+        "2,13"
+      ],
+      [
+        {
+          "c": "#aaaaaa",
+          "w": 2.25
+        },
+        "3,0",
+        {
+          "c": "#cccccc"
+        },
+        "3,2",
+        "3,3",
+        "3,4",
+        "3,5",
+        "3,6",
+        "3,7",
+        "3,8",
+        "3,9",
+        "3,10",
+        "3,11",
+        {
+          "c": "#aaaaaa",
+          "w": 1.75
+        },
+        "3,13",
+        {
+          "c": "#cccccc"
+        },
+        "3,14"
+      ],
+      [
+        {
+          "x": 1.5,
+          "c": "#aaaaaa"
+        },
+        "4,1",
+        {
+          "w": 1.5
+        },
+        "4,2",
+        {
+          "c": "#cccccc",
+          "w": 6
+        },
+        "4,6",
+        {
+          "c": "#aaaaaa",
+          "w": 1.5
+        },
+        "4,9",
+        "4,10"
+      ]
+    ]
+  }
+}

From 257b3cb39f1d1b2f7b14931bdbc00cadc821ab7e Mon Sep 17 00:00:00 2001
From: Cipulot <40441626+Cipulot@users.noreply.github.com>
Date: Tue, 30 Apr 2024 19:43:37 +0200
Subject: [PATCH 2/2] Formatting

---
 v3/cipulot/ec_typeb/ec_typeb.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/v3/cipulot/ec_typeb/ec_typeb.json b/v3/cipulot/ec_typeb/ec_typeb.json
index c396e1a1d4..1f9480e742 100644
--- a/v3/cipulot/ec_typeb/ec_typeb.json
+++ b/v3/cipulot/ec_typeb/ec_typeb.json
@@ -2,6 +2,10 @@
   "name": "EC Type-B",
   "vendorId": "0x6369",
   "productId": "0x6BAA",
+  "matrix": {
+    "rows": 5,
+    "cols": 15
+  },
   "menus": [
     {
       "label": "EC Tools",
@@ -176,10 +180,6 @@
       ]
     }
   ],
-  "matrix": {
-    "rows": 5,
-    "cols": 15
-  },
   "layouts": {
     "keymap": [
       [