From 0c392b202fbbf5ee15c09ac6dc5e049c7e7e3055 Mon Sep 17 00:00:00 2001 From: seklyuts Date: Mon, 26 Aug 2024 16:43:09 +0300 Subject: [PATCH] =?UTF-8?q?=D0=90=D0=A6=D0=9F=20=D0=BF=D0=B5=D1=80=D0=B5?= =?UTF-8?q?=D0=B2=D0=B5=D0=B4=D1=91=D0=BD=20=D0=B2=20=D0=B4=D0=B8=D1=84?= =?UTF-8?q?=D1=84=D0=B5=D1=80=D0=B5=D0=BD=D1=86=D0=B8=D0=B0=D0=BB=D1=8C?= =?UTF-8?q?=D0=BD=D1=8B=D0=B9=20=D1=80=D0=B5=D0=B6=D0=B8=D0=BC=20(=D0=BD?= =?UTF-8?q?=D0=BE=20=D1=8D=D1=82=D0=BE=20=D0=BD=D0=B8=D1=87=D0=B5=D0=B3?= =?UTF-8?q?=D0=BE=20=D0=BD=D0=B5=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=BB=D0=BE)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/Peripherals/gpio_init.c | 7 ++++ .../src/Peripherals/pwm_init.c | 4 +- .../epwm_test_biss_c_cpu1/src/init_perif.c | 14 +++++++ .../2838x_FLASH_lnk_cpu2.cmd | 14 +++++-- Projects/epwm_test_biss_c_cpu2/Start_rfm.pmp | Bin 54982 -> 57427 bytes .../src/Peripherals/adc_init.c | 38 +++++++++++++----- .../src/Peripherals/pwm_init.c | 3 -- .../epwm_test_biss_c_cpu2/src/frmmstr_run.c | 12 +++++- 8 files changed, 71 insertions(+), 21 deletions(-) diff --git a/Projects/epwm_test_biss_c_cpu1/src/Peripherals/gpio_init.c b/Projects/epwm_test_biss_c_cpu1/src/Peripherals/gpio_init.c index a975f3b..c65970f 100644 --- a/Projects/epwm_test_biss_c_cpu1/src/Peripherals/gpio_init.c +++ b/Projects/epwm_test_biss_c_cpu1/src/Peripherals/gpio_init.c @@ -142,6 +142,13 @@ void GpioInit(void) GpioDataRegs.GPDDAT.bit.GPIO98 = 0; //BISS-C_PWR_12V/5V GpioCtrlRegs.GPDCSEL1.bit.GPIO98 = 2; + + GpioCtrlRegs.GPAMUX1.bit.GPIO14 = 0; + GpioCtrlRegs.GPAGMUX1.bit.GPIO14 = 0; + GpioCtrlRegs.GPADIR.bit.GPIO14 = 1; + GpioDataRegs.GPADAT.bit.GPIO14 = 0; + GpioCtrlRegs.GPACSEL2.bit.GPIO14 = 2; + #endif EDIS; } diff --git a/Projects/epwm_test_biss_c_cpu1/src/Peripherals/pwm_init.c b/Projects/epwm_test_biss_c_cpu1/src/Peripherals/pwm_init.c index 6123c0a..50ec596 100644 --- a/Projects/epwm_test_biss_c_cpu1/src/Peripherals/pwm_init.c +++ b/Projects/epwm_test_biss_c_cpu1/src/Peripherals/pwm_init.c @@ -134,9 +134,7 @@ void PWMGpioInit(void)//��� � ������������ � GpioCtrlRegs.GPACSEL1.bit.GPIO6 = 2;//to cpu2 GpioCtrlRegs.GPACSEL1.bit.GPIO7 = 2; #endif -// GpioCtrlRegs.GPAPUD.bit.GPIO14 = 1; // Disable pull-up on GPIO14 (EPWM8A) -// GpioCtrlRegs.GPAMUX1.bit.GPIO14 = 1; // Configure GPIO14 as EPWM8A -// GpioCtrlRegs.GPACSEL2.bit.GPIO14 = 2;//to cpu2 + GpioCtrlRegs.GPAPUD.bit.GPIO4 = 1; // Disable pull-up on GPIO4 (EPWM3A) GpioCtrlRegs.GPAPUD.bit.GPIO5 = 1; // Disable pull-up on GPIO5 (EPWM3B) diff --git a/Projects/epwm_test_biss_c_cpu1/src/init_perif.c b/Projects/epwm_test_biss_c_cpu1/src/init_perif.c index 0658625..6f3833d 100644 --- a/Projects/epwm_test_biss_c_cpu1/src/init_perif.c +++ b/Projects/epwm_test_biss_c_cpu1/src/init_perif.c @@ -53,6 +53,14 @@ #define CONNECT_ADCA(x) EALLOW; DevCfgRegs.CPUSEL11.bit.ADC_A = x; EDIS +#define CONNECT_RAM_GS0(x) EALLOW; MemCfgRegs.GSxMSEL.bit.MSEL_GS0 = x; EDIS +#define CONNECT_RAM_GS1(x) EALLOW; MemCfgRegs.GSxMSEL.bit.MSEL_GS1 = x; EDIS +#define CONNECT_RAM_GS2(x) EALLOW; MemCfgRegs.GSxMSEL.bit.MSEL_GS2 = x; EDIS +#define CONNECT_RAM_GS3(x) EALLOW; MemCfgRegs.GSxMSEL.bit.MSEL_GS3 = x; EDIS +#define CONNECT_RAM_GS4(x) EALLOW; MemCfgRegs.GSxMSEL.bit.MSEL_GS4 = x; EDIS +#define CONNECT_RAM_GS5(x) EALLOW; MemCfgRegs.GSxMSEL.bit.MSEL_GS5 = x; EDIS + + void InitPerif(void) { @@ -130,6 +138,12 @@ void InitPerif(void) CONNECT_CLB1(TO_CPU2); CONNECT_CLB2(TO_CPU2); CONNECT_ADCA(TO_CPU2); + CONNECT_RAM_GS0(TO_CPU2); + CONNECT_RAM_GS1(TO_CPU2); + CONNECT_RAM_GS2(TO_CPU2); + CONNECT_RAM_GS3(TO_CPU2); + CONNECT_RAM_GS4(TO_CPU2); + CONNECT_RAM_GS5(TO_CPU2); Cpu1toCpu2IpcRegs.CPU1TOCPU2IPCBOOTMODE = 0x5A00C803; //str 716 Cpu1toCpu2IpcRegs.CPU1TOCPU2IPCSET.bit.IPC0 = 1; diff --git a/Projects/epwm_test_biss_c_cpu2/2838x_FLASH_lnk_cpu2.cmd b/Projects/epwm_test_biss_c_cpu2/2838x_FLASH_lnk_cpu2.cmd index dcb8b51..9b46b57 100644 --- a/Projects/epwm_test_biss_c_cpu2/2838x_FLASH_lnk_cpu2.cmd +++ b/Projects/epwm_test_biss_c_cpu2/2838x_FLASH_lnk_cpu2.cmd @@ -74,7 +74,7 @@ SECTIONS #if defined(__TI_EABI__) .init_array : > FLASH1, ALIGN(8) - .bss : >> RAMLS5 | RAMLS6 // instead of RAMLS5 + .bss : >> RAMLS5 | RAMLS6 | RAMLS7// instead of RAMLS5 .bss:output : > RAMLS3 .bss:cio : > RAMLS5 .data : > RAMLS5 @@ -99,14 +99,20 @@ SECTIONS MSGRAM_CM_TO_CPU : > CMTOCPURAM, type=NOINIT /* The following section definition are for SDFM examples */ - Filter_RegsFile : > RAMGS10 +// Filter_RegsFile : > RAMGS10 Filter1_RegsFile : > RAMLS1 Filter2_RegsFile : > RAMLS2 Filter3_RegsFile : > RAMLS3 Filter4_RegsFile : > RAMLS4 + Filter6_RegsFile : > RAMLS6 - Filter14_RegsFile : > RAMGS14 - Difference_RegsFile : >RAMGS5 + + ADC_RegsFile0 : > RAMGS0 | RAMGS1 | RAMGS2 + ADC_RegsFile1 : > RAMGS3 | RAMGS4 | RAMGS5 + + +// Filter14_RegsFile : > RAMGS14 +// Difference_RegsFile : >RAMGS5 #if defined(__TI_EABI__) .TI.ramfunc : {} LOAD = FLASH3, diff --git a/Projects/epwm_test_biss_c_cpu2/Start_rfm.pmp b/Projects/epwm_test_biss_c_cpu2/Start_rfm.pmp index 78a596b34bc6980a7150b56dfbea85beef30c849..da7b5676f9e2f63d9a399291494416fa6edf698f 100644 GIT binary patch delta 4639 zcmbuC3s6C zuWxt1Z};Qm0n4Qxi^a~~tF^=_td0H^)7){XK~WS9)zQ{m3;%?wXYC_D?`ZxNWxp0j zljDP^-1~9brH3JMSBe-zY6NzpdC79PO=G}vm3rW}h1;GaVo9W#PNuwx#yf5t<7tH_Sro`~Sx|Mt>r1w^e`Ll$XuwG z)c(wPgNEGO`ht3?KG&`(&A-yC9F;J#Qf4E8nfK4jFn65rGE>w>ow9x zkFL0B;h&0aT1T@sPF1s36)Q?y8};TiQ@$fcnV^LLwLkBzPALitR)X}ZFJFmL0`=%P z^6GBRW7T}uvm=#oDM@oTQdW(JTDkcOS0bR%Rzs>ox1dRA@-yvukOdy>N0==W^eU(d^onkaShJNnevwgS&M~|hy%=H4 zV$gh0EvN?cB50mLbh*<`bz2^`S-GuJ+nL4GbR=Ev-}01V39GiMY1@CU!?_)=Yd~Qw znd*VYClxPI%`J-ysbfo;`q=KL6mKb5v&zJ z#wV!*tuHBqn?Ty84`Z=Sdi%#A8A^Zbk}H9F93ZCG7r`TZ5${PbP{B`+_TV{K&C6a%K}v7 zf$X3kg8D!wK#M_}K$Ae5K{24Hl|VQqI}7awLgo(Dw`B^qTuKYN($#V8D-^G#+$ygu z%I->4PafK3_>#PC&&q%udY@Xbal&6 zuT~#AEN%^{>^$;?aU|Qc0~yYdM6&N=y8kuMm!Zcq234^v1Kq;gyrvhT)(qf3Kr=(x z4B+pf_M2kWjK-^4J1xA;Ak0SRAwlTUW6+GU7tn4w=qI2>AT!=_pp}Az+tby~P`iBl zEa^|o5f7%5Rcg<%g@sk`=Tel>LlwONcKIf=O>;%H3>W#fhUD&-n)s~L)Ah9aSxX=H zUhdW}`Dv}KY=1i;Q4B807^iZ`IQppiIHg;Uatc4@84w_v%P!{EpGJP30hIKvzppgV zOBh&KTvQ~D+It4 za{X30QD(UC@NX3xJB?|gKxaVPL8n0GmAlQ*Lf8%i*_)vAy4^nVY^_TirB24``r_lw z4S3+@ApNTTaQ*+CibS(t!lWaheV}(idqCZw9)qfw`Qo-1B0CCd12uvUgUomK9caG- z9RU3r)CFqRNDI>@h$^TR)DC(N^fssy)B)-R9RnQ#?Fa2;_iZly1~{mnYK%NppB%@U z7ae5<&WbXJ2*;D`ID20lDi@L4&v}mKpVrf5%C`uJ_hEyXI~;clh}&mVmkq4y zeSp!;+f!s5gG&`jgG|h|e*oU@8!y6LQM{bRYl=&s*JCg2+_#85A9fKl{SIW_`yWFy zZ8K9dx&S^-(g;>*H)A|9c9|VY`+NOPsvCWpT3d);!1kZO%>vn z+S)LeFX$mqJje@#MOHCCh+{wxgGPV?L2rS4K<1gnLE8$lg3RY@qNa_P=|~Ey&E#S; SG?83LC!nNlo|OCXn*Rc|EvMlC delta 4398 zcmbuBc~DhV9LLYO@5TBMP#@2yAmkbxcKPvYP%7$7Wg_s&nt-e$TUM#=-6kkI(u3&b?>(E$7tN znvU-c{3FTbyaTeq{cxnk@n)G;3~6nb|;G@2e~p~}Z>{ED$Ep*Z;WJ}nCk=wjnneUp?NuMj_lpng zB735hf2GrPK{YyUO0x0;I?YSA@`Hko@mjt8TZ)w*(y8WYD?cn~v---A^;`+6raq2t zV#`YC;?PHxV56Bs>EUKN`%FKo8P;C07;=e9!^bHRGsk2vUNS$=XL5SvH1~H7r0BHe9d*&$v(LYJUK{b0xuxGZ1D31#Be!yXigx!(qh0ee)o(^E zHBo{iUUMkjiVmX}#&#fQ_%ymVrmOO!7FE3|>a75E(%6DWd>0ZmIgmDFSmk0$NRw7f zvidAUmu6*Jm5^#ZJex9~Q`%se^!Mb>N~qTo_J&hEHszLypA_5nvKGgb{Ek_jFf&Kt zHmc1!p+r>E9mgisIon}V0;=i8luh*KYcYzyS3X>@fm5e~D%IlIZQ*~3bs3R&-JCI&FaEUuvZZJ(YCPA&bjRI9z21LvkhBR?OV4eB z{^LFUn|*~%c%7MZpK1|5&`PKnkl5g5hBK5eiO21eOp_zu?eimm@0c66a$(D zIt}Us`r05Dn`j{G23iUl1$rAa6?6t9_q;!}@gNIm1L(L;E-e_Pn;wJt1n3l~E2sjL z0lEyT1RVv*K#PL*CTn)Nz4;Ig@mr9Lk5{2NKvO`mph%F2=9Vv)gU*3uyoD4(bRz+p zs7_7uvwOyKo=QojiBw(|udevCpW;8Bn-^!zUZ9EUy}gynLuW}8%fi6DK_7#LfSv+5 zLGZDQ^@NxNS_v8q3I)vowFPB^o&e1TC4&+`PwF&J3!mi>`+|mo27(enDWF-PnV{jI zL7?eA&gr>-oZm#xvKHs4NB1vNgtO3Id0?cX+s&yoxHN@AK8mNhGA9*PI@IDrafZ)I z#mu!w*0~4O(rBMtU5J^>@nFI?2+1OXG(cyh&Uee*h?*k zuidkeYoeZW+m5vl)I7ophqHWjbY+Y}$*22|mhNhu^GsqCqa@^k@_oYUm(wxgl-Z$% zp4n@}h;}Dv-7rB+9s%ny%t=rw=oF|9gxc4EorU-j=tJ*p1GUXFPsm=FM@8#;^=QS8 z;4;(ZeEvh1u2@!!8EpaW25kfF0(}lTWRQz(HjwQDeF^#m^cAQYB+s!bXa_+mr~)Jp zrO$LtPlKH>Zv@qVJ_T(89RTeCZ3pcI?Esa7z5s1y%|UMO$+zF@)M(AA!Q-+QyqKLk zBX3D=w#ba*>@Yhb;*T@C=Vvv&K~?@o_-U$|I&+znXL$=f8B3U-PkdF zT^1g34bbkm`aOE!r8tY-bC3Jy