forked from mirrors/qmk_userspace
		
	tmk_core: remove direct quantum.h includes (#21465)
		
	This commit is contained in:
		
					parent
					
						
							
								d83578dbe4
							
						
					
				
			
			
				commit
				
					
						30de598650
					
				
			
		
					 7 changed files with 13 additions and 9 deletions
				
			
		| 
						 | 
				
			
			@ -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"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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>
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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_
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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[] = {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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>
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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…
	
	Add table
		Add a link
		
	
		Reference in a new issue