From 34c407dbbeb380f4877fafa329423af2aaf368d0 Mon Sep 17 00:00:00 2001
From: Andrew Kannan <andrew.kannan@gmail.com>
Date: Mon, 28 Jun 2021 20:40:32 -0400
Subject: [PATCH 1/2] Add via support for 1.2og replacement PCB by
 HoodrowThrillson and Ender

---
 src/cannonkeys/12og_hoodrow/12og_hoodrow.json | 230 ++++++++++++++++++
 1 file changed, 230 insertions(+)
 create mode 100644 src/cannonkeys/12og_hoodrow/12og_hoodrow.json

diff --git a/src/cannonkeys/12og_hoodrow/12og_hoodrow.json b/src/cannonkeys/12og_hoodrow/12og_hoodrow.json
new file mode 100644
index 0000000000..c02f8df8f9
--- /dev/null
+++ b/src/cannonkeys/12og_hoodrow/12og_hoodrow.json
@@ -0,0 +1,230 @@
+{
+  "name": "1.2OG Hoodrow",
+  "vendorId": "0xCA04",
+  "productId": "0x0005",
+  "lighting": "qmk_rgblight",
+  "matrix": {"rows": 12, "cols": 9},
+  "layouts": {
+    "labels": [
+      ["Layout", "ANSI", "ISO"]
+    ],
+    "keymap": [
+      [
+        {
+          "x": 2.5,
+          "c": "#777777"
+        },
+        "1,0",
+        {
+          "x": 1,
+          "c": "#cccccc"
+        },
+        "1,1",
+        "0,1",
+        "1,2",
+        "0,2",
+        {
+          "x": 0.5,
+          "c": "#aaaaaa"
+        },
+        "1,3",
+        "0,3",
+        "1,4",
+        "0,4",
+        {
+          "x": 0.5,
+          "c": "#cccccc"
+        },
+        "1,5",
+        "0,5",
+        "1,6",
+        "0,6",
+        {
+          "x": 0.25,
+          "c": "#aaaaaa"
+        },
+        "1,7",
+        "0,7",
+        "1,8"
+      ],
+      [
+        {
+          "y": 0.5,
+          "x": 2.5
+        },
+        "3,0",
+        {
+          "c": "#cccccc"
+        },
+        "2,0",
+        "3,1",
+        "2,1",
+        "3,2",
+        "2,2",
+        "3,3",
+        "2,3",
+        "3,4",
+        "2,4",
+        "3,5",
+        "2,5",
+        "3,6",
+        {
+          "c": "#aaaaaa",
+          "w": 2
+        },
+        "2,6",
+        {
+          "x": 0.25
+        },
+        "3,7",
+        "2,7",
+        "3,8"
+      ],
+      [
+        {
+          "x": 2.5,
+          "w": 1.5
+        },
+        "5,0",
+        {
+          "c": "#cccccc"
+        },
+        "4,0",
+        "5,1",
+        "4,1",
+        "5,2",
+        "4,2",
+        "5,3",
+        "4,3",
+        "5,4",
+        "4,4",
+        "5,5",
+        "4,5",
+        "5,6",
+        {
+          "c": "#aaaaaa",
+          "w": 1.5
+        },
+        "4,6\n\n\n0,0",
+        {
+          "x": 0.25
+        },
+        "5,7",
+        "4,7",
+        "5,8",
+        {
+          "x": 1.25,
+          "w": 1.25,
+          "h": 2,
+          "w2": 1.5,
+          "h2": 1,
+          "x2": -0.25
+        },
+        "6,6\n\n\n0,1"
+      ],
+      [
+        {
+          "x": 2.5,
+          "w": 1.75
+        },
+        "7,0",
+        {
+          "c": "#cccccc"
+        },
+        "6,0",
+        "7,1",
+        "6,1",
+        "7,2",
+        "6,2",
+        "7,3",
+        "6,3",
+        "7,4",
+        "6,4",
+        "7,5",
+        "6,5",
+        {
+          "c": "#777777",
+          "w": 2.25
+        },
+        "6,6\n\n\n0,0",
+        {
+          "x": 3.5,
+          "c": "#cccccc"
+        },
+        "7,6\n\n\n0,1"
+      ],
+      [
+        {
+          "c": "#aaaaaa",
+          "w": 1.25
+        },
+        "9,0\n\n\n0,1",
+        {
+          "c": "#cccccc"
+        },
+        "8,0\n\n\n0,1",
+        {
+          "x": 0.25,
+          "c": "#aaaaaa",
+          "w": 2.25
+        },
+        "9,0\n\n\n0,0",
+        {
+          "c": "#cccccc"
+        },
+        "9,1",
+        "8,1",
+        "9,2",
+        "8,2",
+        "9,3",
+        "8,3",
+        "9,4",
+        "8,4",
+        "9,5",
+        "8,5",
+        {
+          "c": "#aaaaaa",
+          "w": 2.75
+        },
+        "8,6",
+        {
+          "x": 1.25
+        },
+        "8,7"
+      ],
+      [
+        {
+          "x": 2.5,
+          "w": 1.5
+        },
+        "11,0",
+        "10,0",
+        {
+          "w": 1.5
+        },
+        "11,1",
+        {
+          "c": "#cccccc",
+          "w": 7
+        },
+        "11,3",
+        {
+          "c": "#aaaaaa",
+          "w": 1.5
+        },
+        "11,5",
+        "11,6",
+        {
+          "w": 1.5
+        },
+        "10,6",
+        {
+          "x": 0.25
+        },
+        "11,7",
+        "10,7",
+        "11,8"
+      ]
+    ]
+  }
+}
\ No newline at end of file

From 0f4d46bfd4e4241d395c4c170acd9b10480a0181 Mon Sep 17 00:00:00 2001
From: Andrew Kannan <andrew.kannan@gmail.com>
Date: Tue, 14 Dec 2021 20:52:38 -0500
Subject: [PATCH 2/2] update json for hoodrowG keyboard

---
 .../12og_hoodrow.json => hoodrowg/hoodrowg.json}              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename src/cannonkeys/{12og_hoodrow/12og_hoodrow.json => hoodrowg/hoodrowg.json} (92%)

diff --git a/src/cannonkeys/12og_hoodrow/12og_hoodrow.json b/src/cannonkeys/hoodrowg/hoodrowg.json
similarity index 92%
rename from src/cannonkeys/12og_hoodrow/12og_hoodrow.json
rename to src/cannonkeys/hoodrowg/hoodrowg.json
index c02f8df8f9..59812e4566 100644
--- a/src/cannonkeys/12og_hoodrow/12og_hoodrow.json
+++ b/src/cannonkeys/hoodrowg/hoodrowg.json
@@ -1,7 +1,7 @@
 {
-  "name": "1.2OG Hoodrow",
+  "name": "Hoodrow-G",
   "vendorId": "0xCA04",
-  "productId": "0x0005",
+  "productId": "0x0006",
   "lighting": "qmk_rgblight",
   "matrix": {"rows": 12, "cols": 9},
   "layouts": {