Revert "SCi2cDeps updated, Windows compatibility resolved"

6 files changed, 0 insertions, 133 deletions

diff --git a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralDigital.h b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralDigital.h
index b9b88e79..22d470a2 100644
--- a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralDigital.h
+++ b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralDigital.h
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 /* Copyright (C) 2017 - IIT Bombay - FOSSEE
-=======
-/* Copyright (C) 2016 - IIT Bombay - FOSSEE
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 
  This file must be used under the terms of the CeCILL.
  This source file is licensed as described in the file COPYING, which
@@ -23,24 +19,12 @@
 extern "C" {
 #endif
 
-<<<<<<< HEAD
 #include "types.h"
 
 uint8 u8RPI_digitalReads(uint8 pin);
 uint8 RPI_digitalReadByte();
 void u8RPI_digitalWrites(uint8 pin, uint8 state);
 void u8RPI_digitalWriteBytes(uint8 value);
-=======
-
-#include "types.h"
-#include "wiringPi.h"
-
-extern int phy_pin[];
-
-void u8RPIDigitalSetups(uint8 pin, uint8 direction);
-void u8RPIDigitalOuts(uint8 pin, uint8 state);
-uint8 u8RPIDigitalIns(uint8 pin);
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 
 #ifdef  __cplusplus
 } /* extern "C" */
diff --git a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralPWM.h b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralPWM.h
index 9c523f93..f1d3024e 100644
--- a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralPWM.h
+++ b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralPWM.h
@@ -5,28 +5,17 @@
  you should have received as part of this distribution.  The terms
  are also available at
  http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
-<<<<<<< HEAD
  Author: Siddhesh Wani, Jorawar Singh
-=======
- Author: Siddhesh Wani
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
  Organization: FOSSEE, IIT Bombay
  Email: toolbox@scilab.in
  */
 #ifndef __RPIPERIPHERALPWM_H__
 #define __RPIPERIPHERALPWM_H__
 
-<<<<<<< HEAD
-=======
-#include "types.h"
-#include "wiringPi.h"
-
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 #ifdef  __cplusplus
 extern "C" {
 #endif
 
-<<<<<<< HEAD
 #include "types.h"
 
 void u8RPI_pwmWrites(uint8 pin,uint16 value);
@@ -34,12 +23,6 @@ void u32RPI_pwmRanges(uint32 value);
 void gRPI_pwmModea(char* mode,int size);
 void u16RPI_pwmClocks(uint16 divisor);
 void u8RPI_pwmToneWrites(uint8 pin,uint16 value);
-=======
-void u8RPIHardPWMWrites(uint8 pin, uint16 value);
-void u8RPIHardPWMSetRanges(uint16 value);
-void u8RPIHardPWMSetModes(uint8 mode);
-void u8RPIHardPWMSetClocks(uint16 clk_divisor);
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 
 #ifdef  __cplusplus 
 } /* extern "C" */
diff --git a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralPinISR.h b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralPinISR.h
deleted file mode 100644
index fc5a8d04..00000000
--- a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralPinISR.h
+++ /dev/null
@@ -1,26 +0,0 @@
- /* Copyright (C) 2016 - IIT Bombay - FOSSEE
-
- This file must be used under the terms of the CeCILL.
- This source file is licensed as described in the file COPYING, which
- you should have received as part of this distribution.  The terms
- are also available at
- http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
- Author: Siddhesh Wani
- Organization: FOSSEE, IIT Bombay
- Email: toolbox@scilab.in
- */
-#ifndef __RPIPERIPHERALPINISR_H__
-#define __RPIPERIPHERALPINISR_H__
-
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-int16 i16RPIPinISRs(uint8 pin, uint8 edgetype, void (*ISRFunction)(void));
-
-#ifdef  __cplusplus 
-} /* extern "C" */
-#endif
-
-#endif /*__RPIPERIPHERALPINISR_H__*/
diff --git a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralSerial.h b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralSerial.h
index 19ddcb21..67284bd0 100644
--- a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralSerial.h
+++ b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralSerial.h
@@ -5,28 +5,17 @@
  you should have received as part of this distribution.  The terms
  are also available at
  http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
-<<<<<<< HEAD
  Author: Siddhesh Wani, Jorawar Singh
-=======
- Author: Siddhesh Wani
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
  Organization: FOSSEE, IIT Bombay
  Email: toolbox@scilab.in
  */
 #ifndef __RPIPERIPHERALSERIAL_H__
 #define __RPIPERIPHERALSERIAL_H__
 
-<<<<<<< HEAD
-=======
-#include "types.h"
-#include "wiringSerial.h"
-
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 #ifdef  __cplusplus
 extern "C" {
 #endif
 
-<<<<<<< HEAD
 #include "types.h"
 #include "wiringSerial.h"
 
@@ -38,30 +27,6 @@ void u8RPI_serialGetchars(uint8 fd,char* out);
 void u8RPI_serialPrintfs(uint8 fd,char* msg,int size);
 void u8RPI_serialPutchars(uint8 fd,uint8 character);
 void u8RPI_serialPutss(uint8 fd,char* character,int size);
-=======
-int u8RPISerialSetups(char* port, int baudrate);
-void u8RPISerialCloses(int fd);
-
-void u8RPISerialSendChars(int fd, uint8 data);
-void u8RPISerialSendDatas(int fd, uint8 data);
-void i8RPISerialSendDatas(int fd, int8 data);
-void u16RPISerialSendDatas(int fd, uint16 data);
-void i16RPISerialSendDatas(int fd, int16 data);
-void sRPISerialSendDatas(int fd, float data);
-void dRPISerialSendDatas(int fd, double data);
-void u8RPISerialSendDataa(int fd, uint8* data, int size);
-void i8RPISerialSendDataa(int fd, int8* data, int size);
-void u16RPISerialSendDataa(int fd, uint16* data, int size);
-void i16RPISerialSendDataa(int fd, int16* data, int size);
-void sRPISerialSendDataa(int fd, float* data, int size);
-void dRPISerialSendDataa(int fd, double* data, int size);
-void gRPISerialSendDatas(int fd, uint8* data, int size);
-
-int16 i16RPISerialDataAvails(int fd);
-int16 i16RPISerialGetChars(int fd);
-
-void u8RPISerialFlushs(int fd);
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 
 #ifdef  __cplusplus 
 } /* extern "C" */
diff --git a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralThreading.h b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralThreading.h
deleted file mode 100644
index a7b2adb4..00000000
--- a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralThreading.h
+++ /dev/null
@@ -1,28 +0,0 @@
- /* Copyright (C) 2016 - IIT Bombay - FOSSEE
-
- This file must be used under the terms of the CeCILL.
- This source file is licensed as described in the file COPYING, which
- you should have received as part of this distribution.  The terms
- are also available at
- http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
- Author: Siddhesh Wani
- Organization: FOSSEE, IIT Bombay
- Email: toolbox@scilab.in
- */
-#ifndef __RPIPERIPHERALTHREADING_H__
-#define __RPIPERIPHERALTHREADING_H__
-
-#include "types.h"
-#include "wiringPi.h" 
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-uint16 RPIThreadCreate(void *(*threadFunction)(void*));
-
-#ifdef  __cplusplus 
-} /* extern "C" */
-#endif
-
-#endif /*__RPIPERIPHERALTHREADING_H__*/
diff --git a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralTiming.h b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralTiming.h
index b9087d77..e75a5394 100644
--- a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralTiming.h
+++ b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralTiming.h
@@ -5,11 +5,7 @@
  you should have received as part of this distribution.  The terms
  are also available at
  http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
-<<<<<<< HEAD
  Author: Siddhesh Wani, Jorawar Singh
-=======
- Author: Siddhesh Wani
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
  Organization: FOSSEE, IIT Bombay
  Email: toolbox@scilab.in
 */
@@ -26,17 +22,10 @@ extern "C" {
 #include "types.h"
 #include "wiringPi.h"
 
-<<<<<<< HEAD
 void u32RPI_delays(uint32 time);
 void u32RPI_delayMicros(uint32 time);
 uint32 RPI_millis();
 uint32 RPI_micros();
-=======
-void u16RPIDelayMillis(uint16 time);
-void u16RPIDelayMicros(uint16 time);
-uint32 u32RPIGetMillis();
-uint32 u32RPIGetMicros();
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 
 #ifdef  __cplusplus
 } /* extern "C" */