Clean up my working directory
This commit is contained in:
parent
cdd491da86
commit
bbd0cf2c62
|
|
@ -0,0 +1,4 @@
|
|||
release
|
||||
*.hex
|
||||
*.elf
|
||||
GNUmakefile
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
Outstanding
|
||||
-----------
|
||||
|
||||
7. Unified build with multiple firmware targets
|
||||
|
||||
|
||||
Fixed
|
||||
|
|
@ -13,4 +12,5 @@ Fixed
|
|||
4. Period clock adjustments take forever
|
||||
5. Make setup mode less confusing
|
||||
6. Allow jam clock adjustments in setup
|
||||
7. Unified build with multiple firmware targets
|
||||
8. Debounce buttons
|
||||
47
Makefile
47
Makefile
|
|
@ -1,4 +1,7 @@
|
|||
PROG = main
|
||||
TARGETS += scoreboard-neale.hex
|
||||
TARGETS += scoreboard-susan1.hex
|
||||
TARGETS += scoreboard-susan2.hex
|
||||
TARGETS += scoreboard-std.hex
|
||||
|
||||
MCU = attiny84
|
||||
|
||||
|
|
@ -9,34 +12,32 @@ CFLAGS += -w
|
|||
|
||||
LDFLAGS += -mmcu=$(MCU)
|
||||
|
||||
AVDFLAGS += -p $(MCU)
|
||||
AVDFLAGS += -c usbtiny
|
||||
all: $(TARGETS)
|
||||
|
||||
FUSES += -U lfuse:w:0x7f:m
|
||||
FUSES += -U hfuse:w:0xdd:m
|
||||
FUSES += -U efuse:w:0xff:m
|
||||
scoreboard-%.elf: main.c avr.c config.h avr.h
|
||||
$(CC) $(CFLAGS) -DVARIANT=$* $(LDFLAGS) -o $@ avr.c main.c
|
||||
|
||||
upload: .upload
|
||||
|
||||
.upload: $(PROG).hex
|
||||
avrdude $(AVDFLAGS) -U flash:w:$<
|
||||
touch $@
|
||||
|
||||
fuses:
|
||||
avrdude $(AVDFLAGS) $(FUSES)
|
||||
|
||||
main: main.o avr.o
|
||||
|
||||
blink: blink.o avr.o
|
||||
|
||||
avr.o: avr.c config.h
|
||||
|
||||
%.hex: %
|
||||
%.hex: %.elf
|
||||
avr-objcopy -O ihex -R .eeprom -R .fuse -R .lock -R .signature $< $@
|
||||
|
||||
clean:
|
||||
rm -f $(PROG) *.o *.hex .upload
|
||||
rm -f *.elf *.o *.hex .upload
|
||||
|
||||
|
||||
|
||||
##
|
||||
## Helpful targets for development
|
||||
##
|
||||
|
||||
fuses: AVDFLAGS += -p $(MCU)
|
||||
fuses: AVDFLAGS += -c usbtiny
|
||||
|
||||
upload: scoreboard-neale.hex
|
||||
avrdude $(AVDFLAGS) -U flash:w:$<
|
||||
|
||||
fuses: FUSES += -U lfuse:w:0x7f:m
|
||||
fuses: FUSES += -U hfuse:w:0xdd:m
|
||||
fuses: FUSES += -U efuse:w:0xff:m
|
||||
fuses:
|
||||
avrdude $(AVDFLAGS) $(FUSES)
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,136 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||
|
||||
<svg
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
width="129.57692"
|
||||
height="209.82599"
|
||||
id="svg2"
|
||||
version="1.1"
|
||||
inkscape:version="0.48.4 r9939"
|
||||
sodipodi:docname="controller-conn.svg">
|
||||
<defs
|
||||
id="defs4" />
|
||||
<sodipodi:namedview
|
||||
id="base"
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1.0"
|
||||
inkscape:pageopacity="0.0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:zoom="0.83718329"
|
||||
inkscape:cx="49.790255"
|
||||
inkscape:cy="119.40543"
|
||||
inkscape:document-units="px"
|
||||
inkscape:current-layer="layer1"
|
||||
showgrid="false"
|
||||
inkscape:window-width="1259"
|
||||
inkscape:window-height="839"
|
||||
inkscape:window-x="0"
|
||||
inkscape:window-y="0"
|
||||
inkscape:window-maximized="0"
|
||||
fit-margin-top="0"
|
||||
fit-margin-left="0"
|
||||
fit-margin-right="0"
|
||||
fit-margin-bottom="0" />
|
||||
<metadata
|
||||
id="metadata7">
|
||||
<rdf:RDF>
|
||||
<cc:Work
|
||||
rdf:about="">
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
<dc:title></dc:title>
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<g
|
||||
inkscape:label="Layer 1"
|
||||
inkscape:groupmode="layer"
|
||||
id="layer1"
|
||||
transform="translate(-298.3437,-356.56045)">
|
||||
<path
|
||||
style="fill:none;stroke:#000000;stroke-width:20;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
|
||||
d="m 308.43035,525.01817 c 0.0224,12.61936 10.90299,30.79285 29.01664,31.18674 18.11366,0.3939 46.59996,0.14703 57.65053,-1.01178 12.80286,-1.34256 22.45738,-21.53441 22.52553,-31.36944 0,0 0.64469,-87.18796 0,-91.56654 -0.64469,-4.37857 -13.29505,-15.39673 -28.53212,-31.75759 -15.23706,-16.36086 -25.30565,-33.68303 -48.51772,-33.94468 -17.74986,-0.20008 -31.03771,23.34467 -31.76769,28.18425 -0.72997,4.83959 -0.37517,130.27904 -0.37517,130.27904 z"
|
||||
id="path3050"
|
||||
inkscape:connector-curvature="0"
|
||||
sodipodi:nodetypes="szsszsszs" />
|
||||
<path
|
||||
sodipodi:type="arc"
|
||||
style="fill:none;stroke:#000000;stroke-width:10;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
|
||||
id="path3820"
|
||||
sodipodi:cx="342.81619"
|
||||
sodipodi:cy="402.56421"
|
||||
sodipodi:rx="8.361371"
|
||||
sodipodi:ry="8.6599913"
|
||||
d="m 351.17756,402.56421 c 0,4.78278 -3.74351,8.65999 -8.36137,8.65999 -4.61786,0 -8.36137,-3.87721 -8.36137,-8.65999 0,-4.78278 3.74351,-8.65999 8.36137,-8.65999 4.61786,0 8.36137,3.87721 8.36137,8.65999 z"
|
||||
transform="matrix(1.335243,0,0,1.335243,-114.92672,-134.95682)" />
|
||||
<path
|
||||
transform="matrix(1.335243,0,0,1.335243,-114.6281,-95.538929)"
|
||||
d="m 351.17756,402.56421 c 0,4.78278 -3.74351,8.65999 -8.36137,8.65999 -4.61786,0 -8.36137,-3.87721 -8.36137,-8.65999 0,-4.78278 3.74351,-8.65999 8.36137,-8.65999 4.61786,0 8.36137,3.87721 8.36137,8.65999 z"
|
||||
sodipodi:ry="8.6599913"
|
||||
sodipodi:rx="8.361371"
|
||||
sodipodi:cy="402.56421"
|
||||
sodipodi:cx="342.81619"
|
||||
id="path3822"
|
||||
style="fill:none;stroke:#000000;stroke-width:10;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
|
||||
sodipodi:type="arc" />
|
||||
<path
|
||||
sodipodi:type="arc"
|
||||
style="fill:none;stroke:#000000;stroke-width:10;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
|
||||
id="path3824"
|
||||
sodipodi:cx="342.81619"
|
||||
sodipodi:cy="402.56421"
|
||||
sodipodi:rx="8.361371"
|
||||
sodipodi:ry="8.6599913"
|
||||
d="m 351.17756,402.56421 c 0,4.78278 -3.74351,8.65999 -8.36137,8.65999 -4.61786,0 -8.36137,-3.87721 -8.36137,-8.65999 0,-4.78278 3.74351,-8.65999 8.36137,-8.65999 4.61786,0 8.36137,3.87721 8.36137,8.65999 z"
|
||||
transform="matrix(1.335243,0,0,1.335243,-114.92672,-55.523797)" />
|
||||
<path
|
||||
transform="matrix(1.335243,0,0,1.335243,-114.6281,-15.508665)"
|
||||
d="m 351.17756,402.56421 c 0,4.78278 -3.74351,8.65999 -8.36137,8.65999 -4.61786,0 -8.36137,-3.87721 -8.36137,-8.65999 0,-4.78278 3.74351,-8.65999 8.36137,-8.65999 4.61786,0 8.36137,3.87721 8.36137,8.65999 z"
|
||||
sodipodi:ry="8.6599913"
|
||||
sodipodi:rx="8.361371"
|
||||
sodipodi:cy="402.56421"
|
||||
sodipodi:cx="342.81619"
|
||||
id="path3826"
|
||||
style="fill:none;stroke:#000000;stroke-width:10;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
|
||||
sodipodi:type="arc" />
|
||||
<path
|
||||
sodipodi:type="arc"
|
||||
style="fill:none;stroke:#000000;stroke-width:10;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
|
||||
id="path3828"
|
||||
sodipodi:cx="342.81619"
|
||||
sodipodi:cy="402.56421"
|
||||
sodipodi:rx="8.361371"
|
||||
sodipodi:ry="8.6599913"
|
||||
d="m 351.17756,402.56421 c 0,4.78278 -3.74351,8.65999 -8.36137,8.65999 -4.61786,0 -8.36137,-3.87721 -8.36137,-8.65999 0,-4.78278 3.74351,-8.65999 8.36137,-8.65999 4.61786,0 8.36137,3.87721 8.36137,8.65999 z"
|
||||
transform="matrix(1.335243,0,0,1.335243,-74.314347,-94.344447)" />
|
||||
<path
|
||||
transform="matrix(1.335243,0,0,1.335243,-74.612967,-54.329315)"
|
||||
d="m 351.17756,402.56421 c 0,4.78278 -3.74351,8.65999 -8.36137,8.65999 -4.61786,0 -8.36137,-3.87721 -8.36137,-8.65999 0,-4.78278 3.74351,-8.65999 8.36137,-8.65999 4.61786,0 8.36137,3.87721 8.36137,8.65999 z"
|
||||
sodipodi:ry="8.6599913"
|
||||
sodipodi:rx="8.361371"
|
||||
sodipodi:cy="402.56421"
|
||||
sodipodi:cx="342.81619"
|
||||
id="path3830"
|
||||
style="fill:none;stroke:#000000;stroke-width:10;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
|
||||
sodipodi:type="arc" />
|
||||
<path
|
||||
sodipodi:type="arc"
|
||||
style="fill:none;stroke:#000000;stroke-width:10;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
|
||||
id="path3832"
|
||||
sodipodi:cx="342.81619"
|
||||
sodipodi:cy="402.56421"
|
||||
sodipodi:rx="8.361371"
|
||||
sodipodi:ry="8.6599913"
|
||||
d="m 351.17756,402.56421 c 0,4.78278 -3.74351,8.65999 -8.36137,8.65999 -4.61786,0 -8.36137,-3.87721 -8.36137,-8.65999 0,-4.78278 3.74351,-8.65999 8.36137,-8.65999 4.61786,0 8.36137,3.87721 8.36137,8.65999 z"
|
||||
transform="matrix(1.335243,0,0,1.335243,-74.314347,-14.314183)" />
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 6.5 KiB |
|
|
@ -0,0 +1,217 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||
|
||||
<svg
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
width="744.09448819"
|
||||
height="1052.3622047"
|
||||
id="svg2"
|
||||
version="1.1"
|
||||
inkscape:version="0.48.4 r9939"
|
||||
sodipodi:docname="New document 1">
|
||||
<defs
|
||||
id="defs4" />
|
||||
<sodipodi:namedview
|
||||
id="base"
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1.0"
|
||||
inkscape:pageopacity="0.0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:zoom="1.4"
|
||||
inkscape:cx="418.97372"
|
||||
inkscape:cy="520"
|
||||
inkscape:document-units="px"
|
||||
inkscape:current-layer="layer1"
|
||||
showgrid="false"
|
||||
inkscape:window-width="1436"
|
||||
inkscape:window-height="882"
|
||||
inkscape:window-x="0"
|
||||
inkscape:window-y="14"
|
||||
inkscape:window-maximized="0" />
|
||||
<metadata
|
||||
id="metadata7">
|
||||
<rdf:RDF>
|
||||
<cc:Work
|
||||
rdf:about="">
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
<dc:title></dc:title>
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<g
|
||||
inkscape:label="Layer 1"
|
||||
inkscape:groupmode="layer"
|
||||
id="layer1">
|
||||
<rect
|
||||
style="fill:#e0cece;fill-opacity:1;fill-rule:nonzero;"
|
||||
id="rect3050"
|
||||
width="600"
|
||||
height="259.28571"
|
||||
x="67.14286"
|
||||
y="400.93362"
|
||||
ry="1.9140695" />
|
||||
<rect
|
||||
style="fill:#000000;fill-opacity:1;fill-rule:nonzero"
|
||||
id="rect3052"
|
||||
width="561.42859"
|
||||
height="199.28572"
|
||||
x="85.714287"
|
||||
y="442.36218"
|
||||
ry="1.9140695" />
|
||||
<rect
|
||||
style="fill:#e0cece;fill-opacity:1;fill-rule:nonzero;"
|
||||
id="rect3084"
|
||||
width="169.28572"
|
||||
height="58.57143"
|
||||
x="262.14285"
|
||||
y="556.64789"
|
||||
ry="1.9140695" />
|
||||
<g
|
||||
id="g3094">
|
||||
<rect
|
||||
ry="1.9140695"
|
||||
y="497.36218"
|
||||
x="150"
|
||||
height="115"
|
||||
width="45.714287"
|
||||
id="rect3090"
|
||||
style="fill:#e0cece;fill-opacity:1;fill-rule:nonzero" />
|
||||
<rect
|
||||
transform="matrix(0,1,-1,0,0,0)"
|
||||
style="fill:#e0cece;fill-opacity:1;fill-rule:nonzero"
|
||||
id="rect3092"
|
||||
width="45.714287"
|
||||
height="115"
|
||||
x="532.00507"
|
||||
y="-230.35715"
|
||||
ry="1.9140695" />
|
||||
</g>
|
||||
<g
|
||||
id="g3072">
|
||||
<rect
|
||||
ry="1.9140695"
|
||||
y="548.79077"
|
||||
x="457.85715"
|
||||
height="65.714287"
|
||||
width="65"
|
||||
id="rect3054"
|
||||
style="fill:#e0cece;fill-opacity:1;fill-rule:nonzero" />
|
||||
<path
|
||||
transform="translate(-75,0)"
|
||||
d="m 592.14287,582.36218 a 26.428572,26.428572 0 1 1 -52.85715,0 26.428572,26.428572 0 1 1 52.85715,0 z"
|
||||
sodipodi:ry="26.428572"
|
||||
sodipodi:rx="26.428572"
|
||||
sodipodi:cy="582.36218"
|
||||
sodipodi:cx="565.71429"
|
||||
id="path3060"
|
||||
style="fill:#d40000;fill-opacity:1;fill-rule:nonzero"
|
||||
sodipodi:type="arc" />
|
||||
</g>
|
||||
<g
|
||||
id="g3076"
|
||||
transform="translate(75,0)">
|
||||
<rect
|
||||
style="fill:#e0cece;fill-opacity:1;fill-rule:nonzero"
|
||||
id="rect3078"
|
||||
width="65"
|
||||
height="65.714287"
|
||||
x="457.85715"
|
||||
y="548.79077"
|
||||
ry="1.9140695" />
|
||||
<path
|
||||
sodipodi:type="arc"
|
||||
style="fill:#d40000;fill-opacity:1;fill-rule:nonzero"
|
||||
id="path3080"
|
||||
sodipodi:cx="565.71429"
|
||||
sodipodi:cy="582.36218"
|
||||
sodipodi:rx="26.428572"
|
||||
sodipodi:ry="26.428572"
|
||||
d="m 592.14287,582.36218 c 0,14.5961 -11.83248,26.42857 -26.42858,26.42857 -14.59609,0 -26.42857,-11.83247 -26.42857,-26.42857 0,-14.59609 11.83248,-26.42857 26.42857,-26.42857 14.5961,0 26.42858,11.83248 26.42858,26.42857 z"
|
||||
transform="translate(-75,0)" />
|
||||
</g>
|
||||
<rect
|
||||
style="fill:#000000;fill-opacity:1;fill-rule:nonzero"
|
||||
id="rect3086"
|
||||
width="49.285713"
|
||||
height="18.571428"
|
||||
x="286.42856"
|
||||
y="577.36218"
|
||||
ry="1.9140695"
|
||||
rx="7" />
|
||||
<rect
|
||||
rx="7"
|
||||
ry="1.9140695"
|
||||
y="577.36218"
|
||||
x="358.57141"
|
||||
height="18.571428"
|
||||
width="49.285713"
|
||||
id="rect3088"
|
||||
style="fill:#000000;fill-opacity:1;fill-rule:nonzero" />
|
||||
<g
|
||||
id="g3102"
|
||||
transform="translate(-0.35713959,-1.0714188)">
|
||||
<rect
|
||||
ry="1.9140695"
|
||||
y="501.64789"
|
||||
x="152.85715"
|
||||
height="108.57143"
|
||||
width="40.714287"
|
||||
id="rect3098"
|
||||
style="fill:#000000;fill-opacity:1;fill-rule:nonzero" />
|
||||
<rect
|
||||
transform="matrix(0,1,-1,0,0,0)"
|
||||
style="fill:#000000;fill-opacity:1;fill-rule:nonzero"
|
||||
id="rect3100"
|
||||
width="40.714287"
|
||||
height="108.57143"
|
||||
x="535.57648"
|
||||
y="-227.5"
|
||||
ry="1.9140695" />
|
||||
</g>
|
||||
<rect
|
||||
style="fill:#76745b;fill-opacity:1;fill-rule:nonzero"
|
||||
id="rect3106"
|
||||
width="170.71428"
|
||||
height="28.571428"
|
||||
x="261.42856"
|
||||
y="515.93365"
|
||||
ry="1.9140695"
|
||||
rx="2" />
|
||||
<rect
|
||||
rx="2"
|
||||
ry="1.9140695"
|
||||
y="442.36221"
|
||||
x="261.42856"
|
||||
height="28.571428"
|
||||
width="170.71428"
|
||||
id="rect3108"
|
||||
style="fill:#76745b;fill-opacity:1;fill-rule:nonzero" />
|
||||
<rect
|
||||
style="fill:#76745b;fill-opacity:1;fill-rule:nonzero"
|
||||
id="rect3110"
|
||||
width="170.71428"
|
||||
height="28.571428"
|
||||
x="261.42856"
|
||||
y="478.79077"
|
||||
ry="1.9140695"
|
||||
rx="2" />
|
||||
<rect
|
||||
rx="2"
|
||||
ry="1.9140695"
|
||||
y="623.79077"
|
||||
x="261.42856"
|
||||
height="17.857143"
|
||||
width="170.71428"
|
||||
id="rect3112"
|
||||
style="fill:#76745b;fill-opacity:1;fill-rule:nonzero" />
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 6.0 KiB |
|
|
@ -0,0 +1,9 @@
|
|||
#! /bin/sh
|
||||
|
||||
now=$(date +%Y%m%d)
|
||||
|
||||
make all
|
||||
mkdir -p bin
|
||||
for i in *.hex; do
|
||||
cp $i bin/scoreboard-$now-${i#scoreboard-}
|
||||
done
|
||||
Loading…
Reference in New Issue