diff --git a/boards/shields/.gitkeep b/boards/shields/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/build.yaml b/build.yaml index b52dbd0..f586f8b 100644 --- a/build.yaml +++ b/build.yaml @@ -20,6 +20,7 @@ include: - board: nice_nano_v2 shield: cradio_left + snippet: studio-rpc-usb-uart - board: nice_nano_v2 shield: cradio_right - board: nice_nano_v2 diff --git a/config/cradio-key-positions.dtsi b/config/cradio-key-positions.dtsi new file mode 100644 index 0000000..7be2b8f --- /dev/null +++ b/config/cradio-key-positions.dtsi @@ -0,0 +1,7 @@ +#include + +// Assigning suitable kscan and matrix transforms +&cuddlykeyboards_ferris_layout { + transform = <&default_transform>; + kscan = <&kscan0>; +}; \ No newline at end of file diff --git a/config/cradio.conf b/config/cradio.conf index b696700..cb5134e 100644 --- a/config/cradio.conf +++ b/config/cradio.conf @@ -9,4 +9,7 @@ CONFIG_ZMK_SLEEP=y CONFIG_BT_CTLR_TX_PWR_PLUS_8=y # BLE connection improvements -CONFIG_ZMK_BLE_EXPERIMENTAL_CONN=y \ No newline at end of file +CONFIG_ZMK_BLE_EXPERIMENTAL_CONN=y + +# Activating ZMK Studio +CONFIG_ZMK_STUDIO=y \ No newline at end of file diff --git a/config/cradio.json b/config/cradio.json index d2b4afa..1583fbe 100644 --- a/config/cradio.json +++ b/config/cradio.json @@ -1,48 +1,42 @@ -{ "id": "ferris_sweep", - "name": "Sweep", +{ "layouts": { - "3x5": { - "name": "3x5", + "Default": { "layout": [ - { "row": 0, "col": 1, "x": 0, "y": 0.675 }, - { "row": 0, "col": 2, "x": 1, "y": 0.225 }, - { "row": 0, "col": 3, "x": 2, "y": 0 }, - { "row": 0, "col": 4, "x": 3, "y": 0.225 }, - { "row": 0, "col": 5, "x": 4, "y": 0.35 }, - { "row": 0, "col": 7, "x": 8, "y": 0.35 }, - { "row": 0, "col": 8, "x": 9, "y": 0.225 }, - { "row": 0, "col": 9, "x": 10, "y": 0 }, - { "row": 0, "col": 10, "x": 11, "y": 0.225 }, - { "row": 0, "col": 11, "x": 12, "y": 0.675 }, - - { "row": 1, "col": 1, "x": 0, "y": 1.675 }, - { "row": 1, "col": 2, "x": 1, "y": 1.225 }, - { "row": 1, "col": 3, "x": 2, "y": 1 }, - { "row": 1, "col": 4, "x": 3, "y": 1.225 }, - { "row": 1, "col": 5, "x": 4, "y": 1.35 }, - { "row": 1, "col": 7, "x": 8, "y": 1.35 }, - { "row": 1, "col": 8, "x": 9, "y": 1.225 }, - { "row": 1, "col": 9, "x": 10, "y": 1 }, - { "row": 1, "col": 10, "x": 11, "y": 1.225 }, - { "row": 1, "col": 11, "x": 12, "y": 1.675 }, - - { "row": 2, "col": 1, "x": 0, "y": 2.675 }, - { "row": 2, "col": 2, "x": 1, "y": 2.225 }, - { "row": 2, "col": 3, "x": 2, "y": 2 }, - { "row": 2, "col": 4, "x": 3, "y": 2.225 }, - { "row": 2, "col": 5, "x": 4, "y": 2.35 }, - { "row": 2, "col": 7, "x": 8, "y": 2.35 }, - { "row": 2, "col": 8, "x": 9, "y": 2.225 }, - { "row": 2, "col": 9, "x": 10, "y": 2 }, - { "row": 2, "col": 10, "x": 11, "y": 2.225 }, - { "row": 2, "col": 11, "x": 12, "y": 2.675 }, - - { "row": 3, "col": 4, "x": 2.48, "y": 3.225, "r": 15, "rx": 2.98, "ry": 7.895 }, - { "row": 3, "col": 5, "x": 2.48, "y": 3.3 , "r": 30, "rx": 2.98, "ry": 7.895 }, - { "row": 3, "col": 7, "x": 9.52, "y": 3.3 , "r": -30, "rx": 10.02, "ry": 7.895 }, - { "row": 3, "col": 8, "x": 9.52, "y": 3.225, "r": -15, "rx": 10.02, "ry": 7.895 } + { "x": 0.0, "y": 0.95 }, + { "x": 1.0, "y": 0.32 }, + { "x": 2.0, "y": 0.0 }, + { "x": 3.0, "y": 0.29 }, + { "x": 4.0, "y": 0.42 }, + { "x": 7.0, "y": 0.42 }, + { "x": 8.0, "y": 0.29 }, + { "x": 9.0, "y": 0.0 }, + { "x": 10.0, "y": 0.32 }, + { "x": 11.0, "y": 0.95 }, + { "x": 0.0, "y": 1.95 }, + { "x": 1.0, "y": 1.32 }, + { "x": 2.0, "y": 1.0 }, + { "x": 3.0, "y": 1.29 }, + { "x": 4.0, "y": 1.42 }, + { "x": 7.0, "y": 1.42 }, + { "x": 8.0, "y": 1.29 }, + { "x": 9.0, "y": 1.0 }, + { "x": 10.0, "y": 1.32 }, + { "x": 11.0, "y": 1.95 }, + { "x": 0.0, "y": 2.95 }, + { "x": 1.0, "y": 2.32 }, + { "x": 2.0, "y": 2.0 }, + { "x": 3.0, "y": 2.29 }, + { "x": 4.0, "y": 2.42 }, + { "x": 7.0, "y": 2.42 }, + { "x": 8.0, "y": 2.29 }, + { "x": 9.0, "y": 2.0 }, + { "x": 10.0, "y": 2.32 }, + { "x": 11.0, "y": 2.95 }, + { "x": 3.3, "y": 3.55, "r": 15.0, "rx": 4.3, "ry": 4.55 }, + { "x": 4.3, "y": 3.55, "r": 30.0, "rx": 4.3, "ry": 4.55 }, + { "x": 6.7, "y": 3.55, "r": -30.0, "rx": 7.7, "ry": 4.55 }, + { "x": 7.7, "y": 3.55, "r": -15.0, "rx": 7.7, "ry": 4.55 } ] } - }, - "sensors": [] + } } \ No newline at end of file diff --git a/cradio_left-nice_nano_v2-zmk.uf2 b/cradio_left-nice_nano_v2-zmk.uf2 deleted file mode 100644 index 8fb8044..0000000 Binary files a/cradio_left-nice_nano_v2-zmk.uf2 and /dev/null differ diff --git a/cradio_right-nice_nano_v2-zmk.uf2 b/cradio_right-nice_nano_v2-zmk.uf2 deleted file mode 100644 index ac41784..0000000 Binary files a/cradio_right-nice_nano_v2-zmk.uf2 and /dev/null differ