Remove use of keymap.h (#20004)

This commit is contained in:
Joel Challis 2023-03-27 20:08:17 +01:00 committed by GitHub
parent 79b0f9168e
commit c485d1cf26
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 14 additions and 26 deletions

View file

@ -19,7 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "host.h" #include "host.h"
#include "keycode.h" #include "keycode.h"
#include "keyboard.h" #include "keyboard.h"
#include "keymap.h"
#include "mousekey.h" #include "mousekey.h"
#include "programmable_button.h" #include "programmable_button.h"
#include "command.h" #include "command.h"
@ -30,6 +29,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "action.h" #include "action.h"
#include "wait.h" #include "wait.h"
#include "keycode_config.h" #include "keycode_config.h"
#include "debug.h"
#ifdef BACKLIGHT_ENABLE #ifdef BACKLIGHT_ENABLE
# include "backlight.h" # include "backlight.h"

View file

@ -2,8 +2,8 @@
#include <stdint.h> #include <stdint.h>
#include "keyboard.h" #include "keyboard.h"
#include "keymap.h"
#include "action.h" #include "action.h"
#include "encoder.h"
#include "util.h" #include "util.h"
#include "action_layer.h" #include "action_layer.h"

View file

@ -19,7 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "quantum.h" #include "quantum.h"
#include "keyboard.h" #include "keyboard.h"
#include "matrix.h" #include "matrix.h"
#include "keymap.h" #include "keymap_introspection.h"
#include "magic.h" #include "magic.h"
#include "host.h" #include "host.h"
#include "led.h" #include "led.h"

View file

@ -17,24 +17,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once #pragma once
#include <stdint.h> #pragma message("'keymap.h' should no longer be included!")
#include <stdbool.h>
#include "platform_deps.h"
#include "action.h"
#include "keycode.h"
#include "report.h"
#include "host.h"
#include "debug.h"
#include "keycode_config.h"
#include "gpio.h" // for pin_t
#include "quantum_keycodes.h"
#include "keymap_common.h"
#ifdef ENCODER_MAP_ENABLE
// Ensure we have a forward declaration for the encoder map
# include "encoder.h"
#endif
#include "keymap_introspection.h"

View file

@ -15,7 +15,8 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "keymap.h" #include "keymap_common.h"
#include "keymap_introspection.h"
#include "report.h" #include "report.h"
#include "keycode.h" #include "keycode.h"
#include "action_layer.h" #include "action_layer.h"

View file

@ -4,6 +4,7 @@
#pragma once #pragma once
#include <stdint.h> #include <stdint.h>
#include "keyboard.h"
// translates key to keycode // translates key to keycode
uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key); uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key);

View file

@ -14,6 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "keymap_common.h"
#include "print.h" #include "print.h"
#include "process_combo.h" #include "process_combo.h"
#include "action_tapping.h" #include "action_tapping.h"

View file

@ -18,7 +18,7 @@
#include "platform_deps.h" #include "platform_deps.h"
#include "wait.h" #include "wait.h"
#include "matrix.h" #include "matrix.h"
#include "keymap.h" #include "keyboard.h"
#ifdef BACKLIGHT_ENABLE #ifdef BACKLIGHT_ENABLE
# include "backlight.h" # include "backlight.h"
@ -36,6 +36,9 @@
# include "rgb_matrix.h" # include "rgb_matrix.h"
#endif #endif
#include "keymap_common.h"
#include "quantum_keycodes.h"
#include "keycode_config.h"
#include "action_layer.h" #include "action_layer.h"
#include "eeconfig.h" #include "eeconfig.h"
#include "bootloader.h" #include "bootloader.h"
@ -44,10 +47,12 @@
#include "sync_timer.h" #include "sync_timer.h"
#include "gpio.h" #include "gpio.h"
#include "atomic_util.h" #include "atomic_util.h"
#include "host.h"
#include "led.h" #include "led.h"
#include "action_util.h" #include "action_util.h"
#include "action_tapping.h" #include "action_tapping.h"
#include "print.h" #include "print.h"
#include "debug.h"
#include "suspend.h" #include "suspend.h"
#include <stddef.h> #include <stddef.h>
#include <stdlib.h> #include <stdlib.h>