X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=tmk_core%2Fcommon.mk;h=33bcc97b2ed131768df7e49b6d202cc561a95359;hb=899731679d262023a9e25eba805b3674b1ceb82e;hp=3e0bd7dbc8692fbe1cedf8ca021c0fbe76d4f3f8;hpb=bee9183e7fae7c739b9c42dd4dc759783ac80e46;p=qmk_firmware.git

diff --git a/tmk_core/common.mk b/tmk_core/common.mk
index 3e0bd7dbc..33bcc97b2 100644
--- a/tmk_core/common.mk
+++ b/tmk_core/common.mk
@@ -3,6 +3,10 @@ ifeq ($(PLATFORM),AVR)
 	PLATFORM_COMMON_DIR = $(COMMON_DIR)/avr
 else ifeq ($(PLATFORM),CHIBIOS)
 	PLATFORM_COMMON_DIR = $(COMMON_DIR)/chibios
+else ifeq ($(PLATFORM),ARM_ATSAM)
+	PLATFORM_COMMON_DIR = $(COMMON_DIR)/arm_atsam
+else
+	PLATFORM_COMMON_DIR = $(COMMON_DIR)/test
 endif
 
 TMK_COMMON_SRC +=	$(COMMON_DIR)/host.c \
@@ -16,16 +20,41 @@ TMK_COMMON_SRC +=	$(COMMON_DIR)/host.c \
 	$(COMMON_DIR)/debug.c \
 	$(COMMON_DIR)/util.c \
 	$(COMMON_DIR)/eeconfig.c \
+	$(COMMON_DIR)/report.c \
 	$(PLATFORM_COMMON_DIR)/suspend.c \
 	$(PLATFORM_COMMON_DIR)/timer.c \
 	$(PLATFORM_COMMON_DIR)/bootloader.c \
 
 ifeq ($(PLATFORM),AVR)
 	TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/xprintf.S
-endif 
+endif
 
 ifeq ($(PLATFORM),CHIBIOS)
 	TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/printf.c
+  ifeq ($(MCU_SERIES), STM32F3xx)
+    TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/eeprom_stm32.c
+    TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/flash_stm32.c
+    TMK_COMMON_DEFS += -DEEPROM_EMU_STM32F303xC
+    TMK_COMMON_DEFS += -DSTM32_EEPROM_ENABLE
+  else ifeq ($(MCU_SERIES), STM32F1xx)
+    TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/eeprom_stm32.c
+    TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/flash_stm32.c
+    TMK_COMMON_DEFS += -DEEPROM_EMU_STM32F103xB
+    TMK_COMMON_DEFS += -DSTM32_EEPROM_ENABLE
+  else
+    TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/eeprom_teensy.c
+endif
+  ifeq ($(strip $(AUTO_SHIFT_ENABLE)), yes)
+    TMK_COMMON_SRC += $(CHIBIOS)/os/various/syscalls.c
+  endif
+endif
+
+ifeq ($(PLATFORM),ARM_ATSAM)
+	TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/printf.c
+	TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/eeprom.c
+endif
+
+ifeq ($(PLATFORM),TEST)
 	TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/eeprom.c
 endif
 
@@ -95,25 +124,36 @@ endif
 
 ifeq ($(strip $(BLUETOOTH_ENABLE)), yes)
     TMK_COMMON_DEFS += -DBLUETOOTH_ENABLE
+	TMK_COMMON_DEFS += -DNO_USB_STARTUP_CHECK
 endif
 
 ifeq ($(strip $(BLUETOOTH)), AdafruitBLE)
-		TMK_COMMON_DEFS += -DBLUETOOTH_ENABLE
-		TMK_COMMON_DEFS += -DMODULE_ADAFRUIT_BLE
+	TMK_COMMON_DEFS += -DBLUETOOTH_ENABLE
+	TMK_COMMON_DEFS += -DMODULE_ADAFRUIT_BLE
+	TMK_COMMON_DEFS += -DNO_USB_STARTUP_CHECK
 endif
 
 ifeq ($(strip $(BLUETOOTH)), AdafruitEZKey)
-		TMK_COMMON_DEFS += -DBLUETOOTH_ENABLE
-		TMK_COMMON_DEFS += -DMODULE_ADAFRUIT_EZKEY
+	TMK_COMMON_DEFS += -DBLUETOOTH_ENABLE
+	TMK_COMMON_DEFS += -DMODULE_ADAFRUIT_EZKEY
+    TMK_COMMON_DEFS += -DNO_USB_STARTUP_CHECK
 endif
 
 ifeq ($(strip $(BLUETOOTH)), RN42)
-		TMK_COMMON_DEFS += -DBLUETOOTH_ENABLE
-		TMK_COMMON_DEFS += -DMODULE_RN42
+	TMK_COMMON_DEFS += -DBLUETOOTH_ENABLE
+	TMK_COMMON_DEFS += -DMODULE_RN42
+	TMK_COMMON_DEFS += -DNO_USB_STARTUP_CHECK
 endif
 
 ifeq ($(strip $(ONEHAND_ENABLE)), yes)
-    TMK_COMMON_DEFS += -DONEHAND_ENABLE
+  SWAP_HANDS_ENABLE = yes # backwards compatibility
+endif
+ifeq ($(strip $(SWAP_HANDS_ENABLE)), yes)
+    TMK_COMMON_DEFS += -DSWAP_HANDS_ENABLE
+endif
+
+ifeq ($(strip $(NO_USB_STARTUP_CHECK)), yes)
+    TMK_COMMON_DEFS += -DNO_USB_STARTUP_CHECK
 endif
 
 ifeq ($(strip $(KEYMAP_SECTION_ENABLE)), yes)