From 4966256418d99e1c5017257a64b0e9af3fb31d51 Mon Sep 17 00:00:00 2001 From: Tristan Krause Date: Thu, 16 May 2019 10:07:27 +0200 Subject: [PATCH] plotty cleanup --- control/{src => bin}/plotty | Bin control/src/Makefile | 9 +++++---- control/src/gnuplotscript.gp | 21 --------------------- control/src/graph | Bin 84256 -> 0 bytes control/src/test_plot | Bin 37120 -> 0 bytes firmware/Makefile | 20 ++++++++++---------- 6 files changed, 15 insertions(+), 35 deletions(-) rename control/{src => bin}/plotty (100%) delete mode 100644 control/src/gnuplotscript.gp delete mode 100755 control/src/graph delete mode 100644 control/src/test_plot diff --git a/control/src/plotty b/control/bin/plotty similarity index 100% rename from control/src/plotty rename to control/bin/plotty diff --git a/control/src/Makefile b/control/src/Makefile index 65e275c..fc1583e 100644 --- a/control/src/Makefile +++ b/control/src/Makefile @@ -1,5 +1,5 @@ # Name: Makefile -# Project: B15F (board15 Famulus Edition) +# Project: B15F (Board 15 Famulus Edition) # Author: Tristan Krause # Creation Date: 2019-03-22 @@ -17,8 +17,9 @@ PATH_TMP_LIB = ../lib/ # outputs OUT_TMP_DRV = $(PATH_TMP_LIB)/libb15fdrv.so -OUT_TMP_CLI = $(PATH_TMP_BIN)/cli.elf -OUT_DRV = $(PATH_LIB)/libb15fdrv.so +OUT_TMP_CLI = $(PATH_TMP_BIN)/cli.elf +OUT_DRV = $(PATH_LIB)/libb15fdrv.so +OUT_PLOTTY = $(PATH_TMP_BIN)/plotty # compiling & linking parameters CFLAGS = -std=c++17 -O3 -Wall -Wextra -fPIC @@ -47,7 +48,7 @@ cli: drv $(OBJECTS_CLI) install: drv @echo "Installing driver..." @mkdir -p $(PATH_INCLUDE) - cp plotty $(PATH_BIN) + cp $(OUT_PLOTTY) $(PATH_BIN) cp $(OUT_TMP_DRV) $(PATH_LIB) cp drv/*.h $(PATH_INCLUDE) diff --git a/control/src/gnuplotscript.gp b/control/src/gnuplotscript.gp deleted file mode 100644 index b106bab..0000000 --- a/control/src/gnuplotscript.gp +++ /dev/null @@ -1,21 +0,0 @@ -set margin 10,10 -unset key -set grid -set title '' -set xlabel 'U_{DS} [V]' -set ylabel 'I_D [mA]' -set xrange [0:5] -set yrange [0:50] -set label at 4,2 'U_{GS} [V] = 440' left -set label at 4,4 'U_{GS} [V] = 460' left -set label at 4,7 'U_{GS} [V] = 480' left -set label at 3,14 'U_{GS} [V] = 500' left -set label at 2,22 'U_{GS} [V] = 520' left -set label at 1,33 'U_{GS} [V] = 540' left -set label at 0,38 'U_{GS} [V] = 560' left -set label at 0,38 'U_{GS} [V] = 580' left -set label at 0,38 'U_{GS} [V] = 600' left -unset output -set terminal qt -unset output -plot "/tmp/tempfile0" using ($1*0.004888):($2*0.048876) binary format="%int16%int16" endian=big title 'U_{GS} [V] = 440' w l,"/tmp/tempfile1" using ($1*0.004888):($2*0.048876) binary format="%int16%int16" endian=big title 'U_{GS} [V] = 460' w l,"/tmp/tempfile2" using ($1*0.004888):($2*0.048876) binary format="%int16%int16" endian=big title 'U_{GS} [V] = 480' w l,"/tmp/tempfile3" using ($1*0.004888):($2*0.048876) binary format="%int16%int16" endian=big title 'U_{GS} [V] = 500' w l,"/tmp/tempfile4" using ($1*0.004888):($2*0.048876) binary format="%int16%int16" endian=big title 'U_{GS} [V] = 520' w l,"/tmp/tempfile5" using ($1*0.004888):($2*0.048876) binary format="%int16%int16" endian=big title 'U_{GS} [V] = 540' w l,"/tmp/tempfile6" using ($1*0.004888):($2*0.048876) binary format="%int16%int16" endian=big title 'U_{GS} [V] = 560' w l,"/tmp/tempfile7" using ($1*0.004888):($2*0.048876) binary format="%int16%int16" endian=big title 'U_{GS} [V] = 580' w l,"/tmp/tempfile8" using ($1*0.004888):($2*0.048876) binary format="%int16%int16" endian=big title 'U_{GS} [V] = 600' w l diff --git a/control/src/graph b/control/src/graph deleted file mode 100755 index 7ca5ed2a77992f82a2c5473a80c87debb64cf656..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 84256 zcmeI5PiP!f9LImNZPw1#Y2B1Dj&#&fr#k4WTUqfRf?7@ed$6`uglb!%=^-9crHBzJ zNGarC1&fkPKmrnl6sd;@MszPZ7=-nZgAvJP55_|TbIB$6CN)jE?KZQs`}^(8+wa2b z&YS(c-}n3byf-r&x;yLcef8iAg}nz~JbdJ(Jq8){v~gy~ZhD&>>OYX9i;w+#1`Z#8 z=eE`E%Fg~LSG&)xyt>-EIAYK7W5?fJ8L+>1-{mi<0PA8qkLAqbR_tKE>9(VxDYWu6miQlX@J3_DTM=TaRHY z_qzghcmnIHl}zg83Itfy({APdqQEg&63_^ln1j53+ggK~oUaC3xq_~q%NgW9C%OU} zSFa9xK>!3o0{K(?9Bieb8b1FK0kx-Csiwte8iG@_IYP;?LkgO#sgfpjSf^#yZT>Xx z`^0cT+NXKfZtO+h;6PV^RfCog&P<@lymm_hYswsAh9sCiKg9dq#~va>HTM4(c9f1F zHa01bc|O>T*CY;x^teV91=em2I+m_^miIVkF|Bb@N0a&R&QcfmH2G)sIG1p9lFDBa zm~*LGbkVWT@xI4$&dD5u?m7PRiNu`yn$*F~swlLsxa$b>o5TET*BX{N4kdV{UBeyb zJ?EyKPdoe2uX$9gbATbgsZ@#q4xMp1y% z##JJs9R%!Ay5bfb?eNizraQ`ioO=Qq%`j+WY%oe@Bk`RaTN9kBWadY4f^K4#pwa~0%&lQg>T#@xobr?W zb7D{O&k6UOBY!dp6eh_{rnAOfl_u%d#z!S{gjJ?nxSiz%G{PF}GTqKyi&G|#TO-Wx zmg!Cj9UU}+GWpzf6w0)VTcapYM_5CtOm}nEVouQ=ocY)1wx;;!WxXD@qY-eY=-z0N z@uNHejnJJxMfb&b8Es@RMfXRGj2~4H(1`D@Ge=s}{A){+tUXN+O6qZHxzqG8XMW_4 zN1!lGkHs4qeN<6EBf6X9M_LvBISDD`EA&M2X+(GEROqSb(aDbVD)fwmL%%}LO6YKF z6e`rqtr6xgR_OU=b-HG#)NBrnZw~=`hF)%uGLNb|L$B~;zC5cpL;Ek^!_)I;=m1aV zwXA`FMq!3tTT|rSD$dXwaTK~{^|{{0sb7aN_AI?AQHL{2Z%OEc8t$z6ZDWClH%rF^ zWFXNY1k5=)(jld?mub(@3Dw?X7g7Sw9BJ~46cV)7H2gXGaIMF;70l5`eA$zkxvNTt zlj6**${dI7tT$h!k0tf(Dv8~l)~V7b61BNi`cy(kO2e`pt~h4fS){)>^0qst zw@Cj;dGHtMUn#9L>U1s9_i6ME&vFFpB}4T7xXzNne$TsAdhU{O!|FDk^(4@>OuwbM zGIQBr|9!GF^WpSvFB|ONVdC^3CAYh5JQ5`iG07#6-9!svORmGlo#i$ecQrl=BR~KI zbS9A9Vr*5-(z!;|wlRV3Eyf2MMZn(H>cQtfNi#6F7^*ZsC`;}_M$KHCu2C&qz5k_cpbj1x)nlXNe+9^-e_ z{!s1DqvI{DMGI31oK}e<#%&e1QN6fB*-9>^+(7s^PQf9B`2n1VA7$ z1hNlg3ZWVGTvTnhY7hP2U%A)5>OYE3s08~12k z4+q;I00P<&$Ud66bZ=9&EqV`1Z6Kl$5C8!X009sH0T2KI5C8!X009sH0T2KI5C8!X z009sH0T2KI5C8!X009sH0T2KI5C8!X009sH0T2KI5C8!X009sH0T2KI5C8!X009sH z0T2KI5C8!X009sH0T2KI5C8!X009sH0T2KI5C8!X009sH0T2KI5C8!X009sH0T2KI u5C8!X009sH0T2KI5C8!X009sH0T2KI5C8!X009sH0T2KI5CDO?1pWhrp5^5L diff --git a/control/src/test_plot b/control/src/test_plot deleted file mode 100644 index e1c894d3d3496bf317e5492ed475a133e461da98..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 37120 zcmd4a1$$Lj+wT1_XI7GxWF=V%Gs#L=NeB?!JwSjEG`MSUcXxMpcX#&!#oZkWMT!)P z6lf`0%Knd$0ndJ)V}F2m@8kEJ=XH%SXBPCndly=0WVxDkDr7HLr()A)l}Z^xh(yCv z;4E!;wUB`s)bNR-lzE^!;{C}S<`@f&{|8ejCk41hjnDBrN zp70We;?0R<=hV)r&VufGT&1Ia*|6G8M~GL;f2 zEKWk`p=20b2xpEUrPMs-CL_rxGMY?7rr}L7^t5C;GCdiK3`(%b#4ZzGDKm2xGAo&l z%uePYb0QaVBaf0w1^Pu?qF*Mj;41wZDc!(L z=9~Pt;}-okd58H|Qo6_P9(kX9K>kKPy%LFOcLk-5n{WL`2KnV&2`79a}=*q4ex}yhrp*QEfIqO63OZFrCV<7v1u zhLXcDoO>h4kr+iE!`-n;q%n?pJo^dcL~;@))2EPAF%8o(12dH-6yRaL3 z@RJg4?Bi@d{b%w3d5}Cr9>x(I#W8lr$rCtj!uzQb>%pb{5_>3?37hmxozKJya1xFgwfC&%S;0Z5y!ww(#!VeDkBLMub zzRCakn?VRhDp&|XD8k@ExDsQgCf$fc6rzy^F-nY?R>YX;5X+oFi7_*gnUO__F|%@> zot{I9F>{f**ySPfDluk0k=D%5t{`(EC9PSQEP|qlS7OX!+$lj%P-4uI%%$k1NvSNo zoDyRukxA?-pdu>qHL9?yLRMw2hU%!nT$8MY+Ni@^m#l~S^af-@GMQ{dHbxVAQ#7MD zCtIMUlGbcZwqf6vY)7^yJCGg8PUuYULUtv)p*y_?*;7ep_Ga!w?@RV0`(uET&KyJz zW75y(vFZvaSX?CLP>9);{ItRy?I8YH_x#@j|;enOSp_H zN_z7ed7b+=$eXx@UvL|Dl=S9Z@*eIh>CFec_aXg}lHPpG`~<%Uyu>TK z=KKxbD(TI?*!?YH&3EKK_`v=H`4OM+8DH=(zTz9_-$X1w@JR1rkS6H?8$98~&YQHu z2foab1OChbWFYAzgGm0W-y@i`5Q0$lVWbP;h+vN3PHHleIf{%X(;xq%z2QPIUkvyEI<}iVm;!R3)73BC|!z2F_h2}cuykd ziDW5urO7g6Ih1E#o;itLQLD_ZGP^3wRmo~(b=08OBx{ki$vR|RvL0C<4bTwD>>81c z$tGw@Z$>sFo1-OKp*6cUq|_GenLD5(I-xVVu97q|_e+ zFoP{kYUVXqi*;C!4eX_j*d#J}Y+<*B+{(O-+`+t) zF73i@=AX!)INL|xNA73-83&mUG9RKJCXbLu$>XGSf_@UGaGLoH&eG43=gEsae^F%i zxWs%JS8$cRbdCKD&Toj!HhysbzZlH?&#&OWcEScv&6~8tNAn{khs_ZFiYWqYDV#PB z@m(-42|_BHrwE3H5Sth2B|>f9bZ-%6v(xRurTCEi^}o$mNp15JDICIWOA%%B7m>CA zCE6A!qHInPjWo6(lAi&v1#789TAQV$vxShMBAqRa zD95fmDJ6;Awu)pWB{!MJR+(K@C6BEda}BywOUXm#wbf={7xmcHC+o9ofMj|y*_doZ zHX)mmO+`Lib9xIUpRFZxE41OP4cU%;Talm4Z)=Z^>^gDQiQXAqn7fkQ$Zn#5tvkIZ z*^}%=_C_D{MSphvL_xBEZ6F3I1#Lsfp%|tO=Z-WIqu7m63X+9vAsl?lU zA%79^wmamnO1$kZ^F7?hZ|ol8krHovEQ;BFr$5Cr{Gr6#o^$twQq1;>e9it1`Br6d z+h6p*@lGjbdryAAN8a~|{3MDi|1wMeY2QR~PXR*|^Yjq${K-x#hT@){@TS{IAJUg} zkpA3p&;ztUQNlBbeGtjd0D4;NL\xTlMBu?y!sH9Zn;=14?qX*i3arzO*Ko{r2w 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 V-Jbh=@_(Ptdx!5{-)DEO{R>ifaW((| diff --git a/firmware/Makefile b/firmware/Makefile index 875e034..7805486 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -1,5 +1,5 @@ # Name: Makefile -# Project: B15F (board15 Famulus Edition) +# Project: B15F (Board 15 Famulus Edition) # Author: Tristan Krause # Creation Date: 2019-03-22 @@ -8,7 +8,7 @@ LFUSE = D2 HFUSE = 91 EFUSE = FF F_CPU = 8000000 -DEBUG = -DB15F_DEBUG +DEBUG = -Db15f_DEBUG # Environment COMPILER_PATH = avr-g++ @@ -16,8 +16,8 @@ OBJCOPY_PATH = avr-objcopy # Optionen PROGRAMMER = avrispmkII -OUTPUT = B15F.elf -HEX = B15F.hex +OUTPUT = b15f.elf +HEX = b15f.hex MCU = atmega1284p CFLAGS = -Wall -Wextra -std=c++14 -O3 -mmcu=$(MCU) -DF_CPU=$(F_CPU) $(DEBUG) LDFLAGS = @@ -27,15 +27,15 @@ OBJECTS = main.o spi.o mcp23s17.o tlc5615.o adu.o selftest.o global_vars.o us COMPILE = $(COMPILER_PATH) $(CFLAGS) FUSES = (E:$(EFUSE), H:$(HFUSE), L:$(LFUSE)) -B15F: $(OBJECTS) - @echo "Linking..." +b15f: $(OBJECTS) + @echo "Linking binary..." $(COMPILE) $(OBJECTS) -o $(OUTPUT) $(LDFLAGS) $(OBJCOPY_PATH) -O ihex -R .eeprom -R .fuse -R .lock -R .signature $(OUTPUT) $(HEX) help: @echo "This Makefile has the following rules:" - @echo "make B15F .... to compile (default)" + @echo "make b15f .... to compile (default)" @echo "make clean ... to delete objects, elf and hex file" clean: @@ -43,11 +43,11 @@ clean: rm -f $(OBJECTS) $(OUTPUT) $(HEX) checkfuses: - @echo "" @echo "Checking fuses..." - bash -c 'diff -B <( echo "$(FUSES)" ) <( avrdude -Pusb -p $(MCU) -c $(PROGRAMMER) 2>&1 | grep "safemode: Fuses OK" | tail -c 19 ) >/dev/null || avrdude -Pusb -p $(MCU) -c $(PROGRAMMER) -U lfuse:w:0x$(LFUSE):m -U hfuse:w:0x$(HFUSE):m -U efuse:w:0x$(EFUSE):m' + @bash -c 'diff -B <( echo "$(FUSES)" ) <( avrdude -Pusb -p $(MCU) -c $(PROGRAMMER) 2>&1 | grep "safemode: Fuses OK" | tail -c 19 ) >/dev/null || avrdude -Pusb -p $(MCU) -c $(PROGRAMMER) -U lfuse:w:0x$(LFUSE):m -U hfuse:w:0x$(HFUSE):m -U efuse:w:0x$(EFUSE):m' -upload: B15F checkfuses +upload: b15f checkfuses + @echo "Uploading hex file..." avrdude -Pusb -p $(MCU) -c $(PROGRAMMER) -U flash:w:$(HEX) .cpp.o: