summaryrefslogtreecommitdiff
path: root/keyboards/cannonkeys/ripple
diff options
context:
space:
mode:
authorNick Brassel <nick@tzarc.org>2023-05-29 06:17:24 +1000
committerNick Brassel <nick@tzarc.org>2023-05-29 06:17:24 +1000
commit5024370dd0b441e86ace3089193e84c5b050d892 (patch)
treeb661d5b154be987f9c3dba3a526b70e0b63f9fef /keyboards/cannonkeys/ripple
parent16767e4d59c2334fcd2d5e6556a68d5ff60ffd7b (diff)
parent8b1d86eabf399e82af7738fb675b9c74195d0f98 (diff)
Merge branch 'develop'
Diffstat (limited to 'keyboards/cannonkeys/ripple')
-rw-r--r--keyboards/cannonkeys/ripple/info.json189
-rw-r--r--keyboards/cannonkeys/ripple/rules.mk2
2 files changed, 96 insertions, 95 deletions
diff --git a/keyboards/cannonkeys/ripple/info.json b/keyboards/cannonkeys/ripple/info.json
index 63564ae7ce..e416ad44a3 100644
--- a/keyboards/cannonkeys/ripple/info.json
+++ b/keyboards/cannonkeys/ripple/info.json
@@ -23,9 +23,12 @@
"backlight": true,
"rgblight": true
},
+ "ws2812": {
+ "pin": "B15",
+ "driver": "spi"
+ },
"rgblight": {
"led_count": 20,
- "pin": "B15",
"hue_steps": 17,
"saturation_steps": 17,
"brightness_steps": 17,
@@ -52,98 +55,98 @@
"layouts": {
"LAYOUT": {
"layout": [
- { "matrix": [0, 0], "x": 0, "y": 0 },
- { "matrix": [0, 1], "x": 1.25, "y": 0 },
- { "matrix": [0, 2], "x": 2.25, "y": 0 },
- { "matrix": [0, 3], "x": 3.25, "y": 0 },
- { "matrix": [0, 4], "x": 4.25, "y": 0 },
- { "matrix": [0, 5], "x": 5.5, "y": 0 },
- { "matrix": [0, 6], "x": 6.5, "y": 0 },
- { "matrix": [0, 7], "x": 7.5, "y": 0 },
- { "matrix": [0, 8], "x": 8.5, "y": 0 },
- { "matrix": [0, 9], "x": 9.75, "y": 0 },
- { "matrix": [0, 10], "x": 10.75, "y": 0 },
- { "matrix": [0, 11], "x": 11.75, "y": 0 },
- { "matrix": [0, 12], "x": 12.75, "y": 0 },
- { "matrix": [0, 14], "x": 14, "y": 0 },
- { "matrix": [0, 15], "x": 15.25, "y": 0 },
- { "matrix": [0, 16], "x": 16.25, "y": 0 },
- { "matrix": [0, 17], "x": 17.25, "y": 0 },
- { "matrix": [1, 0], "x": 0, "y": 1.25 },
- { "matrix": [1, 1], "x": 1, "y": 1.25 },
- { "matrix": [1, 2], "x": 2, "y": 1.25 },
- { "matrix": [1, 3], "x": 3, "y": 1.25 },
- { "matrix": [1, 4], "x": 4, "y": 1.25 },
- { "matrix": [1, 5], "x": 5, "y": 1.25 },
- { "matrix": [1, 6], "x": 6, "y": 1.25 },
- { "matrix": [1, 7], "x": 7, "y": 1.25 },
- { "matrix": [1, 8], "x": 8, "y": 1.25 },
- { "matrix": [1, 9], "x": 9, "y": 1.25 },
- { "matrix": [1, 10], "x": 10, "y": 1.25 },
- { "matrix": [1, 11], "x": 11, "y": 1.25 },
- { "matrix": [1, 12], "x": 12, "y": 1.25 },
- { "matrix": [1, 13], "x": 13, "y": 1.25 },
- { "matrix": [1, 14], "x": 14, "y": 1.25 },
- { "matrix": [1, 15], "x": 15.25, "y": 1.25 },
- { "matrix": [1, 16], "x": 16.25, "y": 1.25 },
- { "matrix": [1, 17], "x": 17.25, "y": 1.25 },
- { "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 },
- { "matrix": [2, 1], "x": 1.5, "y": 2.25 },
- { "matrix": [2, 2], "x": 2.5, "y": 2.25 },
- { "matrix": [2, 3], "x": 3.5, "y": 2.25 },
- { "matrix": [2, 4], "x": 4.5, "y": 2.25 },
- { "matrix": [2, 5], "x": 5.5, "y": 2.25 },
- { "matrix": [2, 6], "x": 6.5, "y": 2.25 },
- { "matrix": [2, 7], "x": 7.5, "y": 2.25 },
- { "matrix": [2, 8], "x": 8.5, "y": 2.25 },
- { "matrix": [2, 9], "x": 9.5, "y": 2.25 },
- { "matrix": [2, 10], "x": 10.5, "y": 2.25 },
- { "matrix": [2, 11], "x": 11.5, "y": 2.25 },
- { "matrix": [2, 12], "x": 12.5, "y": 2.25 },
- { "matrix": [2, 14], "w": 1.5, "x": 13.5, "y": 2.25 },
- { "matrix": [2, 15], "x": 15.25, "y": 2.25 },
- { "matrix": [2, 16], "x": 16.25, "y": 2.25 },
- { "matrix": [2, 17], "x": 17.25, "y": 2.25 },
- { "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 },
- { "matrix": [3, 1], "x": 1.75, "y": 3.25 },
- { "matrix": [3, 2], "x": 2.75, "y": 3.25 },
- { "matrix": [3, 3], "x": 3.75, "y": 3.25 },
- { "matrix": [3, 4], "x": 4.75, "y": 3.25 },
- { "matrix": [3, 5], "x": 5.75, "y": 3.25 },
- { "matrix": [3, 6], "x": 6.75, "y": 3.25 },
- { "matrix": [3, 7], "x": 7.75, "y": 3.25 },
- { "matrix": [3, 8], "x": 8.75, "y": 3.25 },
- { "matrix": [3, 9], "x": 9.75, "y": 3.25 },
- { "matrix": [3, 10], "x": 10.75, "y": 3.25 },
- { "matrix": [3, 11], "x": 11.75, "y": 3.25 },
- { "matrix": [3, 12], "x": 12.75, "y": 3.25 },
- { "matrix": [3, 14], "w": 1.25, "x": 13.75, "y": 3.25 },
- { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.25 },
- { "matrix": [4, 1], "x": 1.25, "y": 4.25 },
- { "matrix": [4, 2], "x": 2.25, "y": 4.25 },
- { "matrix": [4, 3], "x": 3.25, "y": 4.25 },
- { "matrix": [4, 4], "x": 4.25, "y": 4.25 },
- { "matrix": [4, 5], "x": 5.25, "y": 4.25 },
- { "matrix": [4, 6], "x": 6.25, "y": 4.25 },
- { "matrix": [4, 7], "x": 7.25, "y": 4.25 },
- { "matrix": [4, 8], "x": 8.25, "y": 4.25 },
- { "matrix": [4, 9], "x": 9.25, "y": 4.25 },
- { "matrix": [4, 10], "x": 10.25, "y": 4.25 },
- { "matrix": [4, 11], "x": 11.25, "y": 4.25 },
- { "matrix": [4, 12], "w": 1.75, "x": 12.25, "y": 4.25 },
- { "matrix": [4, 14], "x": 14, "y": 4.25 },
- { "matrix": [4, 16], "x": 16.25, "y": 4.25 },
- { "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.25 },
- { "matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5.25 },
- { "matrix": [5, 2], "w": 1.25, "x": 2.5, "y": 5.25 },
- { "matrix": [5, 6], "w": 6.25, "x": 3.75, "y": 5.25 },
- { "matrix": [5, 10], "w": 1.25, "x": 10, "y": 5.25 },
- { "matrix": [5, 11], "w": 1.25, "x": 11.25, "y": 5.25 },
- { "matrix": [5, 12], "w": 1.25, "x": 12.5, "y": 5.25 },
- { "matrix": [5, 14], "w": 1.25, "x": 13.75, "y": 5.25 },
- { "matrix": [5, 15], "x": 15.25, "y": 5.25 },
- { "matrix": [5, 16], "x": 16.25, "y": 5.25 },
- { "matrix": [5, 17], "x": 17.25, "y": 5.25 }
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1.25, "y": 0},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.5, "y": 0},
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+ {"matrix": [0, 7], "x": 7.5, "y": 0},
+ {"matrix": [0, 8], "x": 8.5, "y": 0},
+ {"matrix": [0, 9], "x": 9.75, "y": 0},
+ {"matrix": [0, 10], "x": 10.75, "y": 0},
+ {"matrix": [0, 11], "x": 11.75, "y": 0},
+ {"matrix": [0, 12], "x": 12.75, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [0, 15], "x": 15.25, "y": 0},
+ {"matrix": [0, 16], "x": 16.25, "y": 0},
+ {"matrix": [0, 17], "x": 17.25, "y": 0},
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6, "y": 1.25},
+ {"matrix": [1, 7], "x": 7, "y": 1.25},
+ {"matrix": [1, 8], "x": 8, "y": 1.25},
+ {"matrix": [1, 9], "x": 9, "y": 1.25},
+ {"matrix": [1, 10], "x": 10, "y": 1.25},
+ {"matrix": [1, 11], "x": 11, "y": 1.25},
+ {"matrix": [1, 12], "x": 12, "y": 1.25},
+ {"matrix": [1, 13], "x": 13, "y": 1.25},
+ {"matrix": [1, 14], "x": 14, "y": 1.25},
+ {"matrix": [1, 15], "x": 15.25, "y": 1.25},
+ {"matrix": [1, 16], "x": 16.25, "y": 1.25},
+ {"matrix": [1, 17], "x": 17.25, "y": 1.25},
+ {"matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"matrix": [2, 14], "w": 1.5, "x": 13.5, "y": 2.25},
+ {"matrix": [2, 15], "x": 15.25, "y": 2.25},
+ {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+ {"matrix": [2, 17], "x": 17.25, "y": 2.25},
+ {"matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+ {"matrix": [3, 14], "w": 1.25, "x": 13.75, "y": 3.25},
+ {"matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+ {"matrix": [4, 12], "w": 1.75, "x": 12.25, "y": 4.25},
+ {"matrix": [4, 14], "x": 14, "y": 4.25},
+ {"matrix": [4, 16], "x": 16.25, "y": 4.25},
+ {"matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.25},
+ {"matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5.25},
+ {"matrix": [5, 2], "w": 1.25, "x": 2.5, "y": 5.25},
+ {"matrix": [5, 6], "w": 6.25, "x": 3.75, "y": 5.25},
+ {"matrix": [5, 10], "w": 1.25, "x": 10, "y": 5.25},
+ {"matrix": [5, 11], "w": 1.25, "x": 11.25, "y": 5.25},
+ {"matrix": [5, 12], "w": 1.25, "x": 12.5, "y": 5.25},
+ {"matrix": [5, 14], "w": 1.25, "x": 13.75, "y": 5.25},
+ {"matrix": [5, 15], "x": 15.25, "y": 5.25},
+ {"matrix": [5, 16], "x": 16.25, "y": 5.25},
+ {"matrix": [5, 17], "x": 17.25, "y": 5.25}
]
}
}
diff --git a/keyboards/cannonkeys/ripple/rules.mk b/keyboards/cannonkeys/ripple/rules.mk
index 2f5938630c..2a5031cd32 100644
--- a/keyboards/cannonkeys/ripple/rules.mk
+++ b/keyboards/cannonkeys/ripple/rules.mk
@@ -1,7 +1,5 @@
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-WS2812_DRIVER = spi
-
# Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE