correct conflit left for Data branch merge , double function definition
This commit is contained in:
parent
118504546e
commit
14107f0301
|
@ -110,16 +110,6 @@ int lastIndexCaptor()
|
||||||
return lastIndex;
|
return lastIndex;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
int lastIndexCaptor(){
|
|
||||||
int lastIndex = 0;
|
|
||||||
for(int i = 1 ; i < 8 ; i++){
|
|
||||||
if(selectionCaptors[i]){
|
|
||||||
lastIndex = i;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return lastIndex;
|
|
||||||
}
|
|
||||||
/**
|
/**
|
||||||
* @brief write one lign of rawData in the file @param rawDataFile (simulate of freq of the Vegetal Signals Captor)
|
* @brief write one lign of rawData in the file @param rawDataFile (simulate of freq of the Vegetal Signals Captor)
|
||||||
*
|
*
|
||||||
|
|
Loading…
Reference in a new issue