diff --git a/.gitignore b/.gitignore index b638a17..60a528d 100644 --- a/.gitignore +++ b/.gitignore @@ -12,4 +12,5 @@ __pycache__ *.gch scramble cdi4dc -tools/ttf_outline \ No newline at end of file +tools/ttf_outline +*.blend1 diff --git a/common.mk b/common.mk index 25146ff..5a0d1f9 100644 --- a/common.mk +++ b/common.mk @@ -130,6 +130,9 @@ audio.pcm: %.data.o: %.data $(BUILD_BINARY_O) +regs/%.csv: regs/%.ods + libreoffice --headless -convert-to csv:"Text - txt - csv (StarCalc)":44,34,76,,,,true --outdir regs/ $< + maple/maple_bus_commands.hpp: regs/maple_bus_commands.csv regs/gen/maple_bus_commands.py python regs/gen/maple_bus_commands.py $< > $@ diff --git a/example/example.mk b/example/example.mk index 332b821..0a2adcf 100644 --- a/example/example.mk +++ b/example/example.mk @@ -249,3 +249,10 @@ SERIAL_TRANSFER_OBJ = \ example/serial_transfer.elf: LDSCRIPT = $(LIB)/alt.lds example/serial_transfer.elf: $(START_OBJ) $(SERIAL_TRANSFER_OBJ) + +INTERRUPT_OBJ = \ + example/interrupt.o \ + serial.o + +example/interrupt.elf: LDSCRIPT = $(LIB)/alt.lds +example/interrupt.elf: $(START_OBJ) $(INTERRUPT_OBJ) diff --git a/geometry/heart.blend b/geometry/heart.blend index f5d2fc3..9ed07af 100644 Binary files a/geometry/heart.blend and b/geometry/heart.blend differ diff --git a/regs/maple_bus_ft0.ods b/regs/maple_bus_ft0.ods index c9d3363..2cbaf1a 100644 Binary files a/regs/maple_bus_ft0.ods and b/regs/maple_bus_ft0.ods differ