From e4ae5ef3f2a2cca0a19788f5291ca7eea445bd43 Mon Sep 17 00:00:00 2001 From: David Hoelscher Date: Wed, 7 May 2025 16:22:21 -0500 Subject: [PATCH] incorporating changes from drashna --- keyboards/custommk/cmk_cm6646.c | 2 +- keyboards/custommk/cmk_cm6646.h | 2 +- keyboards/custommk/ergosentry_ansi/config.h | 2 +- .../ergosentry_ansi/ergosentry_ansi.c | 29 ++++++++++--------- .../ergosentry_ansi/ergosentry_ansi.h | 4 +++ .../custommk/ergosentry_ansi/keyboard.json | 2 -- .../ergosentry_ansi/keymaps/default/keymap.c | 4 +-- .../ergosentry_ansi/keymaps/default/rules.mk | 2 +- keyboards/custommk/ergosentry_ansi/mcuconf.h | 2 +- keyboards/custommk/ergosentry_ansi/rules.mk | 1 - 10 files changed, 26 insertions(+), 24 deletions(-) create mode 100644 keyboards/custommk/ergosentry_ansi/ergosentry_ansi.h diff --git a/keyboards/custommk/cmk_cm6646.c b/keyboards/custommk/cmk_cm6646.c index db15eabb47f..cf77c5945ff 100644 --- a/keyboards/custommk/cmk_cm6646.c +++ b/keyboards/custommk/cmk_cm6646.c @@ -111,4 +111,4 @@ bool cmk_cmk6646_housekeeping_task(void) { update_usb_audio_enable(); // Return value is enabled state of the CM6646 return cm6646_enabled; -} \ No newline at end of file +} diff --git a/keyboards/custommk/cmk_cm6646.h b/keyboards/custommk/cmk_cm6646.h index b10ae455c4c..605b86ba033 100644 --- a/keyboards/custommk/cmk_cm6646.h +++ b/keyboards/custommk/cmk_cm6646.h @@ -42,4 +42,4 @@ enum cmk_cm6646_keycodes { void process_record_cmk_cm6646(uint16_t keycode, keyrecord_t *record); void cmk_cmk6646_init(bool enabled); -bool cmk_cmk6646_housekeeping_task(void); \ No newline at end of file +bool cmk_cmk6646_housekeeping_task(void); diff --git a/keyboards/custommk/ergosentry_ansi/config.h b/keyboards/custommk/ergosentry_ansi/config.h index 5e524439c60..f79667f050c 100644 --- a/keyboards/custommk/ergosentry_ansi/config.h +++ b/keyboards/custommk/ergosentry_ansi/config.h @@ -45,4 +45,4 @@ #define MIC_MUTE_CONTROL_PIN A0 #define USB_AUDIO_ENABLE_PIN B6 -#define LED_PIN_ON_STATE 0 \ No newline at end of file +#define LED_PIN_ON_STATE 0 diff --git a/keyboards/custommk/ergosentry_ansi/ergosentry_ansi.c b/keyboards/custommk/ergosentry_ansi/ergosentry_ansi.c index e053201b456..079fe033ccb 100644 --- a/keyboards/custommk/ergosentry_ansi/ergosentry_ansi.c +++ b/keyboards/custommk/ergosentry_ansi/ergosentry_ansi.c @@ -2,19 +2,19 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include -#include "keyboards/custommk/cmk_cm6646.h" +#include "ergosentry_ansi.h" typedef union { uint32_t raw; struct { bool usb_audio_enabled; }; -} user_config_t; +} keyboard_config_t; -user_config_t user_config; +keyboard_config_t keyboard_config; void update_kb_eeprom(void) { - eeconfig_update_kb(user_config.raw); + eeconfig_update_kb(keyboard_config.raw); } bool process_record_kb(uint16_t keycode, keyrecord_t *record) { @@ -23,29 +23,30 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { } void keyboard_post_init_kb(void) { - user_config.raw = eeconfig_read_kb(); - cmk_cmk6646_init(user_config.usb_audio_enabled); + keyboard_config.raw = eeconfig_read_kb(); + cmk_cmk6646_init(keyboard_config.usb_audio_enabled); keyboard_post_init_user(); } void housekeeping_task_kb(void) { bool usb_audio_enabled; usb_audio_enabled = cmk_cmk6646_housekeeping_task(); - if (usb_audio_enabled != user_config.usb_audio_enabled) { - user_config.usb_audio_enabled = usb_audio_enabled; + if (usb_audio_enabled != keyboard_config.usb_audio_enabled) { + keyboard_config.usb_audio_enabled = usb_audio_enabled; update_kb_eeprom(); } } -void eeconfig_init_kb() { +void eeconfig_init_kb(void) { //enable nkro by default (not forced) keymap_config.raw = eeconfig_read_keymap(); keymap_config.nkro = 1; eeconfig_update_keymap(keymap_config.raw); - //enable audio by default (not forced) - user_config.raw = eeconfig_read_kb(); - user_config.usb_audio_enabled = 1; - eeconfig_update_kb(user_config.raw); + //enable USB audio by default (not forced) + keyboard_config.raw = eeconfig_read_kb(); + keyboard_config.usb_audio_enabled = 1; + eeconfig_update_kb(keyboard_config.raw); -} \ No newline at end of file + eeconfig_init_user(); +} diff --git a/keyboards/custommk/ergosentry_ansi/ergosentry_ansi.h b/keyboards/custommk/ergosentry_ansi/ergosentry_ansi.h new file mode 100644 index 00000000000..6bb2766a607 --- /dev/null +++ b/keyboards/custommk/ergosentry_ansi/ergosentry_ansi.h @@ -0,0 +1,4 @@ +// Copyright 2025 customMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "keyboards/custommk/cmk_cm6646.h" diff --git a/keyboards/custommk/ergosentry_ansi/keyboard.json b/keyboards/custommk/ergosentry_ansi/keyboard.json index 3a0967fdeda..4e219625d57 100644 --- a/keyboards/custommk/ergosentry_ansi/keyboard.json +++ b/keyboards/custommk/ergosentry_ansi/keyboard.json @@ -22,8 +22,6 @@ ] }, "features": { - "command": false, - "console": false, "audio": true, "bootmagic": true, "encoder": true, diff --git a/keyboards/custommk/ergosentry_ansi/keymaps/default/keymap.c b/keyboards/custommk/ergosentry_ansi/keymaps/default/keymap.c index 47f530e317f..771af7c8b98 100644 --- a/keyboards/custommk/ergosentry_ansi/keymaps/default/keymap.c +++ b/keyboards/custommk/ergosentry_ansi/keymaps/default/keymap.c @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include QMK_KEYBOARD_H -#include "cmk_cm6646.h" +#include "ergosentry_ansi.h" const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( @@ -21,4 +21,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(RM_PREV, RM_NEXT), ENCODER_CCW_CW(RM_VALD, RM_VALU) } }; -#endif \ No newline at end of file +#endif diff --git a/keyboards/custommk/ergosentry_ansi/keymaps/default/rules.mk b/keyboards/custommk/ergosentry_ansi/keymaps/default/rules.mk index a40474b4d5c..ee325681483 100644 --- a/keyboards/custommk/ergosentry_ansi/keymaps/default/rules.mk +++ b/keyboards/custommk/ergosentry_ansi/keymaps/default/rules.mk @@ -1 +1 @@ -ENCODER_MAP_ENABLE = yes \ No newline at end of file +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/custommk/ergosentry_ansi/mcuconf.h b/keyboards/custommk/ergosentry_ansi/mcuconf.h index 9adafe083a5..fb911b629c5 100644 --- a/keyboards/custommk/ergosentry_ansi/mcuconf.h +++ b/keyboards/custommk/ergosentry_ansi/mcuconf.h @@ -19,4 +19,4 @@ // Used for FRAM #undef STM32_SPI_USE_SPI1 -#define STM32_SPI_USE_SPI1 TRUE \ No newline at end of file +#define STM32_SPI_USE_SPI1 TRUE diff --git a/keyboards/custommk/ergosentry_ansi/rules.mk b/keyboards/custommk/ergosentry_ansi/rules.mk index e2a04466bc3..5e97c2dbe37 100644 --- a/keyboards/custommk/ergosentry_ansi/rules.mk +++ b/keyboards/custommk/ergosentry_ansi/rules.mk @@ -2,4 +2,3 @@ SRC += matrix.c \ keyboards/custommk/cmk_cm6646.c CUSTOM_MATRIX = lite -CIE1931_CURVE = yes \ No newline at end of file