Move source into separate directory

rla · Jul 17, 2014 · d2ca9a5 · d2ca9a5
1 parent 36e56d3
commit d2ca9a5
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,4 @@
 hw/*.s#*
 pc/node_modules
+avr/*.elf
+avr/*.hex
diff --git a/README.md b/README.md
@@ -15,9 +15,18 @@ the following features:
 
 The project is still work-in-progress.
 
+## Hardware
+
+### Building
+
+To build the HEX binary for the controller:
+
+    cd avr
+    make
+
 ## Changelog
 
- * 2014-02 Physical hardware design is ready.
+ * 2014-02-01 Physical hardware design is ready.
 
 ## License
 

diff --git a/avr/Makefile b/avr/Makefile
@@ -1,21 +1,18 @@
-all: controller.hex
+all: main.hex
 
-%.elf: %.c
+main.elf: src/main.c src/*.c
 	avr-gcc -std=c99 -mmcu=atmega88pa -Wall -Os -o $@ $<
 
-%.hex: %.elf
+main.hex: main.elf
 	avr-objcopy -j .text -j .data -O ihex $< $@
 
-burn: controller.hex
-	avrdude -c avrispmkii -p m88p -U flash:w:$<
-
-burn-usart: usart_echo.hex
+burn: main.hex
 	avrdude -c avrispmkii -p m88p -U flash:w:$<
 
 burn-fuse:
 	avrdude -c avrispmkii -p m88p -U lfuse:w:0xf7:m
 
 clean:
-	rm -r controller.hex
+	rm -r main.hex
 
-.PHONY: burn burn-usart burn-fuse clean
+.PHONY: burn burn-fuse clean
diff --git a/avr/adc.c → avr/src/adc.c b/avr/adc.c → avr/src/adc.c
diff --git a/avr/control.c → avr/src/control.c b/avr/control.c → avr/src/control.c
diff --git a/avr/fans.c → avr/src/fans.c b/avr/fans.c → avr/src/fans.c
diff --git a/avr/init.c → avr/src/init.c b/avr/init.c → avr/src/init.c
diff --git a/avr/controller.c → avr/src/main.c b/avr/controller.c → avr/src/main.c
diff --git a/avr/measure.c → avr/src/measure.c b/avr/measure.c → avr/src/measure.c
diff --git a/avr/rpm.c → avr/src/rpm.c b/avr/rpm.c → avr/src/rpm.c
diff --git a/avr/usart.c → avr/src/usart.c b/avr/usart.c → avr/src/usart.c