diff options
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 854073f3..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" */ |