diff options
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/avr.mk | 42 | ||||
| -rw-r--r-- | tmk_core/chibios.mk | 4 | ||||
| -rw-r--r-- | tmk_core/common/action.c | 2 | ||||
| -rw-r--r-- | tmk_core/common/avr/suspend.c | 1 | ||||
| -rw-r--r-- | tmk_core/common/mousekey.h | 13 | ||||
| -rw-r--r-- | tmk_core/rules.mk | 6 | 
6 files changed, 45 insertions, 23 deletions
| diff --git a/tmk_core/avr.mk b/tmk_core/avr.mk index 5df539def5..ccecdb1929 100644 --- a/tmk_core/avr.mk +++ b/tmk_core/avr.mk @@ -89,9 +89,9 @@ DEBUG_HOST = localhost  #============================================================================  # Autodecct teensy loader  ifneq (, $(shell which teensy-loader-cli 2>/dev/null)) -  TEENSY_LOADER_CLI = teensy-loader-cli +  TEENSY_LOADER_CLI ?= teensy-loader-cli  else -  TEENSY_LOADER_CLI = teensy_loader_cli +  TEENSY_LOADER_CLI ?= teensy_loader_cli  endif  # Program the device. @@ -100,43 +100,47 @@ program: $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).eep  teensy: $(BUILD_DIR)/$(TARGET).hex  	$(TEENSY_LOADER_CLI) -mmcu=$(MCU) -w -v $(BUILD_DIR)/$(TARGET).hex +	 +BATCHISP ?= batchisp   flip: $(BUILD_DIR)/$(TARGET).hex -	batchisp -hardware usb -device $(MCU) -operation erase f -	batchisp -hardware usb -device $(MCU) -operation loadbuffer $(BUILD_DIR)/$(TARGET).hex program -	batchisp -hardware usb -device $(MCU) -operation start reset 0 +	$(BATCHISP) -hardware usb -device $(MCU) -operation erase f +	$(BATCHISP) -hardware usb -device $(MCU) -operation loadbuffer $(BUILD_DIR)/$(TARGET).hex program +	$(BATCHISP) -hardware usb -device $(MCU) -operation start reset 0 +	 +DFU_PROGRAMMER ?= dfu-programmer  dfu: $(BUILD_DIR)/$(TARGET).hex sizeafter -	until dfu-programmer $(MCU) get bootloader-version; do\ +	until $(DFU_PROGRAMMER) $(MCU) get bootloader-version; do\  		echo "Error: Bootloader not found. Trying again in 5s." ;\  		sleep 5 ;\  	done -ifneq (, $(findstring 0.7, $(shell dfu-programmer --version 2>&1))) -	dfu-programmer $(MCU) erase --force +ifneq (, $(findstring 0.7, $(shell $(DFU_PROGRAMMER) --version 2>&1))) +	$(DFU_PROGRAMMER) $(MCU) erase --force  else -	dfu-programmer $(MCU) erase +	$(DFU_PROGRAMMER) $(MCU) erase  endif -	dfu-programmer $(MCU) flash $(BUILD_DIR)/$(TARGET).hex -	dfu-programmer $(MCU) reset +	$(DFU_PROGRAMMER) $(MCU) flash $(BUILD_DIR)/$(TARGET).hex +	$(DFU_PROGRAMMER) $(MCU) reset  dfu-start: -	dfu-programmer $(MCU) reset -	dfu-programmer $(MCU) start +	$(DFU_PROGRAMMER) $(MCU) reset +	$(DFU_PROGRAMMER) $(MCU) start  flip-ee: $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).eep  	$(COPY) $(BUILD_DIR)/$(TARGET).eep $(BUILD_DIR)/$(TARGET)eep.hex -	batchisp -hardware usb -device $(MCU) -operation memory EEPROM erase -	batchisp -hardware usb -device $(MCU) -operation memory EEPROM loadbuffer $(BUILD_DIR)/$(TARGET)eep.hex program -	batchisp -hardware usb -device $(MCU) -operation start reset 0 +	$(BATCHISP) -hardware usb -device $(MCU) -operation memory EEPROM erase +	$(BATCHISP) -hardware usb -device $(MCU) -operation memory EEPROM loadbuffer $(BUILD_DIR)/$(TARGET)eep.hex program +	$(BATCHISP) -hardware usb -device $(MCU) -operation start reset 0  	$(REMOVE) $(BUILD_DIR)/$(TARGET)eep.hex  dfu-ee: $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).eep  ifneq (, $(findstring 0.7, $(shell dfu-programmer --version 2>&1))) -	dfu-programmer $(MCU) flash --eeprom $(BUILD_DIR)/$(TARGET).eep +	$(DFU_PROGRAMMER) $(MCU) flash --eeprom $(BUILD_DIR)/$(TARGET).eep  else -	dfu-programmer $(MCU) flash-eeprom $(BUILD_DIR)/$(TARGET).eep +	$(DFU_PROGRAMMER) $(MCU) flash-eeprom $(BUILD_DIR)/$(TARGET).eep  endif -	dfu-programmer $(MCU) reset +	$(DFU_PROGRAMMER) $(MCU) reset  # Convert hex to bin.  flashbin: $(BUILD_DIR)/$(TARGET).hex diff --git a/tmk_core/chibios.mk b/tmk_core/chibios.mk index eb0c40138a..2a8d32fb99 100644 --- a/tmk_core/chibios.mk +++ b/tmk_core/chibios.mk @@ -151,5 +151,7 @@ endif  # List any extra directories to look for libraries here.  EXTRALIBDIRS = $(RULESPATH)/ld +DFU_UTIL ?= dfu-util +  dfu-util: $(BUILD_DIR)/$(TARGET).bin sizeafter -	dfu-util $(DFU_ARGS) -D $(BUILD_DIR)/$(TARGET).bin +	$(DFU_UTIL) $(DFU_ARGS) -D $(BUILD_DIR)/$(TARGET).bin diff --git a/tmk_core/common/action.c b/tmk_core/common/action.c index 94de36918d..4ba1cc251a 100644 --- a/tmk_core/common/action.c +++ b/tmk_core/common/action.c @@ -140,7 +140,6 @@ void process_record(keyrecord_t *record)  void process_action(keyrecord_t *record, action_t action)  { -    bool do_release_oneshot = false;      keyevent_t event = record->event;  #ifndef NO_ACTION_TAPPING      uint8_t tap_count = record->tap.count; @@ -152,6 +151,7 @@ void process_action(keyrecord_t *record, action_t action)      }  #ifndef NO_ACTION_ONESHOT +    bool do_release_oneshot = false;      // notice we only clear the one shot layer if the pressed key is not a modifier.      if (is_oneshot_layer_active() && event.pressed && !IS_MOD(action.key.code)) {          clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED); diff --git a/tmk_core/common/avr/suspend.c b/tmk_core/common/avr/suspend.c index 0c81e83612..1c7618ff51 100644 --- a/tmk_core/common/avr/suspend.c +++ b/tmk_core/common/avr/suspend.c @@ -9,6 +9,7 @@  #include "suspend.h"  #include "timer.h"  #include "led.h" +#include "host.h"  #ifdef PROTOCOL_LUFA  	#include "lufa.h" diff --git a/tmk_core/common/mousekey.h b/tmk_core/common/mousekey.h index 6eede06b44..9338d0af77 100644 --- a/tmk_core/common/mousekey.h +++ b/tmk_core/common/mousekey.h @@ -23,8 +23,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  /* max value on report descriptor */ -#define MOUSEKEY_MOVE_MAX       127 -#define MOUSEKEY_WHEEL_MAX      127 +#ifndef MOUSEKEY_MOVE_MAX +    #define MOUSEKEY_MOVE_MAX       127 +#elif MOUSEKEY_MOVE_MAX > 127 +    #error MOUSEKEY_MOVE_MAX needs to be smaller than 127 +#endif + +#ifndef MOUSEKEY_WHEEL_MAX +    #define MOUSEKEY_WHEEL_MAX      127 +#elif MOUSEKEY_WHEEL_MAX > 127 +    #error MOUSEKEY_WHEEL_MAX needs to be smaller than 127 +#endif  #ifndef MOUSEKEY_MOVE_DELTA  #define MOUSEKEY_MOVE_DELTA     5 diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk index e4c8aecb2c..b7cb0a559a 100644 --- a/tmk_core/rules.mk +++ b/tmk_core/rules.mk @@ -92,6 +92,9 @@ endif  endif  CFLAGS += -Wall  CFLAGS += -Wstrict-prototypes +ifneq ($(strip $(ALLOW_WARNINGS)), yes) +    CFLAGS += -Werror +endif  #CFLAGS += -mshort-calls  #CFLAGS += -fno-unit-at-a-time  #CFLAGS += -Wundef @@ -115,6 +118,9 @@ CPPFLAGS += -O$(OPT)  CPPFLAGS += -w  CPPFLAGS += -Wall  CPPFLAGS += -Wundef +ifneq ($(strip $(ALLOW_WARNINGS)), yes) +    CPPFLAGS += -Werror +endif  #CPPFLAGS += -mshort-calls  #CPPFLAGS += -fno-unit-at-a-time  #CPPFLAGS += -Wstrict-prototypes | 
