nikon/CANopenNode
1
0
Fork 0
Code Activity Actions

PIC32

Browse source
This commit is contained in:
Janez 2016-02-15 11:07:48 +01:00
parent 934e90e7ec
commit 392abbe4d3
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
stack/PIC32/CO_driver.c
View file

@ -297,7 +297,7 @@ CO_ReturnError_t CO_CANrxBufferInit(
pRXM1 = &CAN_REG(addr, C_RXM+0x10);
pRXM2 = &CAN_REG(addr, C_RXM+0x20);
pRXM3 = &CAN_REG(addr, C_RXM+0x30);
if(RXM == 0xFFE80000){
if(RXM == *pRXM0){
selectMask = 0;
}
else if(RXM == *pRXM1 || *pRXM1 == 0xFFE80000){

8
stack/PIC32/eeprom.c
View file

@ -70,6 +70,8 @@ static void EE_writeStatus(uint8_t data);
static uint8_t EE_readStatus();
#define EE_isWriteInProcess() (EE_readStatus() & 0x01) /* True if write is in process. */
static uint32_t tmpU32;
/* Store parameters ***********************************************************/
static CO_SDO_abortCode_t CO_ODF_1010(CO_ODF_arg_t *ODF_arg){
@ -186,7 +188,6 @@ CO_ReturnError_t CO_EE_init_1(
uint8_t *OD_ROMAddress,
uint32_t OD_ROMSize)
{
uint32_t rdata;
/* verify arguments */
if(ee==NULL || OD_EEPROMAddress==NULL || OD_ROMAddress==NULL){
@ -196,7 +197,7 @@ CO_ReturnError_t CO_EE_init_1(
/* Configure SPI port for use with eeprom */
SPICON = 0; /* Stops and restes the SPI */
SPISTAT = 0;
rdata = SPIBUF; /* Clear the receive buffer */
tmpU32 = SPIBUF; /* Clear the receive buffer */
SPIBRG = 4; /* Clock = FPB / ((4+1) * 2) */
SPICON = 0x00018120; /* MSSEN = 0 - Master mode slave select enable bit */
/* ENHBUF(bit16) = 1 - Enhanced buffer enable bit */
@ -320,10 +321,9 @@ static void EE_SPIwrite(uint8_t *tx, uint8_t *rx, uint8_t len){
/* read bytes from SPI_RXB fifo buffer */
for(i=0; i<len; i++){
uint32_t a;
while(SPISTATbits.SPIRBE); /* wait if buffer is empty */
if(rx) rx[i] = SPIBUF;
else a = SPIBUF;
else tmpU32 = SPIBUF;
}
}

4
stack/PIC32/main_PIC32.c
View file

@ -111,6 +111,7 @@
/* Global variables and objects */
volatile uint16_t CO_timer1ms = 0U; /* variable increments each millisecond */
const CO_CANbitRateData_t CO_CANbitRateData[8] = {CO_CANbitRateDataInitializers};
static uint32_t tmpU32;
#ifdef USE_EEPROM
CO_EE_t CO_EEO; /* Eeprom object */
#endif
@ -127,7 +128,6 @@ void CANrx_lockCbSync(bool_t syncReceived) {
/* main ***********************************************************************/
int main (void){
unsigned int temp_ui;
CO_NMT_reset_cmd_t reset = CO_RESET_NOT;
/* Configure system for maximum performance. plib is necessary for that.*/
@ -296,7 +296,7 @@ int main (void){
SYSKEY = 0xAA996655;
SYSKEY = 0x556699AA;
RSWRSTSET = 1;
temp_ui = RSWRST;
tmpU32 = RSWRST;
while(1);
}