Вынесен опрос фримастера в фон и теперь работает на 115200
This commit is contained in:
parent
fa206d1d68
commit
0f29a7eb48
@ -21,6 +21,7 @@
|
|||||||
#include "biss.h"
|
#include "biss.h"
|
||||||
#include "rele.h"
|
#include "rele.h"
|
||||||
#include "uart_4Mbit.h"
|
#include "uart_4Mbit.h"
|
||||||
|
#include "frm_uart.h"
|
||||||
|
|
||||||
void main(void)
|
void main(void)
|
||||||
{
|
{
|
||||||
@ -31,6 +32,7 @@ void main(void)
|
|||||||
// asm (" NOP");
|
// asm (" NOP");
|
||||||
// frmmstr_run();
|
// frmmstr_run();
|
||||||
UartErrorReset();
|
UartErrorReset();
|
||||||
|
FMSTR_Poll();
|
||||||
SyncPWMFonRun();
|
SyncPWMFonRun();
|
||||||
rele_run();
|
rele_run();
|
||||||
AdcRun();
|
AdcRun();
|
||||||
|
|||||||
@ -275,14 +275,6 @@ void SdfmInit(void)
|
|||||||
Sdfm_configureData_filter(SDFM2, FILTER4, FILTER_DISABLE, SINC3, OSR_32, DATA_16_BIT, SHIFT_0_BITS);
|
Sdfm_configureData_filter(SDFM2, FILTER4, FILTER_DISABLE, SINC3, OSR_32, DATA_16_BIT, SHIFT_0_BITS);
|
||||||
|
|
||||||
EALLOW;
|
EALLOW;
|
||||||
// Sdfm1Regs.SDSYNC1.bit.SYNCSEL = 0x3F;
|
|
||||||
// Sdfm2Regs.SDSYNC1.bit.SYNCSEL = 0x3F;
|
|
||||||
// Sdfm1Regs.SDSYNC2.bit.SYNCSEL = 0x3F;
|
|
||||||
// Sdfm2Regs.SDSYNC2.bit.SYNCSEL = 0x3F;
|
|
||||||
// Sdfm1Regs.SDSYNC3.bit.SYNCSEL = 0x3F;
|
|
||||||
// Sdfm2Regs.SDSYNC3.bit.SYNCSEL = 0x3F;
|
|
||||||
// Sdfm1Regs.SDSYNC4.bit.SYNCSEL = 0x3F;
|
|
||||||
// Sdfm2Regs.SDSYNC4.bit.SYNCSEL = 0x3F;
|
|
||||||
|
|
||||||
Sdfm1Regs.SDDFPARM1.bit.SDSYNCEN = 0;
|
Sdfm1Regs.SDDFPARM1.bit.SDSYNCEN = 0;
|
||||||
Sdfm2Regs.SDDFPARM1.bit.SDSYNCEN = 0;
|
Sdfm2Regs.SDDFPARM1.bit.SDSYNCEN = 0;
|
||||||
@ -294,24 +286,6 @@ void SdfmInit(void)
|
|||||||
Sdfm2Regs.SDDFPARM4.bit.SDSYNCEN = 0;
|
Sdfm2Regs.SDDFPARM4.bit.SDSYNCEN = 0;
|
||||||
EDIS;
|
EDIS;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Sdfm_configureInterrupt(SDFM1, FILTER1, IEH_DISABLE, IEL_DISABLE, MFIE_ENABLE, AE_ENABLE);
|
|
||||||
// Sdfm_configureInterrupt(SDFM1, FILTER2, IEH_DISABLE, IEL_DISABLE, MFIE_ENABLE, AE_ENABLE);
|
|
||||||
// Sdfm_configureInterrupt(SDFM1, FILTER3, IEH_DISABLE, IEL_DISABLE, MFIE_ENABLE, AE_ENABLE);
|
|
||||||
// Sdfm_configureInterrupt(SDFM1, FILTER4, IEH_DISABLE, IEL_DISABLE, MFIE_ENABLE, AE_ENABLE);
|
|
||||||
////
|
|
||||||
// Sdfm_configureInterrupt(SDFM2, FILTER1, IEH_DISABLE, IEL_DISABLE, MFIE_ENABLE, AE_ENABLE);
|
|
||||||
// Sdfm_configureInterrupt(SDFM2, FILTER2, IEH_DISABLE, IEL_DISABLE, MFIE_ENABLE, AE_ENABLE);
|
|
||||||
// Sdfm_configureInterrupt(SDFM2, FILTER3, IEH_DISABLE, IEL_DISABLE, MFIE_ENABLE, AE_ENABLE);
|
|
||||||
// Sdfm_configureInterrupt(SDFM2, FILTER4, IEH_DISABLE, IEL_DISABLE, MFIE_ENABLE, AE_ENABLE);
|
|
||||||
//
|
|
||||||
// Enable master interrupt so that any of the filter interrupts can trigger
|
|
||||||
// by SDFM interrupt to CPU
|
|
||||||
//
|
|
||||||
//Sdfm1Regs.SDCPARM4.bit.MFIE = 1;
|
|
||||||
//Sdfm1Regs.SDDFPARM4.bit.AE = 1;
|
|
||||||
|
|
||||||
Sdfm_enableMIE(SDFM1);
|
Sdfm_enableMIE(SDFM1);
|
||||||
Sdfm_enableMIE(SDFM2);
|
Sdfm_enableMIE(SDFM2);
|
||||||
|
|
||||||
|
|||||||
@ -5,7 +5,6 @@
|
|||||||
* Author: seklyuts
|
* Author: seklyuts
|
||||||
*/
|
*/
|
||||||
#include "f28x_project.h"
|
#include "f28x_project.h"
|
||||||
#include "frmmstr_run.h"
|
|
||||||
#include "init_perif.h"
|
#include "init_perif.h"
|
||||||
#include "gpio_init.h"
|
#include "gpio_init.h"
|
||||||
#include "fault.h"
|
#include "fault.h"
|
||||||
@ -13,6 +12,7 @@
|
|||||||
#include "buttons.h"
|
#include "buttons.h"
|
||||||
#include "eqep.h"
|
#include "eqep.h"
|
||||||
#include "SyncPWMFonRun.h"
|
#include "SyncPWMFonRun.h"
|
||||||
|
#include "frm_uart.h"
|
||||||
|
|
||||||
volatile uint16_t counter=0 ;
|
volatile uint16_t counter=0 ;
|
||||||
volatile uint16_t counter1=0 ;
|
volatile uint16_t counter1=0 ;
|
||||||
@ -30,7 +30,7 @@ void SyncPWMFonRun(void)
|
|||||||
if(SynchPWMFonRunEnable())
|
if(SynchPWMFonRunEnable())
|
||||||
{
|
{
|
||||||
#ifdef FREEMASTER
|
#ifdef FREEMASTER
|
||||||
frmmstr_run();
|
FMSTR_Recorder();
|
||||||
#endif
|
#endif
|
||||||
SynchPWMFonRunEnableClr();
|
SynchPWMFonRunEnableClr();
|
||||||
if(counter < 100) counter++;
|
if(counter < 100) counter++;
|
||||||
|
|||||||
@ -10,7 +10,7 @@
|
|||||||
#include "SyncPWMFonRun.h"
|
#include "SyncPWMFonRun.h"
|
||||||
|
|
||||||
#define LSPCLK_HZ 100000000.0
|
#define LSPCLK_HZ 100000000.0
|
||||||
#define BAUD 38400.0
|
#define BAUD 115200.0
|
||||||
#define BRR LSPCLK_HZ/(BAUD*8)
|
#define BRR LSPCLK_HZ/(BAUD*8)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -1,17 +0,0 @@
|
|||||||
/*
|
|
||||||
* frmmstr_run.c
|
|
||||||
*
|
|
||||||
* Created on: 14 <EFBFBD><EFBFBD><EFBFBD><EFBFBD>. 2023 <EFBFBD>.
|
|
||||||
* Author: seklyuts
|
|
||||||
*/
|
|
||||||
#include "f28x_project.h"
|
|
||||||
#include "frm_uart.h"
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void frmmstr_run(void)
|
|
||||||
{
|
|
||||||
FMSTR_Poll();
|
|
||||||
FMSTR_Recorder();
|
|
||||||
}
|
|
||||||
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
/*
|
|
||||||
* frmmstr_run.h
|
|
||||||
*
|
|
||||||
* Created on: 14 ñåíò. 2023 ã.
|
|
||||||
* Author: seklyuts
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef SRC_FRMMSTR_RUN_H_
|
|
||||||
#define SRC_FRMMSTR_RUN_H_
|
|
||||||
|
|
||||||
void frmmstr_run(void);
|
|
||||||
|
|
||||||
#endif /* SRC_FRMMSTR_RUN_H_ */
|
|
||||||
Loading…
Reference in New Issue
Block a user