From fcde0a3d2b19019f1f66ca7e9646aa52639179f0 Mon Sep 17 00:00:00 2001 From: Theodor Chikin Date: Thu, 16 Oct 2025 18:49:40 +0300 Subject: [PATCH] fixed error in chans setup (in f_ch_setup was adc_range value instead of channel mode). This error was breaking ADC setup process => ADC clock was internal, instead of SYN2_RISE --- BF_companion | Bin 62824 -> 62832 bytes main.c | 19 +++++++++++++++---- plotter.py | 2 +- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/BF_companion b/BF_companion index 447fb5698ba173a71f3d906fd00d2d3843d05497..848a964cd12817b8dbfbe188f14206b0013ca9f6 100755 GIT binary patch delta 1715 zcma)7ZBSHY6n@XW-7BC7%H41;>+ULFIw@>^A%4V?BA4aE#nDlQvGt3>SaJu6A<-Zm z(j8+zBuo-tacflzfcDmpzT$bGq=hdO?O#m0vb<1u7mte=mIr1uxU9a99 z{Gy*qH#a)|A=uMtSN!LcX5m1HJf*iCEF?u!qmKl80?^o59Z7;#68t)joWq7v&pCw0 za_rL9QKBqN9Kaulm_JH99VTAKm=)6{%{Ef%5jmmb_hAkZ=SPXJ!^Cc^BLYW>mN2ms z+lg2|N|c0&8oa$?E>vMct_^nM;#@bB;QrhV4u{djMVdh9lCj1ZgnT31xbP88qbUT& zK=RO{EP8T|!H#5Xy{->VNVlU`al;1uOtHiF_>*#mGuiO%yi6Fx-aL=xq*cGw*g@TW zdRk7W(rofzv1=xERp;6aMR>!N$<4E(oWGEZvEu6d#Mr;5hF($YHRGfQxHtdxxHcnb zd=-g9SQ7Whq8Bsr#{X%sgSfD;l*Vze@ICk! zGm6sTBEC>m20pw{6mQv;5Y`tA82TC`(jBy3!R$f_rIn?Ys4-F3eM1yIBErjt=$)0N zac9lpN((}wvl#7m!5UoWeil~YQTJTVCS#A=0gn-iO&l-dl;Wu{tS%^C9=C!St8!yi zMOl?SdAohd(*L!h*hV&%6oq@Y*wy1(ykdReBTeg}n!ZmoZJ4luFc!!;t!eu7?hwwP zJ$ydTZ*s1cSE z)?A@{jzzJOt5kpj7Hq9}%IxgWv=lm)Egu)FLlQmn=!w9a6{%+5$JCr29$6A$H9h4x z%^MFLnCZ1aJC=BD+|>@;;kCkgJWQcj>>$gqkL*%>NY;VoN*kQROtMK>Lbe58skCvw zT*4!jR`>urC{&>KRc1|8-8(yZ5Y$Nx@f=w8Yf7`q`v z9Hv(;xndX#VBV2+^+CaWh%%(Lku*y|KCSx$lzB%;(tVzv!q{)Zw09{hl5c1@WZaBD zA<~3}X>B9XIictT`lx>&(;7jRc2A~~4xX`xf>keRmc5(HnJ7-zH}#S&p0Ow~xy4|7 z+qN^Cm}1DJ7&~K$V(K%*NCKG@F{O<9mLAgENEMSSqp6m(D2}mNVw#>|EVKOlmhJ3i z(b7v&xw?kch)H$irX^CZvd6QP)rzK-B$d+XX0@|L)8|A`Q?;y4oVt%(-cRzKVv_Dh z^1cQFS~B&#Oa1QX+89`?CY_9peu9sV_*q?W>cn*HRgBkED!e3c%60^yEh_8|D!7j22!cZ1$!|b8d F{{TGRHk<$e delta 1692 zcmYLK4@?th6#u@v-PxiQSg%6QLR$pUH~}@0Dw}{Td6@w0_CG-}~P0_ujql z^-FK$4jZ_`9+*V~U9)3o#F&9-Ys?_KXbO$iRR#B91Rrxxcy#dU0X}DMhv~D0`XgiA z$`7P%%Z#xZk_eG}gObl5csi^olFvCVHLbcKH6gYbh7+MJGlw39%bBm! zB1q3lrm0YtCDJ+YZq{zv1mjsQ+6+0_UG#wbFnc|vZSv}zo0J*0LWWa(HQAK?rA)~Z0a7L}`2FDYeMpF>9fkcBv zT0HGvEomZS^A&Y)+#@S^BsZM}CnOvF2(C##GDGq3N!}vb4TE`QmfCprxX)kYzpSP? zd!!cAd?gQKt%$MIp|5qbvF zi&AMjY%Hpz4*0Do#^RhF))$Ou`XyS#ABgXV>_P#A6{VIwF)TWDPZJGj5q|(KYNC!6 zrN;f{uxMdWv>yy^7mb6}?xj?OL+%C4Ei+tjr_o=47Mqw~%@A80M|F7VZ}zN{G7= zHz6jSP?Sc*@l%S@iKsiRC}$BX5d(;IXB0)p5R!5p^AW$gi1~=={g{vVHDV(}B1r21 z7Qnzt7^s><>wtP)o#FM)h38@ zYSca^$H224bjl9{`V@-I| z`#4i*FXVHC^mDq8@d^m8NJ0i6@8Ie^L!7xCGlUX7A=fzZxayB!<~1%+^;tF+U&+}I zW0sz+uWwg7BkWP0kUu#4HxtqM!RQpczr)Y9T9Bmtjn_#?V+r|(i&smUMbCy!v_a-cm~hex@c9B5j1k^2tk(5jZr{`I(j2x9}LJVBwRz_z!Is78~)N z@F{ABw#?$26}99o-ZF?%aocuM#V77WH)RI)DwdUPCSKmO0;NJKp3FO!H=RTRo2nz# zd|V^CtPkZ|`9#&%v(@zoxJ2x^Mm~S2B$BR@6TgfyFuFfw$FZXcP|dv{-@Wn@!;E-A z97>@&Id3S}NOjOUlB$3Hxi~kHuJ4@qh;+*OQ9napgWd<}bQkEyGU*qPhxS|Wp*;)d Q&}M=DVJ6)Oc@LBS2RFSivH$=8 diff --git a/main.c b/main.c index 5d38048..b7c8185 100644 --- a/main.c +++ b/main.c @@ -161,7 +161,7 @@ static uint32_t f_ch_modes[ADC_LCH_CNT] = {X502_LCH_MODE_COMM, X502_LCH_MODE_COM //X502_LCH_MODE_ZERO // диапазоны измерения для каналов // -static uint32_t f_ch_ranges[ADC_LCH_CNT] = {X502_ADC_RANGE_5, X502_ADC_RANGE_5,X502_ADC_RANGE_5,X502_ADC_RANGE_5}; +static uint32_t f_ch_ranges[ADC_LCH_CNT] = {X502_ADC_RANGE_02, X502_ADC_RANGE_5,X502_ADC_RANGE_5,X502_ADC_RANGE_5}; //static uint32_t f_ch_ranges[ADC_LCH_CNT] = {X502_ADC_RANGE_1}; //static uint32_t f_ch_ranges[ADC_LCH_CNT] = {X502_ADC_RANGE_1, X502_ADC_RANGE_1,X502_ADC_RANGE_1,X502_ADC_RANGE_1,X502_ADC_RANGE_1,X502_ADC_RANGE_1, X502_ADC_RANGE_1,X502_ADC_RANGE_1,X502_ADC_RANGE_1,X502_ADC_RANGE_1}; //static uint32_t f_ch_ranges[ADC_LCH_CNT] = {X502_ADC_RANGE_5, X502_ADC_RANGE_5,X502_ADC_RANGE_5,X502_ADC_RANGE_5,X502_ADC_RANGE_5,X502_ADC_RANGE_5, X502_ADC_RANGE_5,X502_ADC_RANGE_5,X502_ADC_RANGE_5,X502_ADC_RANGE_5}; @@ -852,7 +852,7 @@ uint32_t X502_FlushRcv_buff(t_x502_hnd hnd){ } void insert_marker_to_file(char* logfilename, char* marker_text){ - printf("marker %s \n", marker_text); + printf("marker %s <======================================\n", marker_text); FILE* logfile_ptr = fopen(logfilename, "a"); fprintf(logfile_ptr, "marker %s \n", marker_text); fclose(logfile_ptr); @@ -1267,7 +1267,7 @@ int main(int argc, char** argv) { - +//* @@ -1360,6 +1360,17 @@ int main(int argc, char** argv) { receive_to_file(hnd, logfilename, inp_buff, max_total_words); + + + + + + + + + + + insert_marker_to_file(logfilename, "enable SYNC_DETector"); printf("\nEnabled SYNC_DETector\n"); BF_exec_cmd_simple(hnd, 0x8012, 2, 1); //enable FFT @@ -1412,7 +1423,7 @@ int main(int argc, char** argv) { printf("\n dbg value: "); BF_exec_cmd_simple(hnd, 0x800A, 10, 1); - +//*/ /* diff --git a/plotter.py b/plotter.py index 7d46f1c..db8c2c4 100755 --- a/plotter.py +++ b/plotter.py @@ -4,7 +4,7 @@ from decimal import * from sys import argv -t_x502_sync_mode = ["INTERNAL", "EXTERNAL_MASTER", "SYN1_RISE", "SYN1_FALL", "SYN2_RISE", "SYN2_FALL", "???"] +t_x502_sync_mode = ["INTERNAL", "EXTERNAL_MASTER", "SYN1_RISE", "SYN1_FALL", "none 1", "none 2","SYN2_RISE", "SYN2_FALL", "???"] t_x502_lch_mode = ["COMM", "DIFF", "ZERO", "???"] t_x502_adc_range = ["+-10V", "+-5V", "+-2V", "+-1V", "+-0.5V", "+-0.2V", "???"]