From aceeb1fe05a8ff6c126ea9ba166a19249488dbd1 Mon Sep 17 00:00:00 2001 From: siddhu8990 Date: Thu, 13 Apr 2017 10:42:02 +0530 Subject: Functions added - balance,rcond,obscont --- .../hardware/rasberrypi/gpio/u8RPIDigitalSetups.c | 7 +++--- .../rasberrypi/includes/RPIPeripheralSerial.h | 4 ++-- .../rasberrypi/serial/u16RPISerialSetups.c | 25 ++++++++++++++++++++++ .../hardware/rasberrypi/serial/u8RPISerialSetups.c | 25 ---------------------- 4 files changed, 31 insertions(+), 30 deletions(-) create mode 100644 src/c/hardware/rasberrypi/serial/u16RPISerialSetups.c delete mode 100644 src/c/hardware/rasberrypi/serial/u8RPISerialSetups.c (limited to 'src/c/hardware/rasberrypi') diff --git a/src/c/hardware/rasberrypi/gpio/u8RPIDigitalSetups.c b/src/c/hardware/rasberrypi/gpio/u8RPIDigitalSetups.c index fa860255..f5fefe08 100644 --- a/src/c/hardware/rasberrypi/gpio/u8RPIDigitalSetups.c +++ b/src/c/hardware/rasberrypi/gpio/u8RPIDigitalSetups.c @@ -21,9 +21,10 @@ /*This array maps pin numbers on RPi board, with pin numbers corrsponding to WiringPi library*/ -int phy_pin[] = {17, 17, 8, 17, 9, 17, 7, 15, 17, 16, /*Pin 1 to 10*/ - 0, 1, 2, 17, 3, 4, 17, 5, 12, 17, /*Pin 11 to 20*/ - 13, 6, 14, 10, 17, 11 }; /*Pin 21 to 26*/ +int phy_pin[] = {17, 17, 8, 17, 9, 17, 7, 15, 17, 16, /*Pin 1 to 10*/ + 0, 1, 2, 17, 3, 4, 17, 5, 12, 17, /*Pin 11 to 20*/ + 13, 6, 14, 10, 17, 11, 30, 31, 21, 17, /*Pin 21 to 30*/ + 22, 26, 23, 17, 24, 27, 25, 28, 17, 29 }; /*Pin 31 to 40*/ /*pin is reduced by one as arrayiindex starts from 0 and pin no starts from 1*/ void u8RPIDigitalSetups(uint8 pin, uint8 direction) diff --git a/src/c/hardware/rasberrypi/includes/RPIPeripheralSerial.h b/src/c/hardware/rasberrypi/includes/RPIPeripheralSerial.h index 76a229e2..14df95b4 100644 --- a/src/c/hardware/rasberrypi/includes/RPIPeripheralSerial.h +++ b/src/c/hardware/rasberrypi/includes/RPIPeripheralSerial.h @@ -29,13 +29,13 @@ void u16RPISerialSendDatas(int fd, uint16 data); void i16RPISerialSendDatas(int fd, int16 data); void sRPISerialSendDatas(int fd, float data); void dRPISerialSendDatas(int fd, double data); -void u8RPISerialSendDataa(int fd, void* data, int size); +void u8RPISerialSendDataa(int fd, uint8* data, int size); void i8RPISerialSendDataa(int fd, int8* data, int size); void u16RPISerialSendDataa(int fd, uint16* data, int size); void i16RPISerialSendDataa(int fd, int16* data, int size); void sRPISerialSendDataa(int fd, float* data, int size); void dRPISerialSendDataa(int fd, double* data, int size); -void gRPISerialSendDatas(int fd, void* data, int size); +void gRPISerialSendDatas(int fd, uint8* data, int size); int16 i16RPISerialDataAvails(int fd); int16 i16RPISerialGetChars(int fd); diff --git a/src/c/hardware/rasberrypi/serial/u16RPISerialSetups.c b/src/c/hardware/rasberrypi/serial/u16RPISerialSetups.c new file mode 100644 index 00000000..cde4cba2 --- /dev/null +++ b/src/c/hardware/rasberrypi/serial/u16RPISerialSetups.c @@ -0,0 +1,25 @@ +/* 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 + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +/* Function to setup port with desired baud rate. */ + +#include "types.h" +#include "RPIPeripheralSerial.h" + +int u16RPISerialSetups(char* port, int baudrate) +{ + int fd; + + fd = serialOpen (port, baudrate); + + return fd; +} diff --git a/src/c/hardware/rasberrypi/serial/u8RPISerialSetups.c b/src/c/hardware/rasberrypi/serial/u8RPISerialSetups.c deleted file mode 100644 index cde4cba2..00000000 --- a/src/c/hardware/rasberrypi/serial/u8RPISerialSetups.c +++ /dev/null @@ -1,25 +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 - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -/* Function to setup port with desired baud rate. */ - -#include "types.h" -#include "RPIPeripheralSerial.h" - -int u16RPISerialSetups(char* port, int baudrate) -{ - int fd; - - fd = serialOpen (port, baudrate); - - return fd; -} -- cgit