датчик температуры перешёл на АЦП1
This commit is contained in:
parent
d573366b75
commit
a1debcfc47
@ -93,12 +93,12 @@ void GpioInit(void)
|
|||||||
InputXbarRegs.INPUT4SELECT = GPIO_FaultPWMpin;//xint1
|
InputXbarRegs.INPUT4SELECT = GPIO_FaultPWMpin;//xint1
|
||||||
|
|
||||||
GpioCtrlRegs.GPIO_Bttonclik_MUX.bit.GPIO_Bttonclik = 0;//Buttons Clik
|
GpioCtrlRegs.GPIO_Bttonclik_MUX.bit.GPIO_Bttonclik = 0;//Buttons Clik
|
||||||
GpioCtrlRegs.GPIO_Bttonclik_GMUX.bit.GPIO_Bttonclik = 0;
|
GpioCtrlRegs.GPIO_Bttonclik_GMUX.bit.GPIO_Bttonclik = 0;
|
||||||
GpioCtrlRegs.GPIO_Bttonclik_DIR.bit.GPIO_Bttonclik = 0;
|
GpioCtrlRegs.GPIO_Bttonclik_DIR.bit.GPIO_Bttonclik = 0;
|
||||||
GpioDataRegs.GPIO_Bttonclik_DAT.bit.GPIO_Bttonclik = 0;
|
GpioDataRegs.GPIO_Bttonclik_DAT.bit.GPIO_Bttonclik = 0;
|
||||||
GpioCtrlRegs.GPIO_Bttonclik_SEL.bit.GPIO_Bttonclik = 2;
|
GpioCtrlRegs.GPIO_Bttonclik_SEL.bit.GPIO_Bttonclik = 2;
|
||||||
|
|
||||||
InputXbarRegs.INPUT6SELECT = GPIO_Bttonclikpin;//xint3
|
InputXbarRegs.INPUT6SELECT = GPIO_Bttonclikpin;//xint3
|
||||||
|
|
||||||
|
|
||||||
GpioCtrlRegs.GPAMUX2.bit.GPIO20 = 1;//EQEP
|
GpioCtrlRegs.GPAMUX2.bit.GPIO20 = 1;//EQEP
|
||||||
|
|||||||
@ -51,6 +51,8 @@
|
|||||||
#define CONNECT_CLB1(x) EALLOW; DevCfgRegs.CPUSEL15.bit.CLB1 = x; EDIS
|
#define CONNECT_CLB1(x) EALLOW; DevCfgRegs.CPUSEL15.bit.CLB1 = x; EDIS
|
||||||
#define CONNECT_CLB2(x) EALLOW; DevCfgRegs.CPUSEL15.bit.CLB2 = x; EDIS
|
#define CONNECT_CLB2(x) EALLOW; DevCfgRegs.CPUSEL15.bit.CLB2 = x; EDIS
|
||||||
|
|
||||||
|
#define CONNECT_ADCA(x) EALLOW; DevCfgRegs.CPUSEL11.bit.ADC_A = x; EDIS
|
||||||
|
|
||||||
void InitPerif(void)
|
void InitPerif(void)
|
||||||
{
|
{
|
||||||
|
|
||||||
@ -127,6 +129,7 @@ void InitPerif(void)
|
|||||||
CONNECT_SPIC(TO_CPU2);
|
CONNECT_SPIC(TO_CPU2);
|
||||||
CONNECT_CLB1(TO_CPU2);
|
CONNECT_CLB1(TO_CPU2);
|
||||||
CONNECT_CLB2(TO_CPU2);
|
CONNECT_CLB2(TO_CPU2);
|
||||||
|
CONNECT_ADCA(TO_CPU2);
|
||||||
|
|
||||||
Cpu1toCpu2IpcRegs.CPU1TOCPU2IPCBOOTMODE = 0x5A00C803; //str 716
|
Cpu1toCpu2IpcRegs.CPU1TOCPU2IPCBOOTMODE = 0x5A00C803; //str 716
|
||||||
Cpu1toCpu2IpcRegs.CPU1TOCPU2IPCSET.bit.IPC0 = 1;
|
Cpu1toCpu2IpcRegs.CPU1TOCPU2IPCSET.bit.IPC0 = 1;
|
||||||
|
|||||||
@ -33,7 +33,7 @@ void main(void)
|
|||||||
rele_run();
|
rele_run();
|
||||||
|
|
||||||
// Gpio_rainbow(diod);
|
// Gpio_rainbow(diod);
|
||||||
// AdcRun();
|
AdcRun();
|
||||||
BissClkgenRun();
|
BissClkgenRun();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -81,7 +81,7 @@ static uint16_t diod = 0;
|
|||||||
fault_read_ports();
|
fault_read_ports();
|
||||||
}else{
|
}else{
|
||||||
buttonsDisp();
|
buttonsDisp();
|
||||||
ScreenDisp();
|
//ScreenDisp();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user