Browse Source

tmk_core: remove direct `quantum.h` includes (#21465)

pull/21472/head
Ryan 10 months ago
committed by GitHub
parent
commit
30de598650
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 13 additions and 9 deletions
  1. +0
    -1
      tmk_core/protocol/arm_atsam/main_arm_atsam.c
  2. +1
    -0
      tmk_core/protocol/arm_atsam/md_rgb_matrix.c
  3. +2
    -6
      tmk_core/protocol/arm_atsam/md_rgb_matrix.h
  4. +1
    -0
      tmk_core/protocol/arm_atsam/md_rgb_matrix_programs.c
  5. +1
    -1
      tmk_core/protocol/lufa/lufa.c
  6. +5
    -1
      tmk_core/protocol/usb_util.c
  7. +3
    -0
      tmk_core/protocol/usb_util.h

+ 0
- 1
tmk_core/protocol/arm_atsam/main_arm_atsam.c View File

@ -23,7 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "host_driver.h"
#include "keycode_config.h"
#include <string.h>
#include "quantum.h"
// From protocol directory
#include "arm_atsam_protocol.h"


+ 1
- 0
tmk_core/protocol/arm_atsam/md_rgb_matrix.c View File

@ -23,6 +23,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# include "arm_atsam_protocol.h"
# include "led.h"
# include "rgb_matrix.h"
# include "eeprom.h"
# include <string.h>
# include <math.h>


+ 2
- 6
tmk_core/protocol/arm_atsam/md_rgb_matrix.h View File

@ -15,11 +15,9 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _LED_MATRIX_H_
#define _LED_MATRIX_H_
#pragma once
#include "quantum.h"
#include "eeprom.h"
#include <stdint.h>
// From keyboard
#include "config_led.h"
@ -200,5 +198,3 @@ void md_led_changed(void);
#else
extern uint8_t gcr_desired;
#endif // USE_MASSDROP_CONFIGURATOR
#endif //_LED_MATRIX_H_

+ 1
- 0
tmk_core/protocol/arm_atsam/md_rgb_matrix_programs.c View File

@ -19,6 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# ifdef USE_MASSDROP_CONFIGURATOR
# include "md_rgb_matrix.h"
# include "util.h"
// Teal <-> Salmon
led_setup_t leds_teal_salmon[] = {


+ 1
- 1
tmk_core/protocol/lufa/lufa.c View File

@ -48,10 +48,10 @@
# include "sleep_led.h"
#endif
#include "suspend.h"
#include "wait.h"
#include "usb_descriptor.h"
#include "lufa.h"
#include "quantum.h"
#include "usb_device_state.h"
#include <util/atomic.h>


+ 5
- 1
tmk_core/protocol/usb_util.c View File

@ -13,13 +13,17 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "quantum.h"
#include "usb_util.h"
#include "gpio.h"
#include "wait.h"
__attribute__((weak)) void usb_disconnect(void) {}
__attribute__((weak)) bool usb_connected_state(void) {
return true;
}
__attribute__((weak)) bool usb_vbus_state(void) {
#ifdef USB_VBUS_PIN
setPinInput(USB_VBUS_PIN);


+ 3
- 0
tmk_core/protocol/usb_util.h View File

@ -13,10 +13,13 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include <stdbool.h>
void usb_disconnect(void);
bool usb_connected_state(void);
bool usb_vbus_state(void);

Loading…
Cancel
Save