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 /src/c/CACSD/interfaces | |
| parent | 87823db220f4c3b8bee16c0b2e08027704de1efe (diff) | |
| parent | 3f52712f806fbd80d66dfdcaff401e5cf94dcca4 (diff) | |
| download | Scilab2C_fossee_old-69c573fe2e59236f063aaa94dcd44b556f945cbc.tar.gz Scilab2C_fossee_old-69c573fe2e59236f063aaa94dcd44b556f945cbc.tar.bz2 Scilab2C_fossee_old-69c573fe2e59236f063aaa94dcd44b556f945cbc.zip | |
Scilab2C Arduino Updated
Diffstat (limited to 'src/c/CACSD/interfaces')
| -rw-r--r-- | src/c/CACSD/interfaces/int_lqr.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/c/CACSD/interfaces/int_lqr.h b/src/c/CACSD/interfaces/int_lqr.h index 8deba90..c292f8c 100644 --- a/src/c/CACSD/interfaces/int_lqr.h +++ b/src/c/CACSD/interfaces/int_lqr.h @@ -16,6 +16,7 @@ extern "C" { #endif +<<<<<<< HEAD #define ss2lqrd2d2(in1,size1,out1,out2) dlqra(in1,size1[0],size1[1],NULL,\ NULL,NULL,out1,out2); @@ -24,6 +25,9 @@ extern "C" { #define ss2d2d2d2lqrd2d2(in1,size1,in2,size2,in3,size3,in4,size4,out1,out2) \ dlqra(in1,size1[0],size1[1],in2,in3,in4,out1,out2); +======= +#define ss2lqrd2d2(in1,size1,out1,out2) dlqra(in1,size1[0],size1[1],out1,out2); +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #ifdef __cplusplus } /* extern "C" */ |