From afc8388cd1b08556c441b35ba4a98f436a44a37f Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@keyboard.io>
Date: Wed, 14 Oct 2020 21:59:52 -0700
Subject: [PATCH] Move a bunch of makefile targets from the generic sketch
 makefile

---
 Makefile                 | 26 ++++++++++++++++++++++++++
 bin/kaleidoscope-builder |  4 ++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index f6ca027d..fb299fa2 100644
--- a/Makefile
+++ b/Makefile
@@ -75,6 +75,13 @@ include $(BOARD_HARDWARE_PATH)/$(KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR)/rules.mk
 prepare-virtual:
 	$(MAKE) -C $(BOARD_HARDWARE_PATH)/keyboardio prepare-virtual
 
+
+simulator-tests: prepare-virtual
+	$(MAKE) -C tests all
+
+docker-simulator-tests:
+	BOARD_HARDWARE_PATH="$(BOARD_HARDWARE_PATH)" ./bin/run-docker "make simulator-tests"
+
 run-tests: prepare-virtual build-gtest-gmock
 	$(MAKE) -c tests
 	@: # blah
@@ -82,3 +89,22 @@ run-tests: prepare-virtual build-gtest-gmock
 build-gtest-gmock:
 	(cd testing/googletest && cmake .)
 	$(MAKE) -C testing/googletest
+
+adjust-git-timestamps:
+	bin/set-timestamps-from-git
+
+find-filename-conflicts:
+	@if [ -d "bin" ]; then \
+		bin/find-filename-conflicts; \
+	fi
+
+SMOKE_SKETCHES=$(shell if [ -d ./examples ]; then find ./examples -type f -name \*ino | xargs -n 1 dirname; fi)
+
+smoke-sketches: $(SMOKE_SKETCHES)
+	@echo "Smoke-tested all the sketches"
+
+.PHONY: force
+
+
+$(SMOKE_SKETCHES): force
+	@BOARD_HARDWARE_PATH="$(BOARD_HARDWARE_PATH)" $(KALEIDOSCOPE_BUILDER_DIR)/kaleidoscope-builder $@ compile
diff --git a/bin/kaleidoscope-builder b/bin/kaleidoscope-builder
index 412ab88d..f1b332c1 100755
--- a/bin/kaleidoscope-builder
+++ b/bin/kaleidoscope-builder
@@ -260,14 +260,14 @@ check_bootloader_port_and_flash () {
 
 flash_over_usb () {
 
-    FLASH_CMD=${AVRDUDE} \
+    FLASH_CMD=$(${AVRDUDE} \
 		-C "${AVRDUDE_CONF}" \
 		-p"${MCU}" \
  		-cavr109 \
 		-D \
 		-P "${DEVICE_PORT_BOOTLOADER}" \
 		-b57600 \
-		"-Uflash:w:${HEX_FILE_PATH}:i"
+		"-Uflash:w:${HEX_FILE_PATH}:i")
 
     if [ "${ARDUINO_VERBOSE}" != "-verbose" ]; then
 	${FLASH_CMD} 2>&1 |grep -v ^avrdude | grep -v '^$' |grep -v '^ ' | grep -vi programmer