diff options
author | Brijeshcr | 2017-07-06 15:24:41 +0530 |
---|---|---|
committer | GitHub | 2017-07-06 15:24:41 +0530 |
commit | a7eeecce4c7c39ea52a2d434815c574a2c42730d (patch) | |
tree | 9968264546fd54f9eaa6ad80ee7db47e366f8601 /2.3-1/src/c/hardware/rasberrypi/pwm | |
parent | 3308ea7a973e2c1e1c8bea99ac7cc783ce8e8b06 (diff) | |
parent | 115efeb443a7e6da44f628537811b69a01553ab2 (diff) | |
download | Scilab2C-a7eeecce4c7c39ea52a2d434815c574a2c42730d.tar.gz Scilab2C-a7eeecce4c7c39ea52a2d434815c574a2c42730d.tar.bz2 Scilab2C-a7eeecce4c7c39ea52a2d434815c574a2c42730d.zip |
Merge pull request #3 from sandeepgupta007/master
LinearAlgebra Function Added
Diffstat (limited to '2.3-1/src/c/hardware/rasberrypi/pwm')
-rw-r--r-- | 2.3-1/src/c/hardware/rasberrypi/pwm/u8RPIHardPWMSetClocks.c (renamed from 2.3-1/src/c/hardware/rasberrypi/pwm/u16RPI_pwmClocks.c) | 18 | ||||
-rw-r--r-- | 2.3-1/src/c/hardware/rasberrypi/pwm/u8RPIHardPWMSetModes.c (renamed from 2.3-1/src/c/hardware/rasberrypi/pwm/gRPI_pwmModea.c) | 25 | ||||
-rw-r--r-- | 2.3-1/src/c/hardware/rasberrypi/pwm/u8RPIHardPWMSetRanges.c (renamed from 2.3-1/src/c/hardware/rasberrypi/pwm/u32RPI_pwmRanges.c) | 19 | ||||
-rw-r--r-- | 2.3-1/src/c/hardware/rasberrypi/pwm/u8RPIHardPWMWrites.c (renamed from 2.3-1/src/c/hardware/rasberrypi/pwm/u8RPI_pwmWrites.c) | 17 | ||||
-rw-r--r-- | 2.3-1/src/c/hardware/rasberrypi/pwm/u8RPI_pwmToneWrites.c | 17 |
5 files changed, 48 insertions, 48 deletions
diff --git a/2.3-1/src/c/hardware/rasberrypi/pwm/u16RPI_pwmClocks.c b/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPIHardPWMSetClocks.c index 85e1fb2b..d06b135c 100644 --- a/2.3-1/src/c/hardware/rasberrypi/pwm/u16RPI_pwmClocks.c +++ b/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPIHardPWMSetClocks.c @@ -5,19 +5,23 @@ 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, Jorawar Singh + Author: Siddhesh Wani Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in */ -#include "RPIPeripheralPWM.h" - /*Function to set clock for pwm channel. Default clock is 19.2 MHz. 'clk_divisor' along with range decides frequency for PWM PWM frequency = 19.2 MHz / clk_divisor/ range - Range for clk_divisor = 1-2048 -*/ + Range for clk_divisor = 1-2048 + */ + +#include "types.h" +#include "RPIPeripheralPWM.h" -void u16RPI_pwmClocks(uint16 divisor){ - pwmSetClock(divisor); +void u8RPIHardPWMSetClocks(uint16 clk_divisor) +{ + pwmSetClock(clk_divisor); + + } diff --git a/2.3-1/src/c/hardware/rasberrypi/pwm/gRPI_pwmModea.c b/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPIHardPWMSetModes.c index da67a15c..0cca7a70 100644 --- a/2.3-1/src/c/hardware/rasberrypi/pwm/gRPI_pwmModea.c +++ b/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPIHardPWMSetModes.c @@ -5,21 +5,24 @@ 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, Jorawar Singh + Author: Siddhesh Wani Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in */ -#include "RPIPeripheralPWM.h" - /*Function to set mode for PWM channel. Two modes are available - "bal" --> balanced mode - "ms" --> mark/space mode + 0 --> balanced mode + 1 --> mark/space mode */ - -void gRPI_pwmModea(char* mode,int size){ - if (mode[0] == 'm') /*mark/space mode*/ - pwmSetMode(0); - else if (mode[0] == 'b') - pwmSetMode(1); + +#include "types.h" +#include "RPIPeripheralPWM.h" + +void u8RPIHardPWMSetModes(uint8 mode) +{ + if (mode == 1) /*mark/space mode*/ + pwmSetMode(PWM_MODE_MS); + else + pwmSetMode(PWM_MODE_BAL); + } diff --git a/2.3-1/src/c/hardware/rasberrypi/pwm/u32RPI_pwmRanges.c b/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPIHardPWMSetRanges.c index 1fb22963..b2489f59 100644 --- a/2.3-1/src/c/hardware/rasberrypi/pwm/u32RPI_pwmRanges.c +++ b/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPIHardPWMSetRanges.c @@ -5,18 +5,21 @@ 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, Jorawar Singh + Author: Siddhesh Wani Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in */ -#include "RPIPeripheralPWM.h" - -/*Function to assign pwm duty to specified pin. PWM duty is decided by 'value' +/*Function to assigne pwm duty to specified pin. PWM duty is decided by 'value' and 'range' specified using corresponding function. PWM duty = value/range */ - -void u32RPI_pwmRanges(uint32 value){ - pwmSetRange(value); -} + +#include "types.h" +#include "RPIPeripheralPWM.h" + +void u8RPIHardPWMSetRanges(uint16 value) +{ + pwmSetRange(value); + +} diff --git a/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPI_pwmWrites.c b/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPIHardPWMWrites.c index be94e73e..ae02bf0d 100644 --- a/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPI_pwmWrites.c +++ b/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPIHardPWMWrites.c @@ -5,15 +5,22 @@ 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, Jorawar Singh + Author: Siddhesh Wani Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in */ +/*Function to set range for pwm channel. PWM duty is decided by 'range' + and 'value' specified using corresponding function. + PWM duty = value/range + */ + +#include "types.h" #include "RPIPeripheralPWM.h" +#include "RPIPeripheralDigital.h" -/*Function to write the given value to the pwm pin*/ - -void u8RPI_pwmWrites(uint8 pin, uint16 value){ - pwmWrite(pin, value); +void u8RPIHardPWMWrites(uint8 pin, uint16 value) +{ + pwmWrite((int)phy_pin[pin-1], value); + } diff --git a/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPI_pwmToneWrites.c b/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPI_pwmToneWrites.c deleted file mode 100644 index fe1b8cd2..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPI_pwmToneWrites.c +++ /dev/null @@ -1,17 +0,0 @@ -/* 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, Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralPWM.h" - -void u8RPI_pwmToneWrites(uint8 pin, uint16 value){ - pwmToneWrite(pin, value); -} |