Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update QMK to 0.26.0 #167

Merged
merged 4 commits into from
Sep 4, 2024
+23 −16
Merged

Update QMK to 0.26.0 #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e8b7286
updated qmk submodule to 0.26.0
Huckies Aug 28, 2024
6f6c717
updated eeprom driver accordingly
Huckies Aug 28, 2024
066ba09
rename: ENCODERS_PAD_* -> ENCODER_*_PINS
Huckies Aug 28, 2024
526ac40
added source: process_rgb_matrix
Huckies Aug 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion qmk_firmware
Open in desktop
Submodule qmk_firmware updated 7086 files
1 change: 1 addition & 0 deletions qmk_porting/common_features.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ if(RGB_MATRIX_ENABLE)
"${QMK_BASE_DIR}/quantum/rgb_matrix/*.c"
"${QMK_BASE_DIR}/quantum/color.c"
"${QMK_BASE_DIR}/quantum/process_keycode/process_rgb.c"
"${QMK_BASE_DIR}/quantum/process_keycode/process_rgb_matrix.c"
"${QMK_BASE_DIR}/lib/lib8tion/*.c"
)
set(CIE1931_CURVE ON CACHE BOOL "KB")
Expand Down
4 changes: 2 additions & 2 deletions qmk_porting/keyboards/AM78-2/qmk_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define BATTERY_INDICATOR_END_INDEX 0

#ifdef ENCODER_ENABLE
#define ENCODERS_PAD_A \
#define ENCODER_A_PINS \
{ \
B2 \
}
#define ENCODERS_PAD_B \
#define ENCODER_B_PINS \
{ \
B1 \
}
Expand Down
4 changes: 2 additions & 2 deletions qmk_porting/keyboards/AM78/qmk_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define BATTERY_INDICATOR_END_INDEX 0

#ifdef ENCODER_ENABLE
#define ENCODERS_PAD_A \
#define ENCODER_A_PINS \
{ \
B2 \
}
#define ENCODERS_PAD_B \
#define ENCODER_B_PINS \
{ \
B1 \
}
Expand Down
4 changes: 2 additions & 2 deletions qmk_porting/keyboards/ClassPad/qmk_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define BATTERY_INDICATOR_END_INDEX 3

#ifdef ENCODER_ENABLE
#define ENCODERS_PAD_A \
#define ENCODER_A_PINS \
{ \
A3, A14 \
}
#define ENCODERS_PAD_B \
#define ENCODER_B_PINS \
{ \
A15, A13 \
}
Expand Down
4 changes: 2 additions & 2 deletions qmk_porting/keyboards/Melting65/qmk_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,11 +132,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// #define NO_ACTION_ONESHOT

#ifdef ENCODER_ENABLE
#define ENCODERS_PAD_A \
#define ENCODER_A_PINS \
{ \
B22 \
}
#define ENCODERS_PAD_B \
#define ENCODER_B_PINS \
{ \
B0 \
}
Expand Down
4 changes: 2 additions & 2 deletions qmk_porting/keyboards/TychePad/qmk_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define HOLD_ON_OTHER_KEY_PRESS

#ifdef ENCODER_ENABLE
#define ENCODERS_PAD_A \
#define ENCODER_A_PINS \
{ \
B2 \
}
#define ENCODERS_PAD_B \
#define ENCODER_B_PINS \
{ \
B1 \
}
Expand Down
4 changes: 2 additions & 2 deletions qmk_porting/keyboards/m2wired/qmk_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP FALSE

#ifdef ENCODER_ENABLE
#define ENCODERS_PAD_A \
#define ENCODER_A_PINS \
{ \
B5 \
}
#define ENCODERS_PAD_B \
#define ENCODER_B_PINS \
{ \
B6 \
}
Expand Down
4 changes: 2 additions & 2 deletions qmk_porting/keyboards/m8rev1/qmk_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP FALSE

#ifdef ENCODER_ENABLE
#define ENCODERS_PAD_A \
#define ENCODER_A_PINS \
{ \
A10 \
}
#define ENCODERS_PAD_B \
#define ENCODER_B_PINS \
{ \
A11 \
}
Expand Down
6 changes: 6 additions & 0 deletions qmk_porting/platforms/ch58x/eeprom/eeprom_ch58x_custom.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,3 +89,9 @@ void eeprom_write_block(const void *buf, void *addr, size_t len)
EEPROM_WRITE(QMK_EEPROM_START_POSITION + offset / EEPROM_PAGE_SIZE * EEPROM_PAGE_SIZE, buffer, sizeof(buffer));
}
}

void eeprom_driver_format(bool erase)
{
(void)erase;
eeprom_driver_erase();
}
2 changes: 1 addition & 1 deletion qmk_porting/platforms/ch58x/platform.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ bool shutdown_kb(bool jump_to_bootloader)
#endif

#ifdef ENCODER_ENABLE
pin_t encoders_pad_a[] = ENCODERS_PAD_A, encoders_pad_b[] = ENCODERS_PAD_B;
pin_t encoders_pad_a[] = ENCODER_A_PINS, encoders_pad_b[] = ENCODER_B_PINS;

for (uint8_t i = 0; i < sizeof(encoders_pad_a) / sizeof(encoders_pad_a[0]); i++) {
gpio_set_pin_input_low(encoders_pad_a[i]);
Expand Down