diff options
| author | Brijeshcr | 2017-07-07 18:19:45 +0530 |
|---|---|---|
| committer | GitHub | 2017-07-07 18:19:45 +0530 |
| commit | 5258fe20f21514eca1f7dc4ee384fe63c35c68a1 (patch) | |
| tree | c0424024c16aa122a5a38686dfed75a4c4866e95 /2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralDigital.h | |
| parent | 8d1da9568248c9a0572da08a7039e75e84d782b0 (diff) | |
| parent | a505550d38b2b886c61863a85be67faf02ad604b (diff) | |
| download | Scilab2C-5258fe20f21514eca1f7dc4ee384fe63c35c68a1.tar.gz Scilab2C-5258fe20f21514eca1f7dc4ee384fe63c35c68a1.tar.bz2 Scilab2C-5258fe20f21514eca1f7dc4ee384fe63c35c68a1.zip | |
Merge pull request #12 from yash1112/master
SCi2cDeps updated, Windows compatibility resolved
Diffstat (limited to '2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralDigital.h')
| -rw-r--r-- | 2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralDigital.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralDigital.h b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralDigital.h index 22d470a2..b9b88e79 100644 --- a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralDigital.h +++ b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralDigital.h @@ -1,4 +1,8 @@ +<<<<<<< HEAD /* Copyright (C) 2017 - IIT Bombay - FOSSEE +======= +/* Copyright (C) 2016 - IIT Bombay - FOSSEE +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 This file must be used under the terms of the CeCILL. This source file is licensed as described in the file COPYING, which @@ -19,12 +23,24 @@ extern "C" { #endif +<<<<<<< HEAD #include "types.h" uint8 u8RPI_digitalReads(uint8 pin); uint8 RPI_digitalReadByte(); void u8RPI_digitalWrites(uint8 pin, uint8 state); void u8RPI_digitalWriteBytes(uint8 value); +======= + +#include "types.h" +#include "wiringPi.h" + +extern int phy_pin[]; + +void u8RPIDigitalSetups(uint8 pin, uint8 direction); +void u8RPIDigitalOuts(uint8 pin, uint8 state); +uint8 u8RPIDigitalIns(uint8 pin); +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #ifdef __cplusplus } /* extern "C" */ |