diff options
| author | Brijeshcr | 2017-07-08 20:18:17 +0530 |
|---|---|---|
| committer | GitHub | 2017-07-08 20:18:17 +0530 |
| commit | bd03b38be0918837e147e969c6bb2014900009db (patch) | |
| tree | 2cd9b7b1c15092e1367ed15e81aa71ccc9e05190 /src/c/hardware/rasberrypi/includes/RPIPeripheralDigital.h | |
| parent | 97d1c6847a05bdb93557553a6bdcfd0f15feda99 (diff) | |
| download | Scilab2C_fossee_old-bd03b38be0918837e147e969c6bb2014900009db.tar.gz Scilab2C_fossee_old-bd03b38be0918837e147e969c6bb2014900009db.tar.bz2 Scilab2C_fossee_old-bd03b38be0918837e147e969c6bb2014900009db.zip | |
Revert "SCi2cDeps updated, Windows compatibility resolved"
Diffstat (limited to 'src/c/hardware/rasberrypi/includes/RPIPeripheralDigital.h')
| -rw-r--r-- | src/c/hardware/rasberrypi/includes/RPIPeripheralDigital.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/src/c/hardware/rasberrypi/includes/RPIPeripheralDigital.h b/src/c/hardware/rasberrypi/includes/RPIPeripheralDigital.h index b9b88e7..22d470a 100644 --- a/src/c/hardware/rasberrypi/includes/RPIPeripheralDigital.h +++ b/src/c/hardware/rasberrypi/includes/RPIPeripheralDigital.h @@ -1,8 +1,4 @@ -<<<<<<< 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 @@ -23,24 +19,12 @@ 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" */ |