mirror of
https://github.com/qmk/qmk_firmware.git
synced 2024-11-23 03:42:59 +00:00
fa71c4c91e
* Fix battery level code in adafruit_ble.cpp The code in tsk_core/protocol/lufa/adafluit_ble.cpp that polls the battery level for the Adafruit feather BLE controller reads the regulated voltage, not the raw voltage coming from the battery. To do that, the Adafruit Feather docs say you should read from pin A9: https://learn.adafruit.com/adafruit-feather-32u4-basic-proto/power-management#measuring-battery-4-9. (See also https://learn.adafruit.com/adafruit-feather-32u4-bluefruit-le/pinouts#logic-pins-2-9.) I'm not sure why, but analogRead(9); doesn't read the correct pin. Checking all available analog pins experimentally, it turns out that analogRead(7); returns the correct value. So the code above should read: state.vbat = analogRead(7); * Update tmk_core/protocol/lufa/adafruit_ble.cpp Co-Authored-By: Drashna Jaelre <drashna@live.com> * Remove old comment * Fix linking error * Remove `#ifdef` around `#include analog.h`. * Really fix linking error
84 lines
2.1 KiB
Makefile
84 lines
2.1 KiB
Makefile
LUFA_DIR = protocol/lufa
|
|
|
|
# Path to the LUFA library
|
|
LUFA_PATH = $(LIB_PATH)/lufa
|
|
|
|
|
|
# Create the LUFA source path variables by including the LUFA makefile
|
|
ifneq (, $(wildcard $(LUFA_PATH)/LUFA/Build/lufa_sources.mk))
|
|
# New build system from 20120730
|
|
LUFA_ROOT_PATH = $(LUFA_PATH)/LUFA
|
|
DMBS_LUFA_PATH = $(LUFA_PATH)/LUFA/Build/LUFA
|
|
include $(LUFA_PATH)/LUFA/Build/lufa_sources.mk
|
|
else
|
|
include $(LUFA_PATH)/LUFA/makefile
|
|
endif
|
|
|
|
LUFA_SRC = lufa.c \
|
|
usb_descriptor.c \
|
|
outputselect.c \
|
|
$(LUFA_SRC_USB)
|
|
|
|
ifeq ($(strip $(MIDI_ENABLE)), yes)
|
|
include $(TMK_PATH)/protocol/midi.mk
|
|
endif
|
|
|
|
ifeq ($(strip $(BLUETOOTH_ENABLE)), yes)
|
|
LUFA_SRC += $(LUFA_DIR)/bluetooth.c \
|
|
$(TMK_DIR)/protocol/serial_uart.c
|
|
endif
|
|
|
|
ifeq ($(strip $(BLUETOOTH)), AdafruitBLE)
|
|
LUFA_SRC += analog.c
|
|
LUFA_SRC += $(LUFA_DIR)/adafruit_ble.cpp
|
|
endif
|
|
|
|
ifeq ($(strip $(BLUETOOTH)), AdafruitEZKey)
|
|
LUFA_SRC += $(LUFA_DIR)/bluetooth.c \
|
|
$(TMK_DIR)/protocol/serial_uart.c
|
|
endif
|
|
|
|
ifeq ($(strip $(BLUETOOTH)), RN42)
|
|
LUFA_SRC += $(LUFA_DIR)/bluetooth.c \
|
|
$(TMK_DIR)/protocol/serial_uart.c
|
|
endif
|
|
|
|
ifeq ($(strip $(VIRTSER_ENABLE)), yes)
|
|
LUFA_SRC += $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/CDCClassDevice.c
|
|
endif
|
|
|
|
SRC += $(LUFA_SRC)
|
|
|
|
# Search Path
|
|
VPATH += $(TMK_PATH)/$(LUFA_DIR)
|
|
VPATH += $(LUFA_PATH)
|
|
VPATH += $(DRIVER_PATH)/avr
|
|
|
|
# Option modules
|
|
#ifdef $(or MOUSEKEY_ENABLE, PS2_MOUSE_ENABLE)
|
|
#endif
|
|
|
|
#ifdef EXTRAKEY_ENABLE
|
|
#endif
|
|
|
|
# LUFA library compile-time options and predefined tokens
|
|
LUFA_OPTS = -DUSB_DEVICE_ONLY
|
|
LUFA_OPTS += -DUSE_FLASH_DESCRIPTORS
|
|
LUFA_OPTS += -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
|
|
#LUFA_OPTS += -DINTERRUPT_CONTROL_ENDPOINT
|
|
LUFA_OPTS += -DFIXED_CONTROL_ENDPOINT_SIZE=8
|
|
LUFA_OPTS += -DFIXED_CONTROL_ENDPOINT_SIZE=8
|
|
LUFA_OPTS += -DFIXED_NUM_CONFIGURATIONS=1
|
|
|
|
# Remote wakeup fix for ATmega32U2 https://github.com/tmk/tmk_keyboard/issues/361
|
|
ifeq ($(MCU),atmega32u2)
|
|
LUFA_OPTS += -DNO_LIMITED_CONTROLLER_CONNECT
|
|
endif
|
|
|
|
OPT_DEFS += -DF_USB=$(F_USB)UL
|
|
OPT_DEFS += -DARCH=ARCH_$(ARCH)
|
|
OPT_DEFS += $(LUFA_OPTS)
|
|
|
|
# This indicates using LUFA stack
|
|
OPT_DEFS += -DPROTOCOL_LUFA
|