From 98c10231df86eb2a9713ea8421502ca73731cb1b Mon Sep 17 00:00:00 2001
From: Controller Works <info@controller.works>
Date: Wed, 5 Jul 2023 14:49:48 -0400
Subject: [PATCH 1/5] Update city42 keymap

---
 src/controllerworks/city42/city42.json | 41 ++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 src/controllerworks/city42/city42.json

diff --git a/src/controllerworks/city42/city42.json b/src/controllerworks/city42/city42.json
new file mode 100644
index 0000000000..f66b35020e
--- /dev/null
+++ b/src/controllerworks/city42/city42.json
@@ -0,0 +1,41 @@
+{
+  "name": "Controller Works city42",
+  "vendorId": "0x4357",
+  "productId": "0x0005",
+  "lighting": "none",
+  "matrix": {"rows": 4, "cols": 12},
+  "layouts": {
+    "keymap": [
+      [{"r":15,"rx":3.9,"ry":4.2,"c":"#aaaaaa"},"3,3"],
+      [{"rx":4.5,"ry":2.5,"y":-1.5,"x":-0.5,"c":"#cccccc"},"0,3"],
+      [{"y":-0.875,"x":-1.5},"0,2",{"x":1},"0,4"],
+      [{"y":-0.875,"x":1.5},"0,5"],
+      [{"y":-0.875,"x":-3.5,"c":"#777777"},"0,0",{"c":"#cccccc"},"0,1"],
+      [{"y":-0.375,"x":-0.5},"1,3"],
+      [{"y":-0.875,"x":-1.5},"1,2",{"x":1},"1,4"],
+      [{"y":-0.875,"x":1.5},"1,5"],
+      [{"y":-0.875,"x":-3.5,"c":"#777777"},"1,0",{"c":"#cccccc"},"1,1"],
+      [{"y":-0.375,"x":-0.5},"2,3"],
+      [{"y":-0.875,"x":-1.5},"2,2",{"x":1},"2,4"],
+      [{"y":-0.875,"x":1.5},"2,5"],
+      [{"y":-0.875,"x":-3.5,"c":"#777777"},"2,0",{"c":"#cccccc"},"2,1"],
+      [{"r":30,"rx":5.25,"ry":4.5,"c":"#aaaaaa"},"3,4"],
+      [{"r":45,"rx":6.75,"ry":4.9,"h":1.5},"3,5"],
+      [{"r":-45,"rx":9.5,"x":-1,"h":1.5},"3,6"],
+      [{"r":-30,"rx":11,"ry":4.5,"x":-1},"3,7"],
+      [{"r":-15,"ry":2,"y":-1,"c":"#cccccc"},"0,8"],
+      [{"y":-0.875,"x":-1},"0,7",{"x":1},"0,9"],
+      [{"y":-0.875,"x":-2},"0,6"],
+      [{"y":-0.875,"x":2},"0,10",{"c":"#777777"},"0,11"],
+      [{"y":-0.375,"c":"#cccccc"},"1,8"],
+      [{"y":-0.875,"x":-1},"1,7",{"x":1},"1,9"],
+      [{"y":-0.875,"x":-2},"1,6"],
+      [{"y":-0.875,"x":2},"1,10",{"c":"#777777"},"1,11"],
+      [{"y":-0.375,"c":"#cccccc"},"2,8"],
+      [{"y":-0.875,"x":-1},"2,7",{"x":1},"2,9"],
+      [{"y":-0.875,"x":-2},"2,6"],
+      [{"y":-0.875,"x":2},"2,10",{"c":"#777777"},"2,11"],
+      [{"rx":12.3,"ry":4.2,"x":-1,"c":"#aaaaaa"},"3,8"]
+    ]      
+  }
+}

From 145fab84cd050cd37a14d62858b9e21c3238eb15 Mon Sep 17 00:00:00 2001
From: Kevin Gee <info@controller.works>
Date: Tue, 29 Aug 2023 09:59:02 -0400
Subject: [PATCH 2/5] Add RGB Matrix menu

---
 src/controllerworks/city42/city42.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/controllerworks/city42/city42.json b/src/controllerworks/city42/city42.json
index f66b35020e..dc9418e2fe 100644
--- a/src/controllerworks/city42/city42.json
+++ b/src/controllerworks/city42/city42.json
@@ -2,7 +2,7 @@
   "name": "Controller Works city42",
   "vendorId": "0x4357",
   "productId": "0x0005",
-  "lighting": "none",
+  "lighting": "qmk_rgb_matrix",
   "matrix": {"rows": 4, "cols": 12},
   "layouts": {
     "keymap": [

From 945d2741d6726c6a1db9857b26f211a837caca11 Mon Sep 17 00:00:00 2001
From: Kevin Gee <info@controller.works>
Date: Tue, 29 Aug 2023 21:39:17 -0400
Subject: [PATCH 3/5] Remove deprecated lighting

---
 src/controllerworks/city42/city42.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/controllerworks/city42/city42.json b/src/controllerworks/city42/city42.json
index dc9418e2fe..0a4c60d678 100644
--- a/src/controllerworks/city42/city42.json
+++ b/src/controllerworks/city42/city42.json
@@ -2,8 +2,9 @@
   "name": "Controller Works city42",
   "vendorId": "0x4357",
   "productId": "0x0005",
-  "lighting": "qmk_rgb_matrix",
   "matrix": {"rows": 4, "cols": 12},
+  "menus": [ "qmk_rgb_matrix" ],
+  "keycodes": [ "qmk_lighting" ],
   "layouts": {
     "keymap": [
       [{"r":15,"rx":3.9,"ry":4.2,"c":"#aaaaaa"},"3,3"],

From ecb1bf7850c964a3eecadcb9ff44a68e42c9ccea Mon Sep 17 00:00:00 2001
From: Controller Works <info@controller.works>
Date: Sat, 2 Sep 2023 21:30:08 -0400
Subject: [PATCH 4/5] Adding city42 to v3

---
 src/controllerworks/city42/city42.json |  3 +-
 v3/controllerworks/city42/city42.json  | 42 ++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 v3/controllerworks/city42/city42.json

diff --git a/src/controllerworks/city42/city42.json b/src/controllerworks/city42/city42.json
index 0a4c60d678..b13cd69edb 100644
--- a/src/controllerworks/city42/city42.json
+++ b/src/controllerworks/city42/city42.json
@@ -3,8 +3,7 @@
   "vendorId": "0x4357",
   "productId": "0x0005",
   "matrix": {"rows": 4, "cols": 12},
-  "menus": [ "qmk_rgb_matrix" ],
-  "keycodes": [ "qmk_lighting" ],
+  "lighting": "none",
   "layouts": {
     "keymap": [
       [{"r":15,"rx":3.9,"ry":4.2,"c":"#aaaaaa"},"3,3"],
diff --git a/v3/controllerworks/city42/city42.json b/v3/controllerworks/city42/city42.json
new file mode 100644
index 0000000000..0a4c60d678
--- /dev/null
+++ b/v3/controllerworks/city42/city42.json
@@ -0,0 +1,42 @@
+{
+  "name": "Controller Works city42",
+  "vendorId": "0x4357",
+  "productId": "0x0005",
+  "matrix": {"rows": 4, "cols": 12},
+  "menus": [ "qmk_rgb_matrix" ],
+  "keycodes": [ "qmk_lighting" ],
+  "layouts": {
+    "keymap": [
+      [{"r":15,"rx":3.9,"ry":4.2,"c":"#aaaaaa"},"3,3"],
+      [{"rx":4.5,"ry":2.5,"y":-1.5,"x":-0.5,"c":"#cccccc"},"0,3"],
+      [{"y":-0.875,"x":-1.5},"0,2",{"x":1},"0,4"],
+      [{"y":-0.875,"x":1.5},"0,5"],
+      [{"y":-0.875,"x":-3.5,"c":"#777777"},"0,0",{"c":"#cccccc"},"0,1"],
+      [{"y":-0.375,"x":-0.5},"1,3"],
+      [{"y":-0.875,"x":-1.5},"1,2",{"x":1},"1,4"],
+      [{"y":-0.875,"x":1.5},"1,5"],
+      [{"y":-0.875,"x":-3.5,"c":"#777777"},"1,0",{"c":"#cccccc"},"1,1"],
+      [{"y":-0.375,"x":-0.5},"2,3"],
+      [{"y":-0.875,"x":-1.5},"2,2",{"x":1},"2,4"],
+      [{"y":-0.875,"x":1.5},"2,5"],
+      [{"y":-0.875,"x":-3.5,"c":"#777777"},"2,0",{"c":"#cccccc"},"2,1"],
+      [{"r":30,"rx":5.25,"ry":4.5,"c":"#aaaaaa"},"3,4"],
+      [{"r":45,"rx":6.75,"ry":4.9,"h":1.5},"3,5"],
+      [{"r":-45,"rx":9.5,"x":-1,"h":1.5},"3,6"],
+      [{"r":-30,"rx":11,"ry":4.5,"x":-1},"3,7"],
+      [{"r":-15,"ry":2,"y":-1,"c":"#cccccc"},"0,8"],
+      [{"y":-0.875,"x":-1},"0,7",{"x":1},"0,9"],
+      [{"y":-0.875,"x":-2},"0,6"],
+      [{"y":-0.875,"x":2},"0,10",{"c":"#777777"},"0,11"],
+      [{"y":-0.375,"c":"#cccccc"},"1,8"],
+      [{"y":-0.875,"x":-1},"1,7",{"x":1},"1,9"],
+      [{"y":-0.875,"x":-2},"1,6"],
+      [{"y":-0.875,"x":2},"1,10",{"c":"#777777"},"1,11"],
+      [{"y":-0.375,"c":"#cccccc"},"2,8"],
+      [{"y":-0.875,"x":-1},"2,7",{"x":1},"2,9"],
+      [{"y":-0.875,"x":-2},"2,6"],
+      [{"y":-0.875,"x":2},"2,10",{"c":"#777777"},"2,11"],
+      [{"rx":12.3,"ry":4.2,"x":-1,"c":"#aaaaaa"},"3,8"]
+    ]      
+  }
+}

From ce8707110ce56dc5f4fbc04e831d722cca4fee21 Mon Sep 17 00:00:00 2001
From: Kevin Gee <info@controller.works>
Date: Mon, 11 Sep 2023 09:07:11 -0400
Subject: [PATCH 5/5] Removed v2 definition from src

---
 src/controllerworks/city42/city42.json | 41 --------------------------
 1 file changed, 41 deletions(-)
 delete mode 100644 src/controllerworks/city42/city42.json

diff --git a/src/controllerworks/city42/city42.json b/src/controllerworks/city42/city42.json
deleted file mode 100644
index b13cd69edb..0000000000
--- a/src/controllerworks/city42/city42.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "name": "Controller Works city42",
-  "vendorId": "0x4357",
-  "productId": "0x0005",
-  "matrix": {"rows": 4, "cols": 12},
-  "lighting": "none",
-  "layouts": {
-    "keymap": [
-      [{"r":15,"rx":3.9,"ry":4.2,"c":"#aaaaaa"},"3,3"],
-      [{"rx":4.5,"ry":2.5,"y":-1.5,"x":-0.5,"c":"#cccccc"},"0,3"],
-      [{"y":-0.875,"x":-1.5},"0,2",{"x":1},"0,4"],
-      [{"y":-0.875,"x":1.5},"0,5"],
-      [{"y":-0.875,"x":-3.5,"c":"#777777"},"0,0",{"c":"#cccccc"},"0,1"],
-      [{"y":-0.375,"x":-0.5},"1,3"],
-      [{"y":-0.875,"x":-1.5},"1,2",{"x":1},"1,4"],
-      [{"y":-0.875,"x":1.5},"1,5"],
-      [{"y":-0.875,"x":-3.5,"c":"#777777"},"1,0",{"c":"#cccccc"},"1,1"],
-      [{"y":-0.375,"x":-0.5},"2,3"],
-      [{"y":-0.875,"x":-1.5},"2,2",{"x":1},"2,4"],
-      [{"y":-0.875,"x":1.5},"2,5"],
-      [{"y":-0.875,"x":-3.5,"c":"#777777"},"2,0",{"c":"#cccccc"},"2,1"],
-      [{"r":30,"rx":5.25,"ry":4.5,"c":"#aaaaaa"},"3,4"],
-      [{"r":45,"rx":6.75,"ry":4.9,"h":1.5},"3,5"],
-      [{"r":-45,"rx":9.5,"x":-1,"h":1.5},"3,6"],
-      [{"r":-30,"rx":11,"ry":4.5,"x":-1},"3,7"],
-      [{"r":-15,"ry":2,"y":-1,"c":"#cccccc"},"0,8"],
-      [{"y":-0.875,"x":-1},"0,7",{"x":1},"0,9"],
-      [{"y":-0.875,"x":-2},"0,6"],
-      [{"y":-0.875,"x":2},"0,10",{"c":"#777777"},"0,11"],
-      [{"y":-0.375,"c":"#cccccc"},"1,8"],
-      [{"y":-0.875,"x":-1},"1,7",{"x":1},"1,9"],
-      [{"y":-0.875,"x":-2},"1,6"],
-      [{"y":-0.875,"x":2},"1,10",{"c":"#777777"},"1,11"],
-      [{"y":-0.375,"c":"#cccccc"},"2,8"],
-      [{"y":-0.875,"x":-1},"2,7",{"x":1},"2,9"],
-      [{"y":-0.875,"x":-2},"2,6"],
-      [{"y":-0.875,"x":2},"2,10",{"c":"#777777"},"2,11"],
-      [{"rx":12.3,"ry":4.2,"x":-1,"c":"#aaaaaa"},"3,8"]
-    ]      
-  }
-}