g1smo
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
QMK Bot 2022-09-20 18:44:34 +00:00
parent 881aab9e76 b0f824755a
commit 8dc81309f4
16 changed files with 11 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
keyboards/acheron/apollo/87h/delta/config.h
View File

@ -38,10 +38,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Locking resynchronize hack */ /* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE #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 EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
#define RGB_DI_PIN B15 #define RGB_DI_PIN B15

4
keyboards/acheron/apollo/87h/delta/halconf.h
View File

@ -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 * 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 * it under the terms of the GNU General Public License as published by
@ -16,8 +16,6 @@
#pragma once #pragma once
#define HAL_USE_I2C TRUE
#define HAL_USE_PWM TRUE #define HAL_USE_PWM TRUE
#define HAL_USE_PAL TRUE #define HAL_USE_PAL TRUE

3
keyboards/acheron/apollo/87h/delta/mcuconf.h
View File

@ -18,9 +18,6 @@
#include_next <mcuconf.h> #include_next <mcuconf.h>
#undef STM32_I2C_USE_I2C1
#define STM32_I2C_USE_I2C1 TRUE
#undef STM32_PWM_USE_ADVANCED #undef STM32_PWM_USE_ADVANCED
#define STM32_PWM_USE_ADVANCED TRUE #define STM32_PWM_USE_ADVANCED TRUE

3
keyboards/acheron/apollo/87h/delta/rules.mk
View File

@ -19,7 +19,8 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output AUDIO_ENABLE = no # Audio output
RGB_MATRIX_ENABLE = yes RGB_MATRIX_ENABLE = yes
RGB_MATRIX_DRIVER = WS2812 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 # Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -DDEBUG_EEPROM_OUTPUT=TRUE OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -DDEBUG_EEPROM_OUTPUT=TRUE

4
keyboards/acheron/apollo/87h/gamma/config.h
View File

@ -38,10 +38,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Locking resynchronize hack */ /* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE #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 EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
// RGB Matrix defines // RGB Matrix defines

6
keyboards/acheron/apollo/87h/gamma/gamma.c
View File

@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "gamma.h" #include "gamma.h"
void board_init(void) {
setPinInput(B9);
setPinInput(B10);
}
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations /* 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 = { { led_config_t g_led_config = { {
{ 0 , 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 10 , 11 , 12 , 13 , 14 , 15 }, { 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 }, { 16 , 17 , 18 , 19 , 20 , 21 , 22 , 23 , 24 , 25 , 26 , 27 , 28 , 29 , 30 , 31 },

3
keyboards/acheron/apollo/87h/gamma/halconf.h
View File

@ -18,7 +18,4 @@
#define HAL_USE_I2C TRUE #define HAL_USE_I2C TRUE
// #define HAL_USE_PWM TRUE
// #define HAL_USE_PAL TRUE
#include_next <halconf.h> #include_next <halconf.h>

6
keyboards/acheron/apollo/87h/gamma/mcuconf.h
View File

@ -20,9 +20,3 @@
#undef STM32_I2C_USE_I2C1 #undef STM32_I2C_USE_I2C1
#define STM32_I2C_USE_I2C1 TRUE #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

3
keyboards/acheron/apollo/87h/gamma/rules.mk
View File

@ -20,7 +20,8 @@ AUDIO_ENABLE = no # Audio output
RGB_MATRIX_ENABLE = yes RGB_MATRIX_ENABLE = yes
RGB_MATRIX_DRIVER = IS31FL3741 RGB_MATRIX_DRIVER = IS31FL3741
KEYBOARD_SHARED_EP = yes 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 # Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -DDEBUG_EEPROM_OUTPUT=TRUE OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -DDEBUG_EEPROM_OUTPUT=TRUE

2
keyboards/acheron/apollo/87htsc/halconf.h
View File

@ -16,8 +16,6 @@
#pragma once #pragma once
#define HAL_USE_I2C TRUE
#define HAL_USE_PWM TRUE #define HAL_USE_PWM TRUE
#define HAL_USE_PAL TRUE #define HAL_USE_PAL TRUE

3
keyboards/acheron/apollo/87htsc/mcuconf.h
View File

@ -18,9 +18,6 @@
#include_next <mcuconf.h> #include_next <mcuconf.h>
#undef STM32_I2C_USE_I2C1
#define STM32_I2C_USE_I2C1 TRUE
#undef STM32_PWM_USE_ADVANCED #undef STM32_PWM_USE_ADVANCED
#define STM32_PWM_USE_ADVANCED TRUE #define STM32_PWM_USE_ADVANCED TRUE

3
keyboards/acheron/apollo/87htsc/rules.mk
View File

@ -19,5 +19,8 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output AUDIO_ENABLE = no # Audio output
RGB_MATRIX_ENABLE = yes RGB_MATRIX_ENABLE = yes
RGB_MATRIX_DRIVER = WS2812 RGB_MATRIX_DRIVER = WS2812
EEPROM_DRIVER = wear_leveling
WEAR_LEVELING_DRIVER = legacy
# Enter lower-power sleep mode when on the ChibiOS idle thread # Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -DDEBUG_EEPROM_OUTPUT=TRUE OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -DDEBUG_EEPROM_OUTPUT=TRUE

5
keyboards/acheron/apollo/88htsc/88htsc.c
View File

@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "88htsc.h" #include "88htsc.h"
void board_init(void) {
setPinInput(B9);
setPinInput(B10);
}
led_config_t g_led_config = { { led_config_t g_led_config = { {
{ 16 , 15 , 14 , 13 , 12 , 11 , 10 , 9 , 8 , 7 , 6 , 5 , 4 , 3 , 2 , 1 , 0 }, { 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 }, { 17 , 18 , 19 , 20 , 21 , 22 , 23 , 24 , 25 , 26 , 27 , 28 , 29 , 30 , 31 , 32 , 33 },

2
keyboards/acheron/apollo/88htsc/halconf.h
View File

@ -16,8 +16,6 @@
#pragma once #pragma once
#define HAL_USE_I2C TRUE
#define HAL_USE_PWM TRUE #define HAL_USE_PWM TRUE
#define HAL_USE_PAL TRUE #define HAL_USE_PAL TRUE

3
keyboards/acheron/apollo/88htsc/mcuconf.h
View File

@ -18,9 +18,6 @@
#include_next <mcuconf.h> #include_next <mcuconf.h>
#undef STM32_I2C_USE_I2C1
#define STM32_I2C_USE_I2C1 TRUE
#undef STM32_PWM_USE_ADVANCED #undef STM32_PWM_USE_ADVANCED
#define STM32_PWM_USE_ADVANCED TRUE #define STM32_PWM_USE_ADVANCED TRUE

4
keyboards/acheron/apollo/88htsc/rules.mk
View File

@ -19,7 +19,9 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output AUDIO_ENABLE = no # Audio output
RGB_MATRIX_ENABLE = yes RGB_MATRIX_ENABLE = yes
RGB_MATRIX_DRIVER = WS2812 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 # Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -DDEBUG_EEPROM_OUTPUT=TRUE OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -DDEBUG_EEPROM_OUTPUT=TRUE