From de14a5628ad439e20770d10733ebdac46562a860 Mon Sep 17 00:00:00 2001
From: Jorawar Singh
Date: Fri, 7 Jul 2017 13:00:37 +0530
Subject: Raspberry Pi function changes and minor gui changes

---
 src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralTiming.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralTiming.h')

diff --git a/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralTiming.h b/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralTiming.h
index d2fae23..cbbb47a 100644
--- a/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralTiming.h
+++ b/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralTiming.h
@@ -24,6 +24,8 @@ extern "C" {
 #define d0RPI_delay(time) u32RPI_delays(time);
 
 #define u320RPI_delayMicro(time) u32RPI_delayMicros(time);
+#define d0RPI_delayMicro(time) u32RPI_delayMicros(time);
+
 #define RPI_millisu320() RPI_millis();
 #define RPI_microsu320() RPI_micros();
 
-- 
cgit 


From 3f52712f806fbd80d66dfdcaff401e5cf94dcca4 Mon Sep 17 00:00:00 2001
From: yash1112
Date: Fri, 7 Jul 2017 21:20:49 +0530
Subject: sci2c arduino updated

---
 .../interfaces/int_RPIPeripheralTiming.h           | 34 ++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralTiming.h

(limited to 'src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralTiming.h')

diff --git a/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralTiming.h b/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralTiming.h
new file mode 100644
index 0000000..1a70465
--- /dev/null
+++ b/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralTiming.h
@@ -0,0 +1,34 @@
+/* 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 __INT_RPIPERIPHERALTIMING_H__
+#define __INT_RPIPERIPHERALTIMING_H__
+
+#include "types.h"
+#include "RPIPeripheralTiming.h"
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+#define RPI_DelayMicro(in1) u16RPIDelayMicros((uint16) in1)
+#define RPI_DelayMilli(in1) u16RPIDelayMillis((uint16) in1)
+#define RPI_GetMicro() u32RPIGetMicros()
+#define RPI_GetMillis() u32RPIGetMillis()
+
+
+#ifdef  __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* !__RPIPERIPHERALTIMING_H__ */
-- 
cgit 


From bd03b38be0918837e147e969c6bb2014900009db Mon Sep 17 00:00:00 2001
From: Brijeshcr
Date: Sat, 8 Jul 2017 20:18:17 +0530
Subject: Revert "SCi2cDeps updated, Windows compatibility resolved"

---
 .../rasberrypi/interfaces/int_RPIPeripheralTiming.h  | 20 --------------------
 1 file changed, 20 deletions(-)

(limited to 'src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralTiming.h')

diff --git a/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralTiming.h b/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralTiming.h
index c91fdfb..cbbb47a 100644
--- a/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralTiming.h
+++ b/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralTiming.h
@@ -5,19 +5,11 @@
  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:  Jorawar Singh, Siddhesh Wani
-=======
- Author: Siddhesh Wani
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
  Organization: FOSSEE, IIT Bombay
  Email: toolbox@scilab.in
 */
 
-<<<<<<< HEAD
-=======
-
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 #ifndef __INT_RPIPERIPHERALTIMING_H__
 #define __INT_RPIPERIPHERALTIMING_H__
 
@@ -28,7 +20,6 @@
 extern "C" {
 #endif
 
-<<<<<<< HEAD
 #define u320RPI_delay(time) u32RPI_delays(time);
 #define d0RPI_delay(time) u32RPI_delays(time);
 
@@ -37,20 +28,9 @@ extern "C" {
 
 #define RPI_millisu320() RPI_millis();
 #define RPI_microsu320() RPI_micros();
-=======
-#define RPI_DelayMicro(in1) u16RPIDelayMicros((uint16) in1)
-#define RPI_DelayMilli(in1) u16RPIDelayMillis((uint16) in1)
-#define RPI_GetMicro() u32RPIGetMicros()
-#define RPI_GetMillis() u32RPIGetMillis()
-
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 
 #ifdef  __cplusplus
 } /* extern "C" */
 #endif
 
-<<<<<<< HEAD
 #endif /* !__INT_RPIPERIPHERALTIMING_H__ */
-=======
-#endif /* !__RPIPERIPHERALTIMING_H__ */
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
-- 
cgit