New functions added and rpi issues resolved

5 files changed, 48 insertions, 48 deletions

diff --git a/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPIHardPWMSetModes.c b/2.3-1/src/c/hardware/rasberrypi/pwm/gRPI_pwmModea.c
index 0cca7a70..da67a15c 100644
--- a/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPIHardPWMSetModes.c
+++ b/2.3-1/src/c/hardware/rasberrypi/pwm/gRPI_pwmModea.c
@@ -5,24 +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
+ Author: Siddhesh Wani, Jorawar Singh
  Organization: FOSSEE, IIT Bombay
  Email: toolbox@scilab.in
 */
 
-/*Function to set mode for PWM channel. Two modes are available
-					0 --> balanced mode
-					1 --> mark/space mode
- */
-     
-#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);
-	
+/*Function to set mode for PWM channel. Two modes are available
+					"bal" --> balanced mode
+					"ms"  --> 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);
 } 
diff --git a/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPIHardPWMSetClocks.c b/2.3-1/src/c/hardware/rasberrypi/pwm/u16RPI_pwmClocks.c
index d06b135c..85e1fb2b 100644
--- a/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPIHardPWMSetClocks.c
+++ b/2.3-1/src/c/hardware/rasberrypi/pwm/u16RPI_pwmClocks.c
@@ -5,23 +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
- Author: Siddhesh Wani
+ Author: Siddhesh Wani, Jorawar Singh
  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			
- */
-     
-#include "types.h"
-#include "RPIPeripheralPWM.h"
+            Range for clk_divisor = 1-2048			
+*/
 
-void u8RPIHardPWMSetClocks(uint16 clk_divisor) 
-{
-	pwmSetClock(clk_divisor);
-	
-	
+void u16RPI_pwmClocks(uint16 divisor){
+	pwmSetClock(divisor);	
 } 
diff --git a/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPIHardPWMSetRanges.c b/2.3-1/src/c/hardware/rasberrypi/pwm/u32RPI_pwmRanges.c
index b2489f59..1fb22963 100644
--- a/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPIHardPWMSetRanges.c
+++ b/2.3-1/src/c/hardware/rasberrypi/pwm/u32RPI_pwmRanges.c
@@ -5,21 +5,18 @@
  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
+ Author: Siddhesh Wani, Jorawar Singh
  Organization: FOSSEE, IIT Bombay
  Email: toolbox@scilab.in
 */
 
-/*Function to assigne pwm duty to specified pin. PWM duty is decided by 'value'
+#include "RPIPeripheralPWM.h"
+
+/*Function to assign pwm duty to specified pin. PWM duty is decided by 'value'
  and 'range' specified using corresponding function. 
  				PWM duty = value/range 
  */
-     
-#include "types.h"
-#include "RPIPeripheralPWM.h"
-
-void u8RPIHardPWMSetRanges(uint16 value)
-{
-	pwmSetRange(value);
-	
-} 
+ 
+void u32RPI_pwmRanges(uint32 value){
+    pwmSetRange(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
new file mode 100644
index 00000000..fe1b8cd2
--- /dev/null
+++ b/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPI_pwmToneWrites.c
@@ -0,0 +1,17 @@
+/* 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);
+}
diff --git a/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPIHardPWMWrites.c b/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPI_pwmWrites.c
index ae02bf0d..be94e73e 100644
--- a/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPIHardPWMWrites.c
+++ b/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPI_pwmWrites.c
@@ -5,22 +5,15 @@
  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
+ Author: Siddhesh Wani, Jorawar Singh
  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"
 
-void u8RPIHardPWMWrites(uint8 pin, uint16 value)
-{
-	pwmWrite((int)phy_pin[pin-1], value);
-	
+/*Function to write the given value to the pwm pin*/
+
+void u8RPI_pwmWrites(uint8 pin, uint16 value){
+	pwmWrite(pin, value);
 }