diff options
| author | Brijeshcr | 2017-07-07 18:19:45 +0530 |
|---|---|---|
| committer | GitHub | 2017-07-07 18:19:45 +0530 |
| commit | 5258fe20f21514eca1f7dc4ee384fe63c35c68a1 (patch) | |
| tree | c0424024c16aa122a5a38686dfed75a4c4866e95 /2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralTiming.h | |
| parent | 8d1da9568248c9a0572da08a7039e75e84d782b0 (diff) | |
| parent | a505550d38b2b886c61863a85be67faf02ad604b (diff) | |
| download | Scilab2C-5258fe20f21514eca1f7dc4ee384fe63c35c68a1.tar.gz Scilab2C-5258fe20f21514eca1f7dc4ee384fe63c35c68a1.tar.bz2 Scilab2C-5258fe20f21514eca1f7dc4ee384fe63c35c68a1.zip | |
Merge pull request #12 from yash1112/master
SCi2cDeps updated, Windows compatibility resolved
Diffstat (limited to '2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralTiming.h')
| -rw-r--r-- | 2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralTiming.h | 11 |
1 files changed, 11 insertions, 0 deletions
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 e75a5394..b9087d77 100644 --- a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralTiming.h +++ b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralTiming.h @@ -5,7 +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: Siddhesh Wani, Jorawar Singh +======= + Author: Siddhesh Wani +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in */ @@ -22,10 +26,17 @@ 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" */ |