nikon/CANopenNode
1
0
Fork 0
Code Activity Actions

Merge branch 'master' of BB1:git/CANopenNode

Browse source
This commit is contained in:
Janez 2015-10-20 13:48:51 +02:00
commit a837948ea4
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
stack/socketCAN/eeprom.c
View file

@ -30,9 +30,10 @@
#include "eeprom.h"
#include "crc16-ccitt.h"
#include <stdio.h>
#include <string.h> /* for memcpy */
#include <stdlib.h> /* for malloc, free */
#if 0
/* Store parameters ***********************************************************/
static CO_SDO_abortCode_t CO_ODF_1010(CO_ODF_arg_t *ODF_arg){
CO_EE_t *ee;
@ -102,11 +103,9 @@ static CO_SDO_abortCode_t CO_ODF_1010(CO_ODF_arg_t *ODF_arg){
/* Restore default parameters *************************************************/
static CO_SDO_abortCode_t CO_ODF_1011(CO_ODF_arg_t *ODF_arg){
CO_EE_t *ee;
uint32_t value;
CO_SDO_abortCode_t ret = CO_SDO_AB_NONE;
ee = (CO_EE_t*) ODF_arg->object;
value = CO_getUint32(ODF_arg->data);
if(!ODF_arg->reading){
@ -241,4 +240,3 @@ void CO_EE_process(CO_EE_t *ee){
(ee->pSRAM)[i] = (ee->OD_EEPROMAddress)[i];
}
}
#endif