Firmware directory reorganization

30 files changed, 16 insertions, 93 deletions

diff --git a/fw/Makefile b/fw/Makefile
index 0b4e3ab..70f1132 100644
--- a/fw/Makefile
+++ b/fw/Makefile
@@ -1,9 +1,9 @@
-# put your *.o targets here, make should handle the rest!
-CMSIS_PATH 		?= STM32Cube/Drivers/CMSIS
+CUBE_PATH 		?= $(wildcard ~)/resource/STM32CubeF0
+CMSIS_PATH 		?= $(CUBE_PATH)/Drivers/CMSIS
 CMSIS_DEV_PATH  ?= $(CMSIS_PATH)/Device/ST/STM32F0xx
-HAL_PATH   		?= STM32Cube/Drivers/STM32F0xx_HAL_Driver
+HAL_PATH   		?= $(CUBE_PATH)/Drivers/STM32F0xx_HAL_Driver
 
-BUS_ADDR        ?= 0
+MAC_ADDR        ?= 0xdeadbeef
 
 CC      := arm-none-eabi-gcc
 LD      := arm-none-eabi-ld
@@ -11,7 +11,7 @@ OBJCOPY := arm-none-eabi-objcopy
 OBJDUMP := arm-none-eabi-objdump
 SIZE    := arm-none-eabi-size
 
-CFLAGS  = -g -Wall -std=gnu11 -O0 -fdump-rtl-expand -DBUS_ADDR=$(BUS_ADDR)
+CFLAGS  = -g -Wall -std=gnu11 -O0 -fdump-rtl-expand -DMAC_ADDR=$(MAC_ADDR)
 CFLAGS += -mlittle-endian -mcpu=cortex-m0 -march=armv6-m -mthumb
 #CFLAGS += -ffunction-sections -fdata-sections
 LDFLAGS = -nostartfiles
@@ -32,12 +32,12 @@ LDFLAGS += -L$(CMSIS_PATH)/Lib/GCC -larm_cortexM0l_math
 
 ###################################################
 
-.PHONY: program clean bus_addr.c
+.PHONY: program clean
 
 all: main.elf
 
 cmsis_exports.c: $(CMSIS_DEV_PATH)/Include/stm32f030x6.h $(CMSIS_PATH)/Include/core_cm0.h
-	python3 gen_cmsis_exports.py $^ > $@
+	python3 tools/gen_cmsis_exports.py $^ > $@
 
 %.o: %.c
 	$(CC) -c $(CFLAGS) -o $@ $^
@@ -61,7 +61,7 @@ sources.c: sources.tar.xz.zip
 	xxd -i $< | head -n -1 | sed 's/=/__attribute__((section(".source_tarball"))) =/' > $@
 
 # FIXME re-add sources.o
-main.elf: main.o startup_stm32f030x6.o system_stm32f0xx.o $(HAL_PATH)/Src/stm32f0xx_ll_utils.o base.o cmsis_exports.o transpose.o bus_addr.o mac.o
+main.elf: main.o startup_stm32f030x6.o system_stm32f0xx.o $(HAL_PATH)/Src/stm32f0xx_ll_utils.o base.o cmsis_exports.o transpose.o mac.o
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
 	$(OBJCOPY) -O ihex $@ $(@:.elf=.hex)
 	$(OBJCOPY) -O binary $@ $(@:.elf=.bin)
@@ -71,12 +71,12 @@ main.elf: main.o startup_stm32f030x6.o system_stm32f0xx.o $(HAL_PATH)/Src/stm32f
 program: main.elf openocd.cfg
 	openocd -f openocd.cfg -c "program $< verify reset exit"
 
-transpose.elf: transpose.c transpose_main.c
+tools/transpose_test: transpose.c tools/transpose_test.c
 	gcc -g -Wall -Wpedantic -o $@ $^
 
-.PHONY: transpose_test
-transpose_test: transpose.elf
-	./transpose.elf
+.PHONY: run_transpose_test
+run_transpose_test: tools/transpose_test
+	tools/transpose_test
 
 _crc.so: crc.c
 	gcc -o $@ -shared -fPIC -g $^
@@ -87,6 +87,9 @@ clean:
 	rm -f **.expand
 	rm -f transpose.elf
 	rm -f crc.so
+	rm -f cmsis_exports.c
 	rm -f sources.tar.xz
+	rm -f sources.tar.xz.zip
 	rm -f sources.c
+	rm -f *.dot
 
diff --git a/fw/bus_addr.c b/fw/bus_addr.c
deleted file mode 100644
index 5e1fa2a..0000000
--- a/fw/bus_addr.c
+++ /dev/null
@@ -1,3 +0,0 @@
-
-#include <stdint.h>
-uint8_t bus_addr = BUS_ADDR;
diff --git a/fw/crc.c b/fw/crc.c
deleted file mode 100644
index 5e5c7d2..0000000
--- a/fw/crc.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* MPEG-2 CRC as done by the STM32F0 hardware CRC unit */
-#include <sys/types.h>
-
-/* CRC32 lookup table for polynomial 0x04c11db7 */
-static u_long crc_table[256] = {
-        0x00000000, 0x04c11db7, 0x09823b6e, 0x0d4326d9, 0x130476dc, 0x17c56b6b,
-        0x1a864db2, 0x1e475005, 0x2608edb8, 0x22c9f00f, 0x2f8ad6d6, 0x2b4bcb61,
-        0x350c9b64, 0x31cd86d3, 0x3c8ea00a, 0x384fbdbd, 0x4c11db70, 0x48d0c6c7,
-        0x4593e01e, 0x4152fda9, 0x5f15adac, 0x5bd4b01b, 0x569796c2, 0x52568b75,
-        0x6a1936c8, 0x6ed82b7f, 0x639b0da6, 0x675a1011, 0x791d4014, 0x7ddc5da3,
-        0x709f7b7a, 0x745e66cd, 0x9823b6e0, 0x9ce2ab57, 0x91a18d8e, 0x95609039,
-        0x8b27c03c, 0x8fe6dd8b, 0x82a5fb52, 0x8664e6e5, 0xbe2b5b58, 0xbaea46ef,
-        0xb7a96036, 0xb3687d81, 0xad2f2d84, 0xa9ee3033, 0xa4ad16ea, 0xa06c0b5d,
-        0xd4326d90, 0xd0f37027, 0xddb056fe, 0xd9714b49, 0xc7361b4c, 0xc3f706fb,
-        0xceb42022, 0xca753d95, 0xf23a8028, 0xf6fb9d9f, 0xfbb8bb46, 0xff79a6f1,
-        0xe13ef6f4, 0xe5ffeb43, 0xe8bccd9a, 0xec7dd02d, 0x34867077, 0x30476dc0,
-        0x3d044b19, 0x39c556ae, 0x278206ab, 0x23431b1c, 0x2e003dc5, 0x2ac12072,
-        0x128e9dcf, 0x164f8078, 0x1b0ca6a1, 0x1fcdbb16, 0x018aeb13, 0x054bf6a4,
-        0x0808d07d, 0x0cc9cdca, 0x7897ab07, 0x7c56b6b0, 0x71159069, 0x75d48dde,
-        0x6b93dddb, 0x6f52c06c, 0x6211e6b5, 0x66d0fb02, 0x5e9f46bf, 0x5a5e5b08,
-        0x571d7dd1, 0x53dc6066, 0x4d9b3063, 0x495a2dd4, 0x44190b0d, 0x40d816ba,
-        0xaca5c697, 0xa864db20, 0xa527fdf9, 0xa1e6e04e, 0xbfa1b04b, 0xbb60adfc,
-        0xb6238b25, 0xb2e29692, 0x8aad2b2f, 0x8e6c3698, 0x832f1041, 0x87ee0df6,
-        0x99a95df3, 0x9d684044, 0x902b669d, 0x94ea7b2a, 0xe0b41de7, 0xe4750050,
-        0xe9362689, 0xedf73b3e, 0xf3b06b3b, 0xf771768c, 0xfa325055, 0xfef34de2,
-        0xc6bcf05f, 0xc27dede8, 0xcf3ecb31, 0xcbffd686, 0xd5b88683, 0xd1799b34,
-        0xdc3abded, 0xd8fba05a, 0x690ce0ee, 0x6dcdfd59, 0x608edb80, 0x644fc637,
-        0x7a089632, 0x7ec98b85, 0x738aad5c, 0x774bb0eb, 0x4f040d56, 0x4bc510e1,
-        0x46863638, 0x42472b8f, 0x5c007b8a, 0x58c1663d, 0x558240e4, 0x51435d53,
-        0x251d3b9e, 0x21dc2629, 0x2c9f00f0, 0x285e1d47, 0x36194d42, 0x32d850f5,
-        0x3f9b762c, 0x3b5a6b9b, 0x0315d626, 0x07d4cb91, 0x0a97ed48, 0x0e56f0ff,
-        0x1011a0fa, 0x14d0bd4d, 0x19939b94, 0x1d528623, 0xf12f560e, 0xf5ee4bb9,
-        0xf8ad6d60, 0xfc6c70d7, 0xe22b20d2, 0xe6ea3d65, 0xeba91bbc, 0xef68060b,
-        0xd727bbb6, 0xd3e6a601, 0xdea580d8, 0xda649d6f, 0xc423cd6a, 0xc0e2d0dd,
-        0xcda1f604, 0xc960ebb3, 0xbd3e8d7e, 0xb9ff90c9, 0xb4bcb610, 0xb07daba7,
-        0xae3afba2, 0xaafbe615, 0xa7b8c0cc, 0xa379dd7b, 0x9b3660c6, 0x9ff77d71,
-        0x92b45ba8, 0x9675461f, 0x8832161a, 0x8cf30bad, 0x81b02d74, 0x857130c3,
-        0x5d8a9099, 0x594b8d2e, 0x5408abf7, 0x50c9b640, 0x4e8ee645, 0x4a4ffbf2,
-        0x470cdd2b, 0x43cdc09c, 0x7b827d21, 0x7f436096, 0x7200464f, 0x76c15bf8,
-        0x68860bfd, 0x6c47164a, 0x61043093, 0x65c52d24, 0x119b4be9, 0x155a565e,
-        0x18197087, 0x1cd86d30, 0x029f3d35, 0x065e2082, 0x0b1d065b, 0x0fdc1bec,
-        0x3793a651, 0x3352bbe6, 0x3e119d3f, 0x3ad08088, 0x2497d08d, 0x2056cd3a,
-        0x2d15ebe3, 0x29d4f654, 0xc5a92679, 0xc1683bce, 0xcc2b1d17, 0xc8ea00a0,
-        0xd6ad50a5, 0xd26c4d12, 0xdf2f6bcb, 0xdbee767c, 0xe3a1cbc1, 0xe760d676,
-        0xea23f0af, 0xeee2ed18, 0xf0a5bd1d, 0xf464a0aa, 0xf9278673, 0xfde69bc4,
-        0x89b8fd09, 0x8d79e0be, 0x803ac667, 0x84fbdbd0, 0x9abc8bd5, 0x9e7d9662,
-        0x933eb0bb, 0x97ffad0c, 0xafb010b1, 0xab710d06, 0xa6322bdf, 0xa2f33668,
-        0xbcb4666d, 0xb8757bda, 0xb5365d03, 0xb1f740b4};
-
-u_long crc32 (char *data, int len)
-{
-        register int i;
-        u_long crc = 0xffffffff;
-
-        for (i=0; i<len; i++)
-                crc = (crc << 8) ^ crc_table[((crc >> 24) ^ *data++) & 0xff];
-
-        return crc;
-}
diff --git a/fw/crc.py b/fw/crc.py
deleted file mode 100644
index 043c6e9..0000000
--- a/fw/crc.py
+++ /dev/null
@@ -1,8 +0,0 @@
-import ctypes
-import os
-lib = ctypes.CDLL(os.path.join(os.path.dirname(__file__), '_crc.so'))
-lib.crc32.restype = ctypes.c_uint32
-def crc(data):
-    if type(data) is not bytes:
-        raise TypeError('This only works with bytes')
-    return lib.crc32(data, len(data))
diff --git a/fw/mac.c b/fw/mac.c
index 4d05c9a..b2fb48a 100644
--- a/fw/mac.c
+++ b/fw/mac.c
@@ -1,3 +1,3 @@
 #include "mac.h"
 
-uint32_t device_mac = 0xdeadbeef;
+uint32_t device_mac = MAC_ADDR;
diff --git a/fw/semihosting.c b/fw/semihosting.c
deleted file mode 100644
index 96ebc7a..0000000
--- a/fw/semihosting.c
+++ /dev/null
@@ -1,10 +0,0 @@
-
-#define SYS_WRITE0 0x04
-
-void write0(const char *c) __attribute__((naked));
-void write0(const char *c) {
-    __asm__("mov r1, %0" : : "r" (c));
-    __asm__("mov r0, %0" : : "I" (SYS_WRITE0));
-    __asm__("bkpt 0xab");
-    __asm__("bx lr");
-}
diff --git a/fw/MatrixTransform.ipynb b/fw/tools/MatrixTransform.ipynb
index 8e95469..8e95469 100644
--- a/fw/MatrixTransform.ipynb
+++ b/fw/tools/MatrixTransform.ipynb
diff --git a/fw/tools/circle.jpg b/fw/tools/circle.jpg
new file mode 100644
index 0000000..afb6e3e
--- /dev/null
+++ b/fw/tools/circle.jpg
diff --git a/fw/gen_cmsis_exports.py b/fw/tools/gen_cmsis_exports.py
index ba3422b..ba3422b 100644
--- a/fw/gen_cmsis_exports.py
+++ b/fw/tools/gen_cmsis_exports.py
diff --git a/fw/mapparse.py b/fw/tools/mapparse.py
index c1f460a..c1f460a 100644
--- a/fw/mapparse.py
+++ b/fw/tools/mapparse.py
diff --git a/fw/mapvis.py b/fw/tools/mapvis.py
index 4a71222..4a71222 100644
--- a/fw/mapvis.py
+++ b/fw/tools/mapvis.py
diff --git a/fw/measure_transpose_performance.gdb b/fw/tools/measure_transpose_performance.gdb
index 966d69f..966d69f 100644
--- a/fw/measure_transpose_performance.gdb
+++ b/fw/tools/measure_transpose_performance.gdb
diff --git a/fw/profile.gdb b/fw/tools/profile.gdb
index fd26540..fd26540 100644
--- a/fw/profile.gdb
+++ b/fw/tools/profile.gdb
diff --git a/fw/profile.sh b/fw/tools/profile.sh
index b209a14..b209a14 100644
--- a/fw/profile.sh
+++ b/fw/tools/profile.sh
diff --git a/fw/tools/pymapfile b/fw/tools/pymapfile
new file mode 160000
+Subproject 7e0c9c46ecd0b9dc7a679ed2d445bca63d096be
diff --git a/fw/tools/scans/digit.png b/fw/tools/scans/digit.png
new file mode 100644
index 0000000..bfe9614
--- /dev/null
+++ b/fw/tools/scans/digit.png
diff --git a/fw/tools/scans/megumin_segmentmap_600dpi.jpg b/fw/tools/scans/megumin_segmentmap_600dpi.jpg
new file mode 100644
index 0000000..8f8dbee
--- /dev/null
+++ b/fw/tools/scans/megumin_segmentmap_600dpi.jpg
diff --git a/fw/tools/scans/pretty.jpg b/fw/tools/scans/pretty.jpg
new file mode 100644
index 0000000..806a6ed
--- /dev/null
+++ b/fw/tools/scans/pretty.jpg
diff --git a/fw/tools/scans/pretty.png b/fw/tools/scans/pretty.png
new file mode 100644
index 0000000..47d6bfa
--- /dev/null
+++ b/fw/tools/scans/pretty.png
diff --git a/fw/tools/scans/pretty2.png b/fw/tools/scans/pretty2.png
new file mode 100644
index 0000000..353dcb6
--- /dev/null
+++ b/fw/tools/scans/pretty2.png
diff --git a/fw/tools/segmasks/seg1.png b/fw/tools/segmasks/seg1.png
new file mode 100644
index 0000000..96abf0c
--- /dev/null
+++ b/fw/tools/segmasks/seg1.png
diff --git a/fw/tools/segmasks/seg2.png b/fw/tools/segmasks/seg2.png
new file mode 100644
index 0000000..be79d61
--- /dev/null
+++ b/fw/tools/segmasks/seg2.png
diff --git a/fw/tools/segmasks/seg3.png b/fw/tools/segmasks/seg3.png
new file mode 100644
index 0000000..3d0715d
--- /dev/null
+++ b/fw/tools/segmasks/seg3.png
diff --git a/fw/tools/segmasks/seg4.png b/fw/tools/segmasks/seg4.png
new file mode 100644
index 0000000..b783f3c
--- /dev/null
+++ b/fw/tools/segmasks/seg4.png
diff --git a/fw/tools/segmasks/seg5.png b/fw/tools/segmasks/seg5.png
new file mode 100644
index 0000000..013fda8
--- /dev/null
+++ b/fw/tools/segmasks/seg5.png
diff --git a/fw/tools/segmasks/seg6.png b/fw/tools/segmasks/seg6.png
new file mode 100644
index 0000000..08b45cc
--- /dev/null
+++ b/fw/tools/segmasks/seg6.png
diff --git a/fw/tools/segmasks/seg7.png b/fw/tools/segmasks/seg7.png
new file mode 100644
index 0000000..dcd4d0f
--- /dev/null
+++ b/fw/tools/segmasks/seg7.png
diff --git a/fw/tools/segmasks/seg8.png b/fw/tools/segmasks/seg8.png
new file mode 100644
index 0000000..1979630
--- /dev/null
+++ b/fw/tools/segmasks/seg8.png
diff --git a/fw/test.py b/fw/tools/test.py
index 63cb324..63cb324 100755
--- a/fw/test.py
+++ b/fw/tools/test.py
diff --git a/fw/transpose_main.c b/fw/tools/transpose_test.c
index 793872d..793872d 100644
--- a/fw/transpose_main.c
+++ b/fw/tools/transpose_test.c