diff options
Diffstat (limited to 'src/c/hardware/rasberrypi/includes/RPIPeripheralPWM.h')
| -rw-r--r-- | src/c/hardware/rasberrypi/includes/RPIPeripheralPWM.h | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/src/c/hardware/rasberrypi/includes/RPIPeripheralPWM.h b/src/c/hardware/rasberrypi/includes/RPIPeripheralPWM.h index 9c523f9..f1d3024 100644 --- a/src/c/hardware/rasberrypi/includes/RPIPeripheralPWM.h +++ b/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" */ |