diff options
| author | yash1112 | 2017-07-07 22:03:16 +0530 |
|---|---|---|
| committer | yash1112 | 2017-07-07 22:03:16 +0530 |
| commit | 640f9fcf3f64298c7958f4bde5a7e6a7602a690d (patch) | |
| tree | f2d5c577e9c719190f2ce68c976a9acefd6611c6 /2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralTiming.h | |
| parent | e9de337a34e123749927039f7011fb30fc96f7c9 (diff) | |
| parent | 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 (diff) | |
| download | Scilab2C-640f9fcf3f64298c7958f4bde5a7e6a7602a690d.tar.gz Scilab2C-640f9fcf3f64298c7958f4bde5a7e6a7602a690d.tar.bz2 Scilab2C-640f9fcf3f64298c7958f4bde5a7e6a7602a690d.zip | |
Scilab2C Arduino Updated
Diffstat (limited to '2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralTiming.h')
| -rw-r--r-- | 2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralTiming.h | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralTiming.h b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralTiming.h index d2fae234..073cc1ec 100644 --- a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralTiming.h +++ b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralTiming.h @@ -5,11 +5,19 @@ 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__ @@ -20,15 +28,27 @@ extern "C" { #endif +<<<<<<< HEAD #define u320RPI_delay(time) u32RPI_delays(time); #define d0RPI_delay(time) u32RPI_delays(time); #define u320RPI_delayMicro(time) u32RPI_delayMicros(time); #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 |