From 3e2e608184776a00538876ba05c827f31d821da4 Mon Sep 17 00:00:00 2001
From: Joseph Coffland <joseph@cauldrondevelopment.com>
Date: Fri, 21 Jul 2017 15:36:37 -0700
Subject: [PATCH] Moved jig code

---
 Makefile                         | 22 +++++++++-------------
 src/jig/.gitignore               |  3 +++
 {jig => src/jig}/Makefile        |  0
 {jig => src/jig}/src/config.h    |  0
 {jig => src/jig}/src/encoder.c   |  0
 {jig => src/jig}/src/encoder.h   |  0
 {jig => src/jig}/src/main.c      |  0
 {jig => src/jig}/src/pins.c      |  0
 {jig => src/jig}/src/pins.h      |  0
 {jig => src/jig}/src/ringbuf.def |  0
 {jig => src/jig}/src/rtc.c       |  0
 {jig => src/jig}/src/rtc.h       |  0
 {jig => src/jig}/src/usart.c     |  0
 {jig => src/jig}/src/usart.h     |  0
 14 files changed, 12 insertions(+), 13 deletions(-)
 create mode 100644 src/jig/.gitignore
 rename {jig => src/jig}/Makefile (100%)
 rename {jig => src/jig}/src/config.h (100%)
 rename {jig => src/jig}/src/encoder.c (100%)
 rename {jig => src/jig}/src/encoder.h (100%)
 rename {jig => src/jig}/src/main.c (100%)
 rename {jig => src/jig}/src/pins.c (100%)
 rename {jig => src/jig}/src/pins.h (100%)
 rename {jig => src/jig}/src/ringbuf.def (100%)
 rename {jig => src/jig}/src/rtc.c (100%)
 rename {jig => src/jig}/src/rtc.h (100%)
 rename {jig => src/jig}/src/usart.c (100%)
 rename {jig => src/jig}/src/usart.h (100%)

diff --git a/Makefile b/Makefile
index c4710ab..167eeb6 100644
--- a/Makefile
+++ b/Makefile
@@ -27,6 +27,8 @@ VERSION := $(shell sed -n 's/^.*"version": "\([^"]*\)",.*$$/\1/p' package.json)
 PKG_NAME := bbctrl-$(VERSION)
 PUB_PATH := root@buildbotics.com:/var/www/buildbotics.com/bbctrl
 
+SUBPROJECTS := avr boot pwr jig
+
 ifndef HOST
 HOST=bbctrl.local
 endif
@@ -37,16 +39,10 @@ endif
 
 WATCH := src/jade src/jade/templates src/stylus src/js src/resources Makefile
 
-all: html css js static avr boot pwr
-
-avr:
-	$(MAKE) -C src/avr
-
-boot:
-	$(MAKE) -C src/boot
-
-pwr:
-	$(MAKE) -C src/pwr
+all: html css js static
+	@for SUB in $(SUBPROJECTS); do \
+	  $(MAKE) -C src/$$SUB; \
+	done
 
 copy: pkg
 	rsync $(RSYNC_OPTS) pkg/$(PKG_NAME)/ $(DEST)/bbctrl/
@@ -136,9 +132,9 @@ tidy:
 
 clean: tidy
 	rm -rf build html dist
-	@$(MAKE) -C src/avr clean
-	@$(MAKE) -C src/boot clean
-	@$(MAKE) -C src/pwr clean
+	@for SUB in $(SUBPROJECTS); do \
+	  $(MAKE) -C src/$$SUB clean; \
+	done
 
 dist-clean: clean
 	rm -rf node_modules
diff --git a/src/jig/.gitignore b/src/jig/.gitignore
new file mode 100644
index 0000000..fa21f96
--- /dev/null
+++ b/src/jig/.gitignore
@@ -0,0 +1,3 @@
+/build
+/*.hex
+/*.elf
diff --git a/jig/Makefile b/src/jig/Makefile
similarity index 100%
rename from jig/Makefile
rename to src/jig/Makefile
diff --git a/jig/src/config.h b/src/jig/src/config.h
similarity index 100%
rename from jig/src/config.h
rename to src/jig/src/config.h
diff --git a/jig/src/encoder.c b/src/jig/src/encoder.c
similarity index 100%
rename from jig/src/encoder.c
rename to src/jig/src/encoder.c
diff --git a/jig/src/encoder.h b/src/jig/src/encoder.h
similarity index 100%
rename from jig/src/encoder.h
rename to src/jig/src/encoder.h
diff --git a/jig/src/main.c b/src/jig/src/main.c
similarity index 100%
rename from jig/src/main.c
rename to src/jig/src/main.c
diff --git a/jig/src/pins.c b/src/jig/src/pins.c
similarity index 100%
rename from jig/src/pins.c
rename to src/jig/src/pins.c
diff --git a/jig/src/pins.h b/src/jig/src/pins.h
similarity index 100%
rename from jig/src/pins.h
rename to src/jig/src/pins.h
diff --git a/jig/src/ringbuf.def b/src/jig/src/ringbuf.def
similarity index 100%
rename from jig/src/ringbuf.def
rename to src/jig/src/ringbuf.def
diff --git a/jig/src/rtc.c b/src/jig/src/rtc.c
similarity index 100%
rename from jig/src/rtc.c
rename to src/jig/src/rtc.c
diff --git a/jig/src/rtc.h b/src/jig/src/rtc.h
similarity index 100%
rename from jig/src/rtc.h
rename to src/jig/src/rtc.h
diff --git a/jig/src/usart.c b/src/jig/src/usart.c
similarity index 100%
rename from jig/src/usart.c
rename to src/jig/src/usart.c
diff --git a/jig/src/usart.h b/src/jig/src/usart.h
similarity index 100%
rename from jig/src/usart.h
rename to src/jig/src/usart.h
-- 
2.27.0