add keys

merge
start of mcu selection
2018-11-26 10:35:42 -05:00 · 2018-11-23 13:24:32 -05:00 · 2018-10-24 16:10:13 -04:00 · 2018-10-23 23:57:54 -04:00 · 2018-10-23 20:38:50 -04:00 · 2018-10-23 20:35:17 -04:00
18 changed files with 211 additions and 215 deletions
@@ -16,6 +16,7 @@ include common.mk
 KEYBOARD_FILESAFE := $(subst /,_,$(KEYBOARD))
 TARGET ?= $(KEYBOARD_FILESAFE)_$(KEYMAP)
 KEYBOARD_OUTPUT := $(BUILD_DIR)/obj_$(KEYBOARD_FILESAFE)
+STM32_PATH := quantum/stm32

 # Force expansion
 TARGET := $(TARGET)
@@ -68,6 +69,7 @@ ifneq ("$(wildcard $(KEYBOARD_PATH_1)/)","")
    KEYBOARD_PATHS += $(KEYBOARD_PATH_1)
 endif

+
 # Pull in rules.mk files from all our subfolders
 ifneq ("$(wildcard $(KEYBOARD_PATH_5)/rules.mk)","")
    include $(KEYBOARD_PATH_5)/rules.mk
@@ -85,6 +87,19 @@ ifneq ("$(wildcard $(KEYBOARD_PATH_1)/rules.mk)","")
    include $(KEYBOARD_PATH_1)/rules.mk
 endif

+ifeq ($(strip $(PROTON)), yes)
+    OPT_DEFS += -DPROTON_CONVERSION
+    include $(STM32_PATH)/proton_c.mk
+endif
+
+include quantum/mcu_selection.mk
+
+ifdef MCU_FAMILY
+    OPT_DEFS += -DQMK_STM32
+    KEYBOARD_PATHS += $(STM32_PATH)
+endif
+
+
 # Find all the C source files to be compiled in subfolders.
 KEYBOARD_SRC :=

Internal Server Error - Gitea: Git with a cup of tea
	
	
	




	
		
			
				
					
						
					
				
				
					
				
			
		
		
		
			
				
				
					500 Internal Server Error
					
					
						Gitea Version: 1.28.0+dev-211-ga30d865b78
Author	SHA1	Message	Date
Jack Humbert	852d94f4e6	add keys	2018-11-26 10:35:42 -05:00
Jack Humbert	1c87b97dd6	merge	2018-11-23 13:24:32 -05:00
Jack Humbert	d9ef323f8a	start of mcu selection	2018-10-24 16:10:13 -04:00
Jack Humbert	57b21c037c	initial proton coversion, no pin mapping	2018-10-23 23:57:54 -04:00
Jack Humbert	fd3c1aa909	adds readme.md	2018-10-23 20:38:50 -04:00
Jack Humbert	3d50a2867b	fixes custom matrix include	2018-10-23 20:35:17 -04:00
Jack Humbert	0836e47e33	adds proton c base	2018-10-23 20:35:04 -04:00