summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-09-20 18:44:34 +0000
committerQMK Bot <hello@qmk.fm>2022-09-20 18:44:34 +0000
commit8dc81309f4f07815de9bdd27c6ca519c44f55d5b (patch)
tree2b0f9911d9a040b00a0df9bc3fb618bdea3f726d
parent881aab9e76d4cab5b1c58548cb47ff4a2c8868cb (diff)
parentb0f824755a1239a5ee6285a8930f6521f3924869 (diff)
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--keyboards/acheron/apollo/87h/delta/config.h4
-rw-r--r--keyboards/acheron/apollo/87h/delta/halconf.h4
-rw-r--r--keyboards/acheron/apollo/87h/delta/mcuconf.h3
-rw-r--r--keyboards/acheron/apollo/87h/delta/rules.mk3
-rw-r--r--keyboards/acheron/apollo/87h/gamma/config.h4
-rw-r--r--keyboards/acheron/apollo/87h/gamma/gamma.c6
-rw-r--r--keyboards/acheron/apollo/87h/gamma/halconf.h3
-rw-r--r--keyboards/acheron/apollo/87h/gamma/mcuconf.h6
-rw-r--r--keyboards/acheron/apollo/87h/gamma/rules.mk3
-rw-r--r--keyboards/acheron/apollo/87htsc/halconf.h2
-rw-r--r--keyboards/acheron/apollo/87htsc/mcuconf.h3
-rw-r--r--keyboards/acheron/apollo/87htsc/rules.mk3
-rw-r--r--keyboards/acheron/apollo/88htsc/88htsc.c5
-rw-r--r--keyboards/acheron/apollo/88htsc/halconf.h2
-rw-r--r--keyboards/acheron/apollo/88htsc/mcuconf.h3
-rw-r--r--keyboards/acheron/apollo/88htsc/rules.mk4
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 85909af208..5df3628db2 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 <http://www.gnu.org/licenses/>.
/* 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 9379352e8e..691c0552a3 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 <gondolindrim@acheronproject.com>
*
* 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 29a62a94c2..652fecfc8a 100644
--- a/keyboards/acheron/apollo/87h/delta/mcuconf.h
+++ b/keyboards/acheron/apollo/87h/delta/mcuconf.h
@@ -18,9 +18,6 @@
#include_next <mcuconf.h>
-#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 c519425408..814a3f15f0 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 89f9a85d24..21fe929409 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 <http://www.gnu.org/licenses/>.
/* 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 72182d4f2a..babad3c11c 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 <http://www.gnu.org/licenses/>.
#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 957fe10f42..2e098f5113 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 <halconf.h>
diff --git a/keyboards/acheron/apollo/87h/gamma/mcuconf.h b/keyboards/acheron/apollo/87h/gamma/mcuconf.h
index 0113e71378..9cf24d5bcd 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 4ba14045bb..c05ab3c41a 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 9379352e8e..09240969ab 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 29a62a94c2..652fecfc8a 100644
--- a/keyboards/acheron/apollo/87htsc/mcuconf.h
+++ b/keyboards/acheron/apollo/87htsc/mcuconf.h
@@ -18,9 +18,6 @@
#include_next <mcuconf.h>
-#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 696b529919..f2becf4db4 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 88e0815b3f..574e1829de 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 <http://www.gnu.org/licenses/>.
#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 9379352e8e..09240969ab 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 29a62a94c2..652fecfc8a 100644
--- a/keyboards/acheron/apollo/88htsc/mcuconf.h
+++ b/keyboards/acheron/apollo/88htsc/mcuconf.h
@@ -18,9 +18,6 @@
#include_next <mcuconf.h>
-#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 c519425408..18e8b33b07 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