From 909054c35772ae62d6d2de0cefd1bef18762e754 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Tue, 12 Sep 2023 06:47:12 +0100 Subject: Migrate spi_flash WEAR_LEVELING_DRIVER to info.json (#21978) --- keyboards/projectd/65/projectd_65_ansi/info.json | 6 ++++++ keyboards/projectd/65/projectd_65_ansi/rules.mk | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'keyboards/projectd') diff --git a/keyboards/projectd/65/projectd_65_ansi/info.json b/keyboards/projectd/65/projectd_65_ansi/info.json index 0c8b9585bb..3d4041db17 100644 --- a/keyboards/projectd/65/projectd_65_ansi/info.json +++ b/keyboards/projectd/65/projectd_65_ansi/info.json @@ -10,6 +10,12 @@ "dynamic_keymap": { "layer_count": 13 }, + "eeprom": { + "driver": "wear_leveling", + "wear_leveling": { + "driver": "spi_flash" + } + }, "features": { "bootmagic": true, "command": false, diff --git a/keyboards/projectd/65/projectd_65_ansi/rules.mk b/keyboards/projectd/65/projectd_65_ansi/rules.mk index 24d5f6f52e..6e7633bfe0 100644 --- a/keyboards/projectd/65/projectd_65_ansi/rules.mk +++ b/keyboards/projectd/65/projectd_65_ansi/rules.mk @@ -1,2 +1 @@ -EEPROM_DRIVER = wear_leveling -WEAR_LEVELING_DRIVER = spi_flash +# This file intentionally left blank -- cgit v1.2.3 From a0aebe5cd586bb464105a8ce6eddf926372c6146 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 13 Sep 2023 22:45:17 +1000 Subject: aw20216: driver naming cleanups (#21891) --- keyboards/projectd/65/projectd_65_ansi/config.h | 10 +++++----- keyboards/projectd/65/projectd_65_ansi/info.json | 2 +- keyboards/projectd/65/projectd_65_ansi/projectd_65_ansi.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'keyboards/projectd') diff --git a/keyboards/projectd/65/projectd_65_ansi/config.h b/keyboards/projectd/65/projectd_65_ansi/config.h index 312a72979f..64e4595e1b 100644 --- a/keyboards/projectd/65/projectd_65_ansi/config.h +++ b/keyboards/projectd/65/projectd_65_ansi/config.h @@ -33,10 +33,10 @@ #define SPI_MOSI_PIN A7 #define SPI_MISO_PIN A6 -#define DRIVER_1_CS A15 -#define DRIVER_2_CS B15 -#define DRIVER_1_EN C13 -#define DRIVER_2_EN C13 +#define AW20216S_DRIVER_1_CS A15 +#define AW20216S_DRIVER_2_CS B15 +#define AW20216S_DRIVER_1_EN C13 +#define AW20216S_DRIVER_2_EN C13 -#define DRIVER_COUNT 1 +#define AW20216S_DRIVER_COUNT 1 #define RGB_MATRIX_LED_COUNT 71 diff --git a/keyboards/projectd/65/projectd_65_ansi/info.json b/keyboards/projectd/65/projectd_65_ansi/info.json index 3d4041db17..c385f00ed1 100644 --- a/keyboards/projectd/65/projectd_65_ansi/info.json +++ b/keyboards/projectd/65/projectd_65_ansi/info.json @@ -80,7 +80,7 @@ "solid_multisplash": true }, "center_point": [76, 25], - "driver": "aw20216", + "driver": "aw20216s", "layout": [ { "flags": 4, "matrix": [1, 3], "x": 0, "y": 0 }, { "flags": 4, "matrix": [1, 7], "x": 10, "y": 0 }, diff --git a/keyboards/projectd/65/projectd_65_ansi/projectd_65_ansi.c b/keyboards/projectd/65/projectd_65_ansi/projectd_65_ansi.c index 6027128a96..a945e8020e 100644 --- a/keyboards/projectd/65/projectd_65_ansi/projectd_65_ansi.c +++ b/keyboards/projectd/65/projectd_65_ansi/projectd_65_ansi.c @@ -18,7 +18,7 @@ #ifdef RGB_MATRIX_ENABLE -const aw_led g_aw_leds[RGB_MATRIX_LED_COUNT] = { +const aw20216s_led g_aw20216s_leds[RGB_MATRIX_LED_COUNT] = { /* Refer to IS31 manual for these locations * driver * | R location -- cgit v1.2.3 From 00feff656f80d9c9bf57cb1c6ad94ef2f69f1440 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Thu, 14 Sep 2023 00:13:19 +0100 Subject: Migrate WEAR_LEVELING_*_SIZE to info.json (#22010) --- keyboards/projectd/65/projectd_65_ansi/config.h | 1 - keyboards/projectd/65/projectd_65_ansi/info.json | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'keyboards/projectd') diff --git a/keyboards/projectd/65/projectd_65_ansi/config.h b/keyboards/projectd/65/projectd_65_ansi/config.h index 64e4595e1b..4d1dc100d8 100644 --- a/keyboards/projectd/65/projectd_65_ansi/config.h +++ b/keyboards/projectd/65/projectd_65_ansi/config.h @@ -25,7 +25,6 @@ /* External spi flash */ #define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN B14 -#define WEAR_LEVELING_BACKING_SIZE (4 * 1024) /* SPI Config for LED Driver */ #define SPI_DRIVER SPIDQ diff --git a/keyboards/projectd/65/projectd_65_ansi/info.json b/keyboards/projectd/65/projectd_65_ansi/info.json index c385f00ed1..861e3792db 100644 --- a/keyboards/projectd/65/projectd_65_ansi/info.json +++ b/keyboards/projectd/65/projectd_65_ansi/info.json @@ -13,7 +13,8 @@ "eeprom": { "driver": "wear_leveling", "wear_leveling": { - "driver": "spi_flash" + "driver": "spi_flash", + "backing_size": 4096 } }, "features": { -- cgit v1.2.3 From 4b26d9b62b299f15ce517e3fb7c9bfbe8eaf88b8 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 20 Sep 2023 20:50:52 +1000 Subject: Update AW20216S LED type (#22072) * Update AW20216S LED type * Remove mattgauf keymap --- keyboards/projectd/65/projectd_65_ansi/projectd_65_ansi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'keyboards/projectd') diff --git a/keyboards/projectd/65/projectd_65_ansi/projectd_65_ansi.c b/keyboards/projectd/65/projectd_65_ansi/projectd_65_ansi.c index a945e8020e..0d6123ac01 100644 --- a/keyboards/projectd/65/projectd_65_ansi/projectd_65_ansi.c +++ b/keyboards/projectd/65/projectd_65_ansi/projectd_65_ansi.c @@ -18,8 +18,8 @@ #ifdef RGB_MATRIX_ENABLE -const aw20216s_led g_aw20216s_leds[RGB_MATRIX_LED_COUNT] = { -/* Refer to IS31 manual for these locations +const aw20216s_led_t g_aw20216s_leds[RGB_MATRIX_LED_COUNT] = { +/* Refer to AW20216S manual for these locations * driver * | R location * | | G location -- cgit v1.2.3 From d56ee70c524b4fc4d1638e5e8c4bdeb89e752993 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 21 Oct 2023 21:41:59 +1000 Subject: Rename `DRIVER_ADDR_n` defines (#22200) Co-authored-by: Nick Brassel --- keyboards/projectd/65/projectd_65_ansi/config.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'keyboards/projectd') diff --git a/keyboards/projectd/65/projectd_65_ansi/config.h b/keyboards/projectd/65/projectd_65_ansi/config.h index 4d1dc100d8..fb86e2c781 100644 --- a/keyboards/projectd/65/projectd_65_ansi/config.h +++ b/keyboards/projectd/65/projectd_65_ansi/config.h @@ -32,10 +32,10 @@ #define SPI_MOSI_PIN A7 #define SPI_MISO_PIN A6 -#define AW20216S_DRIVER_1_CS A15 -#define AW20216S_DRIVER_2_CS B15 -#define AW20216S_DRIVER_1_EN C13 -#define AW20216S_DRIVER_2_EN C13 +#define AW20216S_CS_PIN_1 A15 +#define AW20216S_CS_PIN_2 B15 +#define AW20216S_EN_PIN_1 C13 +#define AW20216S_EN_PIN_2 C13 #define AW20216S_DRIVER_COUNT 1 #define RGB_MATRIX_LED_COUNT 71 -- cgit v1.2.3 From 48d9140cfc197d6f4c54bf8022902d28fac37624 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sun, 22 Oct 2023 00:47:37 +0100 Subject: Fix invalid LED driver config (#22312) --- keyboards/projectd/65/projectd_65_ansi/config.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'keyboards/projectd') diff --git a/keyboards/projectd/65/projectd_65_ansi/config.h b/keyboards/projectd/65/projectd_65_ansi/config.h index fb86e2c781..23540640ad 100644 --- a/keyboards/projectd/65/projectd_65_ansi/config.h +++ b/keyboards/projectd/65/projectd_65_ansi/config.h @@ -33,9 +33,7 @@ #define SPI_MISO_PIN A6 #define AW20216S_CS_PIN_1 A15 -#define AW20216S_CS_PIN_2 B15 #define AW20216S_EN_PIN_1 C13 -#define AW20216S_EN_PIN_2 C13 #define AW20216S_DRIVER_COUNT 1 #define RGB_MATRIX_LED_COUNT 71 -- cgit v1.2.3 From 1efc79063c5bc5fae6766f7555738b122ef8988d Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Mon, 13 Nov 2023 22:30:19 +0000 Subject: Migrate some EEPROM config to info.json (#22434) --- keyboards/projectd/75/ansi/config.h | 1 - keyboards/projectd/75/ansi/info.json | 10 +++++++--- keyboards/projectd/75/ansi/rules.mk | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) (limited to 'keyboards/projectd') diff --git a/keyboards/projectd/75/ansi/config.h b/keyboards/projectd/75/ansi/config.h index 5fcad72e71..c27da26a6f 100644 --- a/keyboards/projectd/75/ansi/config.h +++ b/keyboards/projectd/75/ansi/config.h @@ -25,7 +25,6 @@ /* External spi flash */ #define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN B14 -#define WEAR_LEVELING_BACKING_SIZE (4 * 1024) /* SPI Config for LED Driver */ #define SPI_DRIVER SPIDQ diff --git a/keyboards/projectd/75/ansi/info.json b/keyboards/projectd/75/ansi/info.json index daf94202e0..0e137de614 100644 --- a/keyboards/projectd/75/ansi/info.json +++ b/keyboards/projectd/75/ansi/info.json @@ -6,6 +6,13 @@ "bootmagic": { "matrix": [1, 3] }, + "eeprom": { + "driver": "wear_leveling", + "wear_leveling": { + "driver": "spi_flash", + "backing_size": 4096 + } + }, "diode_direction": "COL2ROW", "dynamic_keymap": { "layer_count": 10 @@ -176,9 +183,6 @@ "pid": "0x000F", "vid": "0x3233" }, - "eeprom": { - "driver": "wear_leveling" - }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/projectd/75/ansi/rules.mk b/keyboards/projectd/75/ansi/rules.mk index 002458405e..6e7633bfe0 100644 --- a/keyboards/projectd/75/ansi/rules.mk +++ b/keyboards/projectd/75/ansi/rules.mk @@ -1 +1 @@ -WEAR_LEVELING_DRIVER = spi_flash +# This file intentionally left blank -- cgit v1.2.3 From b35bac6afbadc88cf6e8e3d1c8cc7494a510bb60 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 22 Nov 2023 21:37:32 +0000 Subject: Remove unnecessary driver counts (#22435) --- keyboards/projectd/65/projectd_65_ansi/config.h | 1 - keyboards/projectd/75/ansi/config.h | 1 - 2 files changed, 2 deletions(-) (limited to 'keyboards/projectd') diff --git a/keyboards/projectd/65/projectd_65_ansi/config.h b/keyboards/projectd/65/projectd_65_ansi/config.h index 23540640ad..8b162a2149 100644 --- a/keyboards/projectd/65/projectd_65_ansi/config.h +++ b/keyboards/projectd/65/projectd_65_ansi/config.h @@ -35,5 +35,4 @@ #define AW20216S_CS_PIN_1 A15 #define AW20216S_EN_PIN_1 C13 -#define AW20216S_DRIVER_COUNT 1 #define RGB_MATRIX_LED_COUNT 71 diff --git a/keyboards/projectd/75/ansi/config.h b/keyboards/projectd/75/ansi/config.h index c27da26a6f..3b685c09b8 100644 --- a/keyboards/projectd/75/ansi/config.h +++ b/keyboards/projectd/75/ansi/config.h @@ -37,7 +37,6 @@ #define DRIVER_1_EN C13 #define DRIVER_2_EN C13 -#define DRIVER_COUNT 2 #define DRIVER_1_LED_TOTAL 70 #define DRIVER_2_LED_TOTAL 17 #define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) -- cgit v1.2.3