Scilab2C Arduino Updated

2 files changed, 51 insertions, 0 deletions

diff --git a/2.3-1/includes/lapack.h b/2.3-1/includes/lapack.h
index 5f12bc25..9731026e 100644
--- a/2.3-1/includes/lapack.h
+++ b/2.3-1/includes/lapack.h
@@ -186,6 +186,7 @@ extern int dggbal_(char*,int*,double*,int*,double*,int*,int*,int*,double*, \
 			double*,double*,int*);
 extern int dgebak_(char*,char*,int*,int*,int*,double*,int*,double*,int*,int*);
 
+<<<<<<< HEAD
 /*Used in SVD */
 extern double dgesvd_(char*,char*,int*,int*,double*,int*,double*,double*,int*,\
 	double*,int*,double *,int*,int*);
@@ -195,6 +196,8 @@ extern doubleComplex zgesvd_( char* , char* , int* , int* ,doubleComplex *,\
                 int* , double* ,doubleComplex* , int* ,doubleComplex* , int* ,\
                  doubleComplex* , int* , double* , int* );
 
+=======
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 #ifdef  __cplusplus
 } /* extern "C" */
 #endif
diff --git a/2.3-1/includes/sci2clib.h b/2.3-1/includes/sci2clib.h
index 1a8b557d..34380bd5 100644
--- a/2.3-1/includes/sci2clib.h
+++ b/2.3-1/includes/sci2clib.h
@@ -18,6 +18,7 @@ extern "C" {
 /* interfacing lapack */
 #include "lapack.h"
 
+<<<<<<< HEAD
 
 #include "sva.h"
 #include "int_sva.h"
@@ -27,6 +28,8 @@ extern "C" {
 #include "int_svd.h"
 
 
+=======
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 /* AUXILIARY FUNCTIONS */
 
 /* interfacing abs */
@@ -74,6 +77,7 @@ extern "C" {
 #include "rand.h"
 #include "int_rand.h"
 
+<<<<<<< HEAD
 /* INTERPOLATION FUNCTIONS*/
 
 /*interfacing interp1*/
@@ -90,6 +94,10 @@ extern "C" {
 /* interfacing isreal*/
 #include "isreal.h"
 #include "int_isreal.h"
+=======
+/* ELEMENTARY FUNCTIONS */
+
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 /* interfacing atand */
 #include "atand.h"
 #include "int_atand.h"
@@ -212,12 +220,15 @@ extern "C" {
 /* interfacing int16 */
 #include "int16.h"
 #include "int_int16.h"
+<<<<<<< HEAD
 /* interfacing uint32 */
 #include "uint32.h"
 #include "int_uint32.h"
 /* interfacing int32 */
 #include "int32.h"
 #include "int_int32.h"
+=======
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 
 /*interfacing bitand */
 #include "bitand.h"
@@ -333,6 +344,7 @@ extern "C" {
 #include "factor.h"
 #include "int_factor.h"
 
+<<<<<<< HEAD
 /*interfacing gcd*/
 #include "gcd.h"
 #include "int_gcd.h"
@@ -342,6 +354,8 @@ extern "C" {
 #include "int_lcm.h"
 
 
+=======
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 /* IMPLICIT LISTS */
 /* interfacing implicitList/OpColon */
 #include "implicitList.h"
@@ -411,7 +425,11 @@ extern "C" {
 /* interfacing ones */
 #include "ones.h"
 #include "int_ones.h"
+<<<<<<< HEAD
 /* Linear Algebra - spec */
+=======
+/* interfacing spec */
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 #include "spec.h"
 #include "int_spec.h"
 /* interfacing trace */
@@ -450,6 +468,7 @@ extern "C" {
 #include "norm.h"
 
 /* SIGNAL PROCESSING */
+<<<<<<< HEAD
 
 
 #include "modk.h"
@@ -462,6 +481,8 @@ extern "C" {
 //#include "dct.h"
 //#include "int_dct.h"
 
+=======
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 /* interfacing convol */
 #include "conv.h"
 #include "conv2d.h"
@@ -481,6 +502,7 @@ extern "C" {
 #include "lev.h"
 #include "int_lev.h"
 
+<<<<<<< HEAD
 /* interfacing zpbutt */
 #include "zpbutt.h"
 #include "int_zpbutt.h"
@@ -540,6 +562,9 @@ extern "C" {
 /* interfacing amell */
 #include "amell.h"
 #include "int_amell.h"
+=======
+
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 
 /* STATISTICS FUNCTIONS */
 
@@ -608,6 +633,7 @@ extern "C" {
 #include "strrchr.h"
 #include "int_strrchr.h"
 
+<<<<<<< HEAD
 /*interfacing strchr*/
 #include "strchr.h"
 #include "int_strchr.h"
@@ -628,6 +654,8 @@ extern "C" {
 #include "strncpy.h"
 #include "int_strncpy.h"
 
+=======
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 /*Functions related to strings*/
 #include "convstr.h"
 #include "int_convstr.h"
@@ -651,6 +679,7 @@ extern "C" {
 #include "balanc.h"
 #include "int_balanc.h"	
 
+<<<<<<< HEAD
 #include "svd.h"		/*Linear Alegbra - Singular value decompostion */
 #include "int_svd.h"
 
@@ -662,6 +691,10 @@ extern "C" {
 
 #include "sva.h"
 #include "int_sva.h" /*Linear Algebra - SVA function */
+=======
+#include "rcond.h"
+#include "int_rcond.h"
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 	
 /*Functions related to opencv*/
 /*#include "cvcore.hpp"
@@ -728,6 +761,7 @@ extern "C" {
 /*RPi*/
 #ifdef RPi1
 #include "wiringPi.h"
+<<<<<<< HEAD
 #include "RPIPeripheralDigital.h"
 #include "int_RPIPeripheralDigital.h"
 #include "RPIPeripheralGertboard.h"
@@ -760,6 +794,20 @@ extern "C" {
 #include "int_RPIPeripheralSoft.h"
 #include "RPIPeripheralTiming.h"
 #include "int_RPIPeripheralTiming.h"
+=======
+#include "int_RPIPeripheralDigital.h"
+#include "RPIPeripheralDigital.h"
+#include "int_RPIPeripheralTiming.h"
+#include "RPIPeripheralTiming.h"
+#include "int_RPIPeripheralSerial.h"
+#include "RPIPeripheralSerial.h"
+#include "int_RPIPeripheralThreading.h"
+#include "RPIPeripheralThreading.h"
+#include "int_RPIPeripheralPinISR.h"
+#include "RPIPeripheralPinISR.h"
+#include "int_RPIPeripheralPWM.h"
+#include "RPIPeripheralPWM.h"
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 #endif
 
 #ifdef __cplusplus