Merge remote-tracking branch 'origin/develop' into xap

2024-12-13 13:20:46 +00:00 · 2023-11-13 22:30:55 +00:00 · 2023-11-13 22:30:55 +00:00 · 50ff29e82b
commit 50ff29e82b
parent 5ac27f0e5f 1efc79063c
29 changed files with 74 additions and 38 deletions
--- a/keyboards/acheron/themis/87h/config.h
+++ b/keyboards/acheron/themis/87h/config.h
@ -28,6 +28,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_PWM_PAL_MODE 1
 #define WS2812_DMA_STREAM STM32_DMA2_STREAM5
 #define WS2812_DMA_CHANNEL 6
-
-#define WEAR_LEVELING_LOGICAL_SIZE 4096
-#define WEAR_LEVELING_BACKING_SIZE 8192
--- a/keyboards/acheron/themis/87h/info.json
+++ b/keyboards/acheron/themis/87h/info.json
@ -21,6 +21,11 @@
        "nkro":      true
    },
    "diode_direction": "COL2ROW",
+    "eeprom": {
+        "wear_leveling": {
+            "backing_size": 8192
+        }
+    },
    "ws2812": {
        "pin": "B15"
    },
--- a/keyboards/acheron/themis/87htsc/config.h
+++ b/keyboards/acheron/themis/87htsc/config.h
@ -28,6 +28,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_PWM_PAL_MODE 1
 #define WS2812_DMA_STREAM STM32_DMA2_STREAM5
 #define WS2812_DMA_CHANNEL 6
-
-#define WEAR_LEVELING_LOGICAL_SIZE 4096
-#define WEAR_LEVELING_BACKING_SIZE 8192
--- a/keyboards/acheron/themis/87htsc/info.json
+++ b/keyboards/acheron/themis/87htsc/info.json
@ -21,6 +21,11 @@
        "nkro":      true
    },
    "diode_direction": "COL2ROW",
+    "eeprom": {
+        "wear_leveling": {
+            "backing_size": 8192
+        }
+    },
    "ws2812": {
        "pin": "B15"
    },
--- a/keyboards/acheron/themis/88htsc/config.h
+++ b/keyboards/acheron/themis/88htsc/config.h
@ -28,6 +28,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_PWM_PAL_MODE 1
 #define WS2812_DMA_STREAM STM32_DMA2_STREAM5
 #define WS2812_DMA_CHANNEL 6
-
-#define WEAR_LEVELING_LOGICAL_SIZE 4096
-#define WEAR_LEVELING_BACKING_SIZE 8192
--- a/keyboards/acheron/themis/88htsc/info.json
+++ b/keyboards/acheron/themis/88htsc/info.json
@ -21,6 +21,11 @@
        "nkro":      true
    },
    "diode_direction": "COL2ROW",
+    "eeprom": {
+        "wear_leveling": {
+            "backing_size": 8192
+        }
+    },
    "ws2812": {
        "pin": "B15"
    },
--- a/keyboards/akko/5087/config.h
+++ b/keyboards/akko/5087/config.h
@ -34,7 +34,6 @@
 #define SPI_MOSI_PAL_MODE 5

 #define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12
-#define WEAR_LEVELING_BACKING_SIZE (8 * 1024)

 /* I2C Config for LED Driver */
 #define DRIVER_COUNT 2
--- a/keyboards/akko/5087/info.json
+++ b/keyboards/akko/5087/info.json
@ -29,6 +29,13 @@
        "rows": ["B15", "C6", "C7", "C8", "C9", "A8"]
    },
    "diode_direction": "ROW2COL",
+    "eeprom": {
+        "driver": "wear_leveling",
+        "wear_leveling": {
+            "driver": "spi_flash",
+            "backing_size": 8192
+        }
+    },
    "indicators": {
        "caps_lock": "A15"
    }, 
--- a/keyboards/akko/5087/rules.mk
+++ b/keyboards/akko/5087/rules.mk
@ -1,3 +1 @@
-EEPROM_DRIVER = wear_leveling
-WEAR_LEVELING_DRIVER = spi_flash
-
+# This file intentionally left blank
--- a/keyboards/darkproject/kd87a_bfg_edition/config.h
+++ b/keyboards/darkproject/kd87a_bfg_edition/config.h
@ -25,7 +25,6 @@

 /* External spi flash */
 #define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN B14
-#define WEAR_LEVELING_BACKING_SIZE (8 * 1024)

 /* SPI Config for LED Driver */
 #define SPI_DRIVER SPIDQ
--- a/keyboards/darkproject/kd87a_bfg_edition/info.json
+++ b/keyboards/darkproject/kd87a_bfg_edition/info.json
@ -7,6 +7,13 @@
        "matrix": [1, 3]
    },
    "diode_direction": "COL2ROW",
+    "eeprom": {
+        "driver": "wear_leveling",
+        "wear_leveling": {
+            "driver": "spi_flash",
+            "backing_size": 8192
+        }
+    },
    "features": {
        "bootmagic": true,
        "extrakey": true,
@ -174,9 +181,6 @@
        "pid": "0xE393",
        "vid": "0x342D"
    },
-    "eeprom": {
-        "driver": "wear_leveling"
-    },
    "community_layouts": ["tkl_ansi"],
    "layouts": {
        "LAYOUT_tkl_ansi": {
--- a/keyboards/darkproject/kd87a_bfg_edition/rules.mk
+++ b/keyboards/darkproject/kd87a_bfg_edition/rules.mk
@ -1 +1 @@
-WEAR_LEVELING_DRIVER = spi_flash
+# This file intentionally left blank
--- a/keyboards/inland/v83p/config.h
+++ b/keyboards/inland/v83p/config.h
@ -29,7 +29,6 @@
 #define SPI_MOSI_PAL_MODE 5

 #define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12
-#define WEAR_LEVELING_BACKING_SIZE (4 * 1024)

 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_MATRIX_KEYPRESSES
--- a/keyboards/inland/v83p/info.json
+++ b/keyboards/inland/v83p/info.json
@ -12,6 +12,13 @@
        "suspend_wakeup_delay": 1000
    },
    "diode_direction": "ROW2COL",
+    "eeprom": {
+        "driver": "wear_leveling",
+        "wear_leveling": {
+            "driver": "spi_flash",
+            "backing_size": 4096
+        }
+    },
    "features": {
        "bootmagic": true,
        "command": false,
--- a/keyboards/inland/v83p/rules.mk
+++ b/keyboards/inland/v83p/rules.mk
@ -1,2 +1 @@
-EEPROM_DRIVER = wear_leveling
-WEAR_LEVELING_DRIVER = spi_flash
+# This file intentionally left blank
--- a/keyboards/jukaie/jk01/config.h
+++ b/keyboards/jukaie/jk01/config.h
@ -25,7 +25,6 @@

 /* External spi flash */
 #define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN B14
-#define WEAR_LEVELING_BACKING_SIZE (8 * 1024)

 /* SPI Config for LED Driver */
 #define SPI_DRIVER SPIDQ
--- a/keyboards/jukaie/jk01/info.json
+++ b/keyboards/jukaie/jk01/info.json
@ -7,6 +7,13 @@
        "matrix": [1, 3]
    },
    "diode_direction": "COL2ROW",
+    "eeprom": {
+        "driver": "wear_leveling",
+        "wear_leveling": {
+            "driver": "spi_flash",
+            "backing_size": 8192
+        }
+    },
    "encoder": {
        "rotary": [
            {"pin_a": "C2", "pin_b": "C3"}
@ -175,9 +182,6 @@
        "pid": "0x0002",
        "vid": "0x4141"
    },
-    "eeprom": {
-        "driver": "wear_leveling"
-    },
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/jukaie/jk01/rules.mk
+++ b/keyboards/jukaie/jk01/rules.mk
@ -1 +1 @@
-WEAR_LEVELING_DRIVER = spi_flash
+# This file intentionally left blank
--- a/keyboards/monsgeek/m3/config.h
+++ b/keyboards/monsgeek/m3/config.h
@ -33,7 +33,6 @@
 #define SPI_MOSI_PAL_MODE 5

 #define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12
-#define WEAR_LEVELING_BACKING_SIZE (8 * 1024)

 /* I2C Config for LED Driver */
 #define SNLED27351_DRIVER_COUNT 2
--- a/keyboards/monsgeek/m3/info.json
+++ b/keyboards/monsgeek/m3/info.json
@ -11,6 +11,13 @@
    },
    "processor": "WB32FQ95",
    "bootloader": "wb32-dfu",
+    "eeprom": {
+        "driver": "wear_leveling",
+        "wear_leveling": {
+            "driver": "spi_flash",
+            "backing_size": 8192
+        }
+    },
    "features": {
        "bootmagic": true,
        "extrakey": true,
--- a/keyboards/monsgeek/m3/rules.mk
+++ b/keyboards/monsgeek/m3/rules.mk
@ -1,2 +1 @@
-EEPROM_DRIVER = wear_leveling
-WEAR_LEVELING_DRIVER = spi_flash
+# This file intentionally left blank
--- a/keyboards/phentech/rpk_001/config.h
+++ b/keyboards/phentech/rpk_001/config.h
@ -17,7 +17,6 @@

 /* SPI Flash */
 #define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12
-#define WEAR_LEVELING_BACKING_SIZE (4 * 1024)

 /* RGB Matrix */
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
--- a/keyboards/phentech/rpk_001/info.json
+++ b/keyboards/phentech/rpk_001/info.json
@ -13,6 +13,13 @@
        "suspend_wakeup_delay": 1000
    },
    "diode_direction": "ROW2COL",
+    "eeprom": {
+        "driver": "wear_leveling",
+        "wear_leveling": {
+            "driver": "spi_flash",
+            "backing_size": 4096
+        }
+    },
    "features": {
        "nkro": true,
        "encoder": true,
--- a/keyboards/phentech/rpk_001/rules.mk
+++ b/keyboards/phentech/rpk_001/rules.mk
@ -1 +1 @@
-WEAR_LEVELING_DRIVER = spi_flash
+# This file intentionally left blank
--- 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
--- 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": [
--- 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
--- a/keyboards/vinhcatba/uncertainty/info.json
+++ b/keyboards/vinhcatba/uncertainty/info.json
@ -4,6 +4,9 @@
    "maintainer": "vinhcatba",
    "development_board": "blackpill_f401",
    "diode_direction": "COL2ROW",
+    "eeprom": {
+        "driver": "i2c"
+    },
    "encoder": {
        "rotary": [
            {"pin_a": "A13", "pin_b": "A14"}
--- a/keyboards/vinhcatba/uncertainty/rules.mk
+++ b/keyboards/vinhcatba/uncertainty/rules.mk
@ -1,3 +1 @@
 SRC += bongo.c
-# using external i2c eeprom
-EEPROM_DRIVER = i2c