diff options
author | yash1112 | 2017-07-07 22:03:16 +0530 |
---|---|---|
committer | yash1112 | 2017-07-07 22:03:16 +0530 |
commit | 69c573fe2e59236f063aaa94dcd44b556f945cbc (patch) | |
tree | 08fa381bec620e38c7a3d2a34448d30160d861eb /macros/CCodeGeneration/JoinDeclarAndCcode.sci | |
parent | 87823db220f4c3b8bee16c0b2e08027704de1efe (diff) | |
parent | 3f52712f806fbd80d66dfdcaff401e5cf94dcca4 (diff) | |
download | scilab2c-69c573fe2e59236f063aaa94dcd44b556f945cbc.tar.gz scilab2c-69c573fe2e59236f063aaa94dcd44b556f945cbc.tar.bz2 scilab2c-69c573fe2e59236f063aaa94dcd44b556f945cbc.zip |
Scilab2C Arduino Updated
Diffstat (limited to 'macros/CCodeGeneration/JoinDeclarAndCcode.sci')
-rw-r--r-- | macros/CCodeGeneration/JoinDeclarAndCcode.sci | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/macros/CCodeGeneration/JoinDeclarAndCcode.sci b/macros/CCodeGeneration/JoinDeclarAndCcode.sci index 35607f6d..4a2906c0 100644 --- a/macros/CCodeGeneration/JoinDeclarAndCcode.sci +++ b/macros/CCodeGeneration/JoinDeclarAndCcode.sci @@ -146,10 +146,17 @@ PrintStringInfo('** --- C code. ---',CPass2FileName,'file','y'); PrintStringInfo('** ---------------',CPass2FileName,'file','y'); PrintStringInfo('*/',CPass2FileName,'file','y'); +<<<<<<< HEAD //if((SharedInfo.Target == "RPi") & (nxtscifunname == SharedInfo.SCIMainFunName)) //Add wiringPiSetup() function as it is required // PrintStringInfo('wiringPiSetup();',CPass2FileName,'file','y'); //end +======= +if((SharedInfo.Target == "RPi") & (nxtscifunname == SharedInfo.SCIMainFunName)) + //Add wiringPiSetup() function as it is required + PrintStringInfo('wiringPiSetup();',CPass2FileName,'file','y'); +end +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Copy the remaining part of V1 in V2. --- while (~meof(CPass1V1FileFid)) // #RNU_RES_B |