From b0f824755a1239a5ee6285a8930f6521f3924869 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20A=2E=20Volpato?= Date: Tue, 20 Sep 2022 15:43:49 -0300 Subject: [PATCH] Update Apollo PCBs to use wear levelling code (#18411) --- keyboards/acheron/apollo/87h/delta/config.h | 4 ---- keyboards/acheron/apollo/87h/delta/halconf.h | 4 +--- keyboards/acheron/apollo/87h/delta/mcuconf.h | 3 --- keyboards/acheron/apollo/87h/delta/rules.mk | 3 ++- keyboards/acheron/apollo/87h/gamma/config.h | 4 ---- keyboards/acheron/apollo/87h/gamma/gamma.c | 6 ------ keyboards/acheron/apollo/87h/gamma/halconf.h | 3 --- keyboards/acheron/apollo/87h/gamma/mcuconf.h | 6 ------ keyboards/acheron/apollo/87h/gamma/rules.mk | 3 ++- keyboards/acheron/apollo/87htsc/halconf.h | 2 -- keyboards/acheron/apollo/87htsc/mcuconf.h | 3 --- keyboards/acheron/apollo/87htsc/rules.mk | 3 +++ keyboards/acheron/apollo/88htsc/88htsc.c | 5 ----- keyboards/acheron/apollo/88htsc/halconf.h | 2 -- keyboards/acheron/apollo/88htsc/mcuconf.h | 3 --- keyboards/acheron/apollo/88htsc/rules.mk | 4 +++- 16 files changed, 11 insertions(+), 47 deletions(-) diff --git a/keyboards/acheron/apollo/87h/delta/config.h b/keyboards/acheron/apollo/87h/delta/config.h index 85909af2088400284ce4f86817da5141e1ad13c1..5df3628db2e844f76d19cc2595c5151f71f4a9ba 100644 --- a/keyboards/acheron/apollo/87h/delta/config.h +++ b/keyboards/acheron/apollo/87h/delta/config.h @@ -38,10 +38,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define EEPROM_I2C_24LC256 -//#define I2C1_CLOCK_SPEED 400000 -//#define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2 - #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE #define RGB_DI_PIN B15 diff --git a/keyboards/acheron/apollo/87h/delta/halconf.h b/keyboards/acheron/apollo/87h/delta/halconf.h index 9379352e8eb718f792054ae3e6fbdd2621294106..691c0552a3fa010326d29b60fc7be48f2394ec17 100644 --- a/keyboards/acheron/apollo/87h/delta/halconf.h +++ b/keyboards/acheron/apollo/87h/delta/halconf.h @@ -1,4 +1,4 @@ -/* Copyright 2022 QMK +/* Copyright 2022 Gondolindrim * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,8 +16,6 @@ #pragma once -#define HAL_USE_I2C TRUE - #define HAL_USE_PWM TRUE #define HAL_USE_PAL TRUE diff --git a/keyboards/acheron/apollo/87h/delta/mcuconf.h b/keyboards/acheron/apollo/87h/delta/mcuconf.h index 29a62a94c2d52a2308dc8112636bbc435869ef93..652fecfc8aa182c7938e5d0264796d543d7cb401 100644 --- a/keyboards/acheron/apollo/87h/delta/mcuconf.h +++ b/keyboards/acheron/apollo/87h/delta/mcuconf.h @@ -18,9 +18,6 @@ #include_next -#undef STM32_I2C_USE_I2C1 -#define STM32_I2C_USE_I2C1 TRUE - #undef STM32_PWM_USE_ADVANCED #define STM32_PWM_USE_ADVANCED TRUE diff --git a/keyboards/acheron/apollo/87h/delta/rules.mk b/keyboards/acheron/apollo/87h/delta/rules.mk index c51942540807d1325be7adb231daa2703bab396c..814a3f15f0315ce212b1191b512714ec77120c82 100644 --- a/keyboards/acheron/apollo/87h/delta/rules.mk +++ b/keyboards/acheron/apollo/87h/delta/rules.mk @@ -19,7 +19,8 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes RGB_MATRIX_DRIVER = WS2812 -EEPROM_DRIVER = i2c +EEPROM_DRIVER = wear_leveling +WEAR_LEVELING_DRIVER = legacy # Enter lower-power sleep mode when on the ChibiOS idle thread OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -DDEBUG_EEPROM_OUTPUT=TRUE diff --git a/keyboards/acheron/apollo/87h/gamma/config.h b/keyboards/acheron/apollo/87h/gamma/config.h index 89f9a85d24b01348e3b1c662579918211d9895b4..21fe9294096c88d9866777785e4c6cb65d7567d6 100644 --- a/keyboards/acheron/apollo/87h/gamma/config.h +++ b/keyboards/acheron/apollo/87h/gamma/config.h @@ -38,10 +38,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define EEPROM_I2C_24LC256 -//#define I2C1_CLOCK_SPEED 400000 -//#define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2 - #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE // RGB Matrix defines diff --git a/keyboards/acheron/apollo/87h/gamma/gamma.c b/keyboards/acheron/apollo/87h/gamma/gamma.c index 72182d4f2a2ae9450a12eafc9f0c412cbc8037cf..babad3c11cf9340f3228ee4edc8b5a088bd24f55 100644 --- a/keyboards/acheron/apollo/87h/gamma/gamma.c +++ b/keyboards/acheron/apollo/87h/gamma/gamma.c @@ -17,11 +17,6 @@ along with this program. If not, see . #include "gamma.h" -void board_init(void) { - setPinInput(B9); - setPinInput(B10); -} - #ifdef RGB_MATRIX_ENABLE const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = { /* Refer to IS31 manual for these locations @@ -126,7 +121,6 @@ const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = { }; - led_config_t g_led_config = { { { 0 , 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 10 , 11 , 12 , 13 , 14 , 15 }, { 16 , 17 , 18 , 19 , 20 , 21 , 22 , 23 , 24 , 25 , 26 , 27 , 28 , 29 , 30 , 31 }, diff --git a/keyboards/acheron/apollo/87h/gamma/halconf.h b/keyboards/acheron/apollo/87h/gamma/halconf.h index 957fe10f42d72d50dd69c950ecf9d98e20392900..2e098f5113d93a9857e4520459b403f118957458 100644 --- a/keyboards/acheron/apollo/87h/gamma/halconf.h +++ b/keyboards/acheron/apollo/87h/gamma/halconf.h @@ -18,7 +18,4 @@ #define HAL_USE_I2C TRUE -// #define HAL_USE_PWM TRUE -// #define HAL_USE_PAL TRUE - #include_next diff --git a/keyboards/acheron/apollo/87h/gamma/mcuconf.h b/keyboards/acheron/apollo/87h/gamma/mcuconf.h index 0113e7137844a47cc7434c4e740c6219ebc0544c..9cf24d5bcdcc521ae60b010f95993ca5499a7923 100644 --- a/keyboards/acheron/apollo/87h/gamma/mcuconf.h +++ b/keyboards/acheron/apollo/87h/gamma/mcuconf.h @@ -20,9 +20,3 @@ #undef STM32_I2C_USE_I2C1 #define STM32_I2C_USE_I2C1 TRUE - -// #undef STM32_PWM_USE_ADVANCED -// #define STM32_PWM_USE_ADVANCED TRUE - -// #undef STM32_PWM_USE_TIM1 -// #define STM32_PWM_USE_TIM1 TRUE diff --git a/keyboards/acheron/apollo/87h/gamma/rules.mk b/keyboards/acheron/apollo/87h/gamma/rules.mk index 4ba14045bbbe3edbe7260f557a47a0112c493dc2..c05ab3c41ab7fc9582f85d892b740f55369e57b9 100644 --- a/keyboards/acheron/apollo/87h/gamma/rules.mk +++ b/keyboards/acheron/apollo/87h/gamma/rules.mk @@ -20,7 +20,8 @@ AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes RGB_MATRIX_DRIVER = IS31FL3741 KEYBOARD_SHARED_EP = yes -EEPROM_DRIVER = i2c +EEPROM_DRIVER = wear_leveling +WEAR_LEVELING_DRIVER = legacy # Enter lower-power sleep mode when on the ChibiOS idle thread OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -DDEBUG_EEPROM_OUTPUT=TRUE diff --git a/keyboards/acheron/apollo/87htsc/halconf.h b/keyboards/acheron/apollo/87htsc/halconf.h index 9379352e8eb718f792054ae3e6fbdd2621294106..09240969ab42a0aa90c805db0495dab261d32f5e 100644 --- a/keyboards/acheron/apollo/87htsc/halconf.h +++ b/keyboards/acheron/apollo/87htsc/halconf.h @@ -16,8 +16,6 @@ #pragma once -#define HAL_USE_I2C TRUE - #define HAL_USE_PWM TRUE #define HAL_USE_PAL TRUE diff --git a/keyboards/acheron/apollo/87htsc/mcuconf.h b/keyboards/acheron/apollo/87htsc/mcuconf.h index 29a62a94c2d52a2308dc8112636bbc435869ef93..652fecfc8aa182c7938e5d0264796d543d7cb401 100644 --- a/keyboards/acheron/apollo/87htsc/mcuconf.h +++ b/keyboards/acheron/apollo/87htsc/mcuconf.h @@ -18,9 +18,6 @@ #include_next -#undef STM32_I2C_USE_I2C1 -#define STM32_I2C_USE_I2C1 TRUE - #undef STM32_PWM_USE_ADVANCED #define STM32_PWM_USE_ADVANCED TRUE diff --git a/keyboards/acheron/apollo/87htsc/rules.mk b/keyboards/acheron/apollo/87htsc/rules.mk index 696b529919205c0b5f3dce1b7f9269a9cd447abf..f2becf4db4592f10dc9f9a040ee6cb961d0d2da8 100644 --- a/keyboards/acheron/apollo/87htsc/rules.mk +++ b/keyboards/acheron/apollo/87htsc/rules.mk @@ -19,5 +19,8 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes RGB_MATRIX_DRIVER = WS2812 + +EEPROM_DRIVER = wear_leveling +WEAR_LEVELING_DRIVER = legacy # Enter lower-power sleep mode when on the ChibiOS idle thread OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -DDEBUG_EEPROM_OUTPUT=TRUE diff --git a/keyboards/acheron/apollo/88htsc/88htsc.c b/keyboards/acheron/apollo/88htsc/88htsc.c index 88e0815b3fdc8490737bb8a35a174d90e3b56e59..574e1829de1f8f26b5568b2d216c20cf9ed8e198 100644 --- a/keyboards/acheron/apollo/88htsc/88htsc.c +++ b/keyboards/acheron/apollo/88htsc/88htsc.c @@ -17,11 +17,6 @@ along with this program. If not, see . #include "88htsc.h" -void board_init(void) { - setPinInput(B9); - setPinInput(B10); -} - led_config_t g_led_config = { { { 16 , 15 , 14 , 13 , 12 , 11 , 10 , 9 , 8 , 7 , 6 , 5 , 4 , 3 , 2 , 1 , 0 }, { 17 , 18 , 19 , 20 , 21 , 22 , 23 , 24 , 25 , 26 , 27 , 28 , 29 , 30 , 31 , 32 , 33 }, diff --git a/keyboards/acheron/apollo/88htsc/halconf.h b/keyboards/acheron/apollo/88htsc/halconf.h index 9379352e8eb718f792054ae3e6fbdd2621294106..09240969ab42a0aa90c805db0495dab261d32f5e 100644 --- a/keyboards/acheron/apollo/88htsc/halconf.h +++ b/keyboards/acheron/apollo/88htsc/halconf.h @@ -16,8 +16,6 @@ #pragma once -#define HAL_USE_I2C TRUE - #define HAL_USE_PWM TRUE #define HAL_USE_PAL TRUE diff --git a/keyboards/acheron/apollo/88htsc/mcuconf.h b/keyboards/acheron/apollo/88htsc/mcuconf.h index 29a62a94c2d52a2308dc8112636bbc435869ef93..652fecfc8aa182c7938e5d0264796d543d7cb401 100644 --- a/keyboards/acheron/apollo/88htsc/mcuconf.h +++ b/keyboards/acheron/apollo/88htsc/mcuconf.h @@ -18,9 +18,6 @@ #include_next -#undef STM32_I2C_USE_I2C1 -#define STM32_I2C_USE_I2C1 TRUE - #undef STM32_PWM_USE_ADVANCED #define STM32_PWM_USE_ADVANCED TRUE diff --git a/keyboards/acheron/apollo/88htsc/rules.mk b/keyboards/acheron/apollo/88htsc/rules.mk index c51942540807d1325be7adb231daa2703bab396c..18e8b33b0713ddd9e8f077df77b0c11227968a8d 100644 --- a/keyboards/acheron/apollo/88htsc/rules.mk +++ b/keyboards/acheron/apollo/88htsc/rules.mk @@ -19,7 +19,9 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes RGB_MATRIX_DRIVER = WS2812 -EEPROM_DRIVER = i2c + +EEPROM_DRIVER = wear_leveling +WEAR_LEVELING_DRIVER = legacy # Enter lower-power sleep mode when on the ChibiOS idle thread OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -DDEBUG_EEPROM_OUTPUT=TRUE