From 5a19ab0e848a5a6974772a9918ca4a873675cade Mon Sep 17 00:00:00 2001 From: jaseg Date: Fri, 1 Sep 2017 20:32:15 +0200 Subject: Add missing files --- fw/.gitignore | 6 ++ fw/Makefile | 6 +- fw/MatrixTransform.ipynb | 218 +++++++++++++++++++++++++++++++++++++++++++++++ fw/bus_addr.c | 3 + fw/crc.c | 59 +++++++++++++ fw/crc.py | 8 ++ 6 files changed, 298 insertions(+), 2 deletions(-) create mode 100644 fw/MatrixTransform.ipynb create mode 100644 fw/bus_addr.c create mode 100644 fw/crc.c create mode 100644 fw/crc.py diff --git a/fw/.gitignore b/fw/.gitignore index 9c55c38..c5278ea 100644 --- a/fw/.gitignore +++ b/fw/.gitignore @@ -1,4 +1,5 @@ *.o +*.so *.dot *.lst *.map @@ -10,3 +11,8 @@ transpose.elf cmsis_exports.c +sources.c +sources.tar.xz +bus_addr.c +__pycache__ +.ipynb_checkpoints diff --git a/fw/Makefile b/fw/Makefile index f86df47..b6f64d0 100644 --- a/fw/Makefile +++ b/fw/Makefile @@ -52,9 +52,9 @@ sources.tar.xz: main.c transpose.c transpose.h tar -caf $@ $^ sources.c: sources.tar.xz - xxd -i $< > $@ + xxd -i $< | sed 's/=/__attribute__((section(".text")))=/' > $@ -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 +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 sources.o $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) $(OBJCOPY) -O ihex $@ $(@:.elf=.hex) $(OBJCOPY) -O binary $@ $(@:.elf=.bin) @@ -80,4 +80,6 @@ clean: rm -f **.expand rm -f transpose.elf rm -f crc.so + rm -f sources.tar.xz + rm -f sources.c diff --git a/fw/MatrixTransform.ipynb b/fw/MatrixTransform.ipynb new file mode 100644 index 0000000..8e95469 --- /dev/null +++ b/fw/MatrixTransform.ipynb @@ -0,0 +1,218 @@ +{ + "cells": [ + { + "cell_type": "code", + "execution_count": 129, + "metadata": { + "collapsed": false + }, + "outputs": [], + "source": [ + "import struct\n", + "\n", + "import serial\n", + "import PIL\n", + "import numpy as np\n", + "from matplotlib import pyplot as plt\n", + "%matplotlib inline\n", + "\n", + "import crc" + ] + }, + { + "cell_type": "code", + "execution_count": 102, + "metadata": { + "collapsed": false + }, + "outputs": [], + "source": [ + "digit_mask = PIL.Image.open('scans/digit.png')\n", + "seg_masks = [ np.asarray(PIL.Image.open('segmasks/seg{}.png'.format(i)), dtype=np.float)[:,:,0]/255.0 for i in range(1,9) ]\n", + "digit_h, digit_w = seg_masks[0].shape" + ] + }, + { + "cell_type": "code", + "execution_count": 193, + "metadata": { + "collapsed": false + }, + "outputs": [], + "source": [ + "pic = PIL.Image.open('circle.jpg')" + ] + }, + { + "cell_type": "code", + "execution_count": 194, + "metadata": { + "collapsed": false + }, + "outputs": [], + "source": [ + "dpi = 600\n", + "scale = 1000/5091\n", + "stride_x, stride_y = 1.0*dpi*scale, 38.8/25.4*dpi*scale" + ] + }, + { + "cell_type": "code", + "execution_count": 195, + "metadata": { + "collapsed": false + }, + "outputs": [], + "source": [ + "mask_w, mask_h = int(8*stride_x)+1, int(4*stride_y)+1\n", + "resized = np.asarray(pic.resize((mask_w, mask_h), PIL.Image.BILINEAR).convert('HSV'), dtype=np.float)[:,:,2]/255" + ] + }, + { + "cell_type": "code", + "execution_count": 196, + "metadata": { + "collapsed": false + }, + "outputs": [], + "source": [ + "def sub(resized, x, y):\n", + " return resized[int(y*stride_y):int(y*stride_y)+digit_h, int(x*stride_x):int(x*stride_x)+digit_w]" + ] + }, + { + "cell_type": "code", + "execution_count": 197, + "metadata": { + "collapsed": true + }, + "outputs": [], + "source": [ + "def digit_values(resized, x, y):\n", + " img = sub(resized, x, y)/255.0\n", + " for mask in seg_masks:\n", + " yield np.average(np.multiply(mask, img))" + ] + }, + { + "cell_type": "code", + "execution_count": 198, + "metadata": { + "collapsed": false + }, + "outputs": [], + "source": [ + "def make_vals(resized):\n", + " subvals = np.zeros((8, 4, 8), dtype=np.float)\n", + " for x in range(8):\n", + " for y in range(4):\n", + " subvals[x,y] = list(digit_values(resized, x, y))\n", + " return subvals" + ] + }, + { + "cell_type": "code", + "execution_count": 204, + "metadata": { + "collapsed": true + }, + "outputs": [], + "source": [ + "def send_packet(ser, resized, addr=5):\n", + " gamma = 2\n", + " out = np.clip(np.power(make_vals(resized), 1/gamma)*255, 0, 255).astype(np.uint8)\n", + " pkt = b''\n", + " for x in range(8):\n", + " for y in range(4):\n", + " pkt += bytes(out[x,y,:]) + b'\\x00\\x00'\n", + " pkt += b'\\x03\\x00\\x00\\x00'\n", + " pkt += struct.pack('I', crc.crc(pkt))\n", + " pkt = bytes([0x40 | addr]) + pkt\n", + " ser.write(pkt)\n", + " return out" + ] + }, + { + "cell_type": "code", + "execution_count": 205, + "metadata": { + "collapsed": false + }, + "outputs": [ + { + "data": { + "text/plain": [ + "array([[[3, 3, 3, 3, 3, 3, 3, 1],\n", + " [3, 3, 3, 3, 3, 3, 3, 1],\n", + " [3, 3, 3, 3, 3, 3, 3, 1],\n", + " [3, 3, 3, 3, 3, 3, 3, 1]],\n", + "\n", + " [[3, 3, 3, 3, 3, 3, 3, 1],\n", + " [3, 3, 3, 3, 3, 3, 3, 0],\n", + " [2, 3, 0, 3, 3, 3, 3, 1],\n", + " [3, 3, 3, 3, 3, 3, 3, 1]],\n", + "\n", + " [[3, 3, 3, 3, 3, 3, 3, 1],\n", + " [1, 2, 0, 0, 0, 0, 0, 0],\n", + " [0, 0, 0, 0, 0, 0, 0, 0],\n", + " [3, 3, 3, 3, 3, 3, 3, 1]],\n", + "\n", + " [[3, 3, 3, 3, 3, 3, 3, 1],\n", + " [0, 0, 0, 0, 0, 0, 0, 0],\n", + " [0, 0, 0, 0, 0, 0, 0, 0],\n", + " [0, 2, 2, 3, 3, 3, 3, 1]],\n", + "\n", + " [[3, 3, 3, 3, 3, 3, 3, 1],\n", + " [0, 0, 0, 0, 0, 0, 0, 0],\n", + " [0, 0, 0, 0, 0, 0, 0, 0],\n", + " [0, 2, 2, 3, 3, 3, 3, 1]],\n", + "\n", + " [[3, 3, 3, 3, 3, 3, 3, 1],\n", + " [1, 0, 2, 0, 0, 0, 0, 0],\n", + " [0, 0, 0, 0, 0, 0, 0, 0],\n", + " [3, 3, 3, 3, 3, 3, 3, 1]],\n", + "\n", + " [[3, 3, 3, 3, 3, 3, 3, 1],\n", + " [3, 3, 3, 3, 0, 3, 1, 1],\n", + " [2, 0, 3, 2, 1, 3, 3, 1],\n", + " [3, 3, 3, 3, 3, 3, 3, 1]],\n", + "\n", + " [[3, 3, 3, 3, 3, 3, 3, 1],\n", + " [3, 3, 3, 3, 3, 3, 3, 1],\n", + " [3, 3, 3, 3, 3, 3, 3, 1],\n", + " [3, 3, 3, 3, 3, 3, 3, 1]]], dtype=uint8)" + ] + }, + "execution_count": 205, + "metadata": {}, + "output_type": "execute_result" + } + ], + "source": [ + "ser = serial.Serial('/dev/serial/by-id/usb-FTDI_FT232R_USB_UART_A90JRHXH-if00-port0', 2000000)\n", + "send_packet(ser, resized)" + ] + } + ], + "metadata": { + "kernelspec": { + "display_name": "Python 3", + "language": "python", + "name": "python3" + }, + "language_info": { + "codemirror_mode": { + "name": "ipython", + "version": 3 + }, + "file_extension": ".py", + "mimetype": "text/x-python", + "name": "python", + "nbconvert_exporter": "python", + "pygments_lexer": "ipython3", + "version": "3.5.3" + } + }, + "nbformat": 4, + "nbformat_minor": 0 +} diff --git a/fw/bus_addr.c b/fw/bus_addr.c new file mode 100644 index 0000000..7f765ec --- /dev/null +++ b/fw/bus_addr.c @@ -0,0 +1,3 @@ + +#include +uint8_t bus_addr = 0; diff --git a/fw/crc.c b/fw/crc.c new file mode 100644 index 0000000..5e5c7d2 --- /dev/null +++ b/fw/crc.c @@ -0,0 +1,59 @@ +/* MPEG-2 CRC as done by the STM32F0 hardware CRC unit */ +#include + +/* 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> 24) ^ *data++) & 0xff]; + + return crc; +} diff --git a/fw/crc.py b/fw/crc.py new file mode 100644 index 0000000..043c6e9 --- /dev/null +++ b/fw/crc.py @@ -0,0 +1,8 @@ +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)) -- cgit