From 6aaaa0b4aee83613937e84cdcc0fa920689424a8 Mon Sep 17 00:00:00 2001 From: Matthias Hannig Date: Tue, 6 Mar 2018 22:22:45 +0100 Subject: [PATCH] fnord23 --- firmware/.Makefile.swp | Bin 0 -> 12288 bytes firmware/.gitignore | 2 +- firmware/Makefile | 2 +- firmware/main.c | 4 +++- firmware/openocd.cfg | 4 +++- firmware/openocd_jaseg.cfg | 10 ++++++++++ 6 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 firmware/.Makefile.swp create mode 100644 firmware/openocd_jaseg.cfg diff --git a/firmware/.Makefile.swp b/firmware/.Makefile.swp new file mode 100644 index 0000000000000000000000000000000000000000..6880f64765394276b0bf501b2b1957b221503969 GIT binary patch literal 12288 zcmYc?2=nw+u+TGLU|?VnU|@&|6o@+GR?NV8mw_QEHLtX!DzykCg%2m^=cFVRrIzcZ z6=jxG=_Tb?U{_rSGf+Q0U%$90SwB6qB%?G*FF8L~KP#~~HC;a^H6=c!s7yaCvnaPb zu_#sFH!(XkEi)$-yMd#kqaiRF0>p(tX-S%{1#hUaks&y%D=R4~2n&T0r*~AI4dsqfqaiRF0;3@? z8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd70wFa#1)7#Pyn85puSAoKsQ{{Jz428Mb3 z3=En43=Bs63=D?+3=AUt3=E(77#J?`F)(c5V_?|K$H36f$H3sn$H2hD$H4G`mx19u zF9Sm@F9QQFF9X8^9tMWZJPZt*co-O_^Dr>j@h~v3^Dr>5@h~u4;$~pD$j!j8o11}Q z7dHdL8g2%L)!YmWLEH=sI@}Bl+T08b+}sQdzquF~esM7{yyjwHIKjohu$PO0VGkDr z!#pkq1~)DS23IZyhBKTD44XI^7qd?7(_W47;bYgFx=u` zV7Sb|z;J?tfnf><14A|k#LpQZe-FWU8+Gz%2#kinXb6mkz-R~zkr3c4%2m)!Qz*_a zElN%;)+80kRDS#OnsTB}LQf3~6k(*cmVdNB-!1QS8 z6%z7@)FN5aU5kK+?~^$-t?i5$qY|s;Qvj0Al+)dAWr8252hi2A3$PI4Ibu zXgFAbTyCqEQ(U46RpRU)5UHu4>#vZMnU`2p2~vnqmz0@@p)M2TWfcbngsP0x3a~0? zXH5ka4QDqWNB3Y&1>JnGS#b>Da7xWdgStCep|~WmsHC(YzPKdU*eK1w*r38puUMhD zvbZEQ7baLyp_i{`pMin1q9R2>Hxm?`H3}K2i75)Yc?!CQ3N;GFsVNHT#rn4T@$rczB}JJ@ zr6sBH@fsS%smUdo`FR>jdJtpcOA?Ec5_58tG&MC9Z1vR@>_CAFkt^0qw!)T97&xmk z3!r|7sf45|P%=W-!l0~>lAotuqL5get*58Qz`$9OSfrqvoS25y2zVeOmY{MLRF-7q z=NT)cr{=|@hDJf9f=V33&8VSd1&S!&V9(%q7uPUo2z%xw=aiNlOaawhFpF zDjLpU2SXg|*E2akFD)}2+29axVvJAANi5FL%Sl0Tt4nZ*ud$IEIAts7x_AV;#)moj zgu2=qni+rrgR(+uS!$j_N`7)_ZfaghYKlT;o&wm!G=qu?y$n5tkc`B<>|%xB5Jd)M z1-N-yW(tXUDGDVSsYR&@nZ*iu`3l9U1&Kw8C8-K2sb!hTso->;S_BIIvdom!6os_> zB8AKn9fjh2h4NJOqEv;n#O%zxbcI9(Ei;6kqEwKTnZ*j3#SF>{A*sn3d6~(HIXRV3 zO{K+PJ$VSHxS8lEB$bvZBo-tVl_;bY<>!K&r4SMv>>prcpiq#QoSm4Ss!)=VSfY@h z2X<{vVo`c(PNhO-N@`vS$asa4e2^xTzzfgO(e+I%umu+zxrqe~%1EgoEv+;UoI`b? zIki|pH!UTxBoT=ZGC(&y86kokZMiv_B_%njx~X|7nTdG{y1B^(rM8gdqnm4>pqram zl$>FkSd?34rkksvn_H4mnwtbOK*3f)H#{*XM?p7TLASUh#Wp>!)X-2t*S}anfq?;3 z_9`eSC|KDlBo^iB=H=(5>ZT?pW$G4ZR;4mPOJhvg{G_au(%b@&0#I3uRY7uoK_!E; zGstu-=BFnoGcdqXtb&39C#StFB%Yj0lT!6viZaVmi;DH3iKwC?9;6l`$^gkzu*{*L zU~h|-<6Xe1NXjv`9fqFJGYq6#XT|3ZTTRqmY}J covKirkzbmVqL7i8my!cYE2*FguSAgn00r5e{Qv*} literal 0 HcmV?d00001 diff --git a/firmware/.gitignore b/firmware/.gitignore index b33e1ea..4c5ab8e 100644 --- a/firmware/.gitignore +++ b/firmware/.gitignore @@ -10,4 +10,4 @@ sources.c sources.tar.xz sources.tar.xz.zip -STM32Cube +STM32Cube* diff --git a/firmware/Makefile b/firmware/Makefile index ce1d221..3af133b 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -32,7 +32,7 @@ cmsis_exports.c: $(CMSIS_DEV_PATH)/Include/stm32f030x6.h $(CMSIS_PATH)/Include/c python3 gen_cmsis_exports.py $^ > $@ sources.tar.xz: main.c Makefile - tar -caf $@ $^ + tar -cf $@ $^ # don't ask... sources.tar.xz.zip: sources.tar.xz diff --git a/firmware/main.c b/firmware/main.c index a7cbbef..e6ea233 100644 --- a/firmware/main.c +++ b/firmware/main.c @@ -53,7 +53,9 @@ void do_transpose(void); * |<----------------NBITS---------------->| |<>|--ignored * | (MSB) brightness data (LSB) | |<>|--ignored */ -uint32_t brightness[32] = { 0 }; +uint32_t brightness[32] = { + 0x2222, 0x2222,0x2222,0x2222,0x2222,0x2222,0x2222,0x2222,0x2222,0x2222,0x2222,0x2222,0x2222,0x2222,0x2222,0x2222,0x2222,0x2222,0x2222,0x2222,0x2222,0x2222,0x2222,0x2222,0x2222,0x2222,0x2222,0x2222,0x2222,0x2222,0x2222,0x2222 +}; /* Bit-golfed modulation data generated from the above values by the main loop, ready to be sent out to the shift * registers. diff --git a/firmware/openocd.cfg b/firmware/openocd.cfg index 2dc74f0..fcbeb8d 100644 --- a/firmware/openocd.cfg +++ b/firmware/openocd.cfg @@ -5,6 +5,8 @@ interface jlink #adapter_khz 10000 transport select swd -source /usr/share/openocd/scripts/target/stm32f0x.cfg +# source /usr/share/openocd/scripts/target/stm32f0x.cfg +# source [find interface/jlink.cfg] +source [find target/stm32f0x.cfg] #flash bank sysflash.alias stm32f0x 0x00000000 0 0 0 $_TARGETNAME diff --git a/firmware/openocd_jaseg.cfg b/firmware/openocd_jaseg.cfg new file mode 100644 index 0000000..2dc74f0 --- /dev/null +++ b/firmware/openocd_jaseg.cfg @@ -0,0 +1,10 @@ +telnet_port 4444 +gdb_port 3333 + +interface jlink +#adapter_khz 10000 +transport select swd + +source /usr/share/openocd/scripts/target/stm32f0x.cfg + +#flash bank sysflash.alias stm32f0x 0x00000000 0 0 0 $_TARGETNAME